fiddlerwoaroof/crawl - Change XZTGZ7MOPX7ZOHQ4IQPXOHGUH5WPRNOYAQ6IQOMZDZYNVSAYFTNAC

In arena mode, make mons_friendly() and mons_wont_attack() always return false,

with mons_friendly_real() and monst_wont_attack_real() having the old behaviour of ignoring arena mode. Remove all special casing of "mons_friendly(mon) && !crawl_state.arena", instead using mons_friendly_real() and mons_wont_attack_real() in the monster code which distinguishes friend from foe. Might be a bit buggy.

Make Zot traps affect all monsters in arena mode, and never the player.

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

Created by zelgadis on January 5, 2009

XZTGZ7MOPX7ZOHQ4IQPXOHGUH5WPRNOYAQ6IQOMZDZYNVSAYFTNAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 831 [14.16817]
∅:D[12.67] → [13.316:345]
∅:D[15.378] → [13.316:345]
B:BD[13.316] → [13.316:345]
```
    if (mons_friendly(mons))
```
[15.378]
[13.345]
```
    if (mons_friendly_real(mons))
```
Replacement in crawl-ref/source/view.cc at line 920 [14.16817]
B:BD[16.102] → [17.132:168]
```
    if (you.species != SP_HILL_ORC)
```
[16.102]
[17.168]
```
    if (you.species != SP_HILL_ORC || crawl_state.arena)
```

Replacement in crawl-ref/source/view.cc at line 3963 [14.16817]

B:BD[18.137] → [19.7:42]

    if (mons_wont_attack(monster))

[18.137]

[18.138]

    if (crawl_state.arena)
    {
        // If the arena-mode code in _handle_behaviour() hasn't set a foe then
        // we don't have one.
        return (false);
    }
    else if (mons_wont_attack(monster))

Insertion in crawl-ref/source/traps.cc at line 40 [20.5308]
[20.6001]
[21.250]
```
#include "state.h"
```

Replacement in crawl-ref/source/traps.cc at line 593 [20.5308]

B:BD[22.11540] → [22.11540:11577]

            if (mons_wont_attack(m))

[22.11540]

[22.11577]

            if (mons_wont_attack(m) || crawl_state.arena)

Replacement in crawl-ref/source/tilesdl.cc at line 1122 [23.19415]
B:BD[23.38894] → [23.38894:38934]
```
        if (mons_friendly(&menv[grid]))
```
[23.38894]
[23.38934]
```
        if (mons_friendly_real(&menv[grid]))
```
Replacement in crawl-ref/source/tilepick.cc at line 1023 [26.96318]
B:BD[24.22399] → [25.4080:4109]
```
    if (mons_friendly(mons))
```
[24.22399]
[26.117933]
```
    if (mons_friendly_real(mons))
```

Replacement in crawl-ref/source/tilepick.cc at line 4388 [26.96318]

