fiddlerwoaroof/crawl - Change OP6CTAKWCAU64JXQ3USQYR5E5IFHQHNCACII5UMVRXUTZXJQOAZAC

Moth of wrath angering attack was lost in 0.2, reintroduced.

Monsters can now go berserk (the rage spell, or by moth of wrath attack).

Rupert is now a crusading-style berserker.

Moths of wrath can now enrage nearby monsters of similar attitude.

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

Created by dshaligram on April 7, 2007

OP6CTAKWCAU64JXQ3USQYR5E5IFHQHNCACII5UMVRXUTZXJQOAZAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 525 [7.16817]

[6.316]

    if (mons->has_ench(ENCH_BERSERK))
        col = RED;

Replacement in crawl-ref/source/travel.h at line 485 [8.29464]

B:BD[2.190] → [2.190:235]

    static const int INFINITE_DIST =  30000;

[2.190]

[9.4929]

    static const int INFINITE_DIST =  INFINITE_DISTANCE;

Insertion in crawl-ref/source/stuff.cc at line 1092 [7.224557]

[10.116542]

}
//////////////////////////////////////////////////////////////////////////
// coord_def
int coord_def::distance_from(const coord_def &other) const
{
    return (grid_distance(x, y, other.x, other.y));

Insertion in crawl-ref/source/stuff.cc at line 1100 [7.224557]
[10.116544]

Insertion in crawl-ref/source/player.cc at line 4935 [7.962854]

[11.7161]

[12.2382]

}
bool player::can_go_berserk() const
{
    return can_go_berserk(false);
}
bool player::can_go_berserk(bool verbose) const
{
    if (you.berserker)
    {
        if (verbose)
            mpr("You're already berserk!");
        // or else you won't notice -- no message here.
        return (false);
    }
    if (you.exhausted)
    {
        if (verbose)
            mpr("You're too exhausted to go berserk.");
        // or else they won't notice -- no message here
        return (false);
    }
    if (you.is_undead)
    {
        if (verbose)
            mpr("You cannot raise a blood rage in your lifeless body.");
        // or else you won't notice -- no message here
        return (false);
    }
    return (true);

Insertion in crawl-ref/source/mstuff2.h at line 105 [7.1336995]
[10.396889]
[7.1340798]
```
bool moth_incite_monsters(const monsters *mon);
```

Insertion in crawl-ref/source/mstuff2.cc at line 369 [7.1340842]

[7.1352387]

[10.397437]

    case MS_BERSERK_RAGE:
        monster->go_berserk(true);
        return;

Insertion in crawl-ref/source/mstuff2.cc at line 726 [7.1340842]
[7.1361531]
[7.1361531]
```
    case MS_BERSERK_RAGE:
    case MS_MIGHT:
```

Insertion in crawl-ref/source/mstuff2.cc at line 1955 [7.1340842]

[10.410596]


static bool make_monster_angry(const monsters *mon, monsters *targ)
{
    if (mon->attitude != targ->attitude)
        return (false);
    // targ is guaranteed to have a foe (needs_berserk checks this).
    // Now targ needs to be closer to *its* foe than mon is (otherwise
    // mon might be in the way).
    coord_def victim;
    if (targ->foe == MHITYOU)
        victim = you.pos();
    else if (targ->foe != MHITNOT)
    {
        const monsters *vmons = &menv[targ->foe];
        if (!vmons->alive())
            return (false);
        victim = vmons->pos();
    }
    else
    {
        // Should be impossible. needs_berserk should find this case.
        ASSERT(false);
        return (false);
    }
    // If mon may be blocking targ from its victim, don't try.
    if (victim.distance_from(targ->pos()) > victim.distance_from(mon->pos()))
        return (false);
    const bool need_message = mons_near(mon) && player_monster_visible(mon);
    if (need_message)
        mprf("%s goads %s on!", mon->name(DESC_CAP_THE).c_str(),
             targ->name(DESC_NOCAP_THE).c_str());
    
    targ->go_berserk(false);
    return (true);
}
bool moth_incite_monsters(const monsters *mon)
{
    int goaded = 0;
    for (int i = 0; i < MAX_MONSTERS; ++i)
    {
        monsters *targ = &menv[i];
        if (targ == mon || !targ->alive() || !targ->needs_berserk())
            continue;
        if (mon->pos().distance_from(targ->pos()) > 3)
            continue;
        // Cannot goad other moths of wrath!
        if (targ->type == MONS_MOTH_OF_WRATH)
            continue;
        if (make_monster_angry(mon, targ) && !one_chance_in(3 * ++goaded))
            return (true);
    }
    return (false);
}

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

[7.1474832]

    case MONS_MOTH_OF_WRATH:
        if (one_chance_in(3))
            used = moth_incite_monsters(monster);
        break;

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

B:BD[10.434498] → [10.434498:434547]

            && monster->behaviour != BEH_WANDER)

