fiddlerwoaroof/crawl - Change H67KZIMFETOX5UUCDU2VBKXYNCDI7WU4GRYYGQ6ZAEQIZAECZN4AC

Some arena tweaks:

When Kirke dies and hogs are turned into humans, don't change their attitute if in arena mode, since that messes up arena book-keeping.
Give an error if a neutral monster is placed in the arena.
If a summoned band leader makes it past the summon throttle restriction, let in all of its band members, even if that will exceed the throttle.

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

Created by zelgadis on July 22, 2009

H67KZIMFETOX5UUCDU2VBKXYNCDI7WU4GRYYGQ6ZAEQIZAECZN4AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 1164 [4.1396662]

[3.5540]

            // A monster changing factions while in the arena messes up
            // arena book-keeping.
            if (!crawl_state.arena)
            {
                monster->attitude = ATT_GOOD_NEUTRAL;
                monster->flags |= MF_WAS_NEUTRAL;
            }

Deletion in crawl-ref/source/monstuff.cc at line 1172 [4.1396662]

B:BD[3.5580] → [3.5580:5676]

            monster->attitude = ATT_GOOD_NEUTRAL;
            monster->flags |= MF_WAS_NEUTRAL;

Replacement in crawl-ref/source/arena.cc at line 1026 [7.10815]

B:BD[5.5046] → [6.5658:5694]

    if (mg.abjuration_duration > 0)

[5.5046]

[6.5694]

    // If the first band member makes it past the summon throttle cut,
    // let all of the rest of its band in too regardless of the summon
    // throttle.
    if (mg.abjuration_duration > 0 && first_band_member)

Replacement in crawl-ref/source/arena.cc at line 1059 [7.10815]

∅:D[2.2961] → [8.5747:5748]

B:BD[8.5747] → [8.5747:5748]

[2.2961]

[5.5160]

    else
    {
        mprf(MSGCH_ERROR, "Placed neutral (%d) monster %s",
             (int) monster->attitude,
             monster->name(DESC_PLAIN, true).c_str());
        more();
    }