fiddlerwoaroof/crawl - Change K4CJM2GNQKZAPQT3FD2FSG4IXBUUZS42VSXH3QCVSWTZ3JOZT6YQC

Consider a round a tie if there aren't any monsters at all left at the end of a

turn. Unless one of the monster involved was a giant spore or ball lightning, in which case if the explosion caused the death of the final monster then the exploder is considered to be the winner (with "giant spore v giant spore" the first to explode is the winner).

Figure out if a fight is still ongoing by doing book-keeping on how many members of each faction is alive, rather than sweeping through menv[] after every turn looking for living monsters.

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

Created by zelgadis on January 5, 2009

K4CJM2GNQKZAPQT3FD2FSG4IXBUUZS42VSXH3QCVSWTZ3JOZT6YQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/arena.cc at line 37 [3.10815]

B:BD[3.11417] → [3.11417:11467]

        mons_list members;
        bool friendly;

[3.11417]

[3.11467]

        mons_list   members;
        bool        friendly;
        int         active_members;
        bool        suicide_attack;

Replacement in crawl-ref/source/arena.cc at line 42 [3.10815]

B:BD[3.11468] → [3.11468:11523]

        faction(bool fr) : members(), friendly(fr) { }

[3.11468]

[3.11523]

        faction(bool fr) : members(), friendly(fr), active_members(0),
                           suicide_attack(false) { }

Insertion in crawl-ref/source/arena.cc at line 47 [3.10815]

[3.11570]

        void reset()
        {
            active_members = 0;
            suicide_attack = false;
        }

Insertion in crawl-ref/source/arena.cc at line 55 [3.10815]
[3.11601]
[3.11601]
```
            reset();
```
Insertion in crawl-ref/source/arena.cc at line 66 [3.10815]
[3.11725]
[4.2928]
```
    int ties        = 0;
```
Insertion in crawl-ref/source/arena.cc at line 346 [3.10815]
[3.16073]
[5.3609]
```
        faction_a.reset();
        faction_b.reset();
```

Replacement in crawl-ref/source/arena.cc at line 392 [3.10815]

B:BD[3.17151] → [3.17151:17220]

                     total_trials ? trials_done - team_a_wins : -1);

[3.17151]

[3.17220]

                     total_trials ? trials_done - team_a_wins - ties : -1);

Replacement in crawl-ref/source/arena.cc at line 455 [3.10815]

B:BD[3.18649] → [3.18649:18749]

    // Returns true as long as at least one member of each faction is alive.
    bool fight_is_on()

[3.18649]

[3.18749]

    // Temporarily unset craw_state.arena to force a --more-- to happen.
    void more()

Replacement in crawl-ref/source/arena.cc at line 458 [3.10815]

B:BD[3.18755] → [3.18755:18824]

        bool found_friend = false;
        bool found_enemy = false;

[3.18755]

