fiddlerwoaroof/crawl - Change K33CV7EYR37TTSEXQWQ6QPHSEUFO545AIPUZOA2C47QTUCUWFPAAC

Add immunity checks for prompts about beams potentially hitting yourself

(not counting self-targetting since what we're trying to avoid in that case is loss of magic as well as self-damage) and add some special cases for Evaporate, so the potions use appropriate resistances without leaking information on the random choices.

Let Enhancers start with Short Blades skill 1.

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

Created by j-p-e-g on July 21, 2008

K33CV7EYR37TTSEXQWQ6QPHSEUFO545AIPUZOA2C47QTUCUWFPAAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells4.cc at line 1339 [6.436250]
[5.1048]
[6.489536]
```
    beam_type tracer_flavour = BEAM_MMISSILE;
```

Replacement in crawl-ref/source/spells4.cc at line 1344 [6.436250]

B:BD[6.489609] → [6.489609:489652]

        beem.flavour = BEAM_POTION_POISON;

[6.489609]

[6.489652]

        beem.flavour   = BEAM_POTION_POISON;
        tracer_flavour = BEAM_POISON;

Replacement in crawl-ref/source/spells4.cc at line 1351 [6.436250]

∅:D[5.1084] → [6.489725:489804]

B:BD[6.489725] → [6.489725:489804]

        beem.flavour = (coinflip() ? BEAM_POTION_POISON : BEAM_POTION_MIASMA);

[5.1084]

[6.489804]

        beem.flavour   = (coinflip() ? BEAM_POTION_POISON : BEAM_POTION_MIASMA);
        tracer_flavour = BEAM_MIASMA;

Replacement in crawl-ref/source/spells4.cc at line 1357 [6.436250]

B:BD[6.489883] → [6.489883:489926]

        beem.flavour = BEAM_POTION_POISON;

[6.489883]

[6.489926]

        beem.flavour   = BEAM_POTION_POISON;
        tracer_flavour = BEAM_POISON;

Replacement in crawl-ref/source/spells4.cc at line 1362 [6.436250]

B:BD[6.489962] → [6.489962:490005]

        beem.flavour = BEAM_POTION_MIASMA;

[6.489962]

[6.490005]

        beem.flavour   = BEAM_POTION_MIASMA;
        tracer_flavour = BEAM_MIASMA;

Replacement in crawl-ref/source/spells4.cc at line 1372 [6.436250]

B:BD[6.490175] → [6.490175:490226]

        beem.flavour = BEAM_POTION_STINKING_CLOUD;

[6.490175]

[6.490226]

        tracer_flavour = beem.flavour = BEAM_POTION_STINKING_CLOUD;

Replacement in crawl-ref/source/spells4.cc at line 1377 [6.436250]
B:BD[6.490285] → [6.490285:490327]
```
        beem.flavour = BEAM_POTION_STEAM;
```
[6.490285]
[6.490327]
```
        tracer_flavour = beem.flavour = BEAM_STEAM;
```

Insertion in crawl-ref/source/spells4.cc at line 1388 [6.436250]

[6.490446]

        if (you.inv[potion].sub_type == POT_BERSERK_RAGE)
            tracer_flavour = BEAM_FIRE;
        else
            tracer_flavour = BEAM_RANDOM;

Insertion in crawl-ref/source/spells4.cc at line 1409 [6.436250]
[6.491012]
[6.491012]
```
        tracer_flavour = BEAM_RANDOM;
```
Insertion in crawl-ref/source/spells4.cc at line 1426 [6.436250]
[6.491711]
[6.491711]
```
        tracer_flavour = BEAM_RANDOM;
```

Insertion in crawl-ref/source/spells4.cc at line 1439 [6.436250]

[4.567]

[5.1767]


    beam_type real_flavour = beem.flavour;
    beem.flavour           = tracer_flavour;

Insertion in crawl-ref/source/spells4.cc at line 1455 [6.436250]
[5.1948]
[5.1948]
```
    beem.flavour = real_flavour;
```
Deletion in crawl-ref/source/spells1.cc at line 574 [6.616635]
B:BD[5.2465] → [5.2465:2503]
```
    beem.flavour     = BEAM_MMISSILE;
```
Insertion in crawl-ref/source/spells1.cc at line 590 [6.616635]
[7.591]
[7.591]
```
        beem.flavour       = BEAM_POTION_STINKING_CLOUD;
```
Replacement in crawl-ref/source/spells1.cc at line 594 [6.616635]
B:BD[7.652] → [7.652:683]
```
        if (beem.fr_count > 0)
```
[7.652]
[7.683]
```
        if (beem.beam_cancelled)
```
Insertion in crawl-ref/source/spells1.cc at line 603 [6.616635]
[5.3028]
[5.3028]
```
    beem.flavour   = BEAM_MMISSILE;
```

Insertion in crawl-ref/source/player.cc at line 1538 [6.962854]

[6.982205]

[8.4394]

    // Only thirsty vampires are naturally poison resistant.
    if (you.species == SP_VAMPIRE && you.hunger_state < HS_SATIATED)
        rp++;

Deletion in crawl-ref/source/player.cc at line 1544 [6.962854]

B:BD[6.982283] → [9.8147:8304]

        // Only thirsty vampires are naturally poison resistant.
        if (you.species == SP_VAMPIRE && you.hunger_state < HS_SATIATED)
            rp++;

Replacement in crawl-ref/source/player.cc at line 4204 [6.962854]

∅:D[9.8465] → [10.10568:10630]

B:BD[11.8080] → [10.10568:10630]

                        + player_mutation_level(MUT_CLARITY);

[9.8465]

[12.353221]

                     + player_mutation_level(MUT_CLARITY);

Insertion in crawl-ref/source/newgame.cc at line 5024 [6.1132300]
[6.1241373]
[13.6763]
```
        you.skills[SK_SHORT_BLADES] = 1;
```
Replacement in crawl-ref/source/enum.h at line 206 [6.3287960]
B:BD[6.3296456] → [6.3296456:3296472]
```
    BEAM_MAGIC,
```
[6.3296456]
[14.8006]
```
    BEAM_MAGIC,                   //  5
```
Replacement in crawl-ref/source/enum.h at line 211 [6.3287960]
B:BD[12.904999] → [12.904999:905016]
```
    BEAM_MIASMA,
```
[12.904999]
[14.8029]
```
    BEAM_MIASMA,                  // 10
```
Replacement in crawl-ref/source/enum.h at line 217 [6.3287960]
B:BD[12.905178] → [14.8047:8063]
```
    BEAM_STEAM,
```
[12.905178]
[12.905220]
```
    BEAM_STEAM,                   // 15
```
Replacement in crawl-ref/source/enum.h at line 222 [6.3287960]
B:BD[6.3296896] → [14.8140:8155]
```
    BEAM_LAVA,
```
[6.3296896]
[6.3296938]
```
    BEAM_LAVA,                    // 20
```

Replacement in crawl-ref/source/enum.h at line 227 [6.3287960]

∅:D[14.8185] → [6.3297058:3297134]

B:BD[6.3297058] → [6.3297058:3297134]

    BEAM_RANDOM,                  //   currently translates into FIRE..ACID

[14.8185]

[6.3297134]

    BEAM_RANDOM,                  // 25 - currently translates into FIRE..ACID

Replacement in crawl-ref/source/enum.h at line 234 [6.3287960]
B:BD[6.3297350] → [6.3297350:3297389]
```
    BEAM_CONFUSION,             // RED
```
[6.3297350]
[6.3297389]
```
    BEAM_CONFUSION,             // RED - 30
```
Replacement in crawl-ref/source/enum.h at line 239 [6.3287960]
B:BD[6.3297562] → [6.3297562:3297607]
```
    BEAM_CHARM,                 // LIGHTBLUE
```
[6.3297562]
[6.3297607]
```
    BEAM_CHARM,                 // LIGHTBLUE - 35
```
Replacement in crawl-ref/source/enum.h at line 244 [6.3287960]
B:BD[6.3297790] → [6.3297790:3297832]
```
    BEAM_DISPEL_UNDEAD,         // YELLOW
```
[6.3297790]
[6.3297832]
```
    BEAM_DISPEL_UNDEAD,         // YELLOW - 40
```
Replacement in crawl-ref/source/enum.h at line 251 [6.3287960]
B:BD[6.3297952] → [6.3297952:3297984]
```
    BEAM_POTION_STINKING_CLOUD,
```
[6.3297952]
[6.3297984]
```
    BEAM_POTION_STINKING_CLOUD, // 45
```
Replacement in crawl-ref/source/enum.h at line 256 [6.3287960]
B:BD[6.3298077] → [6.3298077:3298099]
```
    BEAM_POTION_COLD,
```
[6.3298077]
[6.3298099]
```
    BEAM_POTION_COLD,           // 50
```
Replacement in crawl-ref/source/enum.h at line 261 [6.3287960]
B:BD[6.3298184] → [12.905373:905397]
```
    BEAM_POTION_RANDOM,
```
[6.3298184]
[12.905397]
```
    BEAM_POTION_RANDOM,         // 55
```

Insertion in crawl-ref/source/beam.cc at line 3631 [6.4128068]

[15.428]


static bool _beam_is_harmless(bolt &beam, monsters *mon)
{
    // For enchantments, this is already handled in _nasty_beam().
    if (beam.name[0] == '0')
        return (!_nasty_beam(mon, beam));
    // The others are handled here.
    switch (beam.flavour)
    {
    case BEAM_DIGGING:
        return (true);
    // Cleansing flame doesn't affect player's followers.
    case BEAM_HOLY:
        return (mons_is_holy(mon)
                || is_good_god(you.religion)
                   && ( is_follower(mon) || mons_neutral(mon) ));
    case BEAM_STEAM:
        return (mons_res_steam(mon) >= 3);
    case BEAM_FIRE:
        return (mons_res_fire(mon) >= 3);
    case BEAM_COLD:
        return (mons_res_cold(mon) >= 3);

Insertion in crawl-ref/source/beam.cc at line 3659 [6.4128068]

[15.429]

[16.32594]

    case BEAM_MIASMA:
    case BEAM_NEG:
        return (mons_res_negative_energy(mon) == 3);
    case BEAM_ELECTRICITY:
        return (mons_res_elec(mon) >= 3);
    case BEAM_POISON:
        return (mons_res_poison(mon) >= 3);
    case BEAM_ACID:
        return (mons_res_acid(mon) >= 3);
    default:
        return (false);
    }
}
static bool _beam_is_harmless_player(bolt &beam)
{
#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "beam flavour: %d", beam.flavour);
#endif
    // Shouldn't happen anyway since enchantments are either aimed at self
    // (not prompted) or cast at monsters and don't explode or bounce.
    if (beam.name[0] == '0')
        return (false);
    // The others are handled here.
    switch (beam.flavour)
    {
    case BEAM_DIGGING:
        return (true);
    // Cleansing flame doesn't affect player's followers.
    case BEAM_HOLY:
        return (is_good_god(you.religion));
    case BEAM_STEAM:
        return (player_res_steam(false) >= 3);
    case BEAM_MIASMA:
    case BEAM_NEG:
        return (player_prot_life(false) >= 3);
    case BEAM_POISON:
        return (player_res_poison(false));
    case BEAM_POTION_STINKING_CLOUD:
        return (player_res_poison(false) || player_mental_clarity(false));
    case BEAM_ELECTRICITY:
        return (player_res_electricity(false));
    case BEAM_FIRE:
    case BEAM_COLD:
    case BEAM_ACID:
        // Fire and ice can destroy inventory items, acid damage equipment.
        return (false);
    default:
        return (false);
    }
}

Replacement in crawl-ref/source/beam.cc at line 3739 [6.4128068]

B:BD[17.4512] → [3.3774:3837]

            if (!beam.aimed_at_feet && !beam.dont_stop_player)

[17.4512]

[3.3837]

            if (!beam.aimed_at_feet && !beam.dont_stop_player
                && !_beam_is_harmless_player(beam))

Deletion in crawl-ref/source/beam.cc at line 4353 [6.4128068]

B:BD[18.26861] → [18.26861:26869]

B:BD[18.26869] → [19.8037:8235]

∅:D[19.8235] → [18.26869:26870]

B:BD[18.26869] → [18.26869:26870]

B:BD[18.26870] → [19.8236:8574]

B:BD[19.8574] → [2.2763:2764]

∅:D[2.2764] → [19.8574:8638]

B:BD[19.8574] → [19.8574:8638]

B:BD[19.8638] → [2.2765:2766]

∅:D[2.2766] → [19.8638:8700]

B:BD[19.8638] → [19.8638:8700]

B:BD[19.8700] → [2.2767:2768]

∅:D[2.2768] → [19.8700:8762]

B:BD[19.8700] → [19.8700:8762]

B:BD[19.8762] → [2.2769:2770]

∅:D[2.2770] → [19.8762:8803]

B:BD[19.8762] → [19.8762:8803]

B:BD[19.8803] → [20.3324:3377]

B:BD[20.3377] → [2.2771:2772]

∅:D[2.2772] → [19.8856:8925]

∅:D[20.3377] → [19.8856:8925]

B:BD[19.8856] → [19.8856:8925]

B:BD[19.8925] → [2.2773:2774]

∅:D[2.2774] → [19.8925:8991]

B:BD[19.8925] → [19.8925:8991]

B:BD[19.8991] → [2.2775:2776]

∅:D[2.2776] → [19.8991:9053]

B:BD[19.8991] → [19.8991:9053]

B:BD[19.9053] → [2.2777:2778]

∅:D[2.2778] → [19.9053:9090]

B:BD[19.9053] → [19.9053:9090]

    }
}
static bool _beam_is_harmless(bolt &beam, monsters *mon)
{
    // For enchantments, this is already handled in _nasty_beam().
    if (beam.name[0] == '0')
        return (!_nasty_beam(mon, beam));
    // The others are handled here.
    switch (beam.flavour)
    {
    case BEAM_DIGGING:
        return (true);
    // Cleansing flame doesn't affect player's followers.
    case BEAM_HOLY:
        return (mons_is_holy(mon)
                || is_good_god(you.religion)
                   && ( is_follower(mon) || mons_neutral(mon) ));
    case BEAM_STEAM:
        return (mons_res_steam(mon) >= 3);
    case BEAM_FIRE:
        return (mons_res_fire(mon) >= 3);
    case BEAM_COLD:
        return (mons_res_cold(mon) >= 3);
    case BEAM_MIASMA:
    case BEAM_NEG:
        return (mons_res_negative_energy(mon) == 3);
    case BEAM_ELECTRICITY:
        return (mons_res_elec(mon) >= 3);
    case BEAM_POISON:
        return (mons_res_poison(mon) >= 3);
    case BEAM_ACID:
        return (mons_res_acid(mon) >= 3);
    default:
        return (false);

Add immunity checks for prompts about beams potentially hitting yourself

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spells4.cc at line 1339 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1344 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1351 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1357 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1362 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1372 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1377 [6.436250]

Insertion in crawl-ref/source/spells4.cc at line 1388 [6.436250]

Insertion in crawl-ref/source/spells4.cc at line 1409 [6.436250]

Insertion in crawl-ref/source/spells4.cc at line 1426 [6.436250]

Insertion in crawl-ref/source/spells4.cc at line 1439 [6.436250]

Insertion in crawl-ref/source/spells4.cc at line 1455 [6.436250]

Deletion in crawl-ref/source/spells1.cc at line 574 [6.616635]

Insertion in crawl-ref/source/spells1.cc at line 590 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 594 [6.616635]

Insertion in crawl-ref/source/spells1.cc at line 603 [6.616635]

Insertion in crawl-ref/source/player.cc at line 1538 [6.962854]

Deletion in crawl-ref/source/player.cc at line 1544 [6.962854]

Replacement in crawl-ref/source/player.cc at line 4204 [6.962854]

Insertion in crawl-ref/source/newgame.cc at line 5024 [6.1132300]

Replacement in crawl-ref/source/enum.h at line 206 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 211 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 217 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 222 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 227 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 234 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 239 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 244 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 251 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 256 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 261 [6.3287960]

Insertion in crawl-ref/source/beam.cc at line 3631 [6.4128068]

Insertion in crawl-ref/source/beam.cc at line 3659 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 3739 [6.4128068]

Deletion in crawl-ref/source/beam.cc at line 4353 [6.4128068]