fiddlerwoaroof/crawl - Change POP6UTTHSJGDU5NU7ENQJOZVFUHYM63HJ6HLPXDDLK7XFIP4XEIQC

Two changes:

1.) If Beogh can't find a nearby follower in LOS to bless, try again without the LOS restriction (but still nearby). If this also fails, recall a small amount of followers (1 + rnd(4) + rnd(4)) on the level. I don't think there's much harm in Beogh actively doing something you already have as an invocation as long as it doesn't make the invocation superfluous (and this doesn't). In this case, the chance of this happening should probably be lowered, and actual reinforcement should be rarer still.

2.) Identify magical staves if you have at least 4 skill levels in the corresponding spell school when wielding it, or gain the 4th level while wielding it. (I decided on 4 because that is what most mages start out with in their special school, and it seems a good enough treshold.) Prior to that, there's still the random identification chance at casting an appropriate spell, as before.

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

Created by j-p-e-g on April 25, 2008

POP6UTTHSJGDU5NU7ENQJOZVFUHYM63HJ6HLPXDDLK7XFIP4XEIQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.h at line 58 [5.291319]

[5.292247]

[6.143]


bool maybe_identify_staff( item_def &item, spell_type spell = SPELL_NO_SPELL );

Replacement in crawl-ref/source/spl-cast.h at line 76 [5.291319]

B:BD[5.292886] → [7.143:214]

