fiddlerwoaroof/crawl - Change MDSFNRPBJ2SXDV22NZDCO7B3X2H3IOG6WMBTKDKV7BKBGTEIDTSQC

When drawing the Xom card, and getting Xom's potentially mixed summons,

really anger them at the right time.

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

Created by dolorous on June 22, 2008

MDSFNRPBJ2SXDV22NZDCO7B3X2H3IOG6WMBTKDKV7BKBGTEIDTSQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 496 [6.3]

[5.1998]


            // Mark factions hostile as appropriate.
            beh_type beha = BEH_FRIENDLY;
            unsigned short hitting = you.pet_target;

Insertion in crawl-ref/source/xom.cc at line 501 [6.3]

[5.1999]

[7.4]

            if (hostiletype == 3
                || (is_demonic && hostiletype == 1)
                || (!is_demonic && hostiletype == 2))
            {
                beha = BEH_HOSTILE;
                hitting = MHITYOU;
            }

Replacement in crawl-ref/source/xom.cc at line 511 [6.3]

B:BD[7.61] → [8.4:56]

B:BD[8.56] → [4.4:86]

                    mgen_data(mon, BEH_FRIENDLY, 3,
                              you.pos(), you.pet_target, MG_FORCE_BEH, GOD_XOM));

[7.61]

[9.36]

                    mgen_data(mon, beha, 3,
                              you.pos(), hitting, MG_FORCE_BEH, GOD_XOM));

Deletion in crawl-ref/source/xom.cc at line 516 [6.3]

∅:D[9.103] → [10.249:260]

B:BD[10.249] → [10.249:260]

B:BD[10.260] → [9.104:206]

∅:D[11.84] → [10.319:391]

∅:D[9.206] → [10.319:391]

B:BD[10.319] → [10.319:391]

B:BD[10.391] → [11.85:123]

∅:D[11.123] → [10.449:513]

B:BD[10.449] → [10.449:513]

B:BD[10.513] → [12.186:266]

∅:D[12.266] → [13.842:843]

∅:D[10.513] → [13.842:843]

B:BD[13.842] → [13.842:843]

B:BD[13.843] → [10.514:575]

B:BD[10.575] → [2.5:168]

∅:D[2.168] → [10.766:788]

B:BD[10.766] → [10.766:788]

B:BD[10.788] → [12.386:439]

B:BD[12.439] → [3.9:74]

∅:D[3.74] → [10.845:867]

∅:D[12.439] → [10.845:867]

B:BD[10.845] → [10.845:867]

B:BD[10.867] → [4.87:136]

∅:D[4.136] → [10.867:899]

B:BD[10.867] → [10.867:899]

        }
        if (success && numdifferent != numdemons && numdifferent > 0
            && hostiletype != 0)
        {
            for (int i = 0; i < numdemons; ++i)
            {
                if (summons[i] != -1)
                {
                    monsters *mon = &menv[i];
                    const bool is_demonic = (mons_holiness(mon) == MH_DEMONIC);
                    // Mark factions hostile as appropriate.
                    if (hostiletype == 3
                        || (is_demonic && hostiletype == 1)
                        || (!is_demonic && hostiletype == 2))
                    {
                        mon->attitude = ATT_HOSTILE;
                        behaviour_event(mon, ME_ALERT, MHITYOU);
                    }
                    player_angers_monster(mon);
                }
            }

Deletion in crawl-ref/source/xom.cc at line 517 [6.3]
B:BD[6.14548] → [10.900:927]
```
        delete[] summons;
```

Insertion in crawl-ref/source/xom.cc at line 526 [6.3]

[9.570]

[5.2453]


            for (int i = 0; i < numdemons; ++i)
            {
                if (summons[i] != -1)
                    player_angers_monster(&menv[summons[i]]);
            }

Insertion in crawl-ref/source/xom.cc at line 535 [6.3]
[9.606]
[6.14586]
```
        delete[] summons;
```