B:BD[26.216397] → [27.17658:17721]

        if (menv[idx].is_named() && !mons_friendly(&menv[idx])

[26.216397]

[27.17721]

        if (menv[idx].is_named() && !mons_friendly_real(&menv[idx])

Replacement in crawl-ref/source/mstuff2.cc at line 900 [14.1340842]

B:BD[28.9173] → [28.9173:9332]

        (unseen                 ? MSGCH_SOUND :
         mons_friendly(monster) ? MSGCH_FRIEND_SPELL :
                                  MSGCH_MONSTER_SPELL);

[28.9173]

[28.9332]

        (unseen                      ? MSGCH_SOUND :
         mons_friendly_real(monster) ? MSGCH_FRIEND_SPELL :
                                       MSGCH_MONSTER_SPELL);

Replacement in crawl-ref/source/mstuff2.cc at line 2288 [14.1340842]

B:BD[29.1425] → [30.2645:2722]

    if (!target->alive() || ((bool)wont_attack == mons_wont_attack(target)))

[29.1425]

[29.1488]

    if (!target->alive()
        || ((bool)wont_attack == mons_wont_attack_real(target)))
    {

Insertion in crawl-ref/source/mstuff2.cc at line 2292 [14.1340842]
[29.1508]
[14.1389585]
```
    }
```

Replacement in crawl-ref/source/mstuff2.cc at line 2373 [14.1340842]

B:BD[29.2967] → [30.2723:2778]

    const bool wont_attack = mons_wont_attack(caster);

[29.2967]

[29.3016]

    const bool wont_attack = mons_wont_attack_real(caster);

Replacement in crawl-ref/source/mstuff2.cc at line 2516 [14.1340842]

B:BD[31.3693] → [31.3693:3831]

                        mons_friendly(chief) ? MSGCH_MONSTER_ENCHANT
                                             : MSGCH_FRIEND_ENCHANT;

[31.3693]

[32.410573]

                        mons_friendly_real(chief) ? MSGCH_MONSTER_ENCHANT
                                                  : MSGCH_FRIEND_ENCHANT;

Replacement in crawl-ref/source/mstuff2.cc at line 2554 [14.1340842]

B:BD[12.1389] → [2.183:234]

    if (mons_friendly(mon) != mons_friendly(targ))

[12.1389]

[12.1430]

    if (mons_friendly_real(mon) != mons_friendly_real(targ))

Replacement in crawl-ref/source/monstuff.h at line 54 [14.1390580]

B:BD[14.1390863] → [3.2567:2828]

#define SAME_ATTITUDE(x) (mons_friendly(x)     ? BEH_FRIENDLY : \
                          mons_good_neutral(x) ? BEH_GOOD_NEUTRAL : \
                          mons_neutral(x)      ? BEH_NEUTRAL \
                                               : BEH_HOSTILE)

[14.1390863]

[32.410657]

#define SAME_ATTITUDE(x) (mons_friendly_real(x) ? BEH_FRIENDLY : \
                          mons_good_neutral(x)  ? BEH_GOOD_NEUTRAL : \
                          mons_neutral(x)       ? BEH_NEUTRAL \
                                                : BEH_HOSTILE)

Replacement in crawl-ref/source/monstuff.cc at line 1049 [14.1396662]

B:BD[33.94] → [34.2690:2711]

∅:D[34.2711] → [33.152:158]

B:BD[33.152] → [33.152:158]

B:BD[33.158] → [5.2666:2706]

∅:D[5.2706] → [33.338:348]

∅:D[35.3282] → [33.338:348]

∅:D[36.6016] → [33.338:348]

B:BD[33.338] → [33.338:348]

B:BD[33.348] → [37.818:930]

B:BD[37.930] → [38.1601:1673]

∅:D[38.1673] → [33.481:497]

∅:D[39.1871] → [33.481:497]

B:BD[33.481] → [33.481:497]

    if (!mons_reset)
    {
        if (MONST_INTERESTING(monster))
        {
            take_note(Note(NOTE_KILL_MONSTER,
                           monster->type, mons_friendly(monster),
                           monster->name(DESC_NOCAP_A, true).c_str()));
        }
    }

[33.94]

[40.2991]

    if (!mons_reset && !crawl_state.arena && MONST_INTERESTING(monster))
        take_note(Note(NOTE_KILL_MONSTER,
                       monster->type, mons_friendly(monster),
                       monster->name(DESC_NOCAP_A, true).c_str()));

Deletion in crawl-ref/source/monstuff.cc at line 1569 [14.1396662]

B:BD[10.2714] → [10.2714:2800]

        // Hostile monsters outside of the arena always have you as a
        // foe.

Replacement in crawl-ref/source/monstuff.cc at line 2396 [14.1396662]
∅:D[41.3093] → [42.2676:2727]
B:BD[42.2676] → [42.2676:2727]
```
    bool wontAttack       = mons_wont_attack(mon);
```
[41.3093]
[42.2762]
```
    bool wontAttack       = mons_wont_attack_real(mon);
```

Replacement in crawl-ref/source/monstuff.cc at line 2404 [14.1396662]

B:BD[14.1436813] → [42.2922:2981]

        sourceWontAttack = mons_wont_attack( &menv[src] );

[14.1436759]

[14.1436813]

        sourceWontAttack = mons_wont_attack_real( &menv[src] );

Replacement in crawl-ref/source/monstuff.cc at line 3640 [14.1396662]
B:BD[43.2611] → [44.2558:2603]
∅:D[44.2603] → [14.1439950:1439988]
∅:D[43.2611] → [14.1439950:1439988]
∅:D[45.3648] → [14.1439950:1439988]
B:BD[14.1439950] → [14.1439950:1439988]
```
    bool wontAttack = mons_wont_attack(mon);
    bool proxPlayer = mons_near(mon);
```
[43.2611]
[46.24419]
```
    bool wontAttack = mons_wont_attack_real(mon);
    bool proxPlayer = mons_near(mon) && !crawl_state.arena;
```

Replacement in crawl-ref/source/monstuff.cc at line 3767 [14.1396662]

B:BD[47.13443] → [47.13443:13503]

        && wontAttack && mons_wont_attack(&menv[mon->foe]))

