fiddlerwoaroof/crawl - Change PKXXBHS3LWLPZI2QVRX22MSQ4R2626IXRSNHFFYHXYTLJJQU54LQC

Add arena mode, activated on the command-line by 'crawl -arena "monster v monster"' (eg: crawl -arena "Sigmund v Jessica") to let monsters fight each other undisturbed by the player. Good to examine monster AI and monster behaviour when the player is AWOL.

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

Created by dshaligram on December 31, 2008

PKXXBHS3LWLPZI2QVRX22MSQ4R2626IXRSNHFFYHXYTLJJQU54LQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 205 [11.16817]
[9.213]
[10.7]
```
    if (!map_bounds(p))
        return (false);
```

Replacement in crawl-ref/source/view.cc at line 1188 [11.16817]

B:BD[12.484] → [13.2644:2713]

    const coord_def e = monster->pos() - you.pos() + coord_def(9,9);

[12.484]

[12.578]

    const coord_def e = monster->pos() - crawl_view.glosc() + coord_def(9,9);

Replacement in crawl-ref/source/view.cc at line 1481 [11.16817]

B:BD[11.49112] → [13.3359:3434]

    for (radius_iterator ri(you.pos(), LOS_RADIUS, true, false); ri; ++ri)

[11.49112]

[13.3434]

    const coord_def c(crawl_view.glosc());
    for (radius_iterator ri(c, LOS_RADIUS, true, false);
         ri; ++ri)

Replacement in crawl-ref/source/view.cc at line 1487 [11.16817]

B:BD[11.49308] → [13.3476:3544]

            const coord_def ep = *ri - you.pos() + coord_def(9, 9);

[11.49308]

[13.3544]

            const coord_def ep = *ri - c + coord_def(9, 9);

Replacement in crawl-ref/source/view.cc at line 1512 [11.16817]

B:BD[12.2322] → [13.3812:3889]

    const coord_def e = env.cloud[cloudno].pos - you.pos() + coord_def(9,9);

[12.2322]

[14.379]

    const coord_def e = env.cloud[cloudno].pos - crawl_view.glosc()
        + coord_def(9,9);

Insertion in crawl-ref/source/view.cc at line 2821 [11.16817]

[11.68656]

[15.33248]

    if (crawl_state.arena)
    {
        for (int y = -ENV_SHOW_OFFSET; y <= ENV_SHOW_OFFSET; ++y)
            for (int x = -ENV_SHOW_OFFSET; x <= ENV_SHOW_OFFSET; ++x)
            {
                const coord_def pos = center + coord_def(x, y);
                if (map_bounds(pos))
                    sh[x + sh_xo][y + sh_yo] = gr(pos);
            }
        return;
    }

Insertion in crawl-ref/source/view.cc at line 3932 [11.16817]
[11.88526]
[13.6550]
```
        if (crawl_state.arena)
            return (true);
```

Replacement in crawl-ref/source/view.cc at line 3994 [11.16817]

B:BD[16.1108] → [16.1108:1153]

    return see_grid(env.show, you.pos(), p);

[16.1108]

[16.1153]

    return (crawl_state.arena && crawl_view.in_grid_los(p))
        || see_grid(env.show, you.pos(), p);

Replacement in crawl-ref/source/view.cc at line 4956 [11.16817]

B:BD[12.4317] → [12.4317:4386]

    if (cloud != EMPTY_CLOUD && env.cloud[cloud].type != CLOUD_NONE)

[12.4317]

[17.9317]

    if (cloud != EMPTY_CLOUD && env.cloud[cloud].type != CLOUD_NONE
        && env.cloud[cloud].pos == gp)
    {

Insertion in crawl-ref/source/view.cc at line 4960 [11.16817]
[17.9352]
[14.743]
```
    }
```

Replacement in crawl-ref/source/view.cc at line 5091 [11.16817]

B:BD[11.106288] → [18.3951:4015]

    losight( env.show, grd, you.pos() ); // Must be done first.

[11.106288]

[11.106408]

    if (map_bounds(you.pos()))
    {
        losight( env.show, grd, you.pos() ); // Must be done first.

Replacement in crawl-ref/source/view.cc at line 5095 [11.16817]

B:BD[11.106409] → [19.3236:3323]

B:BD[19.3323] → [18.4016:4072]

    // What would be visible, if all of the translucent walls were
    // made opaque.
    losight( env.no_trans_show, grd, you.pos(), true );

[11.106409]

[19.3390]

        // What would be visible, if all of the translucent walls were
        // made opaque.
        losight( env.no_trans_show, grd, you.pos(), true );
    }

Replacement in crawl-ref/source/view.cc at line 5210 [11.16817]

B:BD[15.69705] → [20.8907:8949]

                else if (gc == you.pos())

[15.69705]

[15.69766]

                else if (gc == you.pos() && !crawl_state.arena)

Replacement in crawl-ref/source/stuff.cc at line 769 [11.224557]
∅:D[21.217] → [22.71:90]
B:BD[22.71] → [22.71:90]
```
    if (exit_code)
```
[21.217]
[22.90]
```
    if (exit_code && !crawl_state.arena)
```
Insertion in crawl-ref/source/state.h at line 44 [23.42804]
[23.43909]
[3.155]
```
    bool arena;             // Set if we're in arena mode.
```

Replacement in crawl-ref/source/state.cc at line 28 [24.1546]

B:BD[24.2260] → [24.2260:2325]

      map_stat_gen(false), unicode_ok(false), glyph2strfn(NULL),

[24.2260]

[24.2325]

      map_stat_gen(false), arena(false), unicode_ok(false), glyph2strfn(NULL),

Insertion in crawl-ref/source/player.cc at line 2922 [11.962854]
[11.1007001]
[25.175]
```
    if (crawl_state.arena)
        return;
```

Insertion in crawl-ref/source/player.cc at line 6947 [11.962854]

[26.528]

    if (crawl_state.arena)
        return target->visible_to(this);

Insertion in crawl-ref/source/output.cc at line 1503 [11.1088282]
[27.7637]
[27.7803]
```
    if (!map_bounds(you.pos()))
        return (-1);
```

Deletion in crawl-ref/source/mstuff2.cc at line 169 [11.1340842]

B:BD[8.2781] → [8.2781:2984]


    // Don't target harmful spells at self unless confused.
    ASSERT(monster->pos() != pbolt.target || monster->confused()
           || (flags & (SPFLAG_HELPFUL | SPFLAG_ESCAPE | SPFLAG_RECOVERY)));

Replacement in crawl-ref/source/monstuff.cc at line 512 [11.1396662]

B:BD[5.2781] → [5.2781:2840]

        && (!mons_near(monster) || !you.can_see(monster)))

