fiddlerwoaroof/crawl - Change Z2GW2JB2K2MS67IU7O566FX7PSJPZIFN52PWECBBSJMB4LS6HXUQC

Generalize monsters::can_drink_potion(). First, monsters that don't

have at least MONUSE_STARTING_EQUIPMENT can't drink them, as they can't use them anyway (which covers wraiths; the same check is also done in monsters::should_drink_potion()). Second, skeletal monsters in general can't use them, since they require digestion of some type (which covers skeletal warriors). Third, insubstantial monsters can't use them, for the same reason (since all insubstantial monsters use, at most, MONUSE_OPEN_DOORS).

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

Created by dolorous on January 2, 2009

Z2GW2JB2K2MS67IU7O566FX7PSJPZIFN52PWECBBSJMB4LS6HXUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 7458 [4.1699344]

B:BD[3.3428] → [3.3428:3477]

    bool rc = true;
    switch (mons_species())

[3.3428]

[3.3477]

    if (mons_itemuse(this) >= MONUSE_STARTING_EQUIPMENT)

Replacement in crawl-ref/source/mon-util.cc at line 7460 [4.1699344]

B:BD[3.3483] → [3.3483:3524]

B:BD[3.3524] → [2.2633:2687]

∅:D[2.2687] → [3.3524:3593]

B:BD[3.3524] → [3.3524:3593]

    case MONS_LICH:
    case MONS_MUMMY:
    case MONS_SKELETAL_WARRIOR:
    case MONS_WRAITH:
        rc = false;
        break;
    default:
        break;
    }

[3.3483]

[3.3593]

        if (mons_is_skeletal(type) || mons_is_insubstantial(type)
            || mons_species() == MONS_LICH || mons_species() == MONS_MUMMY)
        {
            return (false);
        }

Replacement in crawl-ref/source/mon-util.cc at line 7466 [4.1699344]

B:BD[3.3594] → [3.3594:3784]

    switch (ptype)
    {
    case POT_HEALING:
    case POT_HEAL_WOUNDS:
        if (holiness() == MH_UNDEAD
            || holiness() == MH_NONLIVING
            || holiness() == MH_PLANT)

[3.3594]

[3.3784]

        switch (ptype)

Replacement in crawl-ref/source/mon-util.cc at line 7468 [4.1699344]

B:BD[3.3794] → [3.3794:3818]

            rc = false;

[3.3794]

[3.3818]

        case POT_HEALING:
        case POT_HEAL_WOUNDS:
            return (holiness() != MH_UNDEAD
                    && holiness() != MH_NONLIVING
                    && holiness() != MH_PLANT);
        case POT_BLOOD:
        case POT_BLOOD_COAGULATED:
            return (mons_species() != MONS_VAMPIRE);
        default:
            break;

Replacement in crawl-ref/source/mon-util.cc at line 7479 [4.1699344]

B:BD[3.3828] → [3.3828:3984]

        break;
    case POT_BLOOD:
    case POT_BLOOD_COAGULATED:
        rc = (mons_species() == MONS_VAMPIRE);
        break;
    default:
        break;

[3.3828]

[3.3984]


        return (true);

Replacement in crawl-ref/source/mon-util.cc at line 7483 [4.1699344]
B:BD[3.3991] → [3.3991:4006]
```
    return rc;
```
[3.3991]
[5.6515]
```
    return (false);
```