[47.13443]

[14.1441997]

        && wontAttack && mons_wont_attack_real(&menv[mon->foe]))

Replacement in crawl-ref/source/monstuff.cc at line 4169 [14.1396662]
B:BD[48.1389] → [49.875:921]
```
    const bool friendly = mons_friendly(mon);
```
[48.1389]
[45.4401]
```
    const bool friendly = mons_friendly_real(mon);
```

Replacement in crawl-ref/source/monstuff.cc at line 4282 [14.1396662]

B:BD[50.4687] → [51.6468:6533]

        if (channel == MSGCH_PLAIN && mons_wont_attack(monster))

[50.4687]

[51.6533]

        if (channel == MSGCH_PLAIN && mons_wont_attack_real(monster))

Replacement in crawl-ref/source/monstuff.cc at line 4372 [14.1396662]

B:BD[4.2840] → [4.2840:2906]

        if (mons_intel(mon) <= I_NORMAL && !mons_wont_attack(mon)

[4.2840]

[52.2673]

        if (mons_intel(mon) <= I_NORMAL && !mons_wont_attack_real(mon)

Replacement in crawl-ref/source/monstuff.cc at line 4466 [14.1396662]

B:BD[53.4326] → [8.3055:3112]

        if (crawl_state.arena && Options.arena_force_ai)

[53.4326]

[53.4357]

        if (crawl_state.arena && Options.arena_force_ai
            && !mons_is_stationary(monster))

Replacement in crawl-ref/source/monstuff.cc at line 4641 [14.1396662]

B:BD[54.5039] → [54.5039:5092]

                       && !mons_wont_attack(monster)

[54.5039]

[54.5092]

                       && !mons_wont_attack_real(monster)

Replacement in crawl-ref/source/monstuff.cc at line 4659 [14.1396662]

B:BD[54.5872] → [54.5872:5925]

                       && !mons_wont_attack(monster)

[54.5872]

[54.5925]

                       && !mons_wont_attack_real(monster)

Replacement in crawl-ref/source/monstuff.cc at line 4678 [14.1396662]

B:BD[4.3472] → [4.3472:3529]

                           && !mons_wont_attack(monster)

[4.3472]

[4.3529]

                           && !mons_wont_attack_real(monster)

Replacement in crawl-ref/source/monstuff.cc at line 4690 [14.1396662]

B:BD[4.4059] → [4.4059:4117]

                            && !mons_wont_attack(monster)

[4.4059]

[4.4117]

                            && !mons_wont_attack_real(monster)

Replacement in crawl-ref/source/monstuff.cc at line 6533 [14.1396662]
∅:D[55.2702] → [56.3177:3236]
B:BD[56.3177] → [56.3177:3236]
```
    if (mons_wont_attack(mover) == mons_wont_attack(moved)
```
[55.2702]
[56.3236]
```
    if (mons_wont_attack_real(mover) == mons_wont_attack_real(moved)
```

Replacement in crawl-ref/source/monstuff.cc at line 6825 [14.1396662]

B:BD[57.3208] → [7.2628:2737]

                    || you.friendly_pickup > FRIENDLY_PICKUP_NONE
                    || crawl_state.arena))

