fiddlerwoaroof/crawl - Change QEM5F3M5TVOHKIPY75SUYD2EIGTTTMAC7PXIOKREQQMA7YLHQIGQC

Fix 2822832: temporary brands not being removed when thrown with LRET_FUMBLED

         plus: thrown weapon permabrand being removed when
               DUR_WEAPON_BRAND is active
         plus: double messaging of &quot;You are now empty-handed.&quot;

Fix 2810517: Added a pre-ability requirements check that handles Lugonu's enter/exit abyss, berserking, recite, breath attacks and some more. If the requirements aren't met, the check fails before the success check, thus no turn is wasted.

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

Created by j-p-e-g on July 20, 2009

QEM5F3M5TVOHKIPY75SUYD2EIGTTTMAC7PXIOKREQQMA7YLHQIGQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells3.cc at line 96 [10.531613]

B:BD[10.533434] → [3.1054:1153]

    if (!force &&
        random2(you.skills[SK_SPELLCASTING]) < random2(spell_difficulty(spell)))

[10.533434]

[3.1153]

    if (!force
        && random2(you.skills[SK_SPELLCASTING])
           < random2(spell_difficulty(spell)))

Replacement in crawl-ref/source/item_use.h at line 138 [10.2777340]

B:BD[10.2780645] → [11.3715:3834]

bool wield_weapon(bool auto_wield, int slot = -1, bool show_we_messages = true,
                  bool force = false);

[10.2780645]

[10.2780681]

bool wield_weapon(bool auto_wield, int slot = -1,
                  bool show_weff_messages = true, bool force = false,
                  bool show_unwield_msg = true);

Replacement in crawl-ref/source/item_use.cc at line 227 [10.2781507]
B:BD[11.4016] → [11.4016:4046]
```
                  bool force)
```
[11.4016]
[10.2783742]
```
                  bool force, bool show_unwield_msg)
```

Replacement in crawl-ref/source/item_use.cc at line 307 [10.2781507]

B:BD[12.4293] → [13.2640:2682]

            canned_msg(MSG_EMPTY_HANDED);

[12.4293]

[14.1144]

            if (show_unwield_msg)
                canned_msg(MSG_EMPTY_HANDED);

Replacement in crawl-ref/source/item_use.cc at line 2224 [10.2781507]

B:BD[15.3032] → [15.3032:3162]

    if (you.duration[DUR_WEAPON_BRAND] && projected == LRET_THROWN)
        set_item_ego_type( item, OBJ_WEAPONS, SPWPN_NORMAL );

[15.3032]

[16.3069]

    if (you.duration[DUR_WEAPON_BRAND] && projected != LRET_LAUNCHED
        && throw_2 == you.equip[EQ_WEAPON])
    {
        set_item_ego_type(item, OBJ_WEAPONS, SPWPN_NORMAL);
    }

Replacement in crawl-ref/source/item_use.cc at line 2314 [10.2781507]

B:BD[17.741868] → [5.2770:2823]

        if (!wield_weapon(true, PROMPT_GOT_SPECIAL))

[17.741868]

[5.2823]

        if (!wield_weapon(true, PROMPT_GOT_SPECIAL, true, false, false))

Replacement in crawl-ref/source/it_use2.cc at line 489 [10.2904329]

B:BD[10.2915595] → [18.807:877]

                set_item_ego_type( item, OBJ_WEAPONS, SPWPN_NORMAL );

[10.2915595]

[19.3607]

                set_item_ego_type(item, OBJ_WEAPONS, SPWPN_NORMAL);

Insertion in crawl-ref/source/abyss.h at line 17 [10.4481533]
[20.16158]
[21.13952]
```
bool is_level_incorruptible();
```
Replacement in crawl-ref/source/abyss.cc at line 907 [10.4482606]
B:BD[21.20935] → [22.42131:42169]
```
static bool _is_level_incorruptible()
```
[21.20935]
[21.20972]
```
bool is_level_incorruptible()
```
Replacement in crawl-ref/source/abyss.cc at line 935 [10.4482606]
B:BD[21.21174] → [22.42241:42276]
```
    if (_is_level_incorruptible())
```
[21.21174]
[21.21208]
```
    if (is_level_incorruptible())
```

Insertion in crawl-ref/source/abl-show.cc at line 965 [10.4494389]

[23.15398]

[10.4507990]