void miscast_effect( unsigned int sp_type, int mag_pow, int mag_fail,

[5.292886]

[5.292957]

void miscast_effect( unsigned int sp_type, int mag_pow, int mag_fail,

Replacement in crawl-ref/source/spl-cast.cc at line 103 [5.293070]

B:BD[8.1234] → [8.1234:1423]

                        if (!item_ident(ring, ISFLAG_KNOW_PROPERTIES) &&
                            (ring.sub_type == RING_FIRE ||
                             ring.sub_type == RING_ICE))

[8.1234]

[8.1423]

                        if (!item_ident(ring, ISFLAG_KNOW_PROPERTIES)
                            && (ring.sub_type == RING_FIRE
                                || ring.sub_type == RING_ICE))

Replacement in crawl-ref/source/spl-cast.cc at line 707 [5.293070]
∅:D[3.1860] → [9.11279:11330]
B:BD[10.127685] → [9.11279:11330]
```
bool spell_is_utility_spell( spell_type spell_id )
```
[3.1860]
[5.308896]
```
static bool _spell_is_utility_spell( spell_type spell_id )
```
Replacement in crawl-ref/source/spl-cast.cc at line 713 [5.293070]
B:BD[5.309010] → [9.11331:11375]
```
bool spell_is_unholy( spell_type spell_id )
```
[5.309010]
[10.127889]
```
static bool _spell_is_unholy( spell_type spell_id )
```

Replacement in crawl-ref/source/spl-cast.cc at line 718 [5.293070]

B:BD[5.309040] → [11.483:553]

void spellcasting_side_effects(spell_type spell, bool idonly = false)

[5.309040]

[10.128025]

bool maybe_identify_staff(item_def &item, spell_type spell)

Replacement in crawl-ref/source/spl-cast.cc at line 720 [5.293070]

B:BD[10.128027] → [10.128027:128052]

    int total_skill = 0;

[10.128027]

[5.309175]

    if (item_type_known(item))
        return (true);
    int relevant_skill = 0;
    const bool chance = (spell != SPELL_NO_SPELL);

Replacement in crawl-ref/source/spl-cast.cc at line 726 [5.293070]

B:BD[5.309176] → [5.309176:309269]

B:BD[5.309269] → [12.27:89]

    if (you.equip[EQ_WEAPON] != -1
        && item_is_staff( you.inv[you.equip[EQ_WEAPON]] )
        && !item_type_known( you.inv[you.equip[EQ_WEAPON]] ))

[5.309176]

[5.309347]

    switch (item.sub_type)

Deletion in crawl-ref/source/spl-cast.cc at line 728 [5.293070]
B:BD[5.309353] → [5.309353:309419]
```
        switch (you.inv[you.equip[EQ_WEAPON]].sub_type)
        {
```

Insertion in crawl-ref/source/spl-cast.cc at line 729 [5.293070]

[5.309446]

            if (!chance) // The staff of energy only autoIDs by chance.
                return (false);
            // intentional fall-through

Replacement in crawl-ref/source/spl-cast.cc at line 733 [5.293070]

B:BD[5.309475] → [5.309475:309530]

            total_skill = you.skills[SK_SPELLCASTING];

[5.309475]

[5.309530]

            relevant_skill = you.skills[SK_SPELLCASTING];

Insertion in crawl-ref/source/spl-cast.cc at line 735 [5.293070]
[5.309549]
[5.309549]

Replacement in crawl-ref/source/spl-cast.cc at line 737 [5.293070]

B:BD[5.309574] → [11.554:606]

∅:D[11.606] → [5.309625:309682]

B:BD[5.309625] → [5.309625:309682]

            if (spell_typematch(spell, SPTYP_FIRE))
                total_skill = you.skills[SK_FIRE_MAGIC];

[5.309574]

[11.607]

            if (!chance || spell_typematch(spell, SPTYP_FIRE))
                relevant_skill = you.skills[SK_FIRE_MAGIC];

Replacement in crawl-ref/source/spl-cast.cc at line 740 [5.293070]
∅:D[11.663] → [5.309737:309793]
B:BD[5.309737] → [5.309737:309793]
```
                total_skill = you.skills[SK_ICE_MAGIC];
```
[11.663]
[5.309793]
```
                relevant_skill = you.skills[SK_ICE_MAGIC];
```
Insertion in crawl-ref/source/spl-cast.cc at line 742 [5.293070]
[5.309812]
[5.309812]

Replacement in crawl-ref/source/spl-cast.cc at line 744 [5.293070]

B:BD[5.309837] → [11.664:715]

∅:D[11.715] → [5.309887:309943]

B:BD[5.309887] → [5.309887:309943]

            if (spell_typematch(spell, SPTYP_ICE))
                total_skill = you.skills[SK_ICE_MAGIC];

[5.309837]

[11.716]

            if (!chance || spell_typematch(spell, SPTYP_ICE))
                relevant_skill = you.skills[SK_ICE_MAGIC];

Replacement in crawl-ref/source/spl-cast.cc at line 747 [5.293070]
∅:D[11.773] → [5.309999:310056]
B:BD[5.309999] → [5.309999:310056]
```
                total_skill = you.skills[SK_FIRE_MAGIC];
```
[11.773]
[5.310056]
```
                relevant_skill = you.skills[SK_FIRE_MAGIC];
```
Insertion in crawl-ref/source/spl-cast.cc at line 749 [5.293070]
[5.310075]
[5.310075]

Replacement in crawl-ref/source/spl-cast.cc at line 751 [5.293070]

B:BD[5.310099] → [11.774:825]

∅:D[11.825] → [5.310149:310205]

B:BD[5.310149] → [5.310149:310205]

            if (spell_typematch(spell, SPTYP_AIR))
                total_skill = you.skills[SK_AIR_MAGIC];

[5.310099]

[11.826]

            if (!chance || spell_typematch(spell, SPTYP_AIR))
                relevant_skill = you.skills[SK_AIR_MAGIC];

Replacement in crawl-ref/source/spl-cast.cc at line 754 [5.293070]
∅:D[11.884] → [5.310262:310320]
B:BD[5.310262] → [5.310262:310320]
```
                total_skill = you.skills[SK_EARTH_MAGIC];
```
[11.884]
[5.310320]
```
                relevant_skill = you.skills[SK_EARTH_MAGIC];
```
Insertion in crawl-ref/source/spl-cast.cc at line 756 [5.293070]
[5.310339]
[5.310339]

Replacement in crawl-ref/source/spl-cast.cc at line 758 [5.293070]

B:BD[5.310365] → [11.885:938]

∅:D[11.938] → [5.310417:310475]

B:BD[5.310417] → [5.310417:310475]

            if (spell_typematch(spell, SPTYP_EARTH))
                total_skill = you.skills[SK_EARTH_MAGIC];

[5.310365]

[11.939]

            if (!chance || spell_typematch(spell, SPTYP_EARTH))
                relevant_skill = you.skills[SK_EARTH_MAGIC];

Replacement in crawl-ref/source/spl-cast.cc at line 761 [5.293070]
∅:D[11.995] → [5.310530:310586]
B:BD[5.310530] → [5.310530:310586]
```
                total_skill = you.skills[SK_AIR_MAGIC];
```
[11.995]
[5.310586]
```
                relevant_skill = you.skills[SK_AIR_MAGIC];
```
Insertion in crawl-ref/source/spl-cast.cc at line 763 [5.293070]
[5.310605]
[5.310605]

Replacement in crawl-ref/source/spl-cast.cc at line 765 [5.293070]

B:BD[5.310632] → [11.996:1050]

∅:D[11.1050] → [5.310685:310744]

B:BD[5.310685] → [5.310685:310744]

            if (spell_typematch(spell, SPTYP_POISON))
                total_skill = you.skills[SK_POISON_MAGIC];

[5.310632]

[5.310744]

            if (!chance || spell_typematch(spell, SPTYP_POISON))
                relevant_skill = you.skills[SK_POISON_MAGIC];

Insertion in crawl-ref/source/spl-cast.cc at line 768 [5.293070]
[5.310763]
[5.310763]

Replacement in crawl-ref/source/spl-cast.cc at line 770 [5.293070]

B:BD[5.310789] → [11.1051:1109]

∅:D[11.1109] → [5.310846:310903]

B:BD[5.310846] → [5.310846:310903]

            if (spell_typematch(spell, SPTYP_NECROMANCY))
                total_skill = you.skills[SK_NECROMANCY];

[5.310789]

[5.310903]

            if (!chance || spell_typematch(spell, SPTYP_NECROMANCY))
                relevant_skill = you.skills[SK_NECROMANCY];

Insertion in crawl-ref/source/spl-cast.cc at line 773 [5.293070]
[5.310922]
[5.310922]

Replacement in crawl-ref/source/spl-cast.cc at line 775 [5.293070]

B:BD[5.310954] → [11.1110:1169]

∅:D[11.1169] → [5.311012:311071]

B:BD[5.311012] → [5.311012:311071]

            if (spell_typematch(spell, SPTYP_CONJURATION))
                total_skill = you.skills[SK_CONJURATIONS];

[5.310954]

[5.311071]

            if (!chance || spell_typematch(spell, SPTYP_CONJURATION))
                relevant_skill = you.skills[SK_CONJURATIONS];

Insertion in crawl-ref/source/spl-cast.cc at line 778 [5.293070]
[5.311090]
[5.311090]

Replacement in crawl-ref/source/spl-cast.cc at line 780 [5.293070]

B:BD[5.311122] → [11.1170:1229]

∅:D[11.1229] → [5.311180:311239]

B:BD[5.311180] → [5.311180:311239]

            if (spell_typematch(spell, SPTYP_ENCHANTMENT))
                total_skill = you.skills[SK_ENCHANTMENTS];

[5.311122]

[5.311239]

            if (!chance || spell_typematch(spell, SPTYP_ENCHANTMENT))
                relevant_skill = you.skills[SK_ENCHANTMENTS];

Insertion in crawl-ref/source/spl-cast.cc at line 783 [5.293070]
[5.311258]
[5.311258]

Replacement in crawl-ref/source/spl-cast.cc at line 785 [5.293070]

B:BD[5.311288] → [11.1230:1287]

∅:D[11.1287] → [5.311344:311401]

B:BD[5.311344] → [5.311344:311401]

            if (spell_typematch(spell, SPTYP_SUMMONING))
                total_skill = you.skills[SK_SUMMONINGS];

[5.311288]

[5.311401]

            if (!chance || spell_typematch(spell, SPTYP_SUMMONING))
                relevant_skill = you.skills[SK_SUMMONINGS];

Replacement in crawl-ref/source/spl-cast.cc at line 788 [5.293070]

B:BD[5.311420] → [5.311420:311430]

[5.311420]

[5.311430]

    }
    bool id_staff = false;
    if (chance)
    {
        if (you.skills[SK_SPELLCASTING] > relevant_skill)
            relevant_skill = you.skills[SK_SPELLCASTING];
        if (random2(100) < relevant_skill)
            id_staff = true;
    }
    else if (relevant_skill >= 4)
        id_staff = true;

Replacement in crawl-ref/source/spl-cast.cc at line 803 [5.293070]

B:BD[5.311431] → [5.311431:311541]

        if (you.skills[SK_SPELLCASTING] > total_skill)
            total_skill = you.skills[SK_SPELLCASTING];

[5.311431]

[5.311541]

    if (id_staff)
    {
        item_def& wpn = you.inv[you.equip[EQ_WEAPON]];
        // changed from ISFLAG_KNOW_TYPE
        set_ident_flags( wpn, ISFLAG_IDENT_MASK);
        mprf("You are wielding %s.", wpn.name(DESC_NOCAP_A).c_str());
        more();

Replacement in crawl-ref/source/spl-cast.cc at line 811 [5.293070]

B:BD[5.311542] → [5.311542:311592]

B:BD[5.311592] → [13.582:641]

∅:D[13.641] → [14.426:471]

B:BD[5.311637] → [14.426:471]

B:BD[14.471] → [13.642:770]

∅:D[13.770] → [5.311923:311943]

B:BD[5.311923] → [5.311923:311943]

        if (random2(100) < total_skill)
        {
            item_def& wpn = you.inv[you.equip[EQ_WEAPON]];
            // changed from ISFLAG_KNOW_TYPE
            set_ident_flags( wpn, ISFLAG_IDENT_MASK);
            mprf("You are wielding %s.", wpn.name(DESC_NOCAP_A).c_str());
            more();

[5.311542]

[5.311943]

        you.wield_change = true;
    }
    return (id_staff);
}

Replacement in crawl-ref/source/spl-cast.cc at line 816 [5.293070]

B:BD[5.311944] → [5.311944:311991]

            you.wield_change = true;
        }