[10.434498]

[10.434547]

            && monster->behaviour != BEH_WANDER
            // berserking monsters are limited to running up and
            // hitting their foes.
            && !monster->has_ench(ENCH_BERSERK))

Insertion in crawl-ref/source/monspeak.cc at line 227 [7.1558496]

[7.1562462]

[13.10889]

    // berserk monsters just want your hide.
    if (monster->has_ench(ENCH_BERSERK))
        return false;

Replacement in crawl-ref/source/mon-util.cc at line 1868 [7.1699344]

B:BD[7.1740144] → [7.1740144:1740199]

B:BD[7.1740199] → [14.1262:1334]

∅:D[14.1334] → [7.1740199:1740525]

B:BD[7.1740199] → [7.1740199:1740525]

B:BD[7.1740525] → [10.483716:483740]

∅:D[10.483740] → [7.1740525:1740722]

B:BD[7.1740525] → [7.1740525:1740722]

B:BD[7.1740722] → [10.483741:483771]

∅:D[10.483771] → [7.1740722:1741610]

B:BD[7.1740722] → [7.1740722:1741610]

B:BD[7.1741610] → [10.483772:483810]

∅:D[10.483810] → [7.1741610:1741667]

B:BD[7.1741610] → [7.1741610:1741667]

        case MS_BANISHMENT:
        case MS_COLD_BOLT:
        case MS_ICE_BOLT:
        case MS_SHOCK:
        case MS_MAGMA:
        case MS_CONFUSE:
        case MS_CRYSTAL_SPEAR:
        case MS_DISINTEGRATE:
        case MS_ENERGY_BOLT:
        case MS_FIRE_BOLT:
        case MS_FIREBALL:
        case MS_FLAME:
        case MS_FROST:
        case MS_HELLFIRE:
        case MS_IRON_BOLT:
        case MS_LIGHTNING_BOLT:
        case MS_MARSH_GAS:
        case MS_MIASMA:
        case MS_METAL_SPLINTERS:
        case MS_MMISSILE:
        case MS_NEGATIVE_BOLT:
        case MS_ORB_ENERGY:
        case MS_PAIN:
        case MS_PARALYSIS:
        case MS_POISON_BLAST:
        case MS_POISON_ARROW:
        case MS_POISON_SPLASH:
        case MS_QUICKSILVER_BOLT:
        case MS_SLOW:
        case MS_STEAM_BALL:
        case MS_STICKY_FLAME:
        case MS_STING:
        case MS_STONE_ARROW:
        case MS_TELEPORT_OTHER:
        case MS_VENOM_BOLT:
            requires = true;
            break;
        // self-niceties and direct effects
        case MS_ANIMATE_DEAD:
        case MS_BLINK:
        case MS_BRAIN_FEED:
        case MS_DIG:
        case MS_FAKE_RAKSHASA_SUMMON:
        case MS_HASTE:
        case MS_HEAL:
        case MS_HELLFIRE_BURST:
        case MS_INVIS:
        case MS_LEVEL_SUMMON:
        case MS_MUTATION:
        case MS_SMITE:
        case MS_SUMMON_BEAST:
        case MS_SUMMON_DEMON_LESSER:
        case MS_SUMMON_DEMON:
        case MS_SUMMON_DEMON_GREATER:
        case MS_SUMMON_UFETUBUS:
        case MS_TELEPORT:
        case MS_TORMENT:
        case MS_SUMMON_SMALL_MAMMALS:
        case MS_VAMPIRE_SUMMON:
        case MS_CANTRIP:

[7.1740144]

