fiddlerwoaroof/crawl - Change IA4AZVXJEZP6QRPKUUPBLZQWY36PSN4UMGXVLINXJNTKJR2NXHEAC

Yet another fix to the arena win/loss/tie logic.

During arena mode don't reserve any of mitm[] when creating new items, and when mitm[] fills up call arena_cull_items() instead of _cull_items(), since in arena mode we can cull via how boring/interesting the items are rather than having to consider game balance and fairness to the player.

Allow the arena to veto monster placement, rather than culling them immediately after they're placed.

New arena tags:

"no_bands" prevents band members from being placed.
"move_spawners" teleports test spawners every turn to spread their summons randomly over the arena.
"ban_glyphs:" lists a set of text glyphs of types of monsters which shouldn't be allowed in the arena.

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

Created by zelgadis on January 7, 2009

IA4AZVXJEZP6QRPKUUPBLZQWY36PSN4UMGXVLINXJNTKJR2NXHEAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monplace.cc at line 1006 [4.1641732]

[4.1654210]

[5.3702]

    if (crawl_state.arena)
    {
        if (arena_veto_place_monster(mg, first_band_member, fpos))
            return (-1);
    }

Insertion in crawl-ref/source/monplace.cc at line 2050 [4.1641732]
[6.457924]
[6.457924]
```
    if (crawl_state.arena)
        return;
```
Insertion in crawl-ref/source/items.cc at line 29 [4.2584728]
[4.2585517]
[4.2585517]
```
#include "arena.h"
```
Insertion in crawl-ref/source/items.cc at line 64 [4.2584728]
[7.74180]
[4.2585952]
```
#include "state.h"
```
Insertion in crawl-ref/source/items.cc at line 327 [4.2584728]
[4.2592583]
[4.2592583]
```
    if (crawl_state.arena)
        reserve = 0;
```

Replacement in crawl-ref/source/items.cc at line 339 [4.2584728]

B:BD[4.2592784] → [8.6191:6250]

        item = (reserve <= 10) ? _cull_items() : NON_ITEM;

[4.2592784]

[4.2592842]

        if (crawl_state.arena)
        {
            item = arena_cull_items();
            // If arena_cull_items() can't free up any space then
            // _cull_items() won't be able to either, so give up.
            if (item == NON_ITEM)
                return (NON_ITEM);
        }
        else
            item = (reserve <= 10) ? _cull_items() : NON_ITEM;

Insertion in crawl-ref/source/arena.h at line 10 [10.10700]
[9.3736]
[10.10754]
```
struct coord_def;
```

Insertion in crawl-ref/source/arena.h at line 20 [10.10700]

[9.3919]

bool arena_veto_place_monster(const mgen_data &mg, bool first_band_member,
                              const coord_def& pos);

Insertion in crawl-ref/source/arena.h at line 27 [10.10700]
[9.4156]
[10.10774]
```
int arena_cull_items();
```
Insertion in crawl-ref/source/arena.cc at line 19 [10.10815]
[10.11085]
[10.11085]
```
#include "mstuff2.h"
```
Insertion in crawl-ref/source/arena.cc at line 21 [10.10815]
[10.11105]
[10.11105]
```
#include "randart.h"
```
Insertion in crawl-ref/source/arena.cc at line 74 [10.10815]
[2.2999]
[2.2999]
```
    bool allow_bands         = true;
```
Insertion in crawl-ref/source/arena.cc at line 78 [10.10815]
[2.3113]
[11.2998]
```
    bool do_move_spawners    = false;
```
Insertion in crawl-ref/source/arena.cc at line 81 [10.10815]
[11.3034]
[11.3034]
```
    std::vector<int> spawner_list;
```
Insertion in crawl-ref/source/arena.cc at line 83 [10.10815]
[11.3035]
[12.8974]
```
    bool banned_glyphs[256];
```
Insertion in crawl-ref/source/arena.cc at line 199 [10.10815]
[10.13662]
[13.2894]
```
        spawner_list.clear();
```
Insertion in crawl-ref/source/arena.cc at line 283 [10.10815]
[2.3651]
[2.3651]
```
        allow_bands      = !strip_tag(spec, "no_bands");
```
Insertion in crawl-ref/source/arena.cc at line 286 [10.10815]
[2.3774]
[9.4560]
```
        do_move_spawners =  strip_tag(spec, "move_spawners");
```

