fiddlerwoaroof/crawl - Change PR42BCP5BPRFD2MP5H6CIJP7E57Q6TKL6SOXZWFKMFVR2OZWHT7AC

More resist fixes.

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

Created by dshaligram on January 10, 2008

PR42BCP5BPRFD2MP5H6CIJP7E57Q6TKL6SOXZWFKMFVR2OZWHT7AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 2986 [4.293070]

B:BD[4.378339] → [5.27161:27230]

            ouch( check_your_resists( 5 + random2avg(29, 2), 2 ), 0,

[4.378339]

[5.27230]

            ouch( check_your_resists( 5 + random2avg(29, 2), BEAM_FIRE ), 0,

Replacement in crawl-ref/source/spl-cast.cc at line 3019 [4.293070]

B:BD[4.379235] → [5.28184:28253]

            ouch( check_your_resists( 9 + random2avg(33, 2), 2 ), 0,

[4.379235]

[5.28253]

            ouch( check_your_resists( 9 + random2avg(33, 2), BEAM_FIRE ), 0,

Replacement in crawl-ref/source/spl-cast.cc at line 3120 [4.293070]

B:BD[4.382386] → [5.31131:31203]

            ouch(check_your_resists(5 + random2(6) + random2(7), 3), 0,

[4.382386]

[5.31203]

            ouch(check_your_resists(5 + random2(6) + random2(7), BEAM_COLD), 0,

Replacement in crawl-ref/source/spl-cast.cc at line 3154 [4.293070]

B:BD[4.383425] → [5.32119:32185]

            ouch(check_your_resists(9 + random2avg(23, 2), 3), 0,

[4.383425]

[5.32185]

            ouch(check_your_resists(9 + random2avg(23, 2), BEAM_ICE), 0,

Replacement in crawl-ref/source/spl-cast.cc at line 3341 [4.293070]

B:BD[5.37353] → [5.37353:37418]

            ouch(check_your_resists(4 + random2avg(9, 2), 5), 0,

[5.37353]

[5.37418]

            ouch(check_your_resists(4 + random2avg(9, 2), BEAM_ELECTRICITY), 0,

Replacement in crawl-ref/source/spells2.h at line 48 [4.562867]
B:BD[4.564235] → [4.564235:564272]
```
char burn_freeze(int pow, char b_f);
```
[4.564235]
[4.564272]
```
char burn_freeze(int pow, beam_type b_f);
```
Replacement in crawl-ref/source/spells2.cc at line 1158 [4.569242]
B:BD[4.596151] → [4.596151:596191]
```
char burn_freeze(int pow, char flavour)
```
[4.596151]
[4.596191]
```
char burn_freeze(int pow, beam_type flavour)
```
Replacement in crawl-ref/source/ouch.h at line 68 [4.1101726]
B:BD[4.1102506] → [4.1102506:1102555]
```
int check_your_resists(int hurted, int flavour);
```
[4.1102506]
[4.1102555]
```
int check_your_resists(int hurted, beam_type flavour);
```
Insertion in crawl-ref/source/ouch.cc at line 59 [4.1104358]
[4.1106083]
[4.1106083]
```
#include "fight.h"
```
Replacement in crawl-ref/source/ouch.cc at line 89 [4.1104358]
B:BD[4.1106495] → [4.1106495:1106543]
```
int check_your_resists(int hurted, int flavour)
```
[4.1106495]
[4.1106543]
```
int check_your_resists(int hurted, beam_type flavour)
```
Insertion in crawl-ref/source/ouch.cc at line 92 [4.1104358]
[4.1106561]
[4.1106561]
```
    int original = hurted;
```

Replacement in crawl-ref/source/ouch.cc at line 112 [4.1104358]

B:BD[6.360667] → [6.360667:360738]

        resist = player_res_steam();
        if (resist > 0)
        {

[6.360667]

[6.360738]

        hurted = resist_adjust_damage(&you, flavour,
                                      player_res_steam(), hurted, true);
        if (hurted < original)

Replacement in crawl-ref/source/ouch.cc at line 116 [4.1104358]

B:BD[6.360778] → [6.360778:360922]

            hurted /= (1 + (resist * resist));
        }
        else if (resist < 0)
        {
            // We could use a superior message.

[6.360778]

[3.2522]

        else if (hurted > original)

Deletion in crawl-ref/source/ouch.cc at line 118 [4.1104358]
∅:D[3.2566] → [6.360961:361010]
B:BD[6.360961] → [6.360961:361010]
```
            hurted = hurted * 15 / 10;
        }
```

Replacement in crawl-ref/source/ouch.cc at line 121 [4.1104358]

B:BD[4.1107154] → [4.1107154:1107224]

        resist = player_res_fire();
        if (resist > 0)
        {

[4.1107154]

[4.1107224]

        hurted = resist_adjust_damage(&you, flavour,
                                      player_res_fire(), hurted, true);
        if (hurted < original)

Replacement in crawl-ref/source/ouch.cc at line 125 [4.1104358]

B:BD[4.1107264] → [4.1107264:1107350]

            hurted /= (1 + (resist * resist));
        }
        else if (resist < 0)

[4.1107264]

[4.1107350]

        else if (hurted > original)

Deletion in crawl-ref/source/ouch.cc at line 129 [4.1104358]
∅:D[7.33230] → [4.1107399:1107451]
B:BD[4.1107399] → [4.1107399:1107451]
```
            hurted *= 15;
            hurted /= 10;
```

Insertion in crawl-ref/source/ouch.cc at line 133 [4.1104358]

[4.1107497]

        hurted = resist_adjust_damage(&you, flavour,
                                      player_res_fire(), hurted, true);

Replacement in crawl-ref/source/ouch.cc at line 136 [4.1104358]
B:BD[4.1107533] → [4.1107533:1107557]
```
        if (resist > 0)
```
[4.1107533]
[4.1107557]
```
        if (hurted < original)
```
Replacement in crawl-ref/source/ouch.cc at line 141 [4.1104358]
B:BD[4.1107664] → [4.1107664:1107693]
```
        else if (resist < 0)
```
[4.1107664]
[4.1107693]
```
        else if (hurted > original)
```

Replacement in crawl-ref/source/ouch.cc at line 151 [4.1104358]

B:BD[4.1107855] → [4.1107855:1108046]

        resist = player_res_electricity();
        if (resist >= 3)
        {
            canned_msg(MSG_YOU_RESIST);
            hurted = 0;
        }
        else if (resist > 0)
        {

[4.1107855]

[4.1108046]

        hurted = resist_adjust_damage(&you, flavour,
                                      player_res_electricity(),
                                      hurted, true);
        if (hurted < original)

Deletion in crawl-ref/source/ouch.cc at line 157 [4.1104358]
B:BD[4.1108086] → [4.1108086:1108121]
```
            hurted /= 3;
        }
```
Deletion in crawl-ref/source/ouch.cc at line 159 [4.1104358]
B:BD[4.1108137] → [4.1108137:1108138]
Replacement in crawl-ref/source/ouch.cc at line 162 [4.1104358]
B:BD[4.1108199] → [4.1108199:1108220]
```
        if (!resist)
```
[4.1108199]
[4.1108220]
```
        if (resist <= 0)
```

Replacement in crawl-ref/source/ouch.cc at line 164 [4.1104358]

B:BD[4.1108269] → [4.1108269:1108292]

        else
        {

[4.1108269]

[4.1108292]


        hurted = resist_adjust_damage(&you, flavour, resist,
                                      hurted, true);
        if (resist > 0)

Deletion in crawl-ref/source/ouch.cc at line 169 [4.1104358]
B:BD[4.1108332] → [4.1108332:1108367]
```
            hurted /= 3;
        }
```

Replacement in crawl-ref/source/ouch.cc at line 178 [4.1104358]

B:BD[4.1108471] → [4.1108471:1108612]

            poison_player( 6 + random2(3), true );
        else
        {
            mpr("You partially resist.");
            hurted /= 2;

[4.1108471]

[4.1108612]

            poison_player( 4 + random2(3), true );
        else if (!you.is_undead)
            poison_player( 2 + random2(3), true );

Replacement in crawl-ref/source/ouch.cc at line 182 [4.1104358]

B:BD[4.1108613] → [4.1108613:1108645]

B:BD[4.1108645] → [6.361203:361259]

∅:D[6.361259] → [4.1108705:1108715]

B:BD[4.1108705] → [4.1108705:1108715]

            if (!you.is_undead)
                poison_player( 2 + random2(3), true ); 
        }

[4.1108613]

[4.1108715]

        hurted = resist_adjust_damage(&you, flavour, resist, hurted);
        if (hurted < original)
            mpr("You partially resist.");

Deletion in crawl-ref/source/ouch.cc at line 191 [4.1104358]
B:BD[4.1108812] → [4.1108812:1108822]
```
        {
```
Deletion in crawl-ref/source/ouch.cc at line 192 [4.1104358]
B:BD[4.1108867] → [4.1108867:1108877]
```
        }
```

Replacement in crawl-ref/source/ouch.cc at line 197 [4.1104358]

B:BD[4.1108934] → [4.1108934:1108970]

        resist = player_res_cold();

[4.1108934]

[4.1108970]

        hurted = resist_adjust_damage(&you, flavour, player_res_cold(),
                                      hurted, true);

Replacement in crawl-ref/source/ouch.cc at line 200 [4.1104358]
B:BD[4.1108971] → [4.1108971:1109005]
```
        if (resist > 0)
        {
```
[4.1108971]
[4.1109005]
```
        if (hurted < original)
```

Replacement in crawl-ref/source/ouch.cc at line 202 [4.1104358]

B:BD[4.1109047] → [4.1109047:1109111]

            hurted /= 2;
        }
        else if (resist < 0)

[4.1109047]

[4.1109111]

        else if (hurted > original)

Deletion in crawl-ref/source/ouch.cc at line 206 [4.1104358]
∅:D[7.33304] → [4.1109167:1109219]
B:BD[4.1109167] → [4.1109167:1109219]
```
            hurted *= 13;
            hurted /= 10;
```

Replacement in crawl-ref/source/ouch.cc at line 210 [4.1104358]

B:BD[4.1109265] → [4.1109265:1109301]

        resist = player_res_fire();

[4.1109265]

[4.1109301]

        hurted = resist_adjust_damage(&you, flavour, player_res_fire(),
                                      hurted, true);

Replacement in crawl-ref/source/ouch.cc at line 213 [4.1104358]
B:BD[4.1109302] → [4.1109302:1109336]
```
        if (resist > 1)
        {
```
[4.1109302]
[4.1109336]
```
        if (hurted < original)
```

Replacement in crawl-ref/source/ouch.cc at line 215 [4.1104358]

B:BD[4.1109378] → [4.1109378:1109453]

            hurted /= (1 + resist);
        }
        else if (resist < 0)

[4.1109378]

[4.1109453]

        else if (hurted > original)

Deletion in crawl-ref/source/ouch.cc at line 219 [4.1104358]
∅:D[7.33341] → [4.1109502:1109554]
B:BD[4.1109502] → [4.1109502:1109554]
```
            hurted *= 15;
            hurted /= 10;
```
Insertion in crawl-ref/source/ouch.cc at line 245 [4.1104358]
[6.361806]
[4.1109579]
```
    default:
        break;
```
Replacement in crawl-ref/source/mstuff2.cc at line 1560 [4.1340842]
∅:D[2.220] → [4.1375895:1375918]
B:BD[4.1375895] → [4.1375895:1375918]
```
    beam.flavour = -1;
```
[2.220]
[8.201]
```
    beam.flavour = BEAM_NONE;
```
Insertion in crawl-ref/source/monstuff.cc at line 5900 [4.1396662]
[9.8610]
[9.8610]
```
                                  BEAM_FIRE,
```
Insertion in crawl-ref/source/monstuff.cc at line 5929 [4.1396662]
[9.8803]
[9.8803]
```
                                  BEAM_COLD,
```
Insertion in crawl-ref/source/monstuff.cc at line 5962 [4.1396662]
[9.9012]
[9.9012]
```
                BEAM_STEAM,
```

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

B:BD[9.14785] → [9.14785:14860]

            resist_adjust_damage(this, res_fire(), roll_dice( 2, 4 ) - 1);

[9.14785]

[10.23839]

            resist_adjust_damage(this, BEAM_FIRE, res_fire(),
                                 roll_dice( 2, 4 ) - 1);

Replacement in crawl-ref/source/item_use.cc at line 3548 [4.2781507]
B:BD[4.2850542] → [4.2850542:2850568]
```
        beam.flavour = 2;
```
[4.2850542]
[4.2850568]
```
        beam.flavour = BEAM_FIRE;
```

Replacement in crawl-ref/source/fight.h at line 39 [4.3139131]

B:BD[9.25747] → [9.25747:25860]

int resist_adjust_damage(actor *defender, int res, int rawdamage,
                         bool ranged = false);

[9.25747]

[4.3139666]

int resist_adjust_damage(actor *defender, beam_type flavour,
                         int res, int rawdamage, bool ranged = false);

Replacement in crawl-ref/source/fight.h at line 169 [4.3139131]

B:BD[11.54772] → [11.54772:54837]

    void calc_elemental_brand_damage(int res, const char *verb);

[11.54772]

[11.54891]

    void calc_elemental_brand_damage(beam_type flavour,
                                     int res,
                                     const char *verb);

Insertion in crawl-ref/source/fight.cc at line 1655 [4.3140790]

[12.56519]

}
static bool is_boolean_resist(beam_type flavour)
{
    switch (flavour)
    {
    case BEAM_ELECTRICITY:
        return (true);
    default:
        return (false);
    }

Replacement in crawl-ref/source/fight.cc at line 1668 [4.3140790]

B:BD[4.3169846] → [9.25862:25966]

int resist_adjust_damage(actor *defender, int res, int rawdamage,
                         bool ranged)

[4.3169846]

[11.57723]

// Gets the percentage of the total damage of this damage flavour that can
// be resisted.
static inline int get_resistible_fraction(beam_type flavour)
{
    switch (flavour)
    {
    case BEAM_LAVA:
    case BEAM_ICE:
        return (50);
    case BEAM_POISON_ARROW:
        return (40);
    default:
        return (100);
    }
}
// Adjusts damage for elemntal resists, electricity and poison.
//
// FIXME: Does not (yet) handle life draining, player acid damage
// (does handle monster acid damage), miasma, and other exotic
// attacks.
// 
// beam_type is just use to determine the damage flavour, it does not
// necessarily imply that the attack is a beam attack.
int resist_adjust_damage(actor *defender, beam_type flavour,
                         int res, int rawdamage, bool ranged)

Replacement in crawl-ref/source/fight.cc at line 1697 [4.3140790]

B:BD[11.57725] → [9.25967:26041]

    if (defender->atype() == ACT_MONSTER && res >= 3)
        return (0);

[11.57725]

[9.26041]

    if (!res)
        return (rawdamage);
    
    const bool monster = defender->atype() == ACT_MONSTER;
    
    // Check if this is a resist that pretends to be boolean for
    // damage purposes - only electricity at the moment, raw poison
    // damage uses the normal formula.
    int res_base = is_boolean_resist(flavour)? 2 : 1;
    const int resistible_fraction = get_resistible_fraction(flavour);
    int resistible = rawdamage * resistible_fraction / 100;
    const int irresistible = rawdamage - resistible;

Replacement in crawl-ref/source/fight.cc at line 1712 [4.3140790]

B:BD[11.57742] → [9.26047:26083]

        rawdamage /= 1 + res * res;

[11.57742]

[11.57880]

    {
        if (monster && res >= 3)
            resistible = 0;
        else
            resistible /= res_base + res * res;
    }

Replacement in crawl-ref/source/fight.cc at line 1719 [4.3140790]
B:BD[11.57902] → [9.26084:26140]
∅:D[9.26140] → [11.57926:57973]
B:BD[11.57926] → [11.57926:57973]
```
        rawdamage = rawdamage * (ranged? 15 : 20) / 10;
    if (rawdamage < 0)
        rawdamage = 0;
```
[11.57902]
[11.57973]
```
        resistible = resistible * (ranged? 15 : 20) / 10;
```
Replacement in crawl-ref/source/fight.cc at line 1721 [4.3140790]
B:BD[11.57974] → [11.57974:57998]
```
    return (rawdamage);
```
[11.57974]
[11.57998]
```
    return std::max(resistible + irresistible, 0);
```
Insertion in crawl-ref/source/fight.cc at line 1725 [4.3140790]
[11.58049]
[12.56567]
```
    beam_type flavour,
```

Replacement in crawl-ref/source/fight.cc at line 1730 [4.3140790]

B:BD[9.26162] → [9.26162:26237]

        resist_adjust_damage(defender, res, random2(damage_done) / 2 + 1);

[9.26162]

[4.3170033]

        resist_adjust_damage(defender, flavour, res,
                             random2(damage_done) / 2 + 1);

Replacement in crawl-ref/source/fight.cc at line 1909 [4.3140790]

B:BD[11.59789] → [13.354:433]

        calc_elemental_brand_damage(res, defender->is_icy()? "melt" : "burn");

[11.59789]

[11.59839]

        calc_elemental_brand_damage(
            BEAM_FIRE, res, defender->is_icy()? "melt" : "burn");

Replacement in crawl-ref/source/fight.cc at line 1915 [4.3140790]

B:BD[12.57401] → [11.59888:59957]

        calc_elemental_brand_damage(defender->res_cold(), "freeze");

[12.57401]

[11.59957]

        calc_elemental_brand_damage(BEAM_COLD, defender->res_cold(), "freeze");

Insertion in crawl-ref/source/fight.cc at line 2302 [4.3140790]

[9.26890]

                                 BEAM_ELECTRICITY,

Insertion in crawl-ref/source/fight.cc at line 2316 [4.3140790]
[9.27083]
[9.27083]
```
                                 BEAM_COLD,
```
Insertion in crawl-ref/source/fight.cc at line 2344 [4.3140790]
[9.27276]
[9.27276]
```
                                 BEAM_FIRE,
```
Insertion in crawl-ref/source/fight.cc at line 3331 [4.3140790]
[9.27445]
[9.27445]
```
                                 BEAM_FIRE,
```
Insertion in crawl-ref/source/fight.cc at line 3346 [4.3140790]
[9.27544]
[9.27544]
```
                                 BEAM_COLD,
```
Insertion in crawl-ref/source/fight.cc at line 3360 [4.3140790]
[9.27626]
[14.340]
```
                BEAM_ELECTRICITY,
```

Replacement in crawl-ref/source/enum.h at line 187 [4.3287960]

B:BD[4.3296306] → [4.3296306:3296426]

    BEAM_MISSILE,                 //    0
    BEAM_MMISSILE,                //    1 - and similarly unresistable things

[4.3296306]

[4.3296426]

    BEAM_NONE,                    //    0
    
    BEAM_MISSILE,
    BEAM_MMISSILE,                //    and similarly irresistible things

Replacement in crawl-ref/source/enum.h at line 194 [4.3287960]
B:BD[4.3296472] → [4.3296472:3296514]
```
    BEAM_ELECTRICITY,             //    5
```
[4.3296472]
[4.3296514]
```
    BEAM_ELECTRICITY,
```

Replacement in crawl-ref/source/enum.h at line 199 [4.3287960]

B:BD[6.905016] → [6.905016:905119]

    // BEAM_EXPLOSION,            //   10 - use is_explosion, and BEAM of flavour
    BEAM_SPORE = 11,

[6.905016]

[6.905119]


    BEAM_SPORE,

Replacement in crawl-ref/source/enum.h at line 204 [4.3287960]
B:BD[6.905178] → [6.905178:905220]
```
    BEAM_STEAM,                   //   15
```
[6.905178]
[6.905220]
```
    BEAM_STEAM,
```

Replacement in crawl-ref/source/enum.h at line 207 [4.3287960]

B:BD[6.905257] → [6.905257:905337]

    BEAM_HOLY,                    //   18 - aka beam of cleansing, golden flame

[6.905257]

[4.3296881]

    BEAM_HOLY,                    //   aka beam of cleansing, golden flame

Replacement in crawl-ref/source/enum.h at line 209 [4.3287960]
B:BD[4.3296896] → [4.3296896:3296938]
```
    BEAM_LAVA,                    //   20
```
[4.3296896]
[4.3296938]
```
    BEAM_LAVA,
```

Replacement in crawl-ref/source/enum.h at line 212 [4.3287960]

B:BD[4.3296974] → [4.3296974:3297058]

    BEAM_ICE,                     //   23
    BEAM_NUKE = 27,               //   27

[4.3296974]

[4.3297058]

    BEAM_ICE,
    BEAM_NUKE,

Replacement in crawl-ref/source/beam.h at line 108 [4.4124541]
B:BD[15.105816] → [15.105816:105841]
```
    int         flavour;
```
[15.105816]
[15.105841]
```
    beam_type   flavour;
```

Replacement in crawl-ref/source/beam.cc at line 1468 [4.4128068]

B:BD[4.4176574] → [4.4176574:4176630]

                pbolt.flavour = BEAM_FIRE + random2(7);

[4.4176574]

[4.4176630]

                pbolt.flavour =
                    static_cast<beam_type>(
                        random_range(BEAM_FIRE, BEAM_ACID) );

Insertion in crawl-ref/source/beam.cc at line 1607 [4.4128068]
[3.7274]
[3.7274]
```
                pbolt.flavour,
```

Replacement in crawl-ref/source/beam.cc at line 1646 [4.4128068]

B:BD[4.4181007] → [9.31284:31352]

        hurted = resist_adjust_damage(monster, monster->res_cold(),

[4.4181007]

[9.31352]

        hurted = resist_adjust_damage(monster, pbolt.flavour,
                                      monster->res_cold(),

Replacement in crawl-ref/source/beam.cc at line 1667 [4.4128068]

B:BD[4.4181643] → [9.31501:31569]

        hurted = resist_adjust_damage(monster, monster->res_elec(),

[4.4181643]

[9.31569]

        hurted = resist_adjust_damage(monster, pbolt.flavour,
                                      monster->res_elec(),

Replacement in crawl-ref/source/beam.cc at line 1678 [4.4128068]

B:BD[16.1453] → [9.31644:31715]

        hurted = resist_adjust_damage(monster, mons_res_acid(monster),

[16.1453]

[9.31715]

        hurted = resist_adjust_damage(monster, pbolt.flavour,
                                      mons_res_acid(monster),

Replacement in crawl-ref/source/beam.cc at line 1691 [4.4128068]

B:BD[9.31840] → [9.31840:31907]

        hurted = resist_adjust_damage(monster, res, hurted, true);

[9.31840]

[9.31907]

        hurted = resist_adjust_damage(monster, pbolt.flavour, res,
                                      hurted, true);

Replacement in crawl-ref/source/beam.cc at line 1706 [4.4128068]

B:BD[4.4182256] → [9.32007:32131]

        hurted = resist_adjust_damage(monster,
                                      std::min(mons_res_poison(monster), 1),

[4.4182256]

[9.32131]

        hurted = resist_adjust_damage(monster, pbolt.flavour,
                                      mons_res_poison(monster),

Replacement in crawl-ref/source/beam.cc at line 1811 [4.4128068]

B:BD[4.4184422] → [4.4184422:4184487]

        resist = mons_res_cold(monster);
        if (resist > 0)

[4.4184422]

[4.4184487]

        hurted = resist_adjust_damage(monster, pbolt.flavour,
                                      monster->res_cold(), hurted,
                                      true);
        if (hurted < original)

Deletion in crawl-ref/source/beam.cc at line 1818 [4.4128068]
B:BD[4.4184605] → [4.4184605:4184631]
```
            hurted /= 2;
```
Replacement in crawl-ref/source/beam.cc at line 1819 [4.4128068]
B:BD[4.4184641] → [4.4184641:4184670]
```
        else if (resist < 0)
```
[4.4184641]
[4.4184670]
```
        else if (hurted > original)
```
Deletion in crawl-ref/source/beam.cc at line 1823 [4.4128068]
B:BD[4.4184780] → [4.4184780:4184833]
```
            hurted *= 13;
            hurted /= 10;
```
Deletion in crawl-ref/source/beam.cc at line 1825 [4.4128068]
B:BD[4.4184858] → [4.4184858:4184910]
```
    }                           /* end of switch */
```

Replacement in crawl-ref/source/beam.cc at line 1826 [4.4128068]

B:BD[4.4184911] → [4.4184911:4185045]

    if (pbolt.flavour == BEAM_LAVA)    //jmf: lava != hellfire
    {
        resist = mons_res_fire(monster);
        if (resist > 0)

[4.4184911]

[4.4185045]

    case BEAM_LAVA:
        hurted = resist_adjust_damage(monster, pbolt.flavour,
                                      monster->res_fire(), hurted, true);
        
        if (hurted < original)

Deletion in crawl-ref/source/beam.cc at line 1834 [4.4128068]
B:BD[4.4185163] → [4.4185163:4185189]
```
            hurted /= 2;
```
Replacement in crawl-ref/source/beam.cc at line 1835 [4.4128068]
B:BD[4.4185199] → [4.4185199:4185228]
```
        else if (resist < 0)
```
[4.4185199]
[4.4185228]
```
        else if (hurted > original)
```
Deletion in crawl-ref/source/beam.cc at line 1847 [4.4128068]
B:BD[4.4185697] → [4.4185697:4185750]
```
            hurted *= 12;
            hurted /= 10;
```

Replacement in crawl-ref/source/beam.cc at line 1848 [4.4128068]

B:BD[4.4185760] → [4.4185760:4185766]

B:BD[4.4185766] → [6.1232005:1232044]

    }
    else if (pbolt.name == "hellfire")

[4.4185760]

[4.4185822]

        break;
    default:
        break;
    }                           /* end of switch */
    if (pbolt.name == "hellfire")

Replacement in crawl-ref/source/beam.cc at line 2977 [4.4128068]
B:BD[4.4220991] → [4.4220991:4221022]
```
    char objs_vulnerable = -1;
```
[4.4220991]
[4.4221022]
```
    object_class_type objs_vulnerable = OBJ_UNASSIGNED;
```
Insertion in crawl-ref/source/beam.cc at line 2991 [4.4128068]
[4.4221295]
[4.4221295]
```
    default:
        break;
```
Replacement in crawl-ref/source/beam.cc at line 3000 [4.4128068]
B:BD[4.4221430] → [4.4221430:4221467]
```
        if (objs_vulnerable != -1 &&
```
[4.4221430]
[4.4221467]
```
        if (objs_vulnerable != OBJ_UNASSIGNED &&
```

Replacement in crawl-ref/source/beam.cc at line 4770 [4.4128068]

B:BD[4.4256874] → [4.4256874:4256925]

            beam.flavour = BEAM_FIRE + random2(7);

[4.4256874]

[4.4256925]

            beam.flavour =
                static_cast<beam_type>(
                    random_range(BEAM_FIRE, BEAM_ACID) );

More resist fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 2986 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3019 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3120 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3154 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3341 [4.293070]

Replacement in crawl-ref/source/spells2.h at line 48 [4.562867]

Replacement in crawl-ref/source/spells2.cc at line 1158 [4.569242]

Replacement in crawl-ref/source/ouch.h at line 68 [4.1101726]

Insertion in crawl-ref/source/ouch.cc at line 59 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 89 [4.1104358]

Insertion in crawl-ref/source/ouch.cc at line 92 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 112 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 116 [4.1104358]

Deletion in crawl-ref/source/ouch.cc at line 118 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 121 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 125 [4.1104358]

Deletion in crawl-ref/source/ouch.cc at line 129 [4.1104358]

Insertion in crawl-ref/source/ouch.cc at line 133 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 136 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 141 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 151 [4.1104358]

Deletion in crawl-ref/source/ouch.cc at line 157 [4.1104358]

Deletion in crawl-ref/source/ouch.cc at line 159 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 162 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 164 [4.1104358]

Deletion in crawl-ref/source/ouch.cc at line 169 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 178 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 182 [4.1104358]

Deletion in crawl-ref/source/ouch.cc at line 191 [4.1104358]

Deletion in crawl-ref/source/ouch.cc at line 192 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 197 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 200 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 202 [4.1104358]

Deletion in crawl-ref/source/ouch.cc at line 206 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 210 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 213 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 215 [4.1104358]

Deletion in crawl-ref/source/ouch.cc at line 219 [4.1104358]

Insertion in crawl-ref/source/ouch.cc at line 245 [4.1104358]

Replacement in crawl-ref/source/mstuff2.cc at line 1560 [4.1340842]

Insertion in crawl-ref/source/monstuff.cc at line 5900 [4.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 5929 [4.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 5962 [4.1396662]

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

Replacement in crawl-ref/source/item_use.cc at line 3548 [4.2781507]

Replacement in crawl-ref/source/fight.h at line 39 [4.3139131]

Replacement in crawl-ref/source/fight.h at line 169 [4.3139131]

Insertion in crawl-ref/source/fight.cc at line 1655 [4.3140790]

Replacement in crawl-ref/source/fight.cc at line 1668 [4.3140790]

Replacement in crawl-ref/source/fight.cc at line 1697 [4.3140790]

Replacement in crawl-ref/source/fight.cc at line 1712 [4.3140790]

Replacement in crawl-ref/source/fight.cc at line 1719 [4.3140790]

Replacement in crawl-ref/source/fight.cc at line 1721 [4.3140790]

Insertion in crawl-ref/source/fight.cc at line 1725 [4.3140790]

Replacement in crawl-ref/source/fight.cc at line 1730 [4.3140790]

Replacement in crawl-ref/source/fight.cc at line 1909 [4.3140790]

Replacement in crawl-ref/source/fight.cc at line 1915 [4.3140790]

Insertion in crawl-ref/source/fight.cc at line 2302 [4.3140790]

Insertion in crawl-ref/source/fight.cc at line 2316 [4.3140790]

Insertion in crawl-ref/source/fight.cc at line 2344 [4.3140790]

Insertion in crawl-ref/source/fight.cc at line 3331 [4.3140790]

Insertion in crawl-ref/source/fight.cc at line 3346 [4.3140790]

Insertion in crawl-ref/source/fight.cc at line 3360 [4.3140790]

Replacement in crawl-ref/source/enum.h at line 187 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 194 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 199 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 204 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 207 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 209 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 212 [4.3287960]

Replacement in crawl-ref/source/beam.h at line 108 [4.4124541]

Replacement in crawl-ref/source/beam.cc at line 1468 [4.4128068]

Insertion in crawl-ref/source/beam.cc at line 1607 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 1646 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 1667 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 1678 [4.4128068]