fiddlerwoaroof/crawl - Change Q6WLX2VTRJ3LGDPWBH5WKQM7CIIJ5H6AEIKMXPF2PJA5JX5ZLUZQC

Clean up monster potion handling, fix bug where !oHW healing

also applied !oH healing, make monsters drink !oH when helpful, disallow potions for some monsters (currently only liches and mummies, more can be added.) Fixes 2035734, 2048006.

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

Created by haranp on September 18, 2008

Q6WLX2VTRJ3LGDPWBH5WKQM7CIIJ5H6AEIKMXPF2PJA5JX5ZLUZQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 4304 [4.1396662]
B:BD[4.1479205] → [5.6444:6497]
```
    // Yes, there is a logic to this ordering {dlb}:
```

Deletion in crawl-ref/source/monstuff.cc at line 4310 [4.1396662]

∅:D[6.1247] → [4.1479501:1479502]

∅:D[7.3183] → [4.1479501:1479502]

B:BD[4.1479501] → [4.1479501:1479502]

B:BD[4.1479502] → [7.3184:3292]

B:BD[7.3292] → [2.2574:2654]

∅:D[2.2654] → [8.463:464]

∅:D[7.3397] → [8.463:464]

B:BD[8.463] → [8.463:464]

B:BD[8.464] → [7.3398:3843]

∅:D[7.3843] → [4.1480344:1480345]

B:BD[4.1480344] → [4.1480344:1480345]

B:BD[4.1480345] → [7.3844:4027]

∅:D[7.4027] → [4.1480377:1480391]

B:BD[4.1480377] → [4.1480377:1480391]

B:BD[4.1480410] → [4.1480410:1480411]

B:BD[4.1480411] → [7.4028:4106]

∅:D[7.4106] → [9.2748:2762]

B:BD[9.2748] → [9.2748:2762]

B:BD[9.2762] → [7.4107:4191]

∅:D[7.4191] → [9.3058:3059]

B:BD[9.3058] → [9.3058:3059]

B:BD[9.3059] → [7.4192:4534]

∅:D[7.4534] → [9.3091:3105]

B:BD[9.3091] → [9.3091:3105]

B:BD[9.3105] → [7.4535:4589]

∅:D[7.4589] → [9.3124:3125]

B:BD[9.3124] → [9.3124:3125]

B:BD[9.3125] → [7.4590:4840]

∅:D[7.4840] → [9.3196:3197]

B:BD[9.3196] → [9.3196:3197]

B:BD[9.3197] → [7.4841:4911]

∅:D[7.4911] → [10.423743:423757]

B:BD[4.1480719] → [10.423743:423757]

B:BD[10.423757] → [7.4912:5019]

∅:D[7.5019] → [10.423987:424001]

B:BD[10.423987] → [10.423987:424001]

∅:D[10.424001] → [4.1480758:1480759]

B:BD[4.1480758] → [4.1480758:1480759]

B:BD[9.3458] → [9.3458:3486]

