fiddlerwoaroof/crawl - Change ENQRCBNN7MKP6FFQAZ62FYXEVWCRJB5747LTYMZGRGINXQL6HT5AC

Clean up handling of killing mutators or rotters (i.e., chaotic beings),

and make them become enraged by your lawful aura if you start worshipping Zin.

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

Created by dolorous on June 11, 2008

ENQRCBNN7MKP6FFQAZ62FYXEVWCRJB5747LTYMZGRGINXQL6HT5AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells4.cc at line 615 [6.436250]
∅:D[3.4232] → [5.165:196]
B:BD[6.464169] → [5.165:196]
```
    if (is_mons_poisoner(mon))
```
[3.4232]
[6.464424]
```
    if (mons_is_poisoner(mon))
```

Insertion in crawl-ref/source/religion.cc at line 377 [6.804403]

[7.2616]

[8.2568]

static bool _chaotic_beings_attitude_change();
static bool _magic_users_attitude_change();

Replacement in crawl-ref/source/religion.cc at line 2159 [6.804403]
B:BD[9.2887] → [9.2887:2924]
```
    case DID_KILL_MUTATOR_OR_ROTTER:
```
[9.2887]
[9.2924]
```
    case DID_KILL_CHAOTIC:
```

Replacement in crawl-ref/source/religion.cc at line 2455 [6.804403]

B:BD[10.2728] → [10.2728:2799]

          "Kill Demon", "Kill Natural Evil", "Kill Mutator Or Rotter",

[10.2728]

[10.2799]

          "Kill Demon", "Kill Natural Evil", "Kill Chaotic",

Insertion in crawl-ref/source/religion.cc at line 3942 [6.804403]

[11.2531]

static bool _chaotic_beings_on_level_attitude_change()
{
    bool success = false;
    for ( int i = 0; i < MAX_MONSTERS; ++i )
    {
        monsters *monster = &menv[i];
        if (monster->type != -1
            && mons_is_chaotic(monster))
        {
#ifdef DEBUG_DIAGNOSTICS
            mprf(MSGCH_DIAGNOSTICS, "Chaotic attitude changing: %s on level %d, branch %d",
                 monster->name(DESC_PLAIN).c_str(),
                 static_cast<int>(you.your_level),
                 static_cast<int>(you.where_are_you));
#endif
            // If you worship Zin, you make all non-hostile chaotic
            // beings hostile.
            if (is_lawful_god(you.religion))
            {
                if (monster->attitude != ATT_HOSTILE
                    || monster->has_ench(ENCH_CHARM))
                {
                    monster->attitude = ATT_HOSTILE;
                    monster->del_ench(ENCH_CHARM, true);
                    behaviour_event(monster, ME_ALERT, MHITYOU);
                    // for now CREATED_FRIENDLY/WAS_NEUTRAL stays
                    success = true;
                }
            }
        }
    }
    return success;
}
static bool _chaotic_beings_attitude_change()
{
    return apply_to_all_dungeons(_chaotic_beings_on_level_attitude_change);
}

Replacement in crawl-ref/source/religion.cc at line 5154 [6.804403]

B:BD[12.2735] → [12.2735:2864]

    // evil and unholy beings hostile, and when you start worshipping
    // Trog, you make all non-hostile magic users hostile.

[12.2735]

[12.2864]

    // evil and unholy beings hostile; when you start worshipping Zin,
    // you make all non-hostile chaotic beings hostile; and when you
    // start worshipping Trog, you make all non-hostile magic users
    // hostile.

Insertion in crawl-ref/source/religion.cc at line 5160 [6.804403]

[12.3002]

    else if (is_lawful_god(you.religion) && _chaotic_beings_attitude_change())
        mpr("Your chaotic allies forsake you.", MSGCH_MONSTER_ENCHANT);

Deletion in crawl-ref/source/monstuff.h at line 70 [6.1390580]
∅:D[13.2625] → [5.2599:2638]
B:BD[14.40283] → [5.2599:2638]
```
bool is_mons_poisoner(monsters *mon);
```

Deletion in crawl-ref/source/monstuff.cc at line 628 [6.1396662]

B:BD[9.3848] → [9.3848:3849]

B:BD[9.3849] → [15.3820:3875]

∅:D[15.3875] → [9.3903:3996]

B:BD[9.3903] → [9.3903:3996]

B:BD[9.3996] → [16.2561:2631]


static bool _is_mons_mutator_or_rotter(monsters *mons)
{
    if (mons->has_ench(ENCH_GLOWING_SHAPESHIFTER, ENCH_SHAPESHIFTER))
        return true;
    if (mons->has_spell(SPELL_POLYMORPH_OTHER))
        return true;

Deletion in crawl-ref/source/monstuff.cc at line 629 [6.1396662]

∅:D[16.2632] → [9.4005:4135]

B:BD[9.4005] → [9.4005:4135]

B:BD[9.4135] → [17.2769:2772]

B:BD[17.2772] → [5.2640:2860]

B:BD[5.2860] → [18.6691:6881]

∅:D[18.6881] → [5.3034:3037]

B:BD[5.3034] → [5.3034:3037]

    const int attk_flavour = mons_attack_spec(mons, 0).flavour;
    return (attk_flavour == AF_MUTATE || attk_flavour == AF_ROT);
}
bool is_mons_poisoner(monsters *mons)
{
    if (mons_corpse_effect(mons->type) == CE_POISONOUS)
        return true;
    const int attk_flavour = mons_attack_spec(mons, 0).flavour;
    return (attk_flavour == AF_POISON
            || attk_flavour == AF_POISON_NASTY
            || attk_flavour == AF_POISON_MEDIUM
            || attk_flavour == AF_POISON_STRONG
            || attk_flavour == AF_POISON_STR);
}