[5.311944]

[5.311991]

static void _spellcasting_side_effects(spell_type spell, bool idonly = false)
{
    if (you.equip[EQ_WEAPON] != -1
        && item_is_staff( you.inv[you.equip[EQ_WEAPON]] ))
    {
        maybe_identify_staff(you.inv[you.equip[EQ_WEAPON]], spell);

Replacement in crawl-ref/source/spl-cast.cc at line 827 [5.293070]
B:BD[5.311998] → [11.1288:1328]
```
    if (!spell_is_utility_spell(spell))
```
[5.311998]
[11.1328]
```
    if (!_spell_is_utility_spell(spell))
```

Replacement in crawl-ref/source/spl-cast.cc at line 831 [5.293070]

B:BD[2.233] → [2.233:321]

    if (spell_is_unholy(spell) &&
        (spell != SPELL_BANISHMENT || !you.banished))

[2.233]

[2.321]

    if (_spell_is_unholy(spell)
        && (spell != SPELL_BANISHMENT || !you.banished))

Replacement in crawl-ref/source/spl-cast.cc at line 1044 [5.293070]

B:BD[5.312646] → [11.2195:2247]

            spellcasting_side_effects(spell, true);

[5.312646]

[10.130017]

            _spellcasting_side_effects(spell, true);

Replacement in crawl-ref/source/spl-cast.cc at line 1050 [5.293070]

B:BD[5.312789] → [5.312789:312904]

                && (!player_under_penance()
                    && you.piety >= 100 && random2(150) <= you.piety))

[5.312789]

[5.312904]

                && !player_under_penance()
                && you.piety >= 100 && random2(150) <= you.piety)

