fiddlerwoaroof/crawl - Change GN333G64BJJSMYTTXVADZ6IPA3CC3ALVZ6TFGBFYYTED5HYM2MFQC

If Xom summons a mix of demons and non-demons, have a chance that one or

both factions will be hostile.

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

Created by dolorous on March 19, 2008

GN333G64BJJSMYTTXVADZ6IPA3CC3ALVZ6TFGBFYYTED5HYM2MFQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 493 [3.3]

[2.1756]


        // If we get a mix of demons and non-demons, there's a chance
        // that one or both of the factions may be hostile.
        int hostile = random2(12);
        int hostiletype =
            (hostile <  3) ? 0 :                  //  1/4: both are friendly
            (hostile < 11) ? (coinflip() ? 1 : 2) //  2/3: one is hostile
                           : 3;                   // 1/12: both are hostile

Insertion in crawl-ref/source/xom.cc at line 505 [3.3]
[2.1814]
[2.1814]
```
            const bool is_demon = mons_is_demon(mon);
```
Replacement in crawl-ref/source/xom.cc at line 509 [3.3]
B:BD[2.1929] → [2.1929:1966]
```
            if (!mons_is_demon(mon))
```
[2.1929]
[2.1966]
```
            if (!is_demon)
```

Replacement in crawl-ref/source/xom.cc at line 512 [3.3]

B:BD[2.1999] → [2.1999:2070]

            create_monster(mon, 3, BEH_GOD_GIFT, you.x_pos, you.y_pos,

[2.1999]

[2.2070]

            // Mark factions hostile as appropriate.
            beh_type beh =
                (hostiletype == 1 && is_demon)  ? BEH_HOSTILE :
                (hostiletype == 2 && !is_demon) ? BEH_HOSTILE :
                (hostiletype == 3)              ? BEH_HOSTILE
                                                : BEH_GOD_GIFT;
            create_monster(mon, 3, beh, you.x_pos, you.y_pos,