fiddlerwoaroof/crawl - Change CA6ZG6P2CE5EPAOQSB3P7NBDKTNFFHQP4CPOUFZL32ON6N32GSSQC

Add various patches of mine:

[1824221] don't give Yred-worshipping demonspawn the "raise dead" mutation [1829258] remove wrongly hardcoded exp-draining resistance for undead [1829691] typo fixes [1830030] clean up random god servant handling [1829890] fix divine retribution messages, generalize berserker summoning

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

Created by dolorous on November 19, 2007

CA6ZG6P2CE5EPAOQSB3P7NBDKTNFFHQP4CPOUFZL32ON6N32GSSQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.h at line 158 [4.562867]
B:BD[4.568149] → [5.4345:4370]
```
void summon_berserker();
```
[4.568149]
[4.568149]
```
bool summon_berserker(int pow, bool god_gift);
```

Replacement in crawl-ref/source/spells2.cc at line 1483 [4.569242]

B:BD[5.4435] → [5.4435:4513]

// Trog sends some fighting buddies for his followers
void summon_berserker()

[5.4435]

[5.4513]

// Trog sends some fighting buddies for his followers (or enemies if
// god_gift is false)
bool summon_berserker(int pow, bool god_gift)

Replacement in crawl-ref/source/spells2.cc at line 1487 [4.569242]

B:BD[5.4515] → [5.4515:4620]

    beh_type beha = BEH_GOD_GIFT;
    int pow = you.piety + random2(you.piety/4) - random2(you.piety/4);

[5.4515]

[5.4620]

    beh_type beha = (god_gift) ? BEH_GOD_GIFT : BEH_HOSTILE;

Insertion in crawl-ref/source/spells2.cc at line 1489 [4.569242]
[5.4673]
[5.4673]
```
    bool success = false;
```
Insertion in crawl-ref/source/spells2.cc at line 1544 [4.569242]
[6.984]
[6.984]
```
        success = true;
```
Insertion in crawl-ref/source/spells2.cc at line 1559 [4.569242]
[6.1485]
[7.224]
```
    return success;
```

Replacement in crawl-ref/source/religion.cc at line 452 [4.804403]

B:BD[8.171801] → [3.172:241]

static monster_type random_undead_servant(int religion /* unused */)

[8.171801]

[8.171848]

// Only Yredelemnul and Okawaru use this for now
static monster_type random_servant(god_type god)

Replacement in crawl-ref/source/religion.cc at line 458 [4.804403]

B:BD[8.171953] → [8.171953:172592]

    thing_called = ((temp_rand > 66) ? MONS_WRAITH :            // 33%
                    (temp_rand > 52) ? MONS_WIGHT :             // 12%
                    (temp_rand > 40) ? MONS_SPECTRAL_WARRIOR :  // 16%
                    (temp_rand > 31) ? MONS_ROTTING_HULK :      //  9%
                    (temp_rand > 23) ? MONS_SKELETAL_WARRIOR :  //  8%
                    (temp_rand > 16) ? MONS_VAMPIRE :           //  7%
                    (temp_rand > 10) ? MONS_GHOUL :             //  6%
                    (temp_rand >  4) ? MONS_MUMMY               //  6%
                                     : MONS_FLAYED_GHOST);      //  5%

[8.171953]

[8.172592]


    switch (god)
    {
    case GOD_YREDELEMNUL:
        // undead
        thing_called = ((temp_rand > 66) ? MONS_WRAITH :            // 33%
                        (temp_rand > 52) ? MONS_WIGHT :             // 12%
                        (temp_rand > 40) ? MONS_SPECTRAL_WARRIOR :  // 16%
                        (temp_rand > 31) ? MONS_ROTTING_HULK :      //  9%
                        (temp_rand > 23) ? MONS_SKELETAL_WARRIOR :  //  8%
                        (temp_rand > 16) ? MONS_VAMPIRE :           //  7%
                        (temp_rand > 10) ? MONS_GHOUL :             //  6%
                        (temp_rand >  4) ? MONS_MUMMY               //  6%
                                         : MONS_FLAYED_GHOST);      //  5%
        break;
    case GOD_OKAWARU:
        // warriors
        thing_called = ((temp_rand > 84) ? MONS_ORC_WARRIOR :
                        (temp_rand > 69) ? MONS_ORC_KNIGHT :
                        (temp_rand > 59) ? MONS_NAGA_WARRIOR :
                        (temp_rand > 49) ? MONS_CENTAUR_WARRIOR :
                        (temp_rand > 39) ? MONS_STONE_GIANT :
                        (temp_rand > 29) ? MONS_FIRE_GIANT :
                        (temp_rand > 19) ? MONS_FROST_GIANT :
                        (temp_rand >  9) ? MONS_CYCLOPS :
                        (temp_rand >  4) ? MONS_HILL_GIANT
                                         : MONS_TITAN);
        break;
    default:
        break;
    }