[7.1741667]

    case MS_BANISHMENT:
    case MS_COLD_BOLT:
    case MS_ICE_BOLT:
    case MS_SHOCK:
    case MS_MAGMA:
    case MS_CONFUSE:
    case MS_CRYSTAL_SPEAR:
    case MS_DISINTEGRATE:
    case MS_ENERGY_BOLT:
    case MS_FIRE_BOLT:
    case MS_FIREBALL:
    case MS_FLAME:
    case MS_FROST:
    case MS_HELLFIRE:
    case MS_IRON_BOLT:
    case MS_LIGHTNING_BOLT:
    case MS_MARSH_GAS:
    case MS_MIASMA:
    case MS_METAL_SPLINTERS:
    case MS_MMISSILE:
    case MS_NEGATIVE_BOLT:
    case MS_ORB_ENERGY:
    case MS_PAIN:
    case MS_PARALYSIS:
    case MS_POISON_BLAST:
    case MS_POISON_ARROW:
    case MS_POISON_SPLASH:
    case MS_QUICKSILVER_BOLT:
    case MS_SLOW:
    case MS_STEAM_BALL:
    case MS_STICKY_FLAME:
    case MS_STING:
    case MS_STONE_ARROW:
    case MS_TELEPORT_OTHER:
    case MS_VENOM_BOLT:
        requires = true;
        break;

Replacement in crawl-ref/source/mon-util.cc at line 1906 [7.1699344]

B:BD[7.1741668] → [7.1741668:1741756]

        // meaningless, but sure, why not?
        case MS_NO_SPELL:
            break;

[7.1741668]

[7.1741756]

    // self-niceties and direct effects
    case MS_ANIMATE_DEAD:
    case MS_BLINK:
    case MS_BRAIN_FEED:
    case MS_DIG:
    case MS_FAKE_RAKSHASA_SUMMON:
    case MS_HASTE:
    case MS_HEAL:
    case MS_HELLFIRE_BURST:
    case MS_INVIS:
    case MS_LEVEL_SUMMON:
    case MS_MUTATION:
    case MS_SMITE:
    case MS_SUMMON_BEAST:
    case MS_SUMMON_DEMON_LESSER:
    case MS_SUMMON_DEMON:
    case MS_SUMMON_DEMON_GREATER:
    case MS_SUMMON_UFETUBUS:
    case MS_TELEPORT:
    case MS_TORMENT:
    case MS_SUMMON_SMALL_MAMMALS:
    case MS_VAMPIRE_SUMMON:
    case MS_CANTRIP:
    case MS_BERSERK_RAGE:

Replacement in crawl-ref/source/mon-util.cc at line 1931 [7.1699344]

B:BD[7.1741757] → [7.1741757:1741793]

        default:
            break;

[7.1741757]

[7.1741793]

    // meaningless, but sure, why not?
    case MS_NO_SPELL:
        break;

Insertion in crawl-ref/source/mon-util.cc at line 1935 [7.1699344]
[7.1741794]
[7.1741794]
```
    default:
        break;
```

Replacement in crawl-ref/source/mon-util.cc at line 1952 [7.1699344]

B:BD[7.1742071] → [7.1742071:1742511]

B:BD[7.1742511] → [10.483811:483849]

∅:D[10.483849] → [7.1742511:1742589]

B:BD[7.1742511] → [7.1742511:1742589]

        // self-niceties/summonings
        case MS_ANIMATE_DEAD:
        case MS_BLINK:
        case MS_DIG:
        case MS_FAKE_RAKSHASA_SUMMON:
        case MS_HASTE:
        case MS_HEAL:
        case MS_INVIS:
        case MS_LEVEL_SUMMON:
        case MS_SUMMON_BEAST:
        case MS_SUMMON_DEMON_LESSER:
        case MS_SUMMON_DEMON:
        case MS_SUMMON_DEMON_GREATER:
        case MS_SUMMON_UFETUBUS:
        case MS_TELEPORT:
        case MS_SUMMON_SMALL_MAMMALS:
        case MS_VAMPIRE_SUMMON:
            nasty = false;
            break;

[7.1742071]