Replacement in crawl-ref/source/spl-cast.cc at line 1985 [5.293070]
B:BD[5.341652] → [11.2647:2685]
```
    spellcasting_side_effects(spell);
```
[5.341652]
[10.133590]
```
    _spellcasting_side_effects(spell);
```

Replacement in crawl-ref/source/spells3.cc at line 1150 [5.531613]

B:BD[5.557351] → [5.557351:557591]

    int loopy = 0;              // general purpose looping variable {dlb}
    bool success = false;       // more accurately: "apparent success" {dlb}
    int start_count = 0;
    int step_value = 1;
    int end_count = (MAX_MONSTERS - 1);

[5.557351]

[5.557591]

    int loopy          = 0;      // general purpose looping variable {dlb}
    bool success       = false;  // more accurately: "apparent success" {dlb}
    int start_count    = 0;
    int step_value     = 1;
    int end_count      = (MAX_MONSTERS - 1);

Replacement in crawl-ref/source/spells3.cc at line 1161 [5.531613]

B:BD[5.557711] → [5.557711:557812]

// someone really had to make life difficult {dlb}:
// sometimes goes through monster list backwards

[5.557711]

[5.557812]

    // someone really had to make life difficult {dlb}:
    // sometimes goes through monster list backwards

Replacement in crawl-ref/source/spells3.cc at line 1166 [5.531613]

B:BD[5.557880] → [5.557880:557928]

        end_count = 0;
        step_value = -1;

[5.557880]

[5.557928]

        end_count   = 0;
        step_value  = -1;

Replacement in crawl-ref/source/spells3.cc at line 1197 [5.531613]

B:BD[5.558887] → [10.148326:148406]

        if (empty_surrounds(you.x_pos, you.y_pos, DNGN_FLOOR, 3, false, empty))

[5.558887]

[5.558964]

        if (empty_surrounds(you.x_pos, you.y_pos, DNGN_FLOOR, 3, false, empty)
            && monster->move_to_pos( coord_def(empty[0], empty[1])) )

Deletion in crawl-ref/source/spells3.cc at line 1200 [5.531613]

B:BD[5.558974] → [5.558974:559363]

            // clear old cell pointer -- why isn't there a function for moving a monster?
            mgrd[monster->x][monster->y] = NON_MONSTER;
            // set monster x,y to new value
            monster->x = empty[0];
            monster->y = empty[1];
            // set new monster grid pointer to this monster.
            mgrd[monster->x][monster->y] = monster_index(monster);

Deletion in crawl-ref/source/spells3.cc at line 1205 [5.531613]
B:BD[5.559553] → [5.559553:559563]
```
        {
```
Deletion in crawl-ref/source/spells3.cc at line 1206 [5.531613]
B:BD[5.559635] → [5.559635:559645]
```
        }
```
Insertion in crawl-ref/source/skills.cc at line 25 [5.745542]
[5.746095]
[5.746095]
```
#include "itemprop.h"
```
Insertion in crawl-ref/source/skills.cc at line 31 [5.745542]
[5.746155]
[5.746155]
```
#include "spl-cast.h"
```

Replacement in crawl-ref/source/skills.cc at line 39 [5.745542]

B:BD[5.746317] → [5.746317:746388]

// MAX_SPENDING_LIMIT is the maximum XP amount we allow the player to

[5.746317]

[5.746388]

// MAX_SPENDING_LIMIT is the maximum XP amount we allow the player to

Replacement in crawl-ref/source/skills.cc at line 42 [5.745542]

B:BD[5.746449] → [5.746449:746520]

// Note that they don't have to be equal, but it is important to make

[5.746449]

[5.746520]

// Note that they don't have to be equal, but it is important to make

Replacement in crawl-ref/source/skills.cc at line 48 [5.745542]
B:BD[5.746700] → [10.164539:164573]
```
static int exercise2( int exsk );
```
[5.746700]
[5.746736]
```
static int _exercise2( int exsk );
```

Replacement in crawl-ref/source/skills.cc at line 52 [5.745542]

B:BD[5.746888] → [5.746888:747033]

// experience level (which has a number of problems) so things shouldn't 
// seem too different to the player... but we still try to err on the

[5.746888]

[5.747033]

// experience level (which has a number of problems) so things shouldn't
// seem too different to the player... but we still try to err on the

Replacement in crawl-ref/source/skills.cc at line 57 [5.745542]

B:BD[5.747112] → [5.747112:747240]

    // The average starting skill total is actually lower, but 
    // some classes get about 2200, and they would probably be

[5.747112]

[5.747240]

    // The average starting skill total is actually lower, but
    // some classes get about 2200, and they would probably be

Replacement in crawl-ref/source/skills.cc at line 60 [5.745542]
B:BD[5.747311] → [5.747311:747332]
```
    int ret = 2200; 
```
[5.747311]
[5.747332]
```
    int ret = 2200;
```
Replacement in crawl-ref/source/skills.cc at line 92 [5.745542]
B:BD[5.748064] → [5.748064:748073]
```
    {   
```
[5.748064]
[5.748073]
```
    {
```
Replacement in crawl-ref/source/skills.cc at line 96 [5.745542]
B:BD[5.748135] → [5.748135:748166]
```
    for (i = 1; i <= 27; i++) 
```
[5.748135]
[5.748166]
```
    for (i = 1; i <= 27; i++)
```

Replacement in crawl-ref/source/skills.cc at line 98 [5.745542]

B:BD[5.748172] → [5.748172:748232]

        if (you.total_skill_points < skill_cost_needed(i))