Insertion in crawl-ref/source/arena.cc at line 326 [10.10815]

[14.3608]

[10.15327]

        std::string glyphs = strip_tag_prefix(spec, "ban_glyphs:");
        for (unsigned int i = 0; i < glyphs.size(); i++)
            banned_glyphs[(int)glyphs[i]] = true;

Replacement in crawl-ref/source/arena.cc at line 531 [10.10815]
B:BD[15.4084] → [16.3713:3735]
```
    } // count_foes()
```
[15.4084]
[15.4090]
```
    }
```
Insertion in crawl-ref/source/arena.cc at line 611 [10.10815]
[11.3340]
[11.3340]
```
                case MSGCH_WARN: prefix = "WARN: "; break;
```

Insertion in crawl-ref/source/arena.cc at line 621 [10.10815]

[9.5429]

[14.4225]

        }
    }
    // Move test spawners to a new position every turn to scatter each
    // faction all over the arena.
    void move_spawners()
    {
        if (!do_move_spawners)
            return;
        for (unsigned int i = 0; i < spawner_list.size(); i++)
        {
            monsters* mon = &menv[spawner_list[i]];
            if (!mon->alive() || mon->type != MONS_TEST_SPAWNER)
                continue;
            monster_teleport(mon, true, true);

Insertion in crawl-ref/source/arena.cc at line 662 [10.10815]

[16.4174]

#ifdef DEBUG_DIAGNOSTICS
                mprf("---- Turn #%d ----", turns);
#endif

Insertion in crawl-ref/source/arena.cc at line 679 [10.10815]
[10.21121]
[10.21121]
```
                move_spawners();
```
Insertion in crawl-ref/source/arena.cc at line 889 [10.10815]
[11.4247]
[11.4247]

Insertion in crawl-ref/source/arena.cc at line 923 [10.10815]

[9.6722]

        return (true);
    if (arena::banned_glyphs[mons_char(type)])

Insertion in crawl-ref/source/arena.cc at line 928 [10.10815]

[9.6766]

[10.22798]

}
bool arena_veto_place_monster(const mgen_data &mg, bool first_band_member,
                              const coord_def& pos)
{
    return (!arena::allow_bands && !first_band_member
            || arena::banned_glyphs[mons_char(mg.cls)]);

Insertion in crawl-ref/source/arena.cc at line 936 [10.10815]
[10.22800]
[10.22800]

Insertion in crawl-ref/source/arena.cc at line 946 [10.10815]

[15.5748]

[17.3039]

    if (monster->type == MONS_TEST_SPAWNER)
        arena::spawner_list.push_back(monster->mindex());
#ifdef DEBUG_DIAGNOSTICS
    mprf("%s enters the arena!", monster->name(DESC_CAP_A).c_str());
#endif

Replacement in crawl-ref/source/arena.cc at line 999 [10.10815]

B:BD[16.6065] → [3.3067:3210]

∅:D[3.3210] → [15.5925:5926]

∅:D[16.6391] → [15.5925:5926]

B:BD[15.5925] → [15.5925:5926]

B:BD[15.5926] → [3.3211:3240]

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

[16.6065]

[15.6242]

    if (arena::faction_a.active_members > 0
        && arena::faction_b.active_members <= 0)
    {
        arena::faction_a.won = true;
    }
    else if (arena::faction_b.active_members > 0
             && arena::faction_a.active_members <= 0)
    {
        arena::faction_b.won = true;
    }
    // Everyone is dead.  Is it a tie, or something else?
    else if (arena::faction_a.active_members <= 0
             && arena::faction_b.active_members <= 0)

Replacement in crawl-ref/source/arena.cc at line 1013 [10.10815]

B:BD[15.6248] → [3.3241:3342]

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

[15.6248]

[15.6376]

        if (monster->flags & MF_HARD_RESET && !MON_KILL(killer))

Replacement in crawl-ref/source/arena.cc at line 1015 [10.10815]

B:BD[15.6386] → [3.3343:3384]

            arena::faction_a.won = true;

[15.6386]

[15.6596]

            end(1, false, "Last arena monster was dismissed.");

Replacement in crawl-ref/source/arena.cc at line 1017 [10.10815]

B:BD[15.6606] → [3.3385:3496]

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

[15.6606]

[3.3496]

        // 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 (mons_self_destructs(monster) && MON_KILL(killer))

Replacement in crawl-ref/source/arena.cc at line 1024 [10.10815]

B:BD[3.3506] → [3.3506:3547]

            arena::faction_b.won = true;

[3.3506]

[3.3547]

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

Replacement in crawl-ref/source/arena.cc at line 1030 [10.10815]

B:BD[15.6612] → [3.3558:4069]

    // 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))

[15.6612]

[3.4069]

}
static bool _sort_corpses(int a, int b)
{
    return (mitm[a].special < mitm[b].special);
}
#define DESTROY_ITEM(i) \
{ \
    destroy_item(i, true); \
    cull_count++; \
    if (first_avail == NON_ITEM) \
        first_avail = i; \
}
int arena_cull_items()
{
    // Try to cull 15% of items.
    const int cull_target = MAX_ITEMS * 15 / 100;
    int cull_count      = 0;
    std::vector<int> artefacts;
    std::vector<int> egos;
    std::vector<int> ammo;
    std::vector<int> wands;
    std::vector<int> potions;
    std::vector<int> scrolls;
    std::vector<int> corpses;
    int first_avail = NON_ITEM;
#ifdef DEBUG_DIAGNOSTICS
    int non_floor_items = 0;
#endif
    for (int i = 0; i < MAX_ITEMS; i++)

Replacement in crawl-ref/source/arena.cc at line 1068 [10.10815]

B:BD[3.4075] → [3.4075:4255]

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

[3.4075]

[3.4255]

        // All items in mitm[] are valid when we're called.
        const item_def &item(mitm[i]);
#ifdef DEBUG_DIAGNOSTICS
        if (!is_valid_item(item))
        {
            mprf("Invalid item in arena_cull_items()!!", MSGCH_ERROR);
            non_floor_items++;
            continue;
        }
#endif
        // We want floor items.
        if (!in_bounds(item.pos))
        {
#ifdef DEBUG_DIAGNOSTICS
            if (item.pos == coord_def(-1, -1))
                mprf("Player item in arena_cull_items()!!", MSGCH_ERROR);
            non_floor_items++;
#endif
            continue;
        }
        bool cull = false;
        switch(item.base_type)
        {
        case OBJ_WEAPONS:
        case OBJ_ARMOUR:
            if (is_artefact(item))
                artefacts.push_back(i);
            else if (item.special != 0)
                egos.push_back(i);
            else
                // Always cull boring equipment.
                cull = true;
            break;
        case OBJ_MISSILES:
            if (item.sub_type == MI_JAVELIN
                || item.sub_type == MI_THROWING_NET)
            {
                ammo.push_back(i);
            }
            else
                // Arrows/needles/etc on the floor are just clutter.
                cull = true;
            break;
        case OBJ_WANDS:
            if (item.plus == 0)
                // Get rid of empty wands.
                cull = true;
            else
                wands.push_back(i);
            break;
        case OBJ_SCROLLS:
            scrolls.push_back(i);
            break;
        case OBJ_POTIONS:
            potions.push_back(i);
            break;
        case OBJ_CORPSES:
            if (item.sub_type == CORPSE_SKELETON)
                // If it's rotted away into a skeleton then there's no one
                // around who can uses corpses.
                cull = true;
            else
                corpses.push_back(i);
            break;
        default:
            // Get rid of everything else.
            cull = true;
        } // switch(item.base_type)
        if (cull)
            DESTROY_ITEM(i);
    } // for (int i = 0; i < MAX_ITEMS; i++)
    if (cull_count >= cull_target)
    {
#ifdef DEBUG_DIAGNOSTICS
        mprf(MSGCH_DIAGNOSTICS, "Arena culled %d misc items, done.",
                                 cull_count);
#endif
        return (first_avail);

Replacement in crawl-ref/source/arena.cc at line 1158 [10.10815]

∅:D[3.4261] → [9.7008:7010]

∅:D[15.6612] → [9.7008:7010]

B:BD[9.7008] → [9.7008:7010]

[3.4261]

[9.7010]


#ifdef DEBUG_DIAGNOSTICS
    if (cull_count > 0)
        mprf(MSGCH_DIAGNOSTICS, "Arena culled %d misc items.", cull_count);
#endif
    // Get rid of oldest corpses first.
    std::sort(corpses.begin(), corpses.end(), _sort_corpses);
    std::vector<int>* lists[] = {&corpses, &ammo, &egos, &potions,
                                 &scrolls, &wands, &artefacts, NULL};
#ifdef DEBUG_DIAGNOSTICS
    const char* list_names[] = {"corpses", "ammo", "egos", "potions",
                                "scrolls", "wands", "artefacts"};
#endif

Insertion in crawl-ref/source/arena.cc at line 1175 [10.10815]

[9.7011]

    for (int i = 0; lists[i] != NULL; i++)
    {
        std::vector<int>* vec = lists[i];
        for (unsigned int j = 0; j < vec->size(); j++)
        {
            DESTROY_ITEM((*vec)[j]);
            if (cull_count >= cull_target)
            {
#ifdef DEBUG_DIAGNOSTICS
                mprf(MSGCH_DIAGNOSTICS, "Arena culled %d %s, done.", j + 1,
                     list_names[i]);
#endif
                return (first_avail);
            }
        } // for (unsigned int j = 0; j < vec->size(); j++)
#ifdef DEBUG_DIAGNOSTICS
        if (vec->size() > 0)
            mprf(MSGCH_DIAGNOSTICS, "Arena culled %d %s.", vec->size(),
                 list_names[i]);
#endif
    } // for (int i = 0; lists[i] != NULL; i++)
#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "Arena only culled %d of a desired %d items.",
         cull_count, cull_target);
#endif // DEBUG_DIAGNOSTICS
    return (first_avail);
} // arena_cull_items