[3.18824]

        unwind_bool state(crawl_state.arena, false);
        ::more();
    }
    void count_foes()
    {
        int orig_a = faction_a.active_members;
        int orig_b = faction_b.active_members;
        faction_a.active_members = 0;
        faction_b.active_members = 0;

Replacement in crawl-ref/source/arena.cc at line 477 [3.10815]

B:BD[3.19022] → [3.19022:19063]

                    found_friend = true;

[3.19022]

[3.19063]

                    faction_a.active_members++;

Replacement in crawl-ref/source/arena.cc at line 479 [3.10815]

B:BD[3.19119] → [3.19119:19243]

                    found_enemy = true;
                if (found_friend && found_enemy)
                    return (true);

[3.19119]

[3.19243]

                    faction_b.active_members++;

Replacement in crawl-ref/source/arena.cc at line 482 [3.10815]

B:BD[3.19267] → [3.19267:19291]

        return (false);

[3.19267]

[3.19291]


        if (orig_a != faction_a.active_members
            || orig_b != faction_b.active_members)
        {
            mpr("Book-keeping error in faction member count.", MSGCH_ERROR);
            more();
        }
    }
    // Returns true as long as at least one member of each faction is alive.
    bool fight_is_on()
    {
        if (faction_a.active_members > 0 && faction_b.active_members > 0)
            return true;
        // Sync up our book-keeping with the actual state.
        count_foes();
        return (faction_a.active_members > 0 && faction_b.active_members > 0);

Deletion in crawl-ref/source/arena.cc at line 538 [3.10815]

B:BD[3.20320] → [3.20320:20569]

B:BD[3.20569] → [6.5294:5302]

    bool friendlies_win()
    {
        for (int i = 0; i < MAX_MONSTERS; ++i)
        {
            monsters *mons(&menv[i]);
            if (mons->alive())
                return (mons->attitude == ATT_FRIENDLY);
        }
        return (false);
    }

Deletion in crawl-ref/source/arena.cc at line 607 [3.10815]
B:BD[3.21271] → [3.21271:21322]
```
        const bool team_a_won = friendlies_win();
```

Replacement in crawl-ref/source/arena.cc at line 610 [3.10815]

B:BD[3.21347] → [3.21347:21371]

        if (team_a_won)

[3.21347]

[3.21371]

        bool team_a_won = false;
        bool was_tied   = false;
        if (faction_a.active_members > 0 || faction_a.suicide_attack)
        {

Insertion in crawl-ref/source/arena.cc at line 615 [3.10815]

[3.21398]

            team_a_won = true;
        }
        else if (faction_a.active_members == faction_b.active_members
                 && !faction_b.suicide_attack)
        {
            ties++;
            was_tied = true;
        }

Replacement in crawl-ref/source/arena.cc at line 626 [3.10815]

B:BD[3.21433] → [6.5711:5853]

        const char *msg;
        if (Options.arena_dump_msgs || Options.arena_list_eq)
            msg = "---------- Winner: %s! ----------";

[3.21433]

[6.5853]

        std::string msg;
        if (was_tied)
            msg = "Tie";

Replacement in crawl-ref/source/arena.cc at line 632 [3.10815]

B:BD[6.5900] → [6.5900:5918]

∅:D[6.5918] → [3.21461:21537]

B:BD[3.21461] → [3.21461:21537]

        mprf(msg,
             team_a_won ? faction_a.desc.c_str() : faction_b.desc.c_str());

[6.5900]

[6.5919]

        if (Options.arena_dump_msgs || Options.arena_list_eq)
            msg = "---------- " + msg + " ----------";
        if (was_tied)
            mprf(msg.c_str());
        else
            mprf(msg.c_str(),
                 team_a_won ? faction_a.desc.c_str() : faction_b.desc.c_str());

Replacement in crawl-ref/source/arena.cc at line 703 [3.10815]

∅:D[6.6243] → [7.3431:3509]

B:BD[7.3431] → [7.3431:3509]

            fprintf(file, "%d-%d\n", team_a_wins, trials_done - team_a_wins);

[6.6243]

[6.6244]

            fprintf(file, "%d-%d", team_a_wins, 
                    trials_done - team_a_wins - ties);
            if (ties > 0)
                fprintf(file, "-%d", ties);
            fprintf(file, "\n");

Replacement in crawl-ref/source/arena.cc at line 743 [3.10815]

B:BD[3.22539] → [3.22539:22589]

            mprf("Final score: %s (%d); %s (%d)",

[3.22539]

[3.22589]

            mprf("Final score: %s (%d); %s (%d) [%d ties]",

Replacement in crawl-ref/source/arena.cc at line 745 [3.10815]

B:BD[3.22643] → [3.22643:22712]

                 faction_b.desc.c_str(), trials_done - team_a_wins);

[3.22643]

[3.22756]

                 faction_b.desc.c_str(), trials_done - team_a_wins - ties,
                 ties);

Insertion in crawl-ref/source/arena.cc at line 808 [3.10815]

[8.6885]

[2.3039]

    if (monster->attitude == ATT_FRIENDLY)
        arena::faction_a.active_members++;
    else if (monster->attitude == ATT_HOSTILE)
        arena::faction_b.active_members++;

Insertion in crawl-ref/source/arena.cc at line 854 [3.10815]

[8.7008]

    if (monster->attitude == ATT_FRIENDLY)
        arena::faction_a.active_members--;
    else if (monster->attitude == ATT_HOSTILE)
        arena::faction_b.active_members--;
    // 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)
    {
        const monsters* atk = &menv[killer_index];
        if (monster->attitude != atk->attitude && mons_self_destructs(atk))
        {
            if (atk->attitude == ATT_FRIENDLY)
                arena::faction_a.suicide_attack = true;
            else if (atk->attitude == ATT_HOSTILE)
                arena::faction_b.suicide_attack = true;
        }
    }