[5.2781]

[5.2840]

        && (!mons_near(monster) || !you.can_see(monster))
        && !crawl_state.arena)

Insertion in crawl-ref/source/monstuff.cc at line 3406 [11.1396662]

[28.17809]


static void _arena_set_foe(monsters *mons)
{
    const int mind = monster_index(mons);

Insertion in crawl-ref/source/monstuff.cc at line 3411 [11.1396662]

[28.17810]

[11.1439585]

    int nearest = -1;
    int best_distance = -1;
    for (int i = 0; i < MAX_MONSTERS; ++i)
    {
        if (mind == i)
            continue;
        const monsters *other(&menv[i]);
        if (!other->alive() || mons_aligned(mind, i))
            continue;
        const int distance = grid_distance(mons->pos(), other->pos());
        if (best_distance == -1 || distance < best_distance)
        {
            best_distance = distance;
            nearest = i;
        }
    }
    if (nearest != -1)
    {
        mons->foe = nearest;
        mons->target = menv[nearest].pos();
    }
    else
    {
        mons->foe = MHITNOT;
        mons->target = mons->pos();
    }
}

Insertion in crawl-ref/source/monstuff.cc at line 3480 [11.1396662]
[4.2623]
[29.3930]

Insertion in crawl-ref/source/monstuff.cc at line 3485 [11.1396662]

[13.44341]

