fiddlerwoaroof/crawl - Change BUSA7O6EFBZVAG2RL5T7MD2WTWKOEKKIAAZ2VS4Y3L6ECT4HQR6QC

Orc knights and warlords can yell battle-cries to make lesser orcs fight better.

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

Created by dshaligram on October 8, 2007

BUSA7O6EFBZVAG2RL5T7MD2WTWKOEKKIAAZ2VS4Y3L6ECT4HQR6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 6022 [5.962854]
B:BD[4.276] → [4.276:315]
```
bool player::visible_to(actor *looker)
```
[4.276]
[4.315]
```
bool player::visible_to(const actor *looker) const
```

Replacement in crawl-ref/source/player.cc at line 6027 [5.962854]

B:BD[4.396] → [4.396:450]

    monsters* mon = dynamic_cast<monsters*>(looker);

[4.396]

[4.450]

    const monsters* mon = dynamic_cast<const monsters*>(looker);

Replacement in crawl-ref/source/player.cc at line 6031 [5.962854]
B:BD[4.490] → [4.490:526]
```
bool player::can_see(actor *target)
```
[4.490]
[4.526]
```
bool player::can_see(const actor *target) const
```

Replacement in crawl-ref/source/player.cc at line 6036 [5.962854]

B:BD[4.588] → [4.588:642]

    monsters* mon = dynamic_cast<monsters*>(target);

[4.588]

[4.642]

    const monsters* mon = dynamic_cast<const monsters*>(target);

Insertion in crawl-ref/source/mstuff2.h at line 95 [5.1336995]
[5.1340477]
[6.396801]
```
bool orc_battle_cry(monsters *chief);
```

Insertion in crawl-ref/source/mstuff2.cc at line 2146 [5.1340842]

