fiddlerwoaroof/crawl - Change H2K23HSTUDUCQ3PN3WZ3FDVOAQE4BZWLQY7JM66UQSRSS352WOHAC

Simplify checks for whether players/monsters can hit monsters, and make

sure that the latter can properly hit monsters submerged in shallow water if they have tentacles.

Created by David Lawrence Ramsey on September 28, 2009

H2K23HSTUDUCQ3PN3WZ3FDVOAQE4BZWLQY7JM66UQSRSS352WOHAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 1096 [4.962854]

B:BD[3.3352] → [2.3051:3222]

    if (grd(mon->pos()) == DNGN_SHALLOW_WATER)
    {
        const item_def *weapon = you.weapon();
        return (weapon && weapon_skill(*weapon) == SK_POLEARMS);
    }

[3.3352]

[3.3423]

    if (grd(mon->pos()) != DNGN_SHALLOW_WATER)
        return (false);

Replacement in crawl-ref/source/player.cc at line 1099 [4.962854]

B:BD[3.3424] → [2.3223:3243]

    return (false);

[3.3424]

[4.971972]

    const item_def *weapon = you.weapon();
    return (weapon && weapon_skill(*weapon) == SK_POLEARMS);

Replacement in crawl-ref/source/monstuff.cc at line 2797 [4.1396662]

B:BD[2.3769] → [2.3769:3803]

    if (!mons_is_submerged(targ))

[2.3769]

[2.3803]

    if (!mons_is_submerged(targ) || monster->has_damage_type(DVORP_TENTACLE))

Replacement in crawl-ref/source/monstuff.cc at line 2800 [4.1396662]

B:BD[2.3827] → [2.3827:3998]

    if (grd(targ->pos()) == DNGN_SHALLOW_WATER)
    {
        item_def *weapon = monster->weapon();
        return (weapon && weapon_skill(*weapon) == SK_POLEARMS);
    }

[2.3827]

[2.3998]

    if (grd(targ->pos()) != DNGN_SHALLOW_WATER)
        return (false);

Replacement in crawl-ref/source/monstuff.cc at line 2803 [4.1396662]

B:BD[2.3999] → [2.3999:4054]

    return (monster->has_damage_type(DVORP_TENTACLE));

[2.3999]

[5.6794]

    const item_def *weapon = monster->weapon();
    return (weapon && weapon_skill(*weapon) == SK_POLEARMS);