[57.3208]

[58.1454]

                    || you.friendly_pickup > FRIENDLY_PICKUP_NONE))

Insertion in crawl-ref/source/monstuff.cc at line 6960 [14.1396662]

[32.434557]

[59.9283]

            const bool friendly_or_near =
                mons_friendly(monster) || mons_near(monster, monster->foe);

Replacement in crawl-ref/source/monstuff.cc at line 6964 [14.1396662]

B:BD[32.434651] → [53.5265:5341]

            if (mons_friendly(monster) || mons_near(monster, monster->foe))

[32.434651]

[32.434713]

            if (friendly_or_near || monster->type == MONS_TEST_SPAWNER)

Insertion in crawl-ref/source/monstuff.cc at line 6978 [14.1396662]
[60.977]
[14.1512814]
```
            }
```
Insertion in crawl-ref/source/monstuff.cc at line 6980 [14.1396662]
[14.1512815]
[61.8157]
```
            if (friendly_or_near)
            {
```
Insertion in crawl-ref/source/monstuff.cc at line 7050 [14.1396662]
[32.436624]
[62.7631]
```
                ASSERT(!crawl_state.arena);
```

Replacement in crawl-ref/source/monstuff.cc at line 7644 [14.1396662]

B:BD[63.2946] → [63.2946:3008]

    // handle accordingly.
    if (mons_wont_attack(monster))

[63.2946]

[64.3101]

    // handle accordingly.  In the arena Zot traps affect all monsters.
    if (mons_wont_attack(monster) || crawl_state.arena)

Insertion in crawl-ref/source/mon-util.h at line 741 [14.1682293]
[32.464394]
[45.7722]
```
bool mons_friendly_real(const monsters *m);
```
Insertion in crawl-ref/source/mon-util.h at line 746 [14.1682293]
[65.2646]
[66.2644]
```
bool mons_wont_attack_real(const monsters *m);
```

Replacement in crawl-ref/source/mon-util.cc at line 1984 [14.1699344]

B:BD[14.1728247] → [67.5775:5848]

        const bool use_your = !crawl_state.arena && mons_friendly(&mon);

[14.1728247]

        const bool use_your = mons_friendly(&mon);

Insertion in crawl-ref/source/mon-util.cc at line 2452 [14.1699344]

[32.481870]

[14.1733648]

{
    if (crawl_state.arena)
        return (false);
    return (m->attitude == ATT_FRIENDLY || m->has_ench(ENCH_CHARM));
}
bool mons_friendly_real(const monsters *m)

Insertion in crawl-ref/source/mon-util.cc at line 2485 [14.1699344]

[65.2862]

[66.2841]

bool mons_wont_attack_real(const monsters *m)
{
    return (mons_friendly_real(m) || mons_good_neutral(m));
}

Replacement in crawl-ref/source/mon-util.cc at line 2497 [14.1699344]
B:BD[45.8114] → [66.2954:2980]
```
    if (mons_friendly(m))
```
[45.8114]
[66.2980]
```
    if (mons_friendly_real(m))
```
Replacement in crawl-ref/source/mon-util.cc at line 4861 [14.1699344]
B:BD[68.6098] → [11.2637:2692]
```
        if (mons_friendly(this) && !crawl_state.arena)
```
[68.6098]
[69.25309]
```
        if (mons_friendly(this))
```

Replacement in crawl-ref/source/mon-util.cc at line 7113 [14.1699344]

B:BD[70.27439] → [71.4496:4554]

    return (mons_friendly(this)? KC_FRIENDLY : KC_OTHER);

[70.27439]

[72.895]

    return (mons_friendly_real(this)? KC_FRIENDLY : KC_OTHER);

Replacement in crawl-ref/source/mon-util.cc at line 7974 [14.1699344]