Yet another fix to the arena win/loss/tie logic.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/monplace.cc at line 1006 [4.1641732]

Insertion in crawl-ref/source/monplace.cc at line 2050 [4.1641732]

Insertion in crawl-ref/source/items.cc at line 29 [4.2584728]

Insertion in crawl-ref/source/items.cc at line 64 [4.2584728]

Insertion in crawl-ref/source/items.cc at line 327 [4.2584728]

Replacement in crawl-ref/source/items.cc at line 339 [4.2584728]

Insertion in crawl-ref/source/arena.h at line 10 [10.10700]

Insertion in crawl-ref/source/arena.h at line 20 [10.10700]

Insertion in crawl-ref/source/arena.h at line 27 [10.10700]

Insertion in crawl-ref/source/arena.cc at line 19 [10.10815]

Insertion in crawl-ref/source/arena.cc at line 21 [10.10815]

Insertion in crawl-ref/source/arena.cc at line 74 [10.10815]

Insertion in crawl-ref/source/arena.cc at line 78 [10.10815]

Insertion in crawl-ref/source/arena.cc at line 81 [10.10815]

Insertion in crawl-ref/source/arena.cc at line 83 [10.10815]

Insertion in crawl-ref/source/arena.cc at line 199 [10.10815]

Insertion in crawl-ref/source/arena.cc at line 283 [10.10815]

Insertion in crawl-ref/source/arena.cc at line 286 [10.10815]