[7.1742589]

    // self-niceties/summonings
    case MS_ANIMATE_DEAD:
    case MS_BLINK:
    case MS_DIG:
    case MS_FAKE_RAKSHASA_SUMMON:
    case MS_HASTE:
    case MS_HEAL:
    case MS_INVIS:
    case MS_LEVEL_SUMMON:
    case MS_SUMMON_BEAST:
    case MS_SUMMON_DEMON_LESSER:
    case MS_SUMMON_DEMON:
    case MS_SUMMON_DEMON_GREATER:
    case MS_SUMMON_UFETUBUS:
    case MS_TELEPORT:
    case MS_SUMMON_SMALL_MAMMALS:
    case MS_VAMPIRE_SUMMON:
        nasty = false;
        break;

Replacement in crawl-ref/source/mon-util.cc at line 1972 [7.1699344]

B:BD[7.1742590] → [7.1742590:1742724]

        case MS_BRAIN_FEED:
        case MS_HELLFIRE_BURST:
        case MS_MUTATION:
        case MS_SMITE:
        case MS_TORMENT:

[7.1742590]

[7.1742724]

    case MS_BRAIN_FEED:
    case MS_HELLFIRE_BURST:
    case MS_MUTATION:
    case MS_SMITE:
    case MS_TORMENT:
    case MS_BERSERK_RAGE:

Replacement in crawl-ref/source/mon-util.cc at line 1980 [7.1699344]
B:BD[7.1742768] → [7.1742768:1742813]
```
        case MS_NO_SPELL:
            break;
```
[7.1742768]
[7.1742813]
```
    case MS_NO_SPELL:
        break;
```
Replacement in crawl-ref/source/mon-util.cc at line 1983 [7.1699344]
B:BD[7.1742814] → [7.1742814:1742851]
```
        default:
            break;
```
[7.1742814]
[7.1742851]
```
    default:
        break;
```
Deletion in crawl-ref/source/mon-util.cc at line 2075 [7.1699344]
B:BD[7.1744713] → [7.1744713:1744714]

Insertion in crawl-ref/source/mon-util.cc at line 2080 [7.1699344]

[7.1744920]

    case MS_BERSERK_RAGE:
        if (!mon->needs_berserk(false))
            ret = true;
        break;

Insertion in crawl-ref/source/mon-util.cc at line 2627 [7.1699344]

[12.12557]

    if (holiness() != MH_NATURAL || has_ench(ENCH_FATIGUE))
        return;
    if (has_ench(ENCH_SLOW))
    {
        del_ench(ENCH_SLOW);
        simple_monster_message(
            this,
            make_stringf(" shakes off %s lethargy.",
                         name(DESC_NOCAP_YOUR).c_str()).c_str());
    }
    del_ench(ENCH_HASTE);
    del_ench(ENCH_FATIGUE);
    const int duration = 20 + random2avg(20, 2);
    add_ench(mon_enchant(ENCH_BERSERK, duration));
    add_ench(mon_enchant(ENCH_HASTE, duration));
    simple_monster_message( this, " goes berserk!" );

Replacement in crawl-ref/source/mon-util.cc at line 3068 [7.1699344]

B:BD[13.12695] → [13.12695:12788]

bool monsters::has_ench(enchant_type ench,
                        enchant_type ench2) const

[13.12695]

[13.12788]

bool monsters::has_ench(enchant_type ench) const
{
    return (enchantments.find(ench) != enchantments.end());
}
bool monsters::has_ench(enchant_type ench, enchant_type ench2) const

Replacement in crawl-ref/source/mon-util.cc at line 3080 [7.1699344]

