fiddlerwoaroof/crawl - Change R32CQ6FQJTQLB35P3HENIDCBDT3UWXBBCDAAUWHUQO6G6NKEDPKQC

The arena now prevents undesired random monsters from being placed by telling

pick_random_monster() to try something else, rather than by culling them after they're placed.

By default the arena prevents zero xp monsters from being randomly placed. To allow them to be placed use the spec tag "allow_zero_xp".

Removed the arena spec tag "alert", since it's no longer needed.

Added the arena spec tag "cycle_random", which if set causes pick_random_monster() to cycle through all the monsters valid for the level_id chosen as the arena's place. Produces a greater variety of monsters when using test spawners.

If arena mode is dumping message to the output file then prefix error messages with "ERROR: " and diagnostic messages with "DIAG: "

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

Created by zelgadis on January 3, 2009

R32CQ6FQJTQLB35P3HENIDCBDT3UWXBBCDAAUWHUQO6G6NKEDPKQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 23 [7.1396662]
[7.1397575]
[7.1397575]
```
#include "arena.h"
```

Insertion in crawl-ref/source/monstuff.cc at line 1000 [7.1396662]

[8.7307]

[9.2987]


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

Replacement in crawl-ref/source/monstuff.cc at line 3591 [7.1396662]

B:BD[4.3270] → [4.3270:3308]

        mons->behaviour = BEH_WANDER;

[4.3270]

[10.5148]

        if (mons->type == MONS_TEST_SPAWNER)
        {
            mons->foe       = nearest_unseen;
            mons->behaviour = BEH_SEEK;
        }
        else
            mons->behaviour = BEH_WANDER;

Insertion in crawl-ref/source/monplace.cc at line 15 [7.1641732]
[7.1642022]
[11.1187]
```
#include "arena.h"
```

Insertion in crawl-ref/source/monplace.cc at line 318 [7.1641732]

[12.5061]

[2.5186]

    if (crawl_state.arena)
    {
        monster_type type = arena_pick_random_monster(place, power, lev_mons);
        if (type != RANDOM_MONSTER)
            return (type);
    }

Insertion in crawl-ref/source/monplace.cc at line 398 [7.1641732]

[12.6419]

            if (crawl_state.arena && arena_veto_random_monster(mon_type))
                continue;

Insertion in crawl-ref/source/monplace.cc at line 424 [7.1641732]

[12.7014]


            if (crawl_state.arena && arena_veto_random_monster(mon_type))
                continue;

Insertion in crawl-ref/source/monplace.cc at line 1150 [7.1641732]

[13.11276]

[7.1657789]


    if (crawl_state.arena)
        arena_placed_monster(&menv[id], mg, first_band_member);

Insertion in crawl-ref/source/arena.h at line 5 [10.10700]
[10.10754]
[10.10754]
```
#include "enum.h"
class level_id;
class monsters;
class mgen_data;
```

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

[10.10773]


monster_type arena_pick_random_monster(const level_id &place, int power,
                                       int &lev_mons);

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

[10.10774]

bool arena_veto_random_monster(monster_type type);
void arena_placed_monster(monsters *monster, const mgen_data &mg,
                          bool first_band_member);
void arena_monster_died(monsters *monster, killer_type killer,
                        int killer_index, bool silent);

Insertion in crawl-ref/source/arena.cc at line 13 [10.10815]
[10.11019]
[10.11019]
```
#include "mon-pick.h"
```
Replacement in crawl-ref/source/arena.cc at line 50 [10.10815]
B:BD[10.11725] → [10.11725:11756]
B:BD[10.11756] → [3.2846:2877]
∅:D[3.2877] → [14.2846:2873]
B:BD[10.11756] → [14.2846:2873]
```
    bool allow_summons = true;
    bool no_immobile  = false;
    bool do_alert = false;
```
[10.11725]
[15.8974]
```
    bool allow_summons   = true;
    bool allow_zero_xp   = false;
    bool allow_immobile  = true;
```

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

[16.11650]

    bool contest_canceled = false;
    bool cycle_random     = false;
    int  cycle_random_pos = -1;

Deletion in crawl-ref/source/arena.cc at line 94 [10.10815]

∅:D[16.11989] → [14.2874:2935]

B:BD[10.12392] → [14.2874:2935]

B:BD[14.2935] → [5.3019:3044]

∅:D[5.3044] → [14.2956:3719]

