fiddlerwoaroof/crawl - Change 57QTW7NCMZ7EU7BDETQP252YVCJZJWSEFV7MHF5OXESSNBDH3CFQC

Don't allow the box of beasts to give you a hell hound if you worship a

good god, since, like "Summon Small Mammals", only one of its summons is bad.

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

Created by dolorous on June 7, 2008

57QTW7NCMZ7EU7BDETQP252YVCJZJWSEFV7MHF5OXESSNBDH3CFQC

Dependencies

In channels

main

Change contents

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

[3.892]

        // If you worship a good god, don't summon an evil small mammal
        // (in this case, the orange rat).

Deletion in crawl-ref/source/spells2.cc at line 1633 [4.569242]
∅:D[2.252] → [3.927:1019]
B:BD[3.927] → [3.927:1019]
```
            // If you worship a good god, don't summon an evil small
            // mammal.
```

Replacement in crawl-ref/source/it_use3.cc at line 973 [4.2870456]

B:BD[4.2900114] → [4.2900114:2900147]

        temp_rand = random2(11);

[4.2900114]

[4.2900147]

        // If you worship a good god, don't summon an evil beast (in
        // this case, the hell hound).
        do
        {
            temp_rand = random2(11);

Replacement in crawl-ref/source/it_use3.cc at line 979 [4.2870456]

B:BD[4.2900148] → [4.2900148:2900612]

B:BD[4.2900612] → [5.29919:29973]

∅:D[5.29973] → [4.2900667:2900724]

B:BD[4.2900667] → [4.2900667:2900724]

        beasty = ((temp_rand == 0) ? MONS_GIANT_BAT :
                  (temp_rand == 1) ? MONS_HOUND :
                  (temp_rand == 2) ? MONS_JACKAL :
                  (temp_rand == 3) ? MONS_RAT :
                  (temp_rand == 4) ? MONS_ICE_BEAST :
                  (temp_rand == 5) ? MONS_SNAKE :
                  (temp_rand == 6) ? MONS_YAK :
                  (temp_rand == 7) ? MONS_BUTTERFLY :
                  (temp_rand == 8) ? MONS_HELL_HOUND :
                  (temp_rand == 9) ? MONS_BROWN_SNAKE
                                   : MONS_GIANT_LIZARD);

[4.2900148]

[4.2900724]

            beasty = ((temp_rand == 0) ? MONS_GIANT_BAT :
                      (temp_rand == 1) ? MONS_HOUND :
                      (temp_rand == 2) ? MONS_JACKAL :
                      (temp_rand == 3) ? MONS_RAT :
                      (temp_rand == 4) ? MONS_ICE_BEAST :
                      (temp_rand == 5) ? MONS_SNAKE :
                      (temp_rand == 6) ? MONS_YAK :
                      (temp_rand == 7) ? MONS_BUTTERFLY :
                      (temp_rand == 8) ? MONS_BROWN_SNAKE :
                      (temp_rand == 9) ? MONS_GIANT_LIZARD
                                       : MONS_HELL_HOUND);
        }
        while (player_will_anger_monster(beasty));

Replacement in crawl-ref/source/it_use3.cc at line 1003 [4.2870456]

B:BD[6.45228] → [6.45228:45342]

                mgen_data( beasty, beha, 2 + random2(4),
                           you.pos(), hitting ) ) != -1)

[6.45228]

[4.2901024]

                mgen_data(beasty, beha, 2 + random2(4),
                          you.pos(), hitting)) != -1)