// Check prerequisites for a number of abilities.
// Abort any attempt if these cannot be met, without losing the turn.
// TODO: Many more cases need to be added!
static bool _check_ability_possible(const ability_def& abil,
                                    bool hungerCheck = true)
{
    // Don't insta-starve the player.
    // (Happens at 100, losing consciousness possible from 500 downward.)
    if (hungerCheck && you.species != SP_VAMPIRE)
    {
        const int expected_hunger = you.hunger - abil.food_cost * 2;
#ifdef DEBUG_DIAGNOSTICS
        mprf(MSGCH_DIAGNOSTICS,
             "hunger: %d, max. food_cost: %d, expected hunger: %d",
             you.hunger, abil.food_cost * 2, expected_hunger);
#endif
        // Safety margin for natural hunger, mutations etc.
        if (expected_hunger <= 150)
        {
            mpr("You're too hungry.");
            return (false);
        }
    }
    switch (abil.ability)
    {
    case ABIL_ZIN_RECITE:
    {
        const int result = check_recital_audience();
        if (result < 0)
        {
            mpr("There's no appreciative audience!");
            return (false);
        }
        else if (result < 1)
        {
            mpr("There's no-one here to preach to!");
            return (false);
        }
        return (true);
    }
    case ABIL_ZIN_CURE_ALL_MUTATIONS:
        return (how_mutated());
    case ABIL_ZIN_SANCTUARY:
        if (env.sanctuary_time)
        {
            mpr("There's already a sanctuary in place on this level.");
            return (false);
        }
        return (true);
    case ABIL_ELYVILON_PURIFICATION:
        if (!you.disease && !you.rotting && !you.duration[DUR_POISONING]
            && !you.duration[DUR_CONF] && !you.duration[DUR_SLOW]
            && !you.duration[DUR_PARALYSIS] && !you.duration[DUR_PETRIFIED])
        {
            mpr("Nothing ails you!");
            return (false);
        }
        return (true);
    case ABIL_ELYVILON_RESTORATION:
    case ABIL_MUMMY_RESTORATION:
        if (you.strength == you.max_strength
            && you.intel == you.max_intel
            && you.dex == you.max_dex
            && (abil.ability == ABIL_MUMMY_RESTORATION || !player_rotted()))
        {
            mprf("You don't need to restore your stats%s!",
                 abil.ability == ABIL_ELYVILON_RESTORATION ? " or hit points"
                                                           : "");
            return (false);
        }
        return (true);
    case ABIL_LUGONU_ABYSS_EXIT:
        if (you.level_type != LEVEL_ABYSS)
        {
            mpr("You aren't in the Abyss!");
            return (false);
        }
        return (true);
    case ABIL_LUGONU_CORRUPT:
        return (!is_level_incorruptible());
    case ABIL_LUGONU_ABYSS_ENTER:
        if (you.level_type == LEVEL_ABYSS)
        {
            mpr("You're already here!");
            return (false);
        }
        else if (you.level_type == LEVEL_PANDEMONIUM)
        {
            mpr("That doesn't work from Pandemonium.");
            return (false);
        }
        return (true);
    case ABIL_SIF_MUNA_FORGET_SPELL:
        if (you.spell_no == 0)
        {
            mpr("You don't know any spells.");
            return (false);
        }
        return (true);

Insertion in crawl-ref/source/abl-show.cc at line 1074 [10.4494389]

[10.4507991]

[24.4438]

    case ABIL_SPIT_POISON:
    case ABIL_BREATHE_FIRE:
    case ABIL_BREATHE_FROST:
    case ABIL_BREATHE_POISON:
    case ABIL_BREATHE_LIGHTNING:
    case ABIL_BREATHE_POWER:
    case ABIL_BREATHE_STICKY_FLAME:
    case ABIL_BREATHE_STEAM:
        if (you.duration[DUR_BREATH_WEAPON])
        {
            canned_msg(MSG_CANNOT_DO_YET);
            return (false);
        }
        return (true);
    case ABIL_EVOKE_BERSERK:
    case ABIL_TROG_BERSERK:
        if (you.hunger_state < HS_SATIATED)
        {
            mpr("You're too hungry to berserk.");
            return (false);
        }
        return (you.can_go_berserk(true) && berserk_check_wielded_weapon());
    case ABIL_MAPPING:
        if (player_mutation_level(MUT_MAPPING) < 3
            && (you.level_type == LEVEL_PANDEMONIUM
                || !player_in_mappable_area()))
        {
            mpr("You feel momentarily disoriented.");
            return (false);
        }
        return (true);
    case ABIL_FLY_II:
        if (you.duration[DUR_EXHAUSTED])
        {
            mpr("You're too exhausted to fly.");
            return (false);
        }
        else if (you.burden_state != BS_UNENCUMBERED)
        {
            mpr("You're carrying too much weight to fly.");
            return (false);
        }
        return (true);
    case ABIL_TORMENT:
        if (you.is_undead)
        {
            mpr("The unliving cannot use this ability.");
            return (false);
        }
        return (true);
    case ABIL_EVOKE_TURN_INVISIBLE:     // ring, randarts, darkness items
        if (you.hunger_state < HS_SATIATED)
        {
            mpr("You're too hungry to turn invisible.");
            return (false);
        }
        return (true);
    default:
        return (true);
    }
}