B:BD[14.2956] → [14.2956:3719]

        }
    }
    void alert_faction(bool friendly)
    {
        int alerter = 0;
        for (int i = 0; i < MAX_MONSTERS; i++)
        {
            const monsters *mon = &menv[i];
            if (!mon->alive())
                continue;
            if (mons_friendly(mon) != friendly)
            {
                alerter = i;
                break;
            }
        }
        // Move player aside so that behaviour_event() default src_pos
        // isn't the same as the player's position, in order to avoid an
        // assertion.
        you.position = coord_def(-1, -1);
        for (int i = 0; i < MAX_MONSTERS; i++)
        {
            monsters *mon = &menv[i];
            if (!mon->alive())
                continue;
            if (mons_friendly(mon) == friendly)
                behaviour_event(mon, ME_ALERT, alerter);

Deletion in crawl-ref/source/arena.cc at line 96 [10.10815]
B:BD[17.4597] → [17.4597:4598]
B:BD[17.4598] → [14.3720:3795]
```
    void alert_monsters()
    {
        if (!do_alert)
            return;
```
Deletion in crawl-ref/source/arena.cc at line 97 [10.10815]
B:BD[14.3796] → [14.3796:3862]
```
        alert_faction(true);
        alert_faction(false);
    }
```

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

∅:D[6.4362] → [10.15077:15133]

B:BD[10.15077] → [10.15077:15133]

B:BD[10.15133] → [14.3863:3913]

B:BD[14.3913] → [3.3094:3150]

        allow_summons = !strip_tag(spec, "no_summons");
        do_alert      = strip_tag(spec, "alert");
        no_immobile   = strip_tag(spec, "no_immobile");

[6.4362]

[10.15133]

        allow_summons  = !strip_tag(spec, "no_summons");
        allow_immobile = !strip_tag(spec, "no_immobile");
        allow_zero_xp  =  strip_tag(spec, "allow_zero_xp");
        cycle_random = strip_tag(spec, "cycle_random");

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

[3.3597]

            if (place.level_type == LEVEL_LABYRINTH)
                throw (std::string("Can't set arena place to the "
                                   "labyrinth."));
            else if (place.level_type == LEVEL_PORTAL_VAULT)
                throw (std::string("Can't set arena place to a portal "
                                   "vault."));

Deletion in crawl-ref/source/arena.cc at line 314 [10.10815]
B:BD[10.16453] → [14.3914:3940]
```
        alert_monsters();
```
Insertion in crawl-ref/source/arena.cc at line 478 [10.10815]
[17.5408]
[17.5408]
```
        std::vector<int> channels;
```

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

B:BD[17.5497] → [17.5497:5560]

                                !Options.arena_dump_msgs_all);

[17.5497]

[17.5560]

                                !Options.arena_dump_msgs_all,
                                &channels);

Deletion in crawl-ref/source/arena.cc at line 485 [10.10815]

B:BD[17.5620] → [17.5620:5676]

∅:D[17.5676] → [10.20569:20576]

B:BD[10.20569] → [10.20569:20576]

B:BD[10.20576] → [3.3855:3980]

            fprintf(file, "%s\n", messages[i].c_str());
    }
    void cull_immobile()
    {
        if (!no_immobile)
            return;
        for (int i = 0; i < MAX_MONSTERS; i++)

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

B:BD[3.3990] → [3.3990:4028]

            monsters* mon = &menv[i];

[3.3990]

[3.4028]

            std::string msg  = messages[i];
            int         chan = channels[i];

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

B:BD[3.4029] → [3.4029:4225]

            if (!mon->alive())
                continue;
            if (mons_is_stationary(mon) && mon->is_summoned())
                monster_die(mon, KILL_DISMISSED, NON_MONSTER, true, true);

[3.4029]

[3.4225]

            if (chan == MSGCH_ERROR)
                msg = "ERROR: " + msg;
            else if (chan == MSGCH_DIAGNOSTICS)
                msg = "DIAG: " + msg;
                
            fprintf(file, "%s\n", msg.c_str());

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

B:BD[16.12513] → [16.12513:12588]

                        end(0, false, "Canceled contest at user request");

[16.12513]

[16.12588]

                        contest_canceled = true;
                        mpr("Canceled contest at user request");
                        return;

Deletion in crawl-ref/source/arena.cc at line 526 [10.10815]
B:BD[10.21121] → [3.4243:4276]
```
                cull_immobile();
```
Replacement in crawl-ref/source/arena.cc at line 619 [10.10815]
∅:D[18.3032] → [10.22452:22498]
B:BD[10.22452] → [10.22452:22498]
```
        } while (trials_done < total_trials);
```
[18.3032]
[10.22498]
```
        } while (!contest_canceled && trials_done < total_trials);
```

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

[10.22792]

    }
}
/////////////////////////////////////////////////////////////////////////////
// Various arena callbacks
monster_type arena_pick_random_monster(const level_id &place, int power,
                                       int &lev_mons)
{
    if (!arena::cycle_random)
        return (RANDOM_MONSTER);
    for (int tries = 0; tries <= NUM_MONSTERS; tries++)
    {
        arena::cycle_random_pos++;
        if (arena::cycle_random_pos >= NUM_MONSTERS)
            arena::cycle_random_pos = 0;
        const monster_type type = (monster_type) arena::cycle_random_pos;
        if (mons_rarity(type, place) == 0)
            continue;
        if (arena_veto_random_monster(type))
            continue;
        return (type);

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

[10.22798]


    end(1, false, "No random monsters for place '%s'",
        arena::place.describe().c_str());
    return (NUM_MONSTERS);
}
bool arena_veto_random_monster(monster_type type)
{
    if (!arena::allow_immobile && mons_class_is_stationary(type))   
        return (true);
    if (!arena::allow_zero_xp && mons_class_flag(type, M_NO_EXP_GAIN))
        return (true);
    return (false);

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

[10.22801]

void arena_placed_monster(monsters *monster, const mgen_data &mg,
                          bool first_band_member)
{
}
void arena_monster_died(monsters *monster, killer_type killer,
                        int killer_index, bool silent)
{
}
/////////////////////////////////////////////////////////////////////////////

The arena now prevents undesired random monsters from being placed by telling

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 23 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1000 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3591 [7.1396662]

Insertion in crawl-ref/source/monplace.cc at line 15 [7.1641732]

Insertion in crawl-ref/source/monplace.cc at line 318 [7.1641732]

Insertion in crawl-ref/source/monplace.cc at line 398 [7.1641732]

Insertion in crawl-ref/source/monplace.cc at line 424 [7.1641732]

Insertion in crawl-ref/source/monplace.cc at line 1150 [7.1641732]

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

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

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

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

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

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

Deletion in crawl-ref/source/arena.cc at line 94 [10.10815]

Deletion in crawl-ref/source/arena.cc at line 96 [10.10815]

Deletion in crawl-ref/source/arena.cc at line 97 [10.10815]