B:BD[13.12887] → [13.12887:12994]

        if (enchantments.find( static_cast<enchant_type>(i) ) !=
            enchantments.end())
        {

[13.12887]

[13.12994]

        if (has_ench(static_cast<enchant_type>(i)))

Deletion in crawl-ref/source/mon-util.cc at line 3082 [7.1699344]
∅:D[13.13021] → [15.9483:9493]
B:BD[15.9483] → [15.9483:9493]
```
        }
```
Insertion in crawl-ref/source/mon-util.cc at line 3109 [7.1699344]
[13.13659]
[13.13659]
```
        {
```
Replacement in crawl-ref/source/mon-util.cc at line 3111 [7.1699344]
B:BD[13.13694] → [13.13694:13729]
```
        enchantments.insert(ench);
```
[13.13694]
[13.13729]
```
            enchantments.insert(ench);
        }
```
Insertion in crawl-ref/source/mon-util.cc at line 3123 [7.1699344]
[13.13923]
[13.13923]
```
    bool new_enchantment = false;
```
Insertion in crawl-ref/source/mon-util.cc at line 3125 [7.1699344]
[13.13956]
[13.13956]
```
    {
        new_enchantment = true;
```
Insertion in crawl-ref/source/mon-util.cc at line 3128 [7.1699344]
[13.13991]
[13.13991]
```
    }
```

Insertion in crawl-ref/source/mon-util.cc at line 3136 [7.1699344]

[13.14125]

    if (new_enchantment)
        add_enchantment_effect(ench);
    return (true);
}
void monsters::add_enchantment_effect(const mon_enchant &ench, bool)
{

Replacement in crawl-ref/source/mon-util.cc at line 3145 [7.1699344]
B:BD[13.14153] → [13.14153:14186]
```
    if (ench.ench == ENCH_HASTE)
```
[13.14153]
[13.14186]
```
    switch (ench.ench)
```

Insertion in crawl-ref/source/mon-util.cc at line 3147 [7.1699344]

[13.14192]

    case ENCH_BERSERK:
        // Inflate hp.
        scale_hp(3, 2);
        break;
    
    case ENCH_HASTE:

Replacement in crawl-ref/source/mon-util.cc at line 3157 [7.1699344]
∅:D[13.14302] → [15.9493:9499]
B:BD[15.9493] → [15.9493:9499]
```
    }
```
[13.14302]
[13.14303]
```
        break;
```
Replacement in crawl-ref/source/mon-util.cc at line 3159 [7.1699344]
B:BD[13.14304] → [13.14304:14342]
```
    if (ench.ench == ENCH_SLOW)
    {
```
[13.14304]
[13.14342]
```
    case ENCH_SLOW:
```
Replacement in crawl-ref/source/mon-util.cc at line 3164 [7.1699344]
B:BD[13.14452] → [13.14452:14458]
```
    }
```
[13.14452]
[13.14458]
```
        break;
```
Replacement in crawl-ref/source/mon-util.cc at line 3166 [7.1699344]
B:BD[13.14459] → [13.14459:14478]
```
    return (true);
```
[13.14459]
[15.9499]
```
    default:
        break;
    }
```
Insertion in crawl-ref/source/mon-util.cc at line 3188 [7.1699344]
[13.14877]
[13.14877]
```
    case ENCH_BERSERK:
        scale_hp(2, 3);
        break;
```

Insertion in crawl-ref/source/mon-util.cc at line 3339 [7.1699344]

[5.334]

[13.18995]

            break;
        case ENCH_BERSERK:
            del_ench(i->ench);
            del_ench(ENCH_HASTE);

Insertion in crawl-ref/source/mon-util.cc at line 3346 [7.1699344]

[13.19015]

        case ENCH_FATIGUE:
            del_ench(i->ench);
            del_ench(ENCH_SLOW);
            break;

Insertion in crawl-ref/source/mon-util.cc at line 3352 [7.1699344]
[13.19037]
[13.19037]
```
            del_ench(i->ench);
```
Insertion in crawl-ref/source/mon-util.cc at line 3357 [7.1699344]
[13.19114]
[13.19114]
```
            del_ench(i->ench);
```

Insertion in crawl-ref/source/mon-util.cc at line 3380 [7.1699344]

[13.19474]

    case ENCH_BERSERK:
        lose_ench_levels(me, 1);
        if (me.degree <= 1)
        {
            simple_monster_message(this, " is no longer berserk.");
            del_ench(ENCH_HASTE);
            const int duration = random_range(7, 13);
            add_ench(mon_enchant(ENCH_FATIGUE, duration));
            add_ench(mon_enchant(ENCH_SLOW, duration));
        }
        break;
    case ENCH_FATIGUE:
        lose_ench_levels(me, 1);
        if (me.degree <= 1)
        {
            simple_monster_message(this, " looks more energetic.");
            del_ench(ENCH_SLOW);
        }
        break;

Replacement in crawl-ref/source/mon-util.cc at line 3402 [7.1699344]

B:BD[13.19494] → [13.19494:19555]

        if (random2(250) <= mod_speed( hit_dice + 10, spd ))

[13.19494]

[13.19555]

        if (me.degree > 0)
            lose_ench_levels(me, 1);
        else if (random2(250) <= mod_speed( hit_dice + 10, spd ))

Replacement in crawl-ref/source/mon-util.cc at line 3409 [7.1699344]

B:BD[13.19623] → [13.19623:19673]

        if (random2(1000) < mod_speed( 25, spd ))

[13.19623]

[13.19673]

        if (me.degree > 0)
            lose_ench_levels(me, 1);
        else if (random2(1000) < mod_speed( 25, spd ))

Insertion in crawl-ref/source/mon-util.cc at line 3696 [7.1699344]

[13.27390]

void monsters::scale_hp(int num, int den)
{
    hit_points     = hit_points * num / den;
    max_hit_points = max_hit_points * num / den;
    
    if (hit_points < 1)
        hit_points = 1;
    if (max_hit_points < 1)
        max_hit_points = 1;
    if (hit_points > max_hit_points)
        hit_points = max_hit_points;
}

Insertion in crawl-ref/source/mon-util.cc at line 3802 [7.1699344]

[4.1938]

    }
}
int monsters::foe_distance() const
{
    // early out -- no foe!
    if (foe == MHITNOT)
        return (INFINITE_DISTANCE);
    if (foe == MHITYOU)
        return grid_distance(x, y, you.x_pos, you.y_pos);
    // must be a monster
    const monsters *my_foe = &menv[foe];
    if (my_foe->alive())
        return grid_distance(x, y, my_foe->x, my_foe->y);
    return (INFINITE_DISTANCE);
}
bool monsters::can_go_berserk() const
{
    if (holiness() != MH_NATURAL)
        return (false);
    
    if (has_ench(ENCH_FATIGUE) || has_ench(ENCH_BERSERK))
        return (false);
    // If we have no melee attack, going berserk is pointless.
    const mon_attack_def attk = mons_attack_spec(this, 0);
    if (attk.type == AT_NONE || attk.damage == 0)
        return (false);
    
    return (true);
}
bool monsters::needs_berserk(bool check_spells) const
{
    if (!can_go_berserk())
        return (false);
    
    if (has_ench(ENCH_HASTE) || has_ench(ENCH_TP))
        return (false);
    if (foe_distance() > 3)
        return (false);
    if (check_spells)
    {
        for (int i = 0; i < NUM_MONSTER_SPELL_SLOTS; ++i)
        {
            const int spell = spells[i];
            if (spell != MS_NO_SPELL && spell != MS_BERSERK_RAGE)
                return (false);
        }

Insertion in crawl-ref/source/mon-util.cc at line 3858 [7.1699344]
[4.1944]
[4.1944]
```
    return (true);
```

Replacement in crawl-ref/source/mon-util.cc at line 3870 [7.1699344]

B:BD[13.27815] → [16.393:448]

    "short lived", "paralysis", "sick", "sleep", "bug"

[13.27815]

[13.27853]

    "short lived", "paralysis", "sick", "sleep", "fatigue", "bug"

Insertion in crawl-ref/source/mon-spll.h at line 787 [7.1750895]

[10.488897]

[7.1765642]

    // Crusader theme.
    {  MST_RUPERT,
       MS_PARALYSIS,
       MS_CONFUSE,
       MS_BERSERK_RAGE,
       MS_NO_SPELL,
       MS_NO_SPELL,
       MS_BERSERK_RAGE },

Replacement in crawl-ref/source/mon-data.h at line 3224 [7.1826214]

∅:D[17.3742] → [7.1904241:1904320]

B:BD[7.1904241] → [7.1904241:1904320]

    0, 10, 10, 7, MST_WIZARD_IV, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL,

[17.3742]

[11.20071]

    0, 10, 10, 7, MST_RUPERT, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL,

Replacement in crawl-ref/source/mon-data.h at line 3894 [7.1826214]
B:BD[7.1916478] → [7.1916478:1916491]
```
    M_FLIES,
```
[7.1916478]
[10.535033]
```
    M_FLIES | M_SPECIAL_ABILITY,
```

Replacement in crawl-ref/source/mon-data.h at line 3897 [7.1826214]

B:BD[10.535117] → [12.49664:49769]

    { {AT_BITE, AF_PLAIN, 25}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },

[10.535117]

[7.1916559]

    { {AT_BITE, AF_RAGE, 25}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },

Replacement in crawl-ref/source/mon-data.h at line 3899 [7.1826214]

B:BD[7.1916579] → [7.1916579:1916651]

    0, 10, 12, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SHOUT, I_NORMAL,

[7.1916579]

[11.22228]

    0, 10, 12, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SHOUT, I_HIGH,

Replacement in crawl-ref/source/misc.cc at line 1681 [7.1933596]

B:BD[7.1981200] → [7.1981200:1981577]

    if (you.berserker)
    {
        if (intentional)
            mpr("You're already berserk!");
        // or else you won't notice -- no message here.
        return false;
    }
    if (you.exhausted)
    {
        if (intentional)
            mpr("You're too exhausted to go berserk.");
        // or else they won't notice -- no message here
        return false;
    }

[7.1981200]

[7.1981577]

    if (!you.can_go_berserk(intentional))
        return (false);

Deletion in crawl-ref/source/misc.cc at line 1684 [7.1933596]

B:BD[7.1981578] → [7.1981578:1981789]

    if (you.is_undead)
    {
        if (intentional)
            mpr("You cannot raise a blood rage in your lifeless body.");
        // or else you won't notice -- no message here
        return false;
    }

Insertion in crawl-ref/source/misc.cc at line 1686 [7.1933596]
[18.12249]
[7.1981789]
```
    
```

Insertion in crawl-ref/source/fight.cc at line 2497 [7.3140790]

[7.3208177]

[12.66748]

    // Berserk monsters get bonus damage.
    if (atk->has_ench(ENCH_BERSERK))
        damage = damage * 3 / 2;

Insertion in crawl-ref/source/fight.cc at line 2894 [7.3140790]

[12.77356]


    case AF_RAGE:
        if (!one_chance_in(3) || !defender->can_go_berserk())
            break;
        
        if (needs_message)
            mprf("%s %s %s!",
                 attacker->name(DESC_CAP_THE).c_str(),
                 attacker->conj_verb("infuriate").c_str(),
                 defender->name(DESC_NOCAP_THE).c_str());
        defender->go_berserk(false);
        break;

Insertion in crawl-ref/source/externs.h at line 145 [7.3270163]
[11.82288]
[11.82288]
```
    virtual bool can_go_berserk() const = 0;
```
Insertion in crawl-ref/source/externs.h at line 242 [7.3270163]
[19.145916]
[19.145916]
```
    int distance_from(const coord_def &b) const;
```

Insertion in crawl-ref/source/externs.h at line 752 [7.3270163]

[11.83376]

    bool can_go_berserk() const;
    bool can_go_berserk(bool verbose) const;

Insertion in crawl-ref/source/externs.h at line 915 [7.3270163]

[13.31212]


    int  foe_distance() const;
    bool needs_berserk(bool check_spells = true) const;

Replacement in crawl-ref/source/externs.h at line 919 [7.3270163]

B:BD[13.31217] → [13.31217:31325]

    bool        has_ench(enchant_type ench,
                         enchant_type ench2 = ENCH_NONE) const;

[13.31217]

[13.31325]

    bool has_ench(enchant_type ench) const;
    bool has_ench(enchant_type ench, enchant_type ench2) const;

Replacement in crawl-ref/source/externs.h at line 923 [7.3270163]

B:BD[13.31433] → [13.31433:31595]

    bool        add_ench(const mon_enchant &);
    void        update_ench(const mon_enchant &);
    bool        del_ench(enchant_type ench, bool quiet = false);

[13.31433]

[13.31595]

    bool add_ench(const mon_enchant &);
    void update_ench(const mon_enchant &);
    bool del_ench(enchant_type ench, bool quiet = false);
    void scale_hp(int num, int den);

Insertion in crawl-ref/source/externs.h at line 930 [7.3270163]
[13.31657]
[13.31657]
```
    void add_enchantment_effect(const mon_enchant &me, bool quiet = false);
```
Insertion in crawl-ref/source/externs.h at line 977 [7.3270163]
[11.84182]
[11.84182]
```
    bool can_go_berserk() const;
```
Insertion in crawl-ref/source/enum.h at line 1197 [7.3287960]
[16.598]
[20.2558]
```
    ENCH_FATIGUE,        // Post-berserk fatigue.
```
Replacement in crawl-ref/source/enum.h at line 2304 [7.3287960]
B:BD[3.4403] → [3.4403:4418]
```
    AF_DISTORT
```
[3.4403]
[12.90430]
```
    AF_DISTORT,
    AF_RAGE
```
Insertion in crawl-ref/source/enum.h at line 2586 [7.3287960]
[10.924354]
[7.3347707]
```
    MST_RUPERT,
```

Insertion in crawl-ref/source/direct.cc at line 1394 [7.3697945]

[13.32746]

        return;
    if (ench.ench == ENCH_HASTE && mons.has_ench(ENCH_BERSERK))

Insertion in crawl-ref/source/direct.cc at line 1418 [7.3697945]

[13.33205]

    case ENCH_BERSERK:
        strcat(info, " is berserk!");
        break;

Insertion in crawl-ref/source/defines.h at line 77 [7.3982910]
[7.3984727]
[10.1019076]
```
#define INFINITE_DISTANCE       30000
```

Moth of wrath angering attack was lost in 0.2, reintroduced.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 525 [7.16817]

Replacement in crawl-ref/source/travel.h at line 485 [8.29464]

Insertion in crawl-ref/source/stuff.cc at line 1092 [7.224557]

Insertion in crawl-ref/source/stuff.cc at line 1100 [7.224557]

Insertion in crawl-ref/source/player.cc at line 4935 [7.962854]

Insertion in crawl-ref/source/mstuff2.h at line 105 [7.1336995]

Insertion in crawl-ref/source/mstuff2.cc at line 369 [7.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 726 [7.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1955 [7.1340842]

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

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

Insertion in crawl-ref/source/monspeak.cc at line 227 [7.1558496]

Replacement in crawl-ref/source/mon-util.cc at line 1868 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1906 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1931 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 1935 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1952 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1972 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1980 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1983 [7.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 2075 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2080 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2627 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3068 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3080 [7.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 3082 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3109 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3111 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3123 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3125 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3128 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3136 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3145 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3147 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3157 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3159 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3164 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3166 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3188 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3339 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3346 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3352 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3357 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3380 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3402 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3409 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3696 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3802 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3858 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3870 [7.1699344]

Insertion in crawl-ref/source/mon-spll.h at line 787 [7.1750895]

Replacement in crawl-ref/source/mon-data.h at line 3224 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3894 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3897 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3899 [7.1826214]

Replacement in crawl-ref/source/misc.cc at line 1681 [7.1933596]

Deletion in crawl-ref/source/misc.cc at line 1684 [7.1933596]

Insertion in crawl-ref/source/misc.cc at line 1686 [7.1933596]

Insertion in crawl-ref/source/fight.cc at line 2497 [7.3140790]

Insertion in crawl-ref/source/fight.cc at line 2894 [7.3140790]

Insertion in crawl-ref/source/externs.h at line 145 [7.3270163]

Insertion in crawl-ref/source/externs.h at line 242 [7.3270163]

Insertion in crawl-ref/source/externs.h at line 752 [7.3270163]

Insertion in crawl-ref/source/externs.h at line 915 [7.3270163]

Replacement in crawl-ref/source/externs.h at line 919 [7.3270163]

Replacement in crawl-ref/source/externs.h at line 923 [7.3270163]

Insertion in crawl-ref/source/externs.h at line 930 [7.3270163]

Insertion in crawl-ref/source/externs.h at line 977 [7.3270163]

Insertion in crawl-ref/source/enum.h at line 1197 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 2304 [7.3287960]

Insertion in crawl-ref/source/enum.h at line 2586 [7.3287960]

Insertion in crawl-ref/source/direct.cc at line 1394 [7.3697945]

Insertion in crawl-ref/source/direct.cc at line 1418 [7.3697945]

Insertion in crawl-ref/source/defines.h at line 77 [7.3982910]