[5.748172]

[5.748232]

        if (you.total_skill_points < skill_cost_needed(i))

Replacement in crawl-ref/source/skills.cc at line 100 [5.745542]
B:BD[5.748251] → [5.748251:748258]
```
    } 
```
[5.748251]
[5.748258]
```
    }
```

Replacement in crawl-ref/source/skills.cc at line 110 [5.745542]

B:BD[5.748437] → [5.748437:748561]

// skill_level      makes higher skills more expensive 
static int calc_skill_cost( int skill_cost_level, int skill_level )

[5.748437]

[5.748561]

// skill_level      makes higher skills more expensive
static int _calc_skill_cost( int skill_cost_level, int skill_level )

Replacement in crawl-ref/source/skills.cc at line 113 [5.745542]
B:BD[5.748563] → [5.748563:748598]
```
    int ret = 1 + skill_level;    
```
[5.748563]
[5.748598]
```
    int ret = 1 + skill_level;
```
Replacement in crawl-ref/source/skills.cc at line 167 [5.745542]
B:BD[10.164833] → [10.164833:164871]
```
            ret += exercise2( exsk );
```
[10.164833]
[10.164871]
```
            ret += _exercise2( exsk );
```

Replacement in crawl-ref/source/skills.cc at line 175 [5.745542]

B:BD[10.164938] → [10.164938:165095]

        mprf(MSGCH_DIAGNOSTICS,
                "Exercised %s (deg: %d) by %d",
                skill_name(exsk),
                deg,
                ret);

[10.164938]

[5.749765]

        mprf(MSGCH_DIAGNOSTICS, "Exercised %s (deg: %d) by %d",
                                skill_name(exsk), deg, ret);

Replacement in crawl-ref/source/skills.cc at line 183 [5.745542]
B:BD[5.749835] → [10.165123:165156]
```
static int exercise2( int exsk )
```
[5.749835]
[5.749870]
```
static int _exercise2( int exsk )
```

Replacement in crawl-ref/source/skills.cc at line 189 [5.745542]

B:BD[5.749982] → [5.749982:750062]

    int skill_change = calc_skill_cost(you.skill_cost_level, you.skills[exsk]);

[5.749982]

[5.750062]

    int skill_change = _calc_skill_cost(you.skill_cost_level, you.skills[exsk]);

Replacement in crawl-ref/source/skills.cc at line 226 [5.745542]
B:BD[15.2524] → [15.2524:2533]
```
        
```
[15.2524]
[15.2533]
Deletion in crawl-ref/source/skills.cc at line 287 [5.745542]
B:BD[5.753075] → [5.753075:753085]
```
        {
```
Deletion in crawl-ref/source/skills.cc at line 289 [5.745542]
B:BD[5.753165] → [5.753165:753175]
```
        }
```

Replacement in crawl-ref/source/skills.cc at line 297 [5.745542]

B:BD[5.753395] → [5.753395:753462]

    int spending_limit = (you.exp_available < MAX_SPENDING_LIMIT)

[5.753395]

[5.753462]

    int spending_limit = (you.exp_available < MAX_SPENDING_LIMIT)

Replacement in crawl-ref/source/skills.cc at line 308 [5.745542]

B:BD[5.753928] → [5.753928:754079]

        if ((exsk != SK_DARTS && exsk != SK_BOWS && exsk != SK_CROSSBOWS)
                                        || skill_change > you.exp_available)

[5.753928]

[5.754079]

        if (exsk != SK_DARTS && exsk != SK_BOWS && exsk != SK_CROSSBOWS
            || skill_change > you.exp_available)

Replacement in crawl-ref/source/skills.cc at line 382 [5.745542]

B:BD[5.756044] → [5.756044:756125]

       && you.total_skill_points >= skill_cost_needed(you.skill_cost_level + 1))

[5.756044]

[5.756125]

        && you.total_skill_points
               >= skill_cost_needed(you.skill_cost_level + 1))

Replacement in crawl-ref/source/skills.cc at line 386 [5.745542]
B:BD[5.756163] → [5.756163:756174]
```
    }     
```
[5.756163]
[5.756174]
```
    }
```

Replacement in crawl-ref/source/skills.cc at line 395 [5.745542]

B:BD[5.756348] → [5.756348:756424]

    exercised and how much you spent on it. Too irritating to be a regular

[5.756348]

[5.756424]

    exercised and how much you spent on it. Too irritating to be a regular

Replacement in crawl-ref/source/skills.cc at line 400 [5.745542]

B:BD[5.756467] → [16.8178:8240]

    mprf( MSGCH_DIAGNOSTICS, "Exercised %s * %d for %d xp.",

[5.756467]

[16.8240]

    mprf( MSGCH_DIAGNOSTICS, "Exercised %s * %d for %d xp.",

Replacement in crawl-ref/source/skills.cc at line 406 [5.745542]

B:BD[5.756669] → [14.1235:1337]

        (skill_exp_needed(you.skills[exsk] + 2) 
         * species_skills(exsk, you.species) / 100))

[5.756669]

[5.756802]

           (skill_exp_needed(you.skills[exsk] + 2)
            * species_skills(exsk, you.species) / 100))

Replacement in crawl-ref/source/skills.cc at line 409 [5.745542]
B:BD[5.756808] → [14.1338:1347]
```
        
```
[5.756808]
[10.165406]