B:BD[9.3486] → [7.5020:5045]


    bool                    imbibed     = false;
    item_type_id_state_type ident       = ID_UNKNOWN_TYPE;
    bool was_visible = (mons_near(monster) && player_monster_visible(monster));
    const int potion_type = mitm[monster->inv[MSLOT_POTION]].sub_type;
    switch (potion_type)
    {
    case POT_HEALING:
    case POT_HEAL_WOUNDS:
        if (monster->hit_points <= monster->max_hit_points / 2
            && mons_holiness(monster) != MH_UNDEAD
            && mons_holiness(monster) != MH_NONLIVING
            && mons_holiness(monster) != MH_PLANT)
        {
            simple_monster_message(monster, " drinks a potion.");
            if (heal_monster(monster, 5 + random2(7), false))
            {
                simple_monster_message(monster, " is healed!");
                ident = ID_MON_TRIED_TYPE;
            }
            if (mitm[monster->inv[MSLOT_POTION]].sub_type == POT_HEAL_WOUNDS)
            {
                heal_monster(monster, 10 + random2avg(28, 3), false);
            }
            if (potion_type == POT_HEALING)
            {
                monster->del_ench(ENCH_POISON);
                monster->del_ench(ENCH_SICK);
                if (monster->del_ench(ENCH_CONFUSION))
                    ident = ID_KNOWN_TYPE;
                if (monster->del_ench(ENCH_ROT))
                    ident = ID_KNOWN_TYPE;
            }
            imbibed = true;
        }
        break;
    case POT_BLOOD:
    case POT_BLOOD_COAGULATED:
        if (mons_species(monster->type) == MONS_VAMPIRE
            && monster->hit_points <= monster->max_hit_points / 2)
        {
            simple_monster_message(monster, " drinks a potion.");
            if (heal_monster(monster, 10 + random2avg(28, 3), false))
            {
                simple_monster_message(monster, " is healed!");
                ident = ID_MON_TRIED_TYPE;
            }
            imbibed = true;
        }
        break;

Replacement in crawl-ref/source/monstuff.cc at line 4311 [4.1396662]
B:BD[7.5046] → [7.5046:5203]
∅:D[6.1575] → [4.1481035:1481054]
∅:D[11.2735] → [4.1481035:1481054]
∅:D[7.5203] → [4.1481035:1481054]
B:BD[4.1481035] → [4.1481035:1481054]
```
    case POT_SPEED:
        // Notice that these are the same odd colours used in
        // mons_ench_f2() {dlb}
        if (monster->has_ench(ENCH_HASTE))
            break;
```
[7.5046]
[4.1481064]
```
    bool rc = false;
```

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

B:BD[4.1481065] → [7.5204:5377]

∅:D[7.5377] → [4.1481086:1481096]

B:BD[4.1481086] → [4.1481086:1481096]

B:BD[4.1481096] → [7.5378:5448]

        beem.flavour = BEAM_HASTE;
        // intentional fall through
    case POT_INVISIBILITY:
        if (mitm[monster->inv[MSLOT_POTION]].sub_type == POT_INVISIBILITY)
        {
            if (monster->has_ench(ENCH_INVIS))
                break;

[4.1481065]

[12.2315]

    const int potion_idx = monster->inv[MSLOT_POTION];
    item_def& potion = mitm[potion_idx];
    const potion_type ptype = static_cast<potion_type>(potion.sub_type);

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

B:BD[12.2316] → [7.5449:5706]

∅:D[13.398] → [4.1481224:1481234]

∅:D[6.1699] → [4.1481224:1481234]

∅:D[12.2449] → [4.1481224:1481234]

∅:D[7.5706] → [4.1481224:1481234]

B:BD[4.1481224] → [4.1481224:1481234]

            beem.flavour = BEAM_INVISIBILITY;
            // Friendly monsters won't go invisible if the player can't
            // see invisible. We're being nice.
            if (mons_friendly(monster) && !player_see_invis(false))
                break;
        }

[12.2316]

[4.1481234]

    if (monster->can_drink_potion(ptype) && monster->should_drink_potion(ptype))
    {
        const bool was_visible = you.can_see(monster);

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

B:BD[4.1481235] → [7.5707:5983]

∅:D[7.5983] → [4.1481261:1481267]

B:BD[4.1481261] → [4.1481261:1481267]

        // Allow monsters to drink these when player in sight. (jpeg)
        simple_monster_message(monster, " drinks a potion.");
        mons_ench_f2(monster, beem);
        imbibed = true;
        if (beem.obvious_effect)
            ident = ID_KNOWN_TYPE;
        break;
    }

[4.1481235]

[7.5984]

        // Drink the potion.
        const item_type_id_state_type id = monster->drink_potion_effect(ptype);

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

B:BD[7.5985] → [7.5985:6077]

    if (imbibed)
    {
        if (dec_mitm_item_quantity( monster->inv[MSLOT_POTION], 1 ))

[7.5985]

[7.6077]

        // Give ID if necessary.
        if (was_visible && id != ID_UNKNOWN_TYPE)
            set_ident_type(OBJ_POTIONS, ptype, id);
        
        // Remove it from inventory.
        if (dec_mitm_item_quantity(potion_idx, 1))

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

B:BD[7.6128] → [7.6128:6385]

        else if (is_blood_potion(mitm[monster->inv[MSLOT_POTION]]))
            remove_oldest_blood_potion(mitm[monster->inv[MSLOT_POTION]]);
        if (ident != ID_UNKNOWN_TYPE && was_visible)
            set_ident_type(OBJ_POTIONS, potion_type, ident);

[7.6128]

[7.6385]

        else if (is_blood_potion(potion))
            remove_oldest_blood_potion(potion);

Insertion in crawl-ref/source/monstuff.cc at line 4335 [4.1396662]
[7.6426]
[7.6426]
```
        rc = true;
```
Replacement in crawl-ref/source/monstuff.cc at line 4337 [4.1396662]
B:BD[7.6432] → [7.6432:6455]
```
    return (imbibed);
```
[7.6432]
[7.6455]
```
    return rc;
```
Replacement in crawl-ref/source/monplace.cc at line 908 [4.1641732]
B:BD[4.1655774] → [14.30349:30400]
∅:D[14.30400] → [15.4665:4701]
B:BD[16.10133] → [15.4665:4701]
```
    if (monster_can_submerge(&menv[id], grd(fpos))
        && !one_chance_in(5))
    {
```
[4.1655774]
[17.11191]
```
    if (monster_can_submerge(&menv[id], grd(fpos)) && !one_chance_in(5))
```
Deletion in crawl-ref/source/monplace.cc at line 910 [4.1641732]
B:BD[17.11234] → [15.4702:4708]
```
    }
```
Replacement in crawl-ref/source/monplace.cc at line 2109 [4.1641732]
B:BD[18.5164] → [18.5164:5199]
```
            std::string aura = "";
```
[18.5164]
[19.3344]
```
            std::string aura;
```

Insertion in crawl-ref/source/mon-util.cc at line 6694 [4.1699344]

[20.6515]

}
bool monsters::can_drink_potion(potion_type ptype) const
{
    bool rc = true;
    switch (mons_species())
    {
    case MONS_LICH:
    case MONS_MUMMY:
        rc = false;
        break;
    default:
        break;
    }
    switch (ptype)
    {
    case POT_HEALING:
    case POT_HEAL_WOUNDS:
        if (holiness() == MH_UNDEAD
            || holiness() == MH_NONLIVING
            || holiness() == MH_PLANT)
        {
            rc = false;
        }
        break;
    case POT_BLOOD:
    case POT_BLOOD_COAGULATED:
        rc = (mons_species() == MONS_VAMPIRE);
        break;
    default:
        break;
    }
    return rc;

Insertion in crawl-ref/source/mon-util.cc at line 6732 [4.1699344]

[20.6518]

[3.2630]

bool monsters::should_drink_potion(potion_type ptype) const
{
    bool rc = false;
    switch (ptype)
    {
    case POT_HEALING:
        rc = (hit_points <= max_hit_points / 2)
            || has_ench(ENCH_POISON)
            || has_ench(ENCH_SICK)
            || has_ench(ENCH_CONFUSION)
            || has_ench(ENCH_ROT);
        break;
    case POT_HEAL_WOUNDS:
        rc = (hit_points <= max_hit_points / 2);
        break;
    case POT_BLOOD:
    case POT_BLOOD_COAGULATED:
        rc = (hit_points <= max_hit_points / 2);
        break;
    case POT_SPEED:
        rc = !has_ench(ENCH_HASTE);
        break;
    case POT_INVISIBILITY:
        // We're being nice: friendlies won't go invisible
        // if the player won't be able to see them.
        rc = !has_ench(ENCH_INVIS)
            && (player_see_invis(false) || !mons_friendly(this));
        break;
    default:
        break;
    }
    return rc;
}
// Return the ID status gained.       
item_type_id_state_type monsters::drink_potion_effect(potion_type ptype)
{
    simple_monster_message(this, " drinks a potion.");
    item_type_id_state_type ident = ID_MON_TRIED_TYPE;
    switch (ptype)
    {
    case POT_HEALING:
    {
        heal(5 + random2(7));
        simple_monster_message(this, " is healed!");
        
        const enchant_type cured_enchants[] = {
            ENCH_POISON, ENCH_SICK, ENCH_CONFUSION, ENCH_ROT
        };
        
        // We can differentiate healing and heal wounds (and blood,
        // for vampires) by seeing if any status ailments are cured.
        for (unsigned int i = 0; i < ARRAYSZ(cured_enchants); ++i)
            if (del_ench(cured_enchants[i]))                
                ident = ID_KNOWN_TYPE;
    }
    break;
    case POT_HEAL_WOUNDS:
        heal(10 + random2avg(28, 3));
        simple_monster_message(this, " is healed!");
        break;
    case POT_BLOOD:
    case POT_BLOOD_COAGULATED:
        if (mons_species() == MONS_VAMPIRE)
        {
            heal(10 + random2avg(28, 3));
            simple_monster_message(this, " is healed!");
        }
        break;
    case POT_SPEED:
    {
        // XXX FIXME Extract haste() function from mons_ench_f2().
        bolt beem;
        beem.target = pos();
        beem.flavour = BEAM_HASTE;
        mons_ench_f2(this, beem);
        if (beem.obvious_effect)
            ident = ID_KNOWN_TYPE;
        break;
    }
    case POT_INVISIBILITY:
    {
        // XXX FIXME Extract go_invis() function from mons_ench_f2().
        bolt beem;
        beem.target = pos();
        beem.flavour = BEAM_INVISIBILITY;
        mons_ench_f2(this, beem);
        if (beem.obvious_effect)
            ident = ID_KNOWN_TYPE;
        break;
    }
    default:
        break;
    }
    
    return ident;
}

Deletion in crawl-ref/source/itemname.h at line 29 [4.2661173]

B:BD[21.89158] → [21.89158:89311]

};
enum item_type_id_state_type  // used for values in id[4][50]
{
    ID_UNKNOWN_TYPE = 0,
    ID_MON_TRIED_TYPE,
    ID_TRIED_TYPE,
    ID_KNOWN_TYPE

Deletion in crawl-ref/source/it_use2.h at line 14 [4.2902964]

B:BD[4.2903280] → [4.2903280:2903281]

B:BD[4.2903281] → [21.90603:91232]

B:BD[21.91247] → [21.91247:91267]

B:BD[21.91267] → [22.10094:10214]

∅:D[22.10214] → [21.91283:91286]

B:BD[21.91283] → [21.91283:91286]


enum potion_type
{
    POT_HEALING,                       //    0
    POT_HEAL_WOUNDS,
    POT_SPEED,
    POT_MIGHT,
    POT_GAIN_STRENGTH,
    POT_GAIN_DEXTERITY,                //    5
    POT_GAIN_INTELLIGENCE,
    POT_LEVITATION,
    POT_POISON,
    POT_SLOWING,
    POT_PARALYSIS,                     //   10
    POT_CONFUSION,
    POT_INVISIBILITY,
    POT_PORRIDGE,
    POT_DEGENERATION,
    POT_DECAY,                         //   15
    POT_WATER,
    POT_EXPERIENCE,
    POT_MAGIC,
    POT_RESTORE_ABILITIES,
    POT_STRONG_POISON,                 //   20
    POT_BERSERK_RAGE,
    POT_CURE_MUTATION,
    POT_MUTATION,
    POT_RESISTANCE,
    POT_BLOOD,                         //   25
    POT_BLOOD_COAGULATED,
    NUM_POTIONS                        //   27
};

Insertion in crawl-ref/source/externs.h at line 1144 [4.3270163]

[23.10940]

[17.31831]


    bool can_drink_potion(potion_type ptype) const;
    bool should_drink_potion(potion_type ptype) const;
    item_type_id_state_type drink_potion_effect(potion_type ptype);

Insertion in crawl-ref/source/enum.h at line 1326 [4.3287960]

[24.26083]

[4.3324296]

};
enum item_type_id_state_type
{
    ID_UNKNOWN_TYPE = 0,
    ID_MON_TRIED_TYPE,
    ID_TRIED_TYPE,
    ID_KNOWN_TYPE

Insertion in crawl-ref/source/enum.h at line 2258 [4.3287960]

[10.925058]

[10.925803]

};
enum potion_type
{
    POT_HEALING,                       //    0
    POT_HEAL_WOUNDS,
    POT_SPEED,
    POT_MIGHT,
    POT_GAIN_STRENGTH,
    POT_GAIN_DEXTERITY,                //    5
    POT_GAIN_INTELLIGENCE,
    POT_LEVITATION,
    POT_POISON,
    POT_SLOWING,
    POT_PARALYSIS,                     //   10
    POT_CONFUSION,
    POT_INVISIBILITY,
    POT_PORRIDGE,
    POT_DEGENERATION,
    POT_DECAY,                         //   15
    POT_WATER,
    POT_EXPERIENCE,
    POT_MAGIC,
    POT_RESTORE_ABILITIES,
    POT_STRONG_POISON,                 //   20
    POT_BERSERK_RAGE,
    POT_CURE_MUTATION,
    POT_MUTATION,
    POT_RESISTANCE,
    POT_BLOOD,                         //   25
    POT_BLOOD_COAGULATED,
    NUM_POTIONS                        //   27