B:BD[9.11615] → [9.11615:11692]

    const actor*    foe   = (!crawl_state.arena && mons_wont_attack(monster)

[9.11615]

[9.11692]

    const actor*    foe   = (mons_wont_attack(monster)

Insertion in crawl-ref/source/misc.cc at line 3096 [14.1933596]
[73.5364]
[74.3833]
```
    ASSERT(!crawl_state.arena);
```

Replacement in crawl-ref/source/fight.cc at line 4198 [14.3140790]

B:BD[75.4601] → [75.4601:4678]

            napalm_monster(def, mons_friendly(atk) ? KC_FRIENDLY : KC_OTHER,

[75.4601]

[75.4678]

            napalm_monster(def, mons_friendly_real(atk) ? KC_FRIENDLY
                                                        : KC_OTHER,

Replacement in crawl-ref/source/effects.cc at line 1979 [14.3382105]

B:BD[76.28263] → [76.28263:28332]

        if (!mon->alive() || !mons_near(mon) || !mons_friendly(mon))

[76.28263]

[76.28332]

        if (!mon->alive() || !mons_near(mon) || !mons_friendly_real(mon))

Replacement in crawl-ref/source/effects.cc at line 1992 [14.3382105]

B:BD[77.14487] → [77.14487:14556]

        if (!mon->alive() || !mons_near(mon) || !mons_friendly(mon))

[77.14487]

[77.14556]

        if (!mon->alive() || !mons_near(mon) || !mons_friendly_real(mon))

Replacement in crawl-ref/source/beam.cc at line 116 [14.4128068]
∅:D[78.9729] → [79.2820:2856]
B:BD[79.2820] → [79.2820:2856]
```
            if (mons_friendly(mon))
```
[78.9729]
[70.35801]
```
            if (mons_friendly_real(mon))
```

Replacement in crawl-ref/source/beam.cc at line 2037 [14.4128068]

B:BD[78.22635] → [6.4905:4961]

        if (foe_info.hurt > 0 && !mons_wont_attack(mon)

[78.22635]

[80.7310]

        if (foe_info.hurt > 0 && !mons_wont_attack(mon) && !crawl_state.arena

Replacement in crawl-ref/source/arena.cc at line 109 [67.10815]

B:BD[53.11816] → [53.11816:11870]

            const bool friendly = mons_friendly(mon);

[53.11816]

[53.11870]

            const bool friendly = mons_friendly_real(mon);

Insertion in crawl-ref/source/arena.cc at line 573 [67.10815]
[81.5710]
[67.21191]
```
                ASSERT(you.pet_target == MHITNOT);
```

In arena mode, make mons_friendly() and mons_wont_attack() always return false,

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 831 [14.16817]

Replacement in crawl-ref/source/view.cc at line 920 [14.16817]

Replacement in crawl-ref/source/view.cc at line 3963 [14.16817]

Insertion in crawl-ref/source/traps.cc at line 40 [20.5308]

Replacement in crawl-ref/source/traps.cc at line 593 [20.5308]

Replacement in crawl-ref/source/tilesdl.cc at line 1122 [23.19415]

Replacement in crawl-ref/source/tilepick.cc at line 1023 [26.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4388 [26.96318]

Replacement in crawl-ref/source/mstuff2.cc at line 900 [14.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 2288 [14.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 2292 [14.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 2373 [14.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 2516 [14.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 2554 [14.1340842]

Replacement in crawl-ref/source/monstuff.h at line 54 [14.1390580]

Replacement in crawl-ref/source/monstuff.cc at line 1049 [14.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 1569 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2396 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2404 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3640 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3767 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4169 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4282 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4372 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4466 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4641 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4659 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4678 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4690 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6533 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6825 [14.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 6960 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6964 [14.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 6978 [14.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 6980 [14.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 7050 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7644 [14.1396662]

Insertion in crawl-ref/source/mon-util.h at line 741 [14.1682293]

Insertion in crawl-ref/source/mon-util.h at line 746 [14.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 1984 [14.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2452 [14.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2485 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2497 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4861 [14.1699344]