Replacement in crawl-ref/source/skills.cc at line 431 [5.745542]

B:BD[5.756993] → [5.756993:757060]

        // Recalculate this skill's order for tie breaking skills

[5.756993]

[5.757060]

        // Recalculate this skill's order for tie breaking skills

Deletion in crawl-ref/source/skills.cc at line 448 [5.745542]
∅:D[10.166091] → [5.757574:757584]
B:BD[5.757574] → [5.757574:757584]
```
        {
```
Deletion in crawl-ref/source/skills.cc at line 449 [5.745542]
B:BD[5.757607] → [5.757607:757617]
```
        }
```

Replacement in crawl-ref/source/skills.cc at line 453 [5.745542]

B:BD[5.757708] → [5.757708:757886]

        if (exsk == SK_ARMOUR || exsk == SK_SHIELDS 
                || exsk == SK_ICE_MAGIC || exsk == SK_EARTH_MAGIC
                || you.duration[ DUR_TRANSFORMATION ] > 0)

[5.757708]

[5.757886]

        if (exsk == SK_ARMOUR || exsk == SK_SHIELDS
            || exsk == SK_ICE_MAGIC || exsk == SK_EARTH_MAGIC
            || you.duration[ DUR_TRANSFORMATION ] > 0)

Replacement in crawl-ref/source/skills.cc at line 460 [5.745542]

B:BD[5.757948] → [5.757948:758009]

        const unsigned char best = best_skill( SK_FIGHTING,

[5.757948]

[5.758009]

        const unsigned char best = best_skill( SK_FIGHTING,

Replacement in crawl-ref/source/skills.cc at line 463 [5.745542]

B:BD[5.758081] → [5.758081:758152]

        const unsigned char best_spell = best_skill( SK_SPELLCASTING,

[5.758081]

[5.758152]

        const unsigned char best_spell = best_skill( SK_SPELLCASTING,

Replacement in crawl-ref/source/skills.cc at line 466 [5.745542]

B:BD[5.758229] → [5.758229:758345]

        if ((exsk == SK_SPELLCASTING) 
                && (you.skills[exsk] == 1 && best_spell == SK_SPELLCASTING))

[5.758229]

[5.758345]

        if (exsk == SK_SPELLCASTING
            && you.skills[exsk] == 1 && best_spell == SK_SPELLCASTING)

Insertion in crawl-ref/source/skills.cc at line 473 [5.745542]

[5.758501]

            redraw_skill( you.your_name, player_title() );
        if (you.equip[EQ_WEAPON] != -1
            && item_is_staff( you.inv[you.equip[EQ_WEAPON]] ))

Replacement in crawl-ref/source/skills.cc at line 478 [5.745542]

B:BD[5.758511] → [5.758511:758570]

            redraw_skill( you.your_name, player_title() );

[5.758511]

[5.758570]

            maybe_identify_staff(you.inv[you.equip[EQ_WEAPON]]);

Insertion in crawl-ref/source/religion.cc at line 1017 [5.804403]

[17.2514]


// If there are no nearby followers, try to recall some on the level.
static int _beogh_blessing_recalling()
{
    std::vector<int> recalled;
    FixedVector < char, 2 > empty;
    empty[0] = empty[1] = 0;
    monsters *mon;
    for (int loopy = 0; loopy < MAX_MONSTERS; loopy++)
    {
        mon = &menv[loopy];
        if (mon->type == -1)
            continue;
        if (!is_orcish_follower(mon))
            continue;
        recalled.push_back(loopy);
    }
    if (recalled.empty())
        return 0;
    int count_recalled = 0;
    int total          = recalled.size();
    int amount         = 1 + random2(4) + random2(4);
    bool recall_all    = (total <= amount);

Insertion in crawl-ref/source/religion.cc at line 1047 [5.804403]

[17.2515]

[18.2528]

    for (unsigned int loopy = 0; loopy < recalled.size(); loopy++)
    {
        mon = &menv[recalled[loopy]];
        if (!recall_all && total == amount)
            recall_all = true;
        if (recall_all || random2(total) < amount)
        {
            if (empty_surrounds(you.x_pos, you.y_pos, DNGN_FLOOR, 3,
                                false, empty)
                && mon->move_to_pos( coord_def(empty[0], empty[1])) )
            {
                count_recalled++;
                amount--;
            }
            else
                break;    // no more room to place monsters
        }
        total--;
    }
    return (count_recalled);
}

Insertion in crawl-ref/source/religion.cc at line 1158 [5.804403]
[19.3046]
[4.3072]
```
        if (god != GOD_BEOGH)
            return false;
```

Replacement in crawl-ref/source/religion.cc at line 1162 [5.804403]

B:BD[4.3140] → [4.3140:3208]

        follower = choose_random_nearby_monster(0, suitable, true);

[4.3140]

[19.3111]

        follower = choose_random_nearby_monster(0, suitable, true, true);
        if (follower == NON_MONSTER)
        {
            // Try again, without the LOS restriction.
            follower = choose_random_nearby_monster(0, suitable, false, true);
        }

Replacement in crawl-ref/source/religion.cc at line 1172 [5.804403]

B:BD[20.3089] → [4.3247:3272]

            switch (god)

[20.3089]

[20.3118]

            // If no follower was chosen, either send
            // reinforcement or get out.
            // First, try to recall orcish followers on level.
            int  recalled   = _beogh_blessing_recalling();
            bool reinforced = false;
            if (recalled < 3)

Replacement in crawl-ref/source/religion.cc at line 1181 [5.804403]

B:BD[20.3132] → [4.3273:3305]

                case GOD_BEOGH:

[20.3132]

[21.2639]

                reinforced = _beogh_blessing_reinforcement();
                if (!reinforced || !recalled && coinflip())

Replacement in crawl-ref/source/religion.cc at line 1185 [5.804403]

B:BD[21.2657] → [4.3306:3488]

                    // If no follower was chosen, either send
                    // reinforcement or get out.
                    bool reinforced = _beogh_blessing_reinforcement();

[21.2657]

[22.2927]

                    // Try again, or possibly send more reinforcement.
                    if (_beogh_blessing_reinforcement())
                        reinforced = true;
                }
            }

Replacement in crawl-ref/source/religion.cc at line 1191 [5.804403]

B:BD[22.2928] → [4.3489:3767]

                    if (!reinforced || coinflip())
                    {
                        // Try again, or possibly send more reinforcement.
                        if (_beogh_blessing_reinforcement())
                            reinforced = true;
                    }

[22.2928]

[22.3219]

            if (recalled || reinforced)
            {
                pronoun = "";
                blessed = "you";

Replacement in crawl-ref/source/religion.cc at line 1196 [5.804403]

B:BD[22.3220] → [4.3768:4049]

∅:D[22.3278] → [20.3321:3339]

∅:D[4.4049] → [20.3321:3339]

B:BD[20.3321] → [20.3321:3339]

                    if (reinforced)
                    {
                        pronoun = "";
                        blessed = "you";
                        result  = "reinforcement";
                        goto blessing_done;
                    }
                    break;
                }

[22.3220]

[4.4050]

                if (recalled)
                    result = "recalling";
                else if (reinforced)
                    result = "reinforcement";
                else
                    result = "recalling and reinforcement";

Replacement in crawl-ref/source/religion.cc at line 1203 [5.804403]

B:BD[4.4051] → [4.4051:4103]

                default:
                    break;

[4.4051]

[20.3339]

                goto blessing_done;

Deletion in crawl-ref/source/religion.cc at line 1205 [5.804403]
B:BD[20.3353] → [20.3353:3354]
B:BD[20.3354] → [23.2601:2627]
```
            return false;
```
Deletion in crawl-ref/source/religion.cc at line 1206 [5.804403]
∅:D[19.3168] → [24.3945:3946]
∅:D[20.3365] → [24.3945:3946]
B:BD[25.2816] → [24.3945:3946]
Insertion in crawl-ref/source/religion.cc at line 1372 [5.804403]
[4.4159]
[4.4159]

Replacement in crawl-ref/source/religion.cc at line 1374 [5.804403]

B:BD[4.4192] → [4.4192:4237]

        whom = get_unique_monster_name(mon);

[4.4192]

[4.4237]

    {
        if (!mons_near(mon) || !player_monster_visible(mon))
            whom = "a follower";
        else
            whom = get_unique_monster_name(mon);
    }

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

B:BD[26.197896] → [10.344333:344362]

B:BD[10.344362] → [12.923:988]

            && (calc_unid ||
                item_type_known(you.inv[you.equip[EQ_WEAPON]])))

[26.197896]

[5.967700]

            && (calc_unid
                || item_type_known( you.inv[you.equip[EQ_WEAPON]] )))

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