Replacement in crawl-ref/source/religion.cc at line 810 [4.804403]

B:BD[8.177095] → [3.293:397]

                monster_type thing_called =
                    random_undead_servant(GOD_YREDELEMNUL);

[8.177095]

[3.397]

                monster_type thing_called = 
                    random_servant(GOD_YREDELEMNUL);

Replacement in crawl-ref/source/religion.cc at line 813 [4.804403]

∅:D[3.398] → [8.177170:177297]

B:BD[8.177170] → [8.177170:177297]

B:BD[8.177297] → [9.385:488]

                if (create_monster( thing_called, 0, BEH_FRIENDLY, 
                                    you.x_pos, you.y_pos, 
                                    you.pet_target, MAKE_ITEM_RANDOM_RACE )
                    != -1)

[3.398]

[4.816477]

                if (create_monster(thing_called, 0, BEH_FRIENDLY,
                                   you.x_pos, you.y_pos, you.pet_target,
                                   MAKE_ITEM_RANDOM_RACE) != -1)

Insertion in crawl-ref/source/religion.cc at line 2136 [4.804403]
[10.1843]
[10.1843]
```
    bool success = false;
```
Deletion in crawl-ref/source/religion.cc at line 2140 [4.804403]
B:BD[10.1913] → [10.1913:1943]
```
        bool success = false;
```

Replacement in crawl-ref/source/religion.cc at line 2156 [4.804403]

B:BD[10.2530] → [10.2530:2661]

        summon_swarm( you.experience_level * 20, true, false );
        simple_god_message(" sends a plague down upon you!", god);

[10.2530]

[10.2661]

        success = summon_swarm( you.experience_level * 20, true, false );
        simple_god_message(success ?
                           " sends a plague down upon you!" :
                           "'s plague fails to arrive.",
                           god);

Replacement in crawl-ref/source/religion.cc at line 2244 [4.804403]

B:BD[4.862834] → [3.423:515]

            monster_type punisher =
                random_undead_servant(GOD_YREDELEMNUL);

[4.862834]

[4.862988]

            monster_type punisher = random_servant(GOD_YREDELEMNUL);

Replacement in crawl-ref/source/religion.cc at line 2246 [4.804403]

B:BD[4.863316] → [10.5535:5670]

            if (create_monster( punisher, 0, BEH_HOSTILE, 
                                you.x_pos, you.y_pos, MHITYOU, 250 ) != -1)

[4.862989]

[3.516]

            if (create_monster(punisher, 0, BEH_HOSTILE,
                               you.x_pos, you.y_pos, MHITYOU, 250) != -1)

Deletion in crawl-ref/source/religion.cc at line 2249 [4.804403]
∅:D[3.541] → [4.863702:863703]
∅:D[10.5702] → [4.863702:863703]
B:BD[4.863702] → [4.863702:863703]
Replacement in crawl-ref/source/religion.cc at line 2274 [4.804403]
B:BD[10.6412] → [10.6412:6442]
```
        bool success = false;
```
[10.6412]
[10.6442]
```
        int count = 0;
```
Replacement in crawl-ref/source/religion.cc at line 2304 [4.804403]
B:BD[10.7409] → [10.7409:7441]
```
                success = true;
```
[10.7409]
[4.865989]
```
                count++;
```

Replacement in crawl-ref/source/religion.cc at line 2306 [4.804403]

B:BD[4.865999] → [10.7442:7647]

        
        simple_god_message(success ?
                           " sends monsters to punish you." :
                           " has no time to punish you...now.",
                           god);

[4.865999]

[10.7647]


        simple_god_message(count > 1 ? " sends monsters to punish you." :
                           count > 0 ? " sends a monster to punish you." :
                           " has no time to punish you...now.", god);

Replacement in crawl-ref/source/religion.cc at line 2497 [4.804403]

B:BD[10.14224] → [10.14224:14268]

∅:D[10.14268] → [4.870563:870564]

B:BD[4.870563] → [4.870563:870564]

