fiddlerwoaroof/crawl - Change 3MAPXTL5GAQ6373CUUVPBARIRHBRSISAF3BO2WBEROT2KUAXWLGAC

Applying two patches by dolorous:

1819730: remove redundancy for creating random undead servant (Yred) 1819013: typo fix

Also modified spell description for Portaled Projectile.

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

Created by j-p-e-g on October 25, 2007

3MAPXTL5GAQ6373CUUVPBARIRHBRSISAF3BO2WBEROT2KUAXWLGAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 453 [4.804403]
B:BD[3.171801] → [3.171801:171848]
```
static int random_undead_servant(int religion)
```
[3.171801]
[3.171848]
```
static monster_type random_undead_servant(int religion /* unused */)
```
Replacement in crawl-ref/source/religion.cc at line 456 [4.804403]
B:BD[3.171878] → [3.171878:171919]
```
    int thing_called = MONS_PROGRAM_BUG;
```
[3.171878]
[3.171919]
```
    monster_type thing_called = MONS_PROGRAM_BUG;
```

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

B:BD[3.177095] → [3.177095:177170]

                int thing_called = random_undead_servant(GOD_YREDELEMNUL);

[3.177095]

[3.177170]

                monster_type thing_called =
                    random_undead_servant(GOD_YREDELEMNUL);

Replacement in crawl-ref/source/religion.cc at line 2164 [4.804403]
B:BD[4.862222] → [5.4705:4735]
```
        bool success = false;
```
[4.862222]
[5.4735]
```
        int count = 0;
```

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

B:BD[4.862834] → [5.4848:4896]

            const int temp_rand = random2(100);

[4.862834]

[4.862988]

            monster_type punisher =
                random_undead_servant(GOD_YREDELEMNUL);

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

B:BD[4.862989] → [5.4897:5534]

∅:D[5.5534] → [4.863315:863316]

B:BD[4.863315] → [4.863315:863316]

            const monster_type punisher =
                ((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%

Replacement in crawl-ref/source/religion.cc at line 2174 [4.804403]
B:BD[5.5670] → [5.5670:5702]
```
                success = true;
```
[5.5670]
[4.863702]
```
                count++;
```

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

B:BD[4.864276] → [5.5703:5894]

        simple_god_message(success ?
                           " sends a servant to punish you." :
                           "'s servant fails to arrive.",
                           god);

[4.864276]

[5.5894]

        simple_god_message(count > 1? " sends servants to punish you." :
                           count > 0? " sends a servant to punish you." :
                                      "'s servants fail to arrive.", god);

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

B:BD[6.47763] → [2.5039:5111]

                    strm << " But there should be been " <<  cards_left

[6.47763]

[2.5111]

                    strm << " But there should have been " <<  cards_left

Replacement in crawl-ref/source/dat/descript/spells.txt at line 476 [7.2853]

B:BD[7.20072] → [7.20072:20177]

This spell teleports a missile directly to its target, greatly increasing its accuracy (but not damage.)

[7.20072]

[7.20177]

This spell teleports a fired or thrown missile directly to its target, greatly increasing its accuracy (but not damage).