Replacement in crawl-ref/source/abl-show.cc at line 1208 [10.4494389]
B:BD[10.4508939] → [23.15649:15692]
```
    if (!enough_hp( abil.hp_cost, false ))
```
[10.4508939]
[25.761]
```
    if (!enough_hp(abil.hp_cost, false))
```
Replacement in crawl-ref/source/abl-show.cc at line 1214 [10.4494389]
∅:D[26.7072] → [25.842:905]
B:BD[25.842] → [25.842:905]
```
    if (tal.which == ABIL_ZIN_SANCTUARY && env.sanctuary_time)
```
[26.7072]
[27.41768]
```
    if (!_check_ability_possible(abil, hungerCheck))
```
Deletion in crawl-ref/source/abl-show.cc at line 1216 [10.4494389]
B:BD[27.41774] → [2.2863:2931]
```
        mpr("There's already a sanctuary in place on this level.");
```

Deletion in crawl-ref/source/abl-show.cc at line 1220 [10.4494389]

B:BD[26.7074] → [28.11893:12005]

∅:D[28.12005] → [29.5000:5050]

B:BD[30.3092] → [29.5000:5050]

∅:D[29.5050] → [30.3113:3383]

B:BD[30.3113] → [30.3113:3383]

B:BD[30.3383] → [28.12006:12066]

∅:D[28.12066] → [31.7996:8032]

B:BD[30.3443] → [31.7996:8032]

∅:D[31.8032] → [30.3612:3622]

B:BD[30.3612] → [30.3612:3622]

B:BD[30.3622] → [31.8033:8072]

∅:D[31.8072] → [30.3622:3710]

B:BD[30.3622] → [30.3622:3710]

∅:D[30.3710] → [25.975:976]

B:BD[23.15717] → [25.975:976]

B:BD[25.976] → [28.12067:12264]

    // Don't insta-starve the player.
    // (Happens at 100, losing consciousness possible from 500 downward.)
    if (hungerCheck && you.species != SP_VAMPIRE)
    {
        const int expected_hunger = you.hunger - abil.food_cost * 2;
#ifdef DEBUG_DIAGNOSTICS
        mprf(MSGCH_DIAGNOSTICS,
             "hunger: %d, max. food_cost: %d, expected hunger: %d",
             you.hunger, abil.food_cost * 2, expected_hunger);
#endif
        // Safety margin for natural hunger, mutations etc.
        if (expected_hunger <= 150)
        {
            mpr("You're too hungry.");
            crawl_state.zero_turns_taken();
            return (false);
        }
    }
    if ((tal.which == ABIL_EVOKE_BERSERK || tal.which == ABIL_TROG_BERSERK)
        && !berserk_check_wielded_weapon())
    {
        crawl_state.zero_turns_taken();
        return (false);
    }

Deletion in crawl-ref/source/abl-show.cc at line 1311 [10.4494389]
∅:D[32.37600] → [10.4510319:4510455]
B:BD[10.4510319] → [10.4510319:4510455]
B:BD[10.4510455] → [32.37601:37602]
```
        if (you.duration[DUR_BREATH_WEAPON])
        {
            canned_msg(MSG_CANNOT_DO_YET);
            return (false);
        }
```

Deletion in crawl-ref/source/abl-show.cc at line 1330 [10.4494389]

∅:D[33.5979] → [34.35778:35873]

B:BD[35.1475] → [34.35778:35873]

∅:D[34.35873] → [36.1885:1937]

B:BD[36.1885] → [36.1885:1937]

