fiddlerwoaroof/crawl - Change MB3ZKRP3CSLCJJSXQ44QTAME4M4OOAQLNQ2K3D3AFQV5FO6H3EPQC

Add arena_force_ai option (also settable as "force_ai" or "no_force_ai" in the arena spec) that when unset, uses the real game's monster AI, and when set, forces monsters to attack.

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

Created by dshaligram on January 3, 2009

MB3ZKRP3CSLCJJSXQ44QTAME4M4OOAQLNQ2K3D3AFQV5FO6H3EPQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 3646 [5.1396662]

B:BD[4.5302] → [4.5302:5351]

        if (!mon->get_foe() || one_chance_in(3))

[4.5302]

[4.5351]

        if (Options.arena_force_ai)
        {
            if (!mon->get_foe() || one_chance_in(3))
                mon->foe = MHITNOT;
            if (mon->foe == MHITNOT || mon->foe == MHITYOU)
                _arena_set_foe(mon);
            return;
        }
        // If we're not forcing monsters to attack, just make sure they're
        // not targeting the player in arena mode.
        else if (mon->foe == MHITYOU)

Deletion in crawl-ref/source/monstuff.cc at line 3658 [5.1396662]
B:BD[4.5383] → [4.5383:5472]
∅:D[6.2764] → [5.1440747:1440763]
∅:D[4.5472] → [5.1440747:1440763]
∅:D[7.44341] → [5.1440747:1440763]
B:BD[5.1440747] → [5.1440747:1440763]
```
        if (mon->foe == MHITNOT || mon->foe == MHITYOU)
            _arena_set_foe(mon);
        return;
```
Replacement in crawl-ref/source/monstuff.cc at line 4441 [5.1396662]
B:BD[2.4326] → [2.4326:4357]
```
        if (crawl_state.arena)
```
[2.4326]
[2.4357]
```
        if (crawl_state.arena && Options.arena_force_ai)
```

Deletion in crawl-ref/source/monstuff.cc at line 4672 [5.1396662]

B:BD[5.1467156] → [3.2628:2748]


    if (mmov.origin() && monster->behaviour == BEH_WANDER && crawl_state.arena)
        _check_wander_target(monster);

Insertion in crawl-ref/source/libutil.h at line 42 [5.2493627]

[8.25560]

bool strip_bool_tag(std::string &s, const std::string &name,
                    bool defval = false);

Replacement in crawl-ref/source/libutil.cc at line 225 [5.2494093]

B:BD[8.26320] → [8.26320:26434]

    if ((pos = s.find(tag + " ")) != std::string::npos
        || (pos = s.find(" " + tag)) != std::string::npos)

[8.26320]

[8.26434]

    if ((pos = s.find(tag + " ")) == 0
        || ((pos = s.find(" " + tag)) != std::string::npos
            && pos + tag.length() + 1 == s.length()))

Insertion in crawl-ref/source/libutil.cc at line 262 [5.2494093]

[8.27047]

// Get a boolean flag from embedded tags in a string, using "<flag>"
// for true and "no_<flag>" for false. If neither tag is found,
// returns the default value.
bool strip_bool_tag(std::string &s, const std::string &name, bool defval)
{
    if (strip_tag(s, name))
        return (true);
    if (strip_tag(s, "no_" + name))
        return (false);
    return (defval);
}

Insertion in crawl-ref/source/initfile.cc at line 719 [5.2957258]

[9.4145]

[10.793163]


    // If true, monsters are forced to target each other in arena
    // mode, even when outside LOS of each other.
    arena_force_ai         = true;

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

B:BD[11.6135] → [4.7776:7843]

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

[11.6135]

[12.12818]

    attacker_visible   = attacker->visible();

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

B:BD[12.12893] → [4.7844:7953]

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

[12.12893]

[12.12953]

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

Insertion in crawl-ref/source/externs.h at line 2031 [5.3270163]
[9.4426]
[13.444021]
```
    bool        arena_force_ai;
```

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

[4.15077]

        Options.arena_force_ai =
            strip_bool_tag(spec, "force_ai", Options.arena_force_ai);