B:BD[4.870564] → [10.14269:14953]

        const int temp_rand = random2(100);
        monster_type punisher = ((temp_rand > 84) ? MONS_ORC_WARRIOR :
                                 (temp_rand > 69) ? MONS_ORC_KNIGHT :
                                 (temp_rand > 59) ? MONS_NAGA_WARRIOR :
                                 (temp_rand > 49) ? MONS_CENTAUR_WARRIOR :
                                 (temp_rand > 39) ? MONS_STONE_GIANT :
                                 (temp_rand > 29) ? MONS_FIRE_GIANT :
                                 (temp_rand > 19) ? MONS_FROST_GIANT :
                                 (temp_rand >  9) ? MONS_CYCLOPS :
                                 (temp_rand >  4) ? MONS_HILL_GIANT 
                                 : MONS_TITAN);

[10.14224]

[4.870960]

        monster_type punisher = random_servant(GOD_OKAWARU);

Replacement in crawl-ref/source/ouch.cc at line 636 [4.1104358]
B:BD[4.1117225] → [4.1117225:1117267]
```
    if (protection >= 3 || you.is_undead)
```
[4.1117225]
[4.1117267]
```
    if (protection >= 3)
```
Insertion in crawl-ref/source/mutation.cc at line 248 [4.1263003]
[4.1270412]
[4.1270412]
```
    /* Not summoners/necromancers/worshippers of Yredelemnul */
```

Replacement in crawl-ref/source/mutation.cc at line 2223 [4.1263003]

B:BD[2.240] → [2.240:308]

            if ((you.religion != GOD_MAKHLEB || you.piety < 100) &&

[2.240]

[2.308]

            if ((you.religion != GOD_MAKHLEB ||
                you.piety < piety_breakpoint(3)) &&

Replacement in crawl-ref/source/mutation.cc at line 2300 [4.1263003]

B:BD[4.1324808] → [4.1324808:1324925]

            if (you.skills[SK_SUMMONINGS] < 3 && you.skills[SK_NECROMANCY] < 3
                && one_chance_in(10))

[4.1324808]

[4.1324925]

            // Yredelemnulites have the raise dead invocation
            if ((you.religion != GOD_YREDELEMNUL ||
                you.piety < piety_breakpoint(3)) &&
                you.skills[SK_SUMMONINGS] < 3 &&
                you.skills[SK_NECROMANCY] < 3 && one_chance_in(10))

Replacement in crawl-ref/source/mon-data.h at line 46 [4.1826214]

B:BD[4.1827569] → [4.1827569:1827641]

                         damage from hoyl wrath/disruption; affected by

[4.1827569]

[4.1827641]

                         damage from holy wrath/disruption; affected by

Replacement in crawl-ref/source/decks.cc at line 1117 [4.3987460]
B:BD[11.59348] → [11.59348:59376]
```
        // Handled elswehre
```
[11.59348]
[11.59376]
```
        // Handled elsewhere
```

Replacement in crawl-ref/source/abl-show.cc at line 1576 [4.4494389]

B:BD[4.4527423] → [5.9187:9215]

        summon_berserker();

[4.4527423]

[4.4527464]

        summon_berserker(you.piety +
                         random2(you.piety/4) - random2(you.piety/4),
                         true);

Add various patches of mine:

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells2.h at line 158 [4.562867]

Replacement in crawl-ref/source/spells2.cc at line 1483 [4.569242]

Replacement in crawl-ref/source/spells2.cc at line 1487 [4.569242]

Insertion in crawl-ref/source/spells2.cc at line 1489 [4.569242]

Insertion in crawl-ref/source/spells2.cc at line 1544 [4.569242]

Insertion in crawl-ref/source/spells2.cc at line 1559 [4.569242]

Replacement in crawl-ref/source/religion.cc at line 452 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 458 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 810 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 813 [4.804403]

Insertion in crawl-ref/source/religion.cc at line 2136 [4.804403]

Deletion in crawl-ref/source/religion.cc at line 2140 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 2156 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 2244 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 2246 [4.804403]

Deletion in crawl-ref/source/religion.cc at line 2249 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 2274 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 2304 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 2306 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 2497 [4.804403]

Replacement in crawl-ref/source/ouch.cc at line 636 [4.1104358]

Insertion in crawl-ref/source/mutation.cc at line 248 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2223 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2300 [4.1263003]

Replacement in crawl-ref/source/mon-data.h at line 46 [4.1826214]

Replacement in crawl-ref/source/decks.cc at line 1117 [4.3987460]

Replacement in crawl-ref/source/abl-show.cc at line 1576 [4.4494389]