B:BD[36.1937] → [37.15863:15911]

∅:D[36.1992] → [35.1601:1704]

∅:D[37.15911] → [35.1601:1704]

B:BD[35.1601] → [35.1601:1704]

        if (abil.ability == ABIL_MAPPING
            && player_mutation_level(MUT_MAPPING) < 3
            && (you.level_type == LEVEL_PANDEMONIUM
                || !player_in_mappable_area()))
        {
            mpr("You feel momentarily disoriented.");
            return (false);
        }

Replacement in crawl-ref/source/abl-show.cc at line 1366 [10.4494389]
B:BD[10.4512215] → [38.4133:4212]
∅:D[39.286] → [10.4512320:4512373]
∅:D[38.4212] → [10.4512320:4512373]
∅:D[32.37980] → [10.4512320:4512373]
∅:D[17.1282856] → [10.4512320:4512373]
B:BD[10.4512320] → [10.4512320:4512373]
```
        if (you.duration[DUR_BREATH_WEAPON] && abil.ability != ABIL_SPIT_ACID)
        {
            canned_msg(MSG_CANNOT_DO_YET);
```
[10.4512215]
[10.4512373]
```
        beam.range = _calc_breath_ability_range(abil.ability);
        if (!spell_direction(abild, beam))
```

Deletion in crawl-ref/source/abl-show.cc at line 1369 [10.4494389]

B:BD[10.4512401] → [10.4512401:4512411]

B:BD[10.4512411] → [38.4213:4303]

B:BD[38.4303] → [4.3059:3106]

∅:D[4.3106] → [38.4384:4426]

B:BD[38.4384] → [38.4384:4426]

        }
        else
        {
            beam.range = _calc_breath_ability_range(abil.ability);
            if (!spell_direction(abild, beam))
                return (false);
        }

Replacement in crawl-ref/source/abl-show.cc at line 1465 [10.4494389]

B:BD[10.4515011] → [7.3363:3427]

∅:D[7.3427] → [40.3048:3216]

B:BD[40.3048] → [40.3048:3216]

∅:D[40.3216] → [10.4515011:4515153]

B:BD[10.4515011] → [10.4515011:4515153]

B:BD[10.4515153] → [6.2916:2960]

∅:D[6.2960] → [40.3263:3291]

B:BD[40.3263] → [40.3263:3291]

∅:D[40.3291] → [10.4515153:4515154]

B:BD[10.4515153] → [10.4515153:4515154]

B:BD[10.4515154] → [17.1282969:1283014]

B:BD[17.1283014] → [40.3292:3357]

        // FIXME: This is not the best way to do stuff, because
        // you have a chance of failing the evocation test, in
        // which case you'll lose MP, etc.
        // We should add a pre-failure-test check in general.
        if (you.hunger_state < HS_SATIATED)
        {
            mpr("You're too hungry to berserk.");
            return (false);
        }
        else if (!you.can_go_berserk(true))
            return (false);
        // only exercise if berserk succeeds
        // because of the test above, this should always happen,

[10.4515011]

[6.2961]

        // Only exercise if berserk succeeds.
        // Because of the test above, this should always happen,

Replacement in crawl-ref/source/abl-show.cc at line 1482 [10.4494389]

∅:D[40.3482] → [41.20325:20366]

∅:D[26.7255] → [41.20325:20366]

B:BD[10.4515667] → [41.20325:20366]

∅:D[41.20366] → [10.4515694:4515966]

B:BD[10.4515694] → [10.4515694:4515966]

B:BD[10.4515966] → [6.3139:3187]

        if (you.duration[DUR_EXHAUSTED])
        {
            mpr("You're too exhausted to fly.");
            return (false);
        }
        else if (you.burden_state != BS_UNENCUMBERED)
        {
            mpr("You're carrying too much weight to fly.");
            return (false);
        }
        else
            cast_fly(you.experience_level * 2);

[26.7255]

[10.4516104]

        cast_fly(you.experience_level * 2);

Deletion in crawl-ref/source/abl-show.cc at line 1501 [10.4494389]

B:BD[10.4516625] → [10.4516625:4516759]

        if (you.is_undead)
        {
            mpr("The unliving cannot use this ability.");
            return (false);
        }

Deletion in crawl-ref/source/abl-show.cc at line 1548 [10.4494389]

B:BD[10.4518280] → [10.4518280:4518430]

        if (you.hunger_state < HS_SATIATED)
        {
            mpr("You're too hungry to turn invisible.");
            return (false);
        }