B:BD[26.198074] → [27.2851:2880]

∅:D[27.2880] → [26.198104:198172]

B:BD[26.198104] → [26.198104:198172]

            && (calc_unid ||
                item_type_known(you.inv[you.equip[EQ_LEFT_RING]])))

[26.198074]

[5.967887]

            && (calc_unid
                || item_type_known( you.inv[you.equip[EQ_LEFT_RING]] )))

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

B:BD[26.198243] → [27.2925:2954]

∅:D[27.2954] → [26.198273:198341]

B:BD[26.198273] → [26.198273:198341]

            && (calc_unid ||
               item_type_known(you.inv[you.equip[EQ_RIGHT_RING]])))

[26.198243]

[5.968042]

            && (calc_unid
                || item_type_known( you.inv[you.equip[EQ_RIGHT_RING]] )))

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

B:BD[5.1007827] → [5.1007827:1007897]

            && you.experience > exp_needed(you.experience_level + 2))

[5.1007827]

[5.1007897]

           && you.experience > exp_needed(you.experience_level + 2))

Insertion in crawl-ref/source/monstuff.h at line 129 [5.1390580]

[4.4335]

                                 bool in_sight = true,

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

B:BD[4.4829] → [4.4829:4881]

                                 bool prefer_named)

[4.4829]

[28.3746]

                                 bool in_sight, bool prefer_named)

Replacement in crawl-ref/source/monstuff.cc at line 2604 [5.1396662]
B:BD[28.3864] → [28.3864:3916]
```
    int yend = you.y_pos + 9, xend = you.x_pos + 9;
```
[28.3864]
[28.3916]
```
    int yend   = you.y_pos + 9, xend   = you.x_pos + 9;
```

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

B:BD[28.3984] → [28.3984:4054]

    if ( xend >= GXM ) xend = GXM;
    if ( yend >= GYM ) yend = GYM;

[28.3984]