[11.1440747]

        return;
    }
    if (crawl_state.arena)
    {
        if (!mon->get_foe() || one_chance_in(3))
            mon->foe = MHITNOT;
        if (mon->foe == MHITNOT || mon->foe == MHITYOU)
            _arena_set_foe(mon);

Replacement in crawl-ref/source/monstuff.cc at line 4109 [11.1396662]
B:BD[11.1451445] → [30.2136:2165]
```
    if (mons_near( monster )
```
[11.1451445]
[31.6926]
```
    if ((mons_near( monster ) || crawl_state.arena)
```
Insertion in crawl-ref/source/monstuff.cc at line 4299 [11.1396662]
[11.1465752]
[13.48004]
```
    {
```
Insertion in crawl-ref/source/monstuff.cc at line 4301 [11.1396662]
[13.48054]
[11.1465854]
```
    }
```
Insertion in crawl-ref/source/monstuff.cc at line 6577 [11.1396662]
[32.7718]
[33.2542]
```
        ASSERT(!crawl_state.arena || monster->foe != MHITYOU);
```
Insertion in crawl-ref/source/monspeak.cc at line 39 [11.1558496]
[11.1559108]
[11.1559108]
```
#include "state.h"
```
Replacement in crawl-ref/source/monspeak.cc at line 270 [11.1558496]
B:BD[34.7396] → [34.7396:7433]
```
    else if (mons_friendly(monster))
```
[34.7396]
[34.7433]
```
    else if (mons_friendly(monster) && !crawl_state.arena)
```
Insertion in crawl-ref/source/monplace.cc at line 26 [11.1641732]
[2.2568]
[11.1642168]
```
#include "state.h"
```
Insertion in crawl-ref/source/monplace.cc at line 230 [11.1641732]
[35.1304]
[36.2603]
```
    if (crawl_state.arena)
        return;
```
Insertion in crawl-ref/source/mon-util.cc at line 49 [11.1699344]
[37.30707]
[11.1700167]
```
#include "state.h"
```
Insertion in crawl-ref/source/mon-util.cc at line 1976 [11.1699344]
[11.1728247]
[11.1728247]
```
        const bool use_your = !crawl_state.arena && mons_friendly(&mon);
```

Replacement in crawl-ref/source/mon-util.cc at line 1980 [11.1699344]

B:BD[31.10059] → [38.7714:7819]

            result = (mons_friendly(&mon) ? "Your "
                                          : "The ");

[31.10059]

[31.10165]

            result = (use_your ? "Your " : "The ");

Replacement in crawl-ref/source/mon-util.cc at line 1983 [11.1699344]

B:BD[31.10213] → [38.7820:7925]

            result = (mons_friendly(&mon) ? "your "
                                          : "the ");

[31.10213]

[31.10319]

            result = (use_your ? "your " : "the ");

Replacement in crawl-ref/source/mon-util.cc at line 7873 [11.1699344]

B:BD[39.9887] → [39.9887:9968]

    else if (monster->attitude == ATT_FRIENDLY && !mons_is_unique(monster->type)

[39.9887]

[39.9968]

    else if (monster->attitude == ATT_FRIENDLY
             && !mons_is_unique(monster->type)
             && !crawl_state.arena

Insertion in crawl-ref/source/message.cc at line 912 [11.1993826]

[24.10230]

[7.3038]

    if (crawl_state.arena)
    {
        delay(Options.arena_delay);
        mesclr();
        return;
    }

Insertion in crawl-ref/source/mapdef.h at line 420 [15.591249]
[40.42826]
[40.42826]
```
    mon_attitude_type attitude;
```
Insertion in crawl-ref/source/mapdef.h at line 422 [15.591249]
[40.42881]
[41.419]
```
    int  quantity;            // Number of monsters (usually 1).
```

Replacement in crawl-ref/source/mapdef.h at line 437 [15.591249]

B:BD[42.3124] → [43.2560:2697]

B:BD[43.2697] → [44.3483:3548]

        : mid(id), place(), monbase(base), number(num), genweight(gw),
          mlevel(ml), fix_mons(_fixmons), generate_awake(awaken),
          patrolling(false), band(false), colour(BLACK), items()

[42.3124]

[45.379]

        : mid(id), place(), monbase(base), attitude(ATT_HOSTILE), number(num),
          quantity(1), genweight(gw), mlevel(ml), fix_mons(_fixmons),
          generate_awake(awaken), patrolling(false), band(false),
          colour(BLACK), items()

Insertion in crawl-ref/source/mapdef.cc at line 2093 [15.594797]

[46.294]

[43.2751]

        if (!mon_str.empty() && isdigit(mon_str[0]))
        {
            // Look for space after initial digits.
            std::string::size_type pos =
                mon_str.find_first_not_of("0123456789");
            if (pos != std::string::npos && mon_str[pos] == ' ')
            {
                const std::string mcount = mon_str.substr(0, pos);
                const int count = atoi(mcount.c_str());
                if (count >= 1 && count <= 99)
                    mspec.quantity = count;
                mon_str = mon_str.substr(pos);
            }
        }

Replacement in crawl-ref/source/mapdef.cc at line 2198 [15.594797]

B:BD[47.3796] → [47.3796:3921]

                error = make_stringf("Monster '%s' can't use items.",
                                     mon_str.c_str());

[47.3796]

[47.3921]

                if (mid != MONS_DANCING_WEAPON || mspec.items.size() > 1)
                    error = make_stringf("Monster '%s' can't use items.",
                                         mon_str.c_str());

Insertion in crawl-ref/source/makefile.obj at line 7 [48.79]
[48.123]
[48.123]
```
arena.o \
```
Insertion in crawl-ref/source/initfile.h at line 76 [11.2956146]
[23.92300]
[49.3485]
```
    std::string arena_teams;
```
Insertion in crawl-ref/source/initfile.cc at line 712 [11.2957258]
[15.793129]
[15.793163]
```
    arena_delay            = 600;
```
Insertion in crawl-ref/source/initfile.cc at line 3285 [11.2957258]
[50.747]
[51.387]
```
    CLO_ARENA,
```
Replacement in crawl-ref/source/initfile.cc at line 3293 [11.2957258]
B:BD[49.10333] → [49.10333:10347]
```
    "mapstat"
```
[49.10333]
[49.10347]
```
    "mapstat", "arena"
```

Insertion in crawl-ref/source/initfile.cc at line 3425 [11.2957258]

[50.1247]

            break;
        case CLO_ARENA:
            crawl_state.arena = true;
            if (next_is_param)
            {
                SysEnv.arena_teams = next_arg;
                nextUsed = true;
            }

Insertion in crawl-ref/source/fight.cc at line 54 [11.3140790]
[23.93882]
[11.3142848]
```
#include "state.h"
```

Replacement in crawl-ref/source/fight.cc at line 373 [11.3140790]

B:BD[52.6135] → [52.6135:6181]

    attacker_visible   = attacker->visible();

[52.6135]

[53.12818]

    attacker_visible   = attacker->visible() || crawl_state.arena;

Replacement in crawl-ref/source/fight.cc at line 375 [11.3140790]

B:BD[53.12893] → [53.12893:12953]

    defender_visible   = (defender && defender->visible());

[53.12893]

[53.12953]

    defender_visible   = (defender &&
                          (defender->visible() || crawl_state.arena));

Insertion in crawl-ref/source/externs.h at line 2024 [11.3270163]
[54.444021]
[54.444021]
```
    int         arena_delay;
```
Insertion in crawl-ref/source/dungeon.h at line 326 [11.3428186]
[55.2612]
[56.11639]
```
coord_def dgn_find_feature_marker(dungeon_feature_type feat);
```

Replacement in crawl-ref/source/dungeon.h at line 349 [11.3428186]

B:BD[57.363] → [47.10785:10826]

B:BD[47.10826] → [13.71540:71606]

∅:D[13.71606] → [58.4885:5010]

B:BD[57.468] → [58.4885:5010]

bool dgn_place_monster(mons_spec &mspec,
                       int monster_level, const coord_def& where,
                       bool force_pos = false, bool generate_awake = false,
                       bool patrolling = false);

[57.363]

[57.513]

int dgn_place_monster(mons_spec &mspec,
                      int monster_level, const coord_def& where,
                      bool force_pos = false, bool generate_awake = false,
                      bool patrolling = false);

Insertion in crawl-ref/source/dungeon.h at line 365 [11.3428186]
[59.7546]
[60.2735]
```
void dgn_reset_level();
```
Deletion in crawl-ref/source/dungeon.cc at line 89 [11.3429798]
B:BD[61.6155] → [61.6155:6183]
```
static void _reset_level();
```
Replacement in crawl-ref/source/dungeon.cc at line 298 [11.3429798]
∅:D[62.13069] → [61.12911:12935]
B:BD[63.697] → [61.12911:12935]
```
        _reset_level();
```
[62.13069]
[63.720]
```
        dgn_reset_level();
```
Replacement in crawl-ref/source/dungeon.cc at line 887 [11.3429798]
B:BD[64.4521] → [61.14877:14904]
```
static void _reset_level()
```
[64.4521]
[64.4587]
```
void dgn_reset_level()
```
Replacement in crawl-ref/source/dungeon.cc at line 4220 [11.3429798]
B:BD[65.4509] → [61.31516:31544]
```
            _reset_level();
```
[66.3933]
[65.4536]
```
            dgn_reset_level();
```

Replacement in crawl-ref/source/dungeon.cc at line 4631 [11.3429798]

B:BD[47.13564] → [47.13564:13605]

B:BD[47.13605] → [13.83467:83610]

bool dgn_place_monster(mons_spec &mspec,
                       int monster_level, const coord_def& where,
                       bool force_pos, bool generate_awake, bool patrolling)

[47.13564]

[67.10926]

int dgn_place_monster(mons_spec &mspec,
                      int monster_level, const coord_def& where,
                      bool force_pos, bool generate_awake, bool patrolling)

Replacement in crawl-ref/source/dungeon.cc at line 4657 [11.3429798]

∅:D[68.11285] → [69.165:231]

B:BD[67.11113] → [69.165:231]

B:BD[69.231] → [70.653:685]

            if (mons_is_unique(mid) && you.unique_creatures[mid])
                return (false);

[68.11285]

[71.24203]

            if (mons_is_unique(mid) && you.unique_creatures[mid]
                && !crawl_state.arena)
            {
                return (-1);
            }

Insertion in crawl-ref/source/dungeon.cc at line 4706 [11.3429798]

[72.3877]

[40.50163]

        switch (mspec.attitude)
        {
        case ATT_FRIENDLY:
            mg.behaviour = BEH_FRIENDLY;
            break;
        case ATT_NEUTRAL:
            mg.behaviour = BEH_NEUTRAL;
            break;
        case ATT_GOOD_NEUTRAL:
            mg.behaviour = BEH_GOOD_NEUTRAL;
            break;
        default:
            break;
        }

Insertion in crawl-ref/source/dungeon.cc at line 4723 [11.3429798]

[53.17272]

[13.83664]


        coord_def place(where);
        if (!force_pos && mgrd(place) != NON_MONSTER
            && mg.cls != RANDOM_MONSTER && mg.cls < NUM_MONSTERS)
        {
            place = find_newmons_square_contiguous(mg.cls, where, 6);
        }

Replacement in crawl-ref/source/dungeon.cc at line 4750 [11.3429798]
∅:D[44.9005] → [40.50379:50410]
B:BD[46.1239] → [40.50379:50410]
```
        return (mindex != -1);
```
[44.9005]
[70.883]
```
        return (mindex);
```
Replacement in crawl-ref/source/dungeon.cc at line 4752 [11.3429798]
B:BD[70.889] → [62.14616:14636]
```
    return (false);
```
[70.889]
[57.1134]
```
    return (-1);
```

Replacement in crawl-ref/source/dungeon.cc at line 4764 [11.3429798]

B:BD[42.9710] → [13.83771:83836]

∅:D[13.83836] → [58.5471:5529]

B:BD[58.5471] → [58.5471:5529]

    return dgn_place_monster(mspec, monster_level, where, false,
                             generate_awake, patrolling);

[42.9710]

[70.909]

    return (-1 != dgn_place_monster(mspec, monster_level, where, false,
                                    generate_awake, patrolling));

Replacement in crawl-ref/source/dungeon.cc at line 7729 [11.3429798]

B:BD[73.157799] → [61.51915:51984]

static coord_def _dgn_find_feature_marker(dungeon_feature_type feat)

[73.157799]

[74.2860]

coord_def dgn_find_feature_marker(dungeon_feature_type feat)

Replacement in crawl-ref/source/dungeon.cc at line 7747 [11.3429798]

B:BD[75.506] → [61.52037:52098]

    return (_dgn_find_feature_marker(DNGN_ENTER_LABYRINTH));

[75.506]

[74.3253]

    return (dgn_find_feature_marker(DNGN_ENTER_LABYRINTH));

Replacement in crawl-ref/source/dungeon.cc at line 7763 [11.3429798]

B:BD[76.5129] → [76.5129:5199]

        const coord_def pos(_dgn_find_feature_marker(stair_to_find));

[76.5129]

[76.5199]

        const coord_def pos(dgn_find_feature_marker(stair_to_find));

Replacement in crawl-ref/source/dungeon.cc at line 7788 [11.3429798]

B:BD[77.547] → [61.52174:52244]

        const coord_def pos(_dgn_find_feature_marker(stair_to_find));

[77.547]

[77.616]

        const coord_def pos(dgn_find_feature_marker(stair_to_find));

Replacement in crawl-ref/source/dungeon.cc at line 7808 [11.3429798]

B:BD[75.852] → [61.52310:52389]

        const coord_def pos(_dgn_find_feature_marker(DNGN_STONE_STAIRS_UP_I));

[75.852]

[75.930]

        const coord_def pos(dgn_find_feature_marker(DNGN_STONE_STAIRS_UP_I));

Replacement in crawl-ref/source/dungeon.cc at line 7949 [11.3429798]

B:BD[78.9246] → [78.9246:9312]

    const coord_def pos(_dgn_find_feature_marker(stair_to_find));

[78.9246]

[78.9312]

    const coord_def pos(dgn_find_feature_marker(stair_to_find));

Insertion in crawl-ref/source/directn.h at line 77 [11.3696722]

[23.97139]

    coord_def glosc() const
    {
        return (glos1 + glos2) / 2;
    }

Insertion in crawl-ref/source/dat/clua/loadmaps.lua at line 15 [79.816]
[6.3461]
[6.3461]
```
  "arena.des",
```

File addition: arena.des (----------)

[15.1041429]

NAME: arena_level
TAGS: arena_level no_mons_gen
MARKER: A = feat: stone_stairs_up_i
MARKER: B = feat: stone_stairs_down_i
MARKER: O = feat: escape_hatch_up
SUBST: A = ., B = ., O = .
ORIENT: encompass
MAP
XXXXXXXXXXXXXXXXX
X...............X
X.......B.......X
X...............X
X...............X
X...............X
X...............X
X...............X
X.......O.......X
X...............X
X...............X
X...............X
X...............X
X...............X
X.......A.......X
X...............X
XXXXXXXXXXXXXXXXX
ENDMAP

File addition: arena.h (----------)

[80.24]

#ifndef ARENA_H
#define ARENA_H
#include "AppHdr.h"
void run_arena();
#endif

File addition: arena.cc (----------)

[80.24]

#include "AppHdr.h"
#include "externs.h"
#include "arena.h"
#include "chardump.h"
#include "cio.h"
#include "dungeon.h"
#include "initfile.h"
#include "libutil.h"
#include "maps.h"
#include "message.h"
#include "mon-util.h"
#include "monstuff.h"
#include "monplace.h"
#include "output.h"
#include "skills2.h"
#include "spl-util.h"
#include "state.h"
#include "version.h"
#include "view.h"
extern void world_reacts();
namespace arena
{
    // A faction is just a big list of monsters. Monsters will be dropped
    // around the appropriate marker.
    struct faction
    {
        std::string desc;
        mons_list members;
        bool friendly;
        faction(bool fr) : members(), friendly(fr) { }
        void place_at(const coord_def &pos);
        void clear()
        {
            members.clear();
        }
    };
    int total_trials = 0;
    int trials_done = 0;
    int team_a_wins = 0;
    bool allow_summons = true;
    faction faction_a(true);
    faction faction_b(false);
    void adjust_monsters()
    {
        if (!allow_summons)
        {
            for (int m = 0; m < MAX_MONSTERS; ++m)
            {
                monsters *mons(&menv[m]);
                if (!mons->alive())
                    continue;
                monster_spells &spells(mons->spells);
                for (int i = 0; i < NUM_MONSTER_SPELL_SLOTS; ++i)
                {
                    spell_type sp = spells[i];
                    if (spell_typematch(sp, SPTYP_SUMMONING))
                        spells[i] = SPELL_NO_SPELL;
                }
            }
        }
    }
    void faction::place_at(const coord_def &pos)
    {
        ASSERT(in_bounds(pos));
        for (int i = 0, size = members.size(); i < size; ++i)
        {
            mons_spec spec = members.get_monster(i);
            if (friendly)
                spec.attitude = ATT_FRIENDLY;
            for (int q = 0; q < spec.quantity; ++q)
            {
                const coord_def place =
                    find_newmons_square_contiguous(MONS_GIANT_BAT, pos, 6);
                if (!in_bounds(place))
                    break;
                const int imon = dgn_place_monster(spec, you.your_level,
                                                   place, false, true, false);
                if (imon == -1)
                    end(1, false, "Failed to create monster at (%d,%d)",
                        place.x, place.y);
            }
        }
    }
    void center_print(unsigned sz, std::string text, int number = -1)
    {
        if (number >= 0)
            text = make_stringf("(%d) %s", number, text.c_str());
        if (text.length() > sz)
            text = text.substr(0, sz);
        int padding = (sz - text.length()) / 2 + text.length();
        cprintf("%*s", padding, text.c_str());
    }
    void setup_level()
    {
        dgn_reset_level();
        for (int x = 0; x < GXM; ++x)
            for (int y = 0; y < GYM; ++y)
                grd[x][y] = DNGN_ROCK_WALL;
        unwind_bool gen(Generating_Level, true);
        typedef unwind_var< std::set<std::string> > unwind_stringset;
        const unwind_stringset mtags(you.uniq_map_tags);
        const unwind_stringset mnames(you.uniq_map_names);
        const map_def *map = random_map_for_tag("arena_level", false);
        ASSERT(map);
        dgn_place_map(map, true, true);
        if (!env.rock_colour)
            env.rock_colour = CYAN;
        if (!env.floor_colour)
            env.floor_colour = LIGHTGREY;
    }
    std::string find_monster_spec()
    {
        if (!SysEnv.arena_teams.empty())
            return (SysEnv.arena_teams);
        throw std::string("No monsters specified for the arena.");
    }
    void parse_faction(faction &fact, std::string spec)
        throw (std::string)
    {
        fact.clear();
        fact.desc = spec;
        std::vector<std::string> monsters = split_string(",", spec);
        for (int i = 0, size = monsters.size(); i < size; ++i)
        {
            const std::string err = fact.members.add_mons(monsters[i], false);
            if (!err.empty())
                throw err;
        }
    }
    void parse_monster_spec()
        throw (std::string)
    {
        std::string spec = find_monster_spec();
        allow_summons = !strip_tag(spec, "no_summons");
        const int ntrials = strip_number_tag(spec, "t:");
        if (ntrials != TAG_UNFOUND && ntrials >= 1 && ntrials <= 99
            && !total_trials)
            total_trials = ntrials;
        std::vector<std::string> factions = split_string(" v ", spec);
        if (factions.size() == 1)
            factions = split_string(" vs ", spec);
        if (factions.size() != 2)
            throw make_stringf("Expected arena monster spec \"xxx v yyy\", "
                               "but got \"%s\"", spec.c_str());
        try
        {
            parse_faction(faction_a, factions[0]);
            parse_faction(faction_b, factions[1]);
        }
        catch (const std::string &err)
        {
            throw make_stringf("Bad monster spec \"%s\": %s",
                               spec.c_str(),
                               err.c_str());
        }
    }
    void setup_monsters()
        throw (std::string)
    {
        unwind_var< FixedVector<bool, NUM_MONSTERS> >
            uniq(you.unique_creatures);
        parse_monster_spec();
        coord_def place_a(dgn_find_feature_marker(DNGN_STONE_STAIRS_UP_I));
        coord_def place_b(dgn_find_feature_marker(DNGN_STONE_STAIRS_DOWN_I));
        faction_a.place_at(place_a);
        faction_b.place_at(place_b);
        adjust_monsters();
    }
    void show_fight_banner(bool after_fight = false)
    {
        int line = 1;
        cgotoxy(1, line++, GOTO_STAT);
        textcolor(WHITE);
        center_print(crawl_view.hudsz.x,
                     "Crawl " VER_NUM VER_QUAL " " VERSION_DETAIL);
        line++;
        cgotoxy(1, line++, GOTO_STAT);
        textcolor(YELLOW);
        center_print(crawl_view.hudsz.x, faction_a.desc,
                     total_trials ? team_a_wins : -1);
        cgotoxy(1, line++, GOTO_STAT);
        textcolor(LIGHTGREY);
        center_print(crawl_view.hudsz.x, "vs");
        cgotoxy(1, line++, GOTO_STAT);
        textcolor(YELLOW);
        center_print(crawl_view.hudsz.x, faction_b.desc,
                     total_trials ? trials_done - team_a_wins : -1);
        if (total_trials > 1 && trials_done < total_trials)
        {
            cgotoxy(1, line++, GOTO_STAT);
            textcolor(BROWN);
            center_print(crawl_view.hudsz.x,
                         make_stringf("Round %d of %d",
                                      after_fight ? trials_done
                                                  : trials_done + 1,
                                      total_trials));
        }
        else
        {
            cgotoxy(1, line++, GOTO_STAT);
            textcolor(BROWN);
            clear_to_end_of_line();
        }
    }
    void setup_others()
    {
        you.species = SP_HUMAN;
        you.char_class = JOB_FIGHTER;
        you.experience_level = 27;
        you.mutation[MUT_ACUTE_VISION] = 3;
        coord_def yplace(dgn_find_feature_marker(DNGN_ESCAPE_HATCH_UP));
        // Fix up the viewport.
        you.moveto(yplace);
        strcpy(you.your_name, "Arena");
        you.hp = you.hp_max = 99;
        you.your_level = 20;
        Options.show_gold_turns = false;
        show_fight_banner();
    }
    void expand_mlist(int exp)
    {
        crawl_view.mlistp.y -= exp;
        crawl_view.mlistsz.y += exp;
    }
    void setup_fight()
        throw (std::string)
    {
        //no_messages mx;
        setup_level();
        // Monster set up may block waiting for matchups.
        setup_monsters();
        setup_others();
    }
    // Returns true as long as at least one member of each faction is alive.
    bool fight_is_on()
    {
        bool found_friend = false;
        bool found_enemy = false;
        for (int i = 0; i < MAX_MONSTERS; ++i)
        {
            const monsters *mons(&menv[i]);
            if (mons->alive())
            {
                if (mons->attitude == ATT_FRIENDLY)
                    found_friend = true;
                else if (mons->attitude == ATT_HOSTILE)
                    found_enemy = true;
                if (found_friend && found_enemy)
                    return (true);
            }
        }
        return (false);
    }
    void report_foes()
    {
        for (int i = 0; i < MAX_MONSTERS; ++i)
        {
            monsters *mons(&menv[i]);
            if (mons->alive())
            {
                if (mons->type == MONS_SIGMUND)
                {
                    coord_def where;
                    if (mons->get_foe())
                        where = mons->get_foe()->pos();
                    mprf("%s (%d,%d) foe: %s (%d,%d)",
                         mons->name(DESC_PLAIN).c_str(),
                         mons->pos().x, mons->pos().y,
                         mons->get_foe()? mons->get_foe()->name(DESC_PLAIN).c_str()
                         : "(none)",
                         where.x, where.y);
                }
            }
        }
    }
    void fixup_foes()
    {
        for (int i = 0; i < MAX_MONSTERS; ++i)
        {
            monsters *mons(&menv[i]);
            if (mons->alive())
            {
                behaviour_event(mons, ME_DISTURB, MHITNOT, mons->pos());
            }
        }
    }
    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);
    }
    void do_fight()
    {
        mesclr(true);
        {
            cursor_control coff(false);
            while (fight_is_on())
            {
                if (kbhit() && getch() == ESCAPE)
                    end(0, false, "Canceled contest at user request");
                viewwindow(true, false);
                unwind_var<coord_def> pos(you.position);
                // Move hero offscreen.
                you.position.y = -1;
                you.time_taken = 10;
                //report_foes();
                world_reacts();
                delay(Options.arena_delay);
                mesclr();
            }
            viewwindow(true, false);
        }
        mesclr();
        const bool team_a_won = friendlies_win();
        trials_done++;
        if (team_a_won)
            team_a_wins++;
        show_fight_banner(true);
        mprf("Winner: %s!",
             team_a_won ? faction_a.desc.c_str() : faction_b.desc.c_str());
    }
    void global_setup()
    {
        expand_mlist(5);
    }
    void write_results()
    {
        if (FILE *f = fopen("arena.result", "w"))
        {
            fprintf(f, "%d-%d\n", team_a_wins, trials_done - team_a_wins);
            fclose(f);
        }
    }
    void write_error(const std::string &error)
    {
        if (FILE *f = fopen("arena.result", "w"))
        {
            fprintf(f, "err: %s\n", error.c_str());
            fclose(f);
        }
    }
    void simulate()
    {
        init_level_connectivity();
        do
        {
            try
            {
                setup_fight();
            }
            catch (const std::string &error)
            {
                write_error(error);
                end(0, false, "%s", error.c_str());
            }
            do_fight();
            if (trials_done < total_trials)
                delay(Options.arena_delay * 8);
        } while (trials_done < total_trials);
        if (total_trials > 0)
        {
            mprf("Final score: %s (%d); %s (%d)",
                 faction_a.desc.c_str(), team_a_wins,
                 faction_b.desc.c_str(), trials_done - team_a_wins);
            delay(Options.arena_delay * 8);
        }
        write_results();
    }
}
void run_arena()
{
    arena::global_setup();
    arena::simulate();
}

Insertion in crawl-ref/source/acr.cc at line 46 [11.4397395]
[11.4399966]
[81.19882]
```
#include "arena.h"
```
Insertion in crawl-ref/source/acr.cc at line 138 [11.4397395]
[15.1255466]
[24.23635]
```
void world_reacts();
```
Deletion in crawl-ref/source/acr.cc at line 166 [11.4397395]
B:BD[82.16806] → [82.16806:16835]
```
static void _world_reacts();
```
Replacement in crawl-ref/source/acr.cc at line 1532 [11.4397395]
B:BD[24.28465] → [82.18461:18486]
```
        _world_reacts();
```
[24.28465]
[15.1259263]
```
        world_reacts();
```
Replacement in crawl-ref/source/acr.cc at line 1552 [11.4397395]
B:BD[83.3878] → [83.3878:3907]
```
            _world_reacts();
```
[83.3878]
[15.1259406]
```
            world_reacts();
```
Replacement in crawl-ref/source/acr.cc at line 1558 [11.4397395]
B:BD[84.16876] → [82.18513:18538]
```
        _world_reacts();
```
[84.16876]
[15.1259520]
```
        world_reacts();
```
Replacement in crawl-ref/source/acr.cc at line 1627 [11.4397395]
B:BD[11.4421346] → [82.18636:18661]
```
        _world_reacts();
```
[11.4421346]
[15.1259930]
```
        world_reacts();
```
Replacement in crawl-ref/source/acr.cc at line 3054 [11.4397395]
B:BD[85.8818] → [82.26321:26349]
```
static void _world_reacts()
```
[85.8818]
[86.2029]
```
void world_reacts()
```
Replacement in crawl-ref/source/acr.cc at line 3085 [11.4397395]
B:BD[15.1270279] → [15.1270279:1270310]
```
    stealth = check_stealth();
```
[15.1270279]
[11.4458872]
```
    if (!crawl_state.arena)
        stealth = check_stealth();
```
Replacement in crawl-ref/source/acr.cc at line 3096 [11.4397395]
B:BD[15.1270531] → [15.1270531:1270558]
```
    if (one_chance_in(10))
```
[15.1270531]
[87.490]
```
    if (!crawl_state.arena && one_chance_in(10))
```
Replacement in crawl-ref/source/acr.cc at line 3105 [11.4397395]
B:BD[15.1270859] → [88.12520:12565]
```
    if (env.cgrid(you.pos()) != EMPTY_CLOUD)
```
[15.1270859]
[15.1270915]
```
    if (!crawl_state.arena && env.cgrid(you.pos()) != EMPTY_CLOUD)
```
Replacement in crawl-ref/source/acr.cc at line 3155 [11.4397395]
B:BD[11.4460328] → [89.5888:5920]
```
    if (Options.stash_tracking)
```
[11.4460328]
[82.26473]
```
    if (Options.stash_tracking && !crawl_state.arena)
```

Insertion in crawl-ref/source/acr.cc at line 3878 [11.4397395]

[62.18169]

[90.4862]

    if (crawl_state.arena)
    {
        run_arena();
        end(0, false);
    }

Replacement in crawl-ref/source/abyss.cc at line 401 [11.4482606]
B:BD[91.3369] → [92.2984:3022]
```
         you.youpos.x, you.youpos.y);
```
[91.3369]
[93.31650]
```
         you.position.x, you.position.y);
```

Add arena mode, activated on the command-line by 'crawl -arena "monster v monster"' (eg: crawl -arena "Sigmund v Jessica") to let monsters fight each other undisturbed by the player. Good to examine monster AI and monster behaviour when the player is AWOL.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 205 [11.16817]

Replacement in crawl-ref/source/view.cc at line 1188 [11.16817]

Replacement in crawl-ref/source/view.cc at line 1481 [11.16817]

Replacement in crawl-ref/source/view.cc at line 1487 [11.16817]

Replacement in crawl-ref/source/view.cc at line 1512 [11.16817]

Insertion in crawl-ref/source/view.cc at line 2821 [11.16817]

Insertion in crawl-ref/source/view.cc at line 3932 [11.16817]

Replacement in crawl-ref/source/view.cc at line 3994 [11.16817]

Replacement in crawl-ref/source/view.cc at line 4956 [11.16817]

Insertion in crawl-ref/source/view.cc at line 4960 [11.16817]

Replacement in crawl-ref/source/view.cc at line 5091 [11.16817]

Replacement in crawl-ref/source/view.cc at line 5095 [11.16817]

Replacement in crawl-ref/source/view.cc at line 5210 [11.16817]

Replacement in crawl-ref/source/stuff.cc at line 769 [11.224557]

Insertion in crawl-ref/source/state.h at line 44 [23.42804]

Replacement in crawl-ref/source/state.cc at line 28 [24.1546]

Insertion in crawl-ref/source/player.cc at line 2922 [11.962854]

Insertion in crawl-ref/source/player.cc at line 6947 [11.962854]

Insertion in crawl-ref/source/output.cc at line 1503 [11.1088282]

Deletion in crawl-ref/source/mstuff2.cc at line 169 [11.1340842]

Replacement in crawl-ref/source/monstuff.cc at line 512 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 3406 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 3411 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 3480 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 3485 [11.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4109 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4299 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4301 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 6577 [11.1396662]

Insertion in crawl-ref/source/monspeak.cc at line 39 [11.1558496]

Replacement in crawl-ref/source/monspeak.cc at line 270 [11.1558496]

Insertion in crawl-ref/source/monplace.cc at line 26 [11.1641732]

Insertion in crawl-ref/source/monplace.cc at line 230 [11.1641732]

Insertion in crawl-ref/source/mon-util.cc at line 49 [11.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 1976 [11.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1980 [11.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1983 [11.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7873 [11.1699344]

Insertion in crawl-ref/source/message.cc at line 912 [11.1993826]

Insertion in crawl-ref/source/mapdef.h at line 420 [15.591249]

Insertion in crawl-ref/source/mapdef.h at line 422 [15.591249]

Replacement in crawl-ref/source/mapdef.h at line 437 [15.591249]

Insertion in crawl-ref/source/mapdef.cc at line 2093 [15.594797]

Replacement in crawl-ref/source/mapdef.cc at line 2198 [15.594797]

Insertion in crawl-ref/source/makefile.obj at line 7 [48.79]

Insertion in crawl-ref/source/initfile.h at line 76 [11.2956146]

Insertion in crawl-ref/source/initfile.cc at line 712 [11.2957258]

Insertion in crawl-ref/source/initfile.cc at line 3285 [11.2957258]

Replacement in crawl-ref/source/initfile.cc at line 3293 [11.2957258]

Insertion in crawl-ref/source/initfile.cc at line 3425 [11.2957258]

Insertion in crawl-ref/source/fight.cc at line 54 [11.3140790]

Replacement in crawl-ref/source/fight.cc at line 373 [11.3140790]

Replacement in crawl-ref/source/fight.cc at line 375 [11.3140790]

Insertion in crawl-ref/source/externs.h at line 2024 [11.3270163]

Insertion in crawl-ref/source/dungeon.h at line 326 [11.3428186]

Replacement in crawl-ref/source/dungeon.h at line 349 [11.3428186]

Insertion in crawl-ref/source/dungeon.h at line 365 [11.3428186]

Deletion in crawl-ref/source/dungeon.cc at line 89 [11.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 298 [11.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 887 [11.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4220 [11.3429798]