fiddlerwoaroof/crawl - Change KOVRG7IPNFPXQNBFVMYEY7T6WM55CHJ37I4E763S6EJ6IZH32FYAC

Get the arena tied-round and giant spore logic working again, partially by

making self-initiated explosions happen directly in melee_attack::mons_self_destructs() and by calling arena_monster_died() after the spore has exploded instead of before.

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

Created by zelgadis on January 6, 2009

KOVRG7IPNFPXQNBFVMYEY7T6WM55CHJ37I4E763S6EJ6IZH32FYAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 1006 [6.1396662]

B:BD[4.7307] → [5.2648:2743]


    if (crawl_state.arena)
        arena_monster_died(monster, killer, killer_index, silent);

Insertion in crawl-ref/source/monstuff.cc at line 1156 [6.1396662]

[7.2615]

[2.3277]

    if (crawl_state.arena)
        arena_monster_died(monster, killer, killer_index, silent);

Insertion in crawl-ref/source/fight.cc at line 3822 [6.3140790]

[4.64131]

        // Do the explosion right now.
        monster_die(atk, KILL_MON, atk->mindex());

Replacement in crawl-ref/source/arena.cc at line 531 [9.10815]
∅:D[3.4030] → [8.4271:4296]
B:BD[8.4271] → [8.4271:4296]
```
            return true;
```
[3.4030]
[3.4031]
```
            return (true);
```

Replacement in crawl-ref/source/arena.cc at line 942 [9.10815]

B:BD[3.6065] → [3.6065:6391]

    if (arena::faction_a.active_members > 0
        && arena::faction_b.active_members <= 0)
    {
        arena::faction_a.won = true;
        return;
    }
    else if (arena::faction_b.active_members > 0
             && arena::faction_a.active_members <= 0)
    {
        arena::faction_b.won = true;
        return;
    }

[3.6065]

[8.5925]

    const monsters* atk =
        (invalid_monster_index(killer_index) || menv[killer_index].type == -1)
        ? NULL : &menv[killer_index];

Replacement in crawl-ref/source/arena.cc at line 946 [9.10815]

B:BD[8.5926] → [8.5926:6242]

    // Was the death caused by the suicide attack of a gas spore or
    // ball lightning which was the final member of its faction?
    if (arena::faction_a.active_members <= 0
        && arena::faction_b.active_members <= 0
        && !invalid_monster_index(killer_index)
        && menv[killer_index].type != -1)

[8.5926]

[8.6242]

    if (atk && atk->alive())

Replacement in crawl-ref/source/arena.cc at line 948 [9.10815]

B:BD[8.6248] → [8.6248:6376]

        const monsters* atk = &menv[killer_index];
        if (monster->attitude != atk->attitude && mons_self_destructs(atk))

[8.6248]

[8.6376]

        if (arena::faction_a.active_members > 0
            && arena::faction_b.active_members <= 0)

Replacement in crawl-ref/source/arena.cc at line 951 [9.10815]

B:BD[8.6386] → [8.6386:6433]

B:BD[8.6433] → [3.6392:6437]

∅:D[3.6437] → [8.6489:6540]

B:BD[8.6489] → [8.6489:6540]

B:BD[8.6540] → [3.6438:6483]

            if (atk->attitude == ATT_FRIENDLY)
                arena::faction_a.won = true;
            else if (atk->attitude == ATT_HOSTILE)
                arena::faction_b.won = true;

[8.6386]

[8.6596]

            arena::faction_a.won = true;

Insertion in crawl-ref/source/arena.cc at line 953 [9.10815]

[8.6606]

        else if (arena::faction_b.active_members > 0
                 && arena::faction_a.active_members <= 0)
        {
            arena::faction_b.won = true;
        }

Insertion in crawl-ref/source/arena.cc at line 959 [9.10815]

[8.6612]

[5.7008]

    // If all monsters are dead and the last one to die is a giant spore
    // or ball lightning then that monster's faction is the winner,
    // since self destruction is their purpose.  But if a trap causes
    // the spore to explode and that kills everything it's a tie since
    // it counts as the trap killing everyone.
    else if (arena::faction_a.active_members <= 0
             && arena::faction_b.active_members <= 0
             && mons_self_destructs(monster)
             && MON_KILL(killer))
    {
        if (monster->attitude == ATT_FRIENDLY)
            arena::faction_a.won = true;
        else if (monster->attitude == ATT_HOSTILE)
            arena::faction_b.won = true;
    }