Deletion in crawl-ref/source/abl-show.cc at line 1581 [10.4494389]

B:BD[42.9216] → [43.5892:5973]

B:BD[43.5973] → [44.2836:2890]

∅:D[44.2890] → [43.6026:6093]

B:BD[43.6026] → [43.6026:6093]

∅:D[43.6093] → [42.9255:9357]

B:BD[42.9255] → [42.9255:9357]

        int result = check_recital_audience();
        if (result < 0)
        {
            mpr("There's no appreciative audience!");
            return (false);
        }
        else if (result < 1)
        {
            mpr("There's no-one here to preach to!");
            return (false);
        }

Deletion in crawl-ref/source/abl-show.cc at line 1790 [10.4494389]

∅:D[26.7420] → [10.4527006:4527149]

B:BD[10.4527006] → [10.4527006:4527149]

        if (you.hunger_state < HS_SATIATED)
        {
            mpr("You're too hungry to berserk.");
            return (false);
        }

Replacement in crawl-ref/source/abl-show.cc at line 1806 [10.4494389]

B:BD[10.4527517] → [10.4527517:4527555]

        cast_selective_amnesia(true);

[10.4527517]

[10.4527555]

        if (!cast_selective_amnesia(true))
            return (false);

Deletion in crawl-ref/source/abl-show.cc at line 1865 [10.4494389]
B:BD[45.2460] → [46.11923:11966]
∅:D[46.11966] → [47.5502:5557]
B:BD[47.5502] → [47.5502:5557]
B:BD[47.5557] → [48.3202:3258]
∅:D[48.3258] → [47.5610:5620]
B:BD[47.5610] → [47.5610:5620]
B:BD[47.5620] → [8.3530:3531]
```
        if (you.level_type != LEVEL_ABYSS)
        {
            mpr("You aren't in the Abyss!");
            return (false);       // Don't incur costs.
        }
```
Deletion in crawl-ref/source/abl-show.cc at line 1902 [10.4494389]
∅:D[45.2716] → [47.6387:6481]
∅:D[49.3610] → [47.6387:6481]
B:BD[47.6387] → [47.6387:6481]
B:BD[47.6481] → [48.3259:3287]
∅:D[48.3287] → [47.6507:6637]
B:BD[47.6507] → [47.6507:6637]
B:BD[47.6637] → [48.3288:3316]
∅:D[48.3316] → [47.6663:6673]
B:BD[47.6663] → [47.6663:6673]
B:BD[47.6673] → [49.3611:3612]
```
        if (you.level_type == LEVEL_ABYSS)
        {
            mpr("You're already here.");
            return (false);
        }
        else if (you.level_type == LEVEL_PANDEMONIUM)
        {
            mpr("That doesn't work from Pandemonium.");
            return (false);
        }
```
Deletion in crawl-ref/source/abl-show.cc at line 1988 [10.4494389]
B:BD[9.42408] → [9.42408:42409]
Replacement in crawl-ref/source/abl-show.cc at line 2002 [10.4494389]
B:BD[9.42700] → [9.42700:42726]
```
        rain(you.pos() );
```
[9.42699]
[9.42726]
```
        rain(you.pos());
```

Fix 2822832: temporary brands not being removed when thrown with LRET_FUMBLED

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells3.cc at line 96 [10.531613]

Replacement in crawl-ref/source/item_use.h at line 138 [10.2777340]

Replacement in crawl-ref/source/item_use.cc at line 227 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 307 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2224 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2314 [10.2781507]

Replacement in crawl-ref/source/it_use2.cc at line 489 [10.2904329]

Insertion in crawl-ref/source/abyss.h at line 17 [10.4481533]

Replacement in crawl-ref/source/abyss.cc at line 907 [10.4482606]

Replacement in crawl-ref/source/abyss.cc at line 935 [10.4482606]

Insertion in crawl-ref/source/abl-show.cc at line 965 [10.4494389]

Insertion in crawl-ref/source/abl-show.cc at line 1074 [10.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1208 [10.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1214 [10.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1216 [10.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1220 [10.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1311 [10.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1330 [10.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1366 [10.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1369 [10.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1465 [10.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1482 [10.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1501 [10.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1548 [10.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1581 [10.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1790 [10.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1806 [10.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1865 [10.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1902 [10.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1988 [10.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 2002 [10.4494389]