[28.4054]

    if ( xend >= GXM )  xend = GXM;
    if ( yend >= GYM )  yend = GYM;

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

B:BD[28.4164] → [28.4164:4226]

            if ( see_grid(x,y) && mgrd[x][y] != NON_MONSTER )

[28.4164]

[28.4226]

            if ( mgrd[x][y] != NON_MONSTER && (!in_sight || see_grid(x,y)) )

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

B:BD[4.5027] → [4.5027:5100]

                        && !get_unique_monster_name(&menv[mon]).empty())

[4.5027]

[4.5100]

                        && !(get_unique_monster_name(&menv[mon]).empty()))

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

[29.1675]

[30.4464]

}
bool monsters::move_to_pos(const coord_def &newpos)
{
    if (mgrd[newpos.x][newpos.y] != NON_MONSTER
        || you.x_pos == newpos.x && you.y_pos == newpos.y)
    {
        return (false);
    }
    // clear old cell pointer
    mgrd[x][y] = NON_MONSTER;
    // set monster x,y to new value
    x = newpos.x;
    y = newpos.y;
    // set new monster grid pointer to this monster.
    mgrd[x][y] = monster_index(this);
    return (true);

Insertion in crawl-ref/source/mon-util.cc at line 5504 [5.1699344]
[31.14773]
[32.1497]
Replacement in crawl-ref/source/item_use.cc at line 487 [5.2781507]
B:BD[5.2789187] → [33.5579:5621]
```
    if (item.base_type == OBJ_MISCELLANY)
```
[5.2789187]
[5.2789246]
```
    switch (item.base_type)
    {
    case OBJ_MISCELLANY:
```
Insertion in crawl-ref/source/item_use.cc at line 500 [5.2781507]
[5.2789484]
[5.2789484]
```
        break;
```
Replacement in crawl-ref/source/item_use.cc at line 503 [5.2781507]
B:BD[5.2789491] → [33.5677:5715]
```
    if (item.base_type == OBJ_STAVES)
```
[5.2789491]
[5.2789546]
```
    case OBJ_STAVES:
```
Replacement in crawl-ref/source/item_use.cc at line 512 [5.2781507]
B:BD[5.2789762] → [5.2789762:2789775]
```
        else
```
[5.2789762]
[5.2789775]
```
        else if (!maybe_identify_staff(item))
```

Replacement in crawl-ref/source/item_use.cc at line 514 [5.2781507]

B:BD[5.2789785] → [5.2789785:2789910]

B:BD[5.2789910] → [33.5820:5876]

            // Most staves only give curse status when wielded and
            // right now that's always "uncursed". -- bwr
            set_ident_flags( item, ISFLAG_KNOW_CURSE );

[5.2789785]

[5.2789983]

                // Give curse status when wielded.
                // Right now that's always "uncursed". -- bwr
                set_ident_flags( item, ISFLAG_KNOW_CURSE );

Insertion in crawl-ref/source/item_use.cc at line 518 [5.2781507]
[5.2789993]
[5.2789993]
```
        break;
```
Replacement in crawl-ref/source/item_use.cc at line 521 [5.2781507]
B:BD[5.2790000] → [33.5877:5916]
```
    if (item.base_type == OBJ_WEAPONS)
```
[5.2790000]
[5.2790056]
```
    case OBJ_WEAPONS:
```
Insertion in crawl-ref/source/item_use.cc at line 754 [5.2781507]
[34.49467]
[5.2796400]
```
        break;
```
Insertion in crawl-ref/source/item_use.cc at line 756 [5.2781507]
[5.2796406]
[10.734123]
```
    default:
        break;
    } // switch (base type)
```
Insertion in crawl-ref/source/externs.h at line 1056 [5.3270163]
[30.24114]
[35.3089]
```
    bool move_to_pos(const coord_def &newpos);
```

Two changes:

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-cast.h at line 58 [5.291319]

Replacement in crawl-ref/source/spl-cast.h at line 76 [5.291319]

Replacement in crawl-ref/source/spl-cast.cc at line 103 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 707 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 713 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 718 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 720 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 726 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 728 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 729 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 733 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 735 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 737 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 740 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 742 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 744 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 747 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 749 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 751 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 754 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 756 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 758 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 761 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 763 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 765 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 768 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 770 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 773 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 775 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 778 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 780 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 783 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 785 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 788 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 803 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 811 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 816 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 827 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 831 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1044 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1050 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1985 [5.293070]

Replacement in crawl-ref/source/spells3.cc at line 1150 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 1161 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 1166 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 1197 [5.531613]

Deletion in crawl-ref/source/spells3.cc at line 1200 [5.531613]

Deletion in crawl-ref/source/spells3.cc at line 1205 [5.531613]

Deletion in crawl-ref/source/spells3.cc at line 1206 [5.531613]

Insertion in crawl-ref/source/skills.cc at line 25 [5.745542]

Insertion in crawl-ref/source/skills.cc at line 31 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 39 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 42 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 48 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 52 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 57 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 60 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 92 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 96 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 98 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 100 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 110 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 113 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 167 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 175 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 183 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 189 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 226 [5.745542]

Deletion in crawl-ref/source/skills.cc at line 287 [5.745542]

Deletion in crawl-ref/source/skills.cc at line 289 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 297 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 308 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 382 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 386 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 395 [5.745542]

Replacement in crawl-ref/source/skills.cc at line 400 [5.745542]