Replacement in crawl-ref/source/monstuff.cc at line 904 [6.1396662]

B:BD[6.1410642] → [15.4027:4084]

                if (_is_mons_mutator_or_rotter(monster))

[6.1410642]

[19.4512]

                if (mons_is_chaotic(monster))

Replacement in crawl-ref/source/monstuff.cc at line 906 [6.1396662]
∅:D[15.4084] → [9.4350:4414]
∅:D[19.4530] → [9.4350:4414]
B:BD[9.4350] → [9.4350:4414]
```
                    did_god_conduct(DID_KILL_MUTATOR_OR_ROTTER,
```
[19.4530]
[9.4414]
```
                    did_god_conduct(DID_KILL_CHAOTIC,
```

Replacement in crawl-ref/source/monplace.h at line 270 [6.1638277]

B:BD[20.2898] → [20.2898:2977]

                               bool *unholy = NULL, bool *antimagical = NULL);

[20.2898]

[20.2977]

                               bool *unholy = NULL, bool *lawful = NULL,
                               bool *antimagical = NULL);

Replacement in crawl-ref/source/monplace.h at line 274 [6.1638277]

B:BD[20.3043] → [20.3043:3122]

                               bool *unholy = NULL, bool *antimagical = NULL);

[20.3043]

[20.3122]

                               bool *unholy = NULL, bool *lawful = NULL,
                               bool *antimagical = NULL);

Replacement in crawl-ref/source/monplace.cc at line 2012 [6.1641732]

B:BD[20.3230] → [20.3230:3294]

                               bool *unholy, bool *antimagical)

[20.3230]

[21.250]

                               bool *unholy, bool *lawful,
                               bool *antimagical)

Replacement in crawl-ref/source/monplace.cc at line 2018 [6.1641732]

B:BD[20.3339] → [20.3339:3414]

    return (player_will_anger_monster(&dummy, holy, unholy, antimagical));

[20.3339]

[20.3414]

    return (player_will_anger_monster(&dummy, holy, unholy, lawful,
                                      antimagical));

Replacement in crawl-ref/source/monplace.cc at line 2023 [6.1641732]

B:BD[20.3475] → [20.3475:3539]

                               bool *unholy, bool *antimagical)

[20.3475]

[20.3539]

                               bool *unholy, bool *lawful,
                               bool *antimagical)

Insertion in crawl-ref/source/monplace.cc at line 2030 [6.1641732]

[2.2750]

    const bool is_lawful =
        (is_lawful_god(you.religion) && mons_is_chaotic(mon));

Insertion in crawl-ref/source/monplace.cc at line 2039 [6.1641732]
[2.2915]
[20.3717]
```
    if (lawful)
        *lawful = is_lawful;
```
Insertion in crawl-ref/source/monplace.cc at line 2051 [6.1641732]
[20.3940]
[20.3940]
```
    bool lawful;
```

Replacement in crawl-ref/source/monplace.cc at line 2055 [6.1641732]

B:BD[22.5280] → [20.3963:4033]

    if (player_will_anger_monster(mon, &holy, &unholy, &antimagical))

[22.5280]

[21.494]

    if (player_will_anger_monster(mon, &holy, &unholy, &lawful, &antimagical))

Insertion in crawl-ref/source/monplace.cc at line 2071 [6.1641732]

[23.2743]

                else if (lawful)
                    aura = "lawful";

Insertion in crawl-ref/source/mon-util.h at line 642 [6.1682293]

[4.13912]

[24.464395]

bool mons_is_chaotic(const monsters *mon);
bool mons_is_poisoner(const monsters *mon);

Insertion in crawl-ref/source/mon-util.cc at line 498 [6.1699344]

[4.13999]

[25.1786]

bool mons_is_chaotic(const monsters *mon)
{
    if (mon->has_ench(ENCH_GLOWING_SHAPESHIFTER, ENCH_SHAPESHIFTER))
        return true;
    if (mon->has_spell(SPELL_POLYMORPH_OTHER))
        return true;
    const int attk_flavour = mons_attack_spec(mon, 0).flavour;
    return (attk_flavour == AF_MUTATE || attk_flavour == AF_ROT);
}
bool mons_is_poisoner(const monsters *mon)
{
    if (mons_corpse_effect(mon->type) == CE_POISONOUS)
        return true;
    const int attk_flavour = mons_attack_spec(mon, 0).flavour;
    return (attk_flavour == AF_POISON
            || attk_flavour == AF_POISON_NASTY
            || attk_flavour == AF_POISON_MEDIUM
            || attk_flavour == AF_POISON_STRONG
            || attk_flavour == AF_POISON_STR);
}

Replacement in crawl-ref/source/enum.h at line 652 [6.3287960]
B:BD[9.6159] → [9.6159:6198]
```
    DID_KILL_MUTATOR_OR_ROTTER, // Zin
```
[9.6159]
[26.7072]
```
    DID_KILL_CHAOTIC,         // Zin
```