fiddlerwoaroof/crawl - Change KJ7BAVTDVVETEXDWUUDPDRCSX5DWRU2QOTYCUOICFA7CJPAGNVCAC

Simplify further.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4963 c06c8d41-db1a-0410-9941-cceddc491573

Created by dolorous on May 9, 2008

KJ7BAVTDVVETEXDWUUDPDRCSX5DWRU2QOTYCUOICFA7CJPAGNVCAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.cc at line 874 [5.616635]
B:BD[3.357] → [4.598:637]
```
        // Divine robustness, level 1.
```
[3.357]
[6.1113]
```
        // Divine robustness.
```

Deletion in crawl-ref/source/spells1.cc at line 876 [5.616635]

B:BD[6.1129] → [2.171:288]

∅:D[7.231] → [6.1158:1172]

∅:D[2.288] → [6.1158:1172]

∅:D[4.697] → [6.1158:1172]

B:BD[6.1158] → [6.1158:1172]

∅:D[8.375] → [6.1172:1204]

B:BD[6.1172] → [6.1172:1204]

B:BD[6.1204] → [4.698:772]

B:BD[4.772] → [7.232:289]

∅:D[7.289] → [9.171:278]

B:BD[4.831] → [9.171:278]

B:BD[9.278] → [10.171:222]

∅:D[10.222] → [4.904:931]

∅:D[9.278] → [4.904:931]

B:BD[4.904] → [4.904:931]

B:BD[4.931] → [10.223:288]

B:BD[10.288] → [2.289:359]

∅:D[10.288] → [6.1237:1275]

∅:D[2.359] → [6.1237:1275]

∅:D[11.375] → [6.1237:1275]

∅:D[4.931] → [6.1237:1275]

B:BD[6.1237] → [6.1237:1275]

B:BD[6.1275] → [3.358:421]

∅:D[3.421] → [12.1626:1683]

B:BD[6.1275] → [12.1626:1683]

B:BD[6.1337] → [6.1337:1338]

B:BD[6.1338] → [4.932:971]

            if (you.attribute[ATTR_DIVINE_ROBUSTNESS] == 0
                && player_mutation_level(MUT_ROBUST) < 3)
            {
                success = true;
                mpr("Zin grants you divine robustness.", MSGCH_DURATION);
                you.attribute[ATTR_DIVINE_ROBUSTNESS]++;
                you.duration[DUR_DIVINE_ROBUSTNESS] +=
                    you.skills[SK_INVOCATIONS] * 2;
                const int old_hp_max = you.hp_max;
                calc_hp();
                set_hp(you.hp * you.hp_max / old_hp_max, false);
                need_chain = (player_mutation_level(MUT_ROBUST) < 2);
                break;
            }
            step = 4;
            // Deliberate fall through.
            if (step == step_max)
                break;
        // Divine robustness, level 2.

Replacement in crawl-ref/source/spells1.cc at line 877 [5.616635]

B:BD[6.1384] → [2.360:477]

            if (you.attribute[ATTR_DIVINE_ROBUSTNESS] == 1
                && player_mutation_level(MUT_ROBUST) < 2)

[6.1384]

[13.204]

        case 5:
            if ((step == 3 || you.duration[DUR_REVITALISATION_CHAIN] > 0))
                && you.attribute[ATTR_DIVINE_ROBUSTNESS] == (step - 3)
                && player_mutation_level(MUT_ROBUST) < (6 - step))

Replacement in crawl-ref/source/spells1.cc at line 883 [5.616635]

B:BD[13.250] → [4.1032:1112]

B:BD[4.1112] → [7.351:408]

                mpr("Zin strengthens your divine robustness.", MSGCH_DURATION);
                you.attribute[ATTR_DIVINE_ROBUSTNESS]++;

[13.250]

[9.279]

                mprf(MSGCH_DURATION, "Zin %s divine robustness.",
                    (step == 3) ? "grants you" :
                    (step == 4) ? "strengthens your" :
                                : "maximises your");
                you.attribute[ATTR_DIVINE_ROBUSTNESS] = (step - 2);

Replacement in crawl-ref/source/spells1.cc at line 889 [5.616635]

B:BD[9.334] → [9.334:382]

B:BD[9.382] → [10.289:340]

∅:D[10.340] → [4.1244:1271]

∅:D[9.382] → [4.1244:1271]

B:BD[4.1244] → [4.1244:1271]

B:BD[4.1271] → [10.341:406]

B:BD[10.406] → [2.478:548]

∅:D[10.406] → [13.292:330]

∅:D[11.411] → [13.292:330]

∅:D[2.548] → [13.292:330]

∅:D[4.1271] → [13.292:330]

B:BD[13.292] → [13.292:330]

B:BD[13.330] → [3.422:485]

∅:D[3.485] → [12.1685:1742]

B:BD[13.330] → [12.1685:1742]

                    you.skills[SK_INVOCATIONS];
                const int old_hp_max = you.hp_max;
                calc_hp();
                set_hp(you.hp * you.hp_max / old_hp_max, false);
                need_chain = (player_mutation_level(MUT_ROBUST) < 1);
                break;
            }
            step = 5;
            // Deliberate fall through.
            if (step == step_max)
                break;

[9.334]

[13.392]

                    (step == 3) ? (you.skills[SK_INVOCATIONS] * 2) :
                    (step == 4) ? (you.skills[SK_INVOCATIONS])
                                : (you.skills[SK_INVOCATIONS] / 2);

Deletion in crawl-ref/source/spells1.cc at line 893 [5.616635]

B:BD[13.393] → [4.1272:1311]

∅:D[13.428] → [6.1384:1400]

∅:D[4.1311] → [6.1384:1400]

B:BD[6.1384] → [6.1384:1400]

B:BD[6.1400] → [2.549:666]

∅:D[7.469] → [6.1433:1447]

∅:D[8.657] → [6.1433:1447]

∅:D[2.666] → [6.1433:1447]

∅:D[4.1371] → [6.1433:1447]

B:BD[6.1433] → [6.1433:1447]

∅:D[8.693] → [6.1447:1479]

B:BD[6.1447] → [6.1447:1479]

B:BD[6.1479] → [4.1372:1450]

B:BD[4.1450] → [7.470:527]

∅:D[7.527] → [9.383:490]

B:BD[4.1509] → [9.383:490]

        // Divine robustness, level 3.
        case 5:
            if (you.attribute[ATTR_DIVINE_ROBUSTNESS] == 2
                && player_mutation_level(MUT_ROBUST) < 1)
            {
                success = true;
                mpr("Zin maximises your divine robustness.", MSGCH_DURATION);
                you.attribute[ATTR_DIVINE_ROBUSTNESS]++;
                you.duration[DUR_DIVINE_ROBUSTNESS] +=
                    you.skills[SK_INVOCATIONS] / 2;

Replacement in crawl-ref/source/spells1.cc at line 896 [5.616635]

B:BD[10.524] → [11.412:447]

                need_chain = true;

[10.524]

[6.1521]

                need_chain = (player_mutation_level(MUT_ROBUST) < (5 - step));