[6.410573]


    return (false);
}
bool orc_battle_cry(monsters *chief)
{
    const actor *foe = chief->get_foe();
    if (foe && chief->can_see(foe) && coinflip())
    {
        const int boss_index = monster_index(chief);
        const int level = chief->hit_dice > 12? 2 : 1;
        std::vector<monsters*> affected;
        for (int i = 0; i < MAX_MONSTERS; ++i)
        {
            monsters *mons = &menv[i];
            if (mons != chief
                && mons->alive()
                && mons_species(mons->type) == MONS_ORC
                && mons_aligned(boss_index, i)
                && mons->hit_dice < chief->hit_dice
                && chief->can_see(mons))
            {
                mon_enchant ench = mons->get_ench(ENCH_BATTLE_FRENZY);
                if (ench.ench == ENCH_NONE || ench.degree < level)
                {
                    const int dur =
                        random_range(5, 10) * speed_to_duration(mons->speed);
                
                    if (ench.ench != ENCH_NONE)
                    {
                        ench.degree   = level;
                        ench.duration = std::max(ench.duration, dur);
                        mons->update_ench(ench);
                    }
                    else
                    {
                        mons->add_ench(
                            mon_enchant(ENCH_BATTLE_FRENZY, level,
                                        KC_OTHER,
                                        dur));
                    }
                    affected.push_back(mons);
                }
            }
        }
        
        if (!affected.empty())
        {
            if (you.can_see(chief))
                mprf("%s roars a battle-cry!",
                     chief->name(DESC_CAP_THE).c_str());
            // Disabling detailed frenzy announcement because it's so spammy.
#ifdef ANNOUNCE_BATTLE_FRENZY
            std::map<std::string, int> names;
            for (int i = 0, size = affected.size(); i < size; ++i)
            {
                if (you.can_see(affected[i]))
                    names[affected[i]->name(DESC_PLAIN)]++;
            }

Insertion in crawl-ref/source/mstuff2.cc at line 2207 [5.1340842]

[6.410574]

            for (std::map<std::string,int>::const_iterator i = names.begin();
                 i != names.end(); ++i)
            {
                const std::string s =
                    i->second> 1? pluralise(i->first) : i->first;
                mprf("The %s go%s into a battle-frenzy!",
                     s.c_str(), i->second == 1? "es" : "");
            }
#endif
        }
    }
    // Orc battle cry doesn't cost the monster an action.

Deletion in crawl-ref/source/monstuff.cc at line 2375 [5.1396662]
B:BD[5.1471373] → [5.1471373:1471422]
```
//    losight(show, grd, you.x_pos, you.y_pos);
```

Insertion in crawl-ref/source/monstuff.cc at line 2378 [5.1396662]

[5.1471456]

[6.422737]

    case MONS_ORC_KNIGHT:
    case MONS_ORC_WARLORD:
        used = orc_battle_cry(monster);
        break;

Replacement in crawl-ref/source/mon-util.h at line 331 [5.1682293]

∅:D[7.493] → [5.1689357:1689481]

B:BD[5.1689357] → [5.1689357:1689481]

bool mons_monster_visible( struct monsters *mon, struct monsters *targ );
bool mons_player_visible( struct monsters *mon );

[7.493]

[5.1689481]

bool mons_monster_visible( const monsters *mon, const monsters *targ );
bool mons_player_visible( const monsters *mon );

Replacement in crawl-ref/source/mon-util.cc at line 623 [5.1699344]

B:BD[5.1706675] → [5.1706675:1706748]

bool mons_monster_visible( struct monsters *mon, struct monsters *targ )

[5.1706675]

[5.1706748]

bool mons_monster_visible( const monsters *mon, const monsters *targ )

Replacement in crawl-ref/source/mon-util.cc at line 636 [5.1699344]
B:BD[5.1707062] → [5.1707062:1707111]
```
bool mons_player_visible( struct monsters *mon )
```
[5.1707062]
[5.1707111]
```
bool mons_player_visible( const monsters *mon )
```
Insertion in crawl-ref/source/mon-util.cc at line 4121 [5.1699344]
[3.506]
[8.2817]
```
        case ENCH_BATTLE_FRENZY:
```

Insertion in crawl-ref/source/mon-util.cc at line 4253 [5.1699344]

[9.19989]

[10.13346]

            
    case ENCH_BATTLE_FRENZY:
        decay_enchantment(me, false);
        break;

Replacement in crawl-ref/source/mon-util.cc at line 4744 [5.1699344]
B:BD[11.268] → [4.765:806]
```
bool monsters::visible_to(actor *looker)
```
[11.268]
[4.806]
```
bool monsters::visible_to(const actor *looker) const
```

Replacement in crawl-ref/source/mon-util.cc at line 4753 [5.1699344]

B:BD[4.986] → [4.986:1044]

        monsters* mon = dynamic_cast<monsters*>(looker);

[4.986]

[4.1044]

        const monsters* mon = dynamic_cast<const monsters*>(looker);

Replacement in crawl-ref/source/mon-util.cc at line 4758 [5.1699344]
B:BD[4.1101] → [4.1101:1139]
```
bool monsters::can_see(actor *target)
```
[4.1101]
[4.1139]
```
bool monsters::can_see(const actor *target) const
```

Replacement in crawl-ref/source/mon-util.cc at line 4769 [5.1699344]

B:BD[4.1331] → [4.1331:1384]

    monsters* mon = dynamic_cast<monsters*>(target);

[4.1331]

[4.1384]

    const monsters* mon = dynamic_cast<const monsters*>(target);

Replacement in crawl-ref/source/mon-util.cc at line 4908 [5.1699344]
B:BD[2.265] → [2.265:275]
```
    "bug"
```
[2.265]
[9.27853]
```
    "blood-lust", "bug"
```

Insertion in crawl-ref/source/fight.cc at line 2885 [5.3140790]

[12.10866]

    else if (atk->has_ench(ENCH_BATTLE_FRENZY))
    {
        const mon_enchant ench = atk->get_ench(ENCH_BATTLE_FRENZY);
        
#ifdef DEBUG_DIAGNOSTICS
        const int orig_damage = damage;
#endif
        
        damage = damage * (115 + ench.degree * 15) / 100;
        
#ifdef DEBUG_DIAGNOSTICS
        mprf(MSGCH_DIAGNOSTICS, "%s frenzy damage: %d->%d",
             attacker->name(DESC_PLAIN).c_str(), orig_damage, damage);
#endif
    }

Replacement in crawl-ref/source/externs.h at line 116 [5.3270163]

B:BD[7.3144] → [4.2163:2256]

    virtual bool visible_to(actor *looker) = 0;
    virtual bool can_see(actor *target) = 0;

[7.3144]

[4.2256]

    virtual bool visible_to(const actor *looker) const = 0;
    virtual bool can_see(const actor *target) const = 0;

Replacement in crawl-ref/source/externs.h at line 717 [5.3270163]

B:BD[7.3209] → [4.2294:2363]

    bool visible_to(actor *looker);
    bool can_see(actor *target);

[7.3209]

[13.473]

    bool visible_to(const actor *looker) const;
    bool can_see(const actor *target) const;

Replacement in crawl-ref/source/externs.h at line 1075 [5.3270163]

B:BD[7.3274] → [4.2364:2433]

    bool visible_to(actor *looker);
    bool can_see(actor *target);

[7.3274]

[13.499]

    bool visible_to(const actor *looker) const ;
    bool can_see(const actor *target) const;

Insertion in crawl-ref/source/enum.h at line 1064 [5.3287960]
[14.2423]
[15.2558]
```
    ENCH_BATTLE_FRENZY,  // Monster is in a battle frenzy
```

Replacement in crawl-ref/source/direct.cc at line 1744 [5.3697945]

B:BD[12.12047] → [12.12047:12111]

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

[12.12047]

[16.1392]

    if ((ench.ench == ENCH_HASTE || ench.ench == ENCH_BATTLE_FRENZY)
        && mons.has_ench(ENCH_BERSERK))
    {

Insertion in crawl-ref/source/direct.cc at line 1748 [5.3697945]
[16.1411]
[17.473888]
```
    }
```

Insertion in crawl-ref/source/direct.cc at line 1764 [5.3697945]

[16.1616]

[9.33205]

    case ENCH_BATTLE_FRENZY:
        return "consumed by blood-lust";

Deletion in crawl-ref/source/debug.cc at line 431 [5.4016436]

B:BD[5.4031819] → [18.35444:36382]

        // Only one ghost allowed per level
        if (mspec.mid == MONS_PLAYER_GHOST)
        {
            for (int i = 0; i < MAX_MONSTERS; i++)
                if (menv[i].type == MONS_PLAYER_GHOST
                    && menv[i].alive())
                {
                    mpr("Only one player ghost per level allowed, "
                        "and this level already has one.");
                        return;
                }
        }
        // Only one pandemonium lord allowed per level as well.
        else if (mspec.mid == MONS_PANDEMONIUM_DEMON)
        {
            for (int i = 0; i < MAX_MONSTERS; i++)
                if (menv[i].type == MONS_PANDEMONIUM_DEMON
                    && menv[i].alive())
                {
                    mpr("Only one Pandemonium lord per level allowed, "
                        "and this level already has one.");
                        return;
                }
        }

Orc knights and warlords can yell battle-cries to make lesser orcs fight better.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/player.cc at line 6022 [5.962854]

Replacement in crawl-ref/source/player.cc at line 6027 [5.962854]

Replacement in crawl-ref/source/player.cc at line 6031 [5.962854]

Replacement in crawl-ref/source/player.cc at line 6036 [5.962854]

Insertion in crawl-ref/source/mstuff2.h at line 95 [5.1336995]

Insertion in crawl-ref/source/mstuff2.cc at line 2146 [5.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 2207 [5.1340842]

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

Insertion in crawl-ref/source/monstuff.cc at line 2378 [5.1396662]

Replacement in crawl-ref/source/mon-util.h at line 331 [5.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 623 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 636 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 4121 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 4253 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4744 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4753 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4758 [5.1699344]