fiddlerwoaroof/crawl - Change VK3LNDA3TXEPBMLDWBTEBDOZMPP3YUED3A624XMHWI6FI7LP3HGAC

First cut at new multilevel resists for monsters, needs a lot of work - suggestions welcome.

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

Created by dshaligram on January 9, 2008

VK3LNDA3TXEPBMLDWBTEBDOZMPP3YUED3A624XMHWI6FI7LP3HGAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/ouch.cc at line 119 [7.1104358]
B:BD[6.360922] → [6.360922:360961]
```
            mpr("It burns terribly!");
```
[6.360922]
[6.360961]
```
            mpr("It scalds you terribly!");
```

Deletion in crawl-ref/source/monstuff.cc at line 5953 [7.1396662]

B:BD[7.1550870] → [7.1550870:1551007]


        // what of whether it is wearing steam dragon armour? {dlb}
        if (monster->type == MONS_STEAM_DRAGON)
            return;

Replacement in crawl-ref/source/mon-util.h at line 305 [7.1682293]
B:BD[5.10927] → [5.10927:10975]
```
    mon_resist_def(int flags, short level = 1);
```
[5.10927]
[5.10975]
```
    mon_resist_def(int flags, short level = -100);
```
Insertion in crawl-ref/source/mon-util.h at line 309 [7.1682293]
[5.11112]
[8.71983]
```
private:
    short get_default_res_level(int resist, short level) const;
```

Insertion in crawl-ref/source/mon-util.h at line 314 [7.1682293]

[7.1684667]

[5.11113]

inline mon_resist_def operator | (int a, const mon_resist_def &b)
{
    return (mon_resist_def(a) | b);
}

Replacement in crawl-ref/source/mon-util.cc at line 934 [7.1699344]
B:BD[5.12720] → [5.12720:12764]
```
    return (res + mons_res_fire(mon) / 2); 
```
[5.12720]
[5.12764]
```
    return (res + mons_res_fire(mon) / 2);
```

Insertion in crawl-ref/source/mon-util.cc at line 5730 [7.1699344]

[5.15342]

short mon_resist_def::get_default_res_level(int resist, short level) const
{
    if (level != -100)
        return level;
    switch (resist)
    {
    case MR_RES_STEAM:
    case MR_RES_ACID:
        return 3;
    case MR_RES_ELEC:
        return 2;
    default:
        return 1;
    }
}

Insertion in crawl-ref/source/mon-util.cc at line 5753 [7.1699344]
[5.15591]
[5.15591]
```
        const short nl = get_default_res_level(1 << i, level);
```

Replacement in crawl-ref/source/mon-util.cc at line 5757 [7.1699344]

B:BD[5.15683] → [5.15683:16248]

        case MR_RES_ELEC:    elec = level; break;
        case MR_RES_POISON:  poison = level; break;
        case MR_RES_FIRE:    fire = level; break;
        case MR_RES_HELLFIRE: hellfire = level; break;
        case MR_RES_COLD:    cold = level; break;
        case MR_RES_ASPHYX:  asphyx = level; break;
        case MR_RES_ACID:    acid = level; break;
        case MR_VUL_ELEC:    elec = -level; break;
        case MR_VUL_POISON:  poison = -level; break;
        case MR_VUL_FIRE:    fire = -level; break;
        case MR_VUL_COLD:    cold = -level; break;

[5.15683]

[5.16248]

        case MR_RES_ELEC:    elec = nl; break;
        case MR_RES_POISON:  poison = nl; break;
        case MR_RES_FIRE:    fire = nl; break;
        case MR_RES_HELLFIRE: hellfire = nl; break;
        case MR_RES_COLD:    cold = nl; break;
        case MR_RES_ASPHYX:  asphyx = nl; break;
        case MR_RES_ACID:    acid = nl; break;
        case MR_VUL_ELEC:    elec = -nl; break;
        case MR_VUL_POISON:  poison = -nl; break;
        case MR_VUL_FIRE:    fire = -nl; break;
        case MR_VUL_COLD:    cold = -nl; break;

Replacement in crawl-ref/source/mon-util.cc at line 5769 [7.1699344]

B:BD[5.16257] → [5.16257:16576]

        case MR_RES_PIERCE:  pierce = level; break;
        case MR_RES_SLICE:   slice = level; break;
        case MR_RES_BLUDGEON: bludgeon = level; break;
        case MR_VUL_PIERCE:  pierce = -level; break;
        case MR_VUL_SLICE:   slice = -level; break;
        case MR_VUL_BLUDGEON: bludgeon = -level; break;

[5.16257]

[5.16576]

        case MR_RES_PIERCE:  pierce = nl; break;
        case MR_RES_SLICE:   slice = nl; break;
        case MR_RES_BLUDGEON: bludgeon = nl; break;
        case MR_VUL_PIERCE:  pierce = -nl; break;
        case MR_VUL_SLICE:   slice = -nl; break;
        case MR_VUL_BLUDGEON: bludgeon = -nl; break;

Replacement in crawl-ref/source/mon-data.h at line 322 [7.1826214]
B:BD[6.494610] → [6.494610:494643]
```
    MR_RES_POISON | MR_RES_COLD,
```
[6.494610]
[6.494643]
```
    MR_RES_POISON | mrd(MR_RES_COLD, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 393 [7.1826214]
∅:D[9.3411] → [6.495157:495218]
B:BD[6.495157] → [6.495157:495218]
```
    MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD | MR_RES_ELEC,
```
[9.3411]
[6.495218]
```
    MR_RES_POISON | mrd(MR_RES_FIRE, 3) | MR_VUL_COLD | MR_RES_ELEC,
```
Replacement in crawl-ref/source/mon-data.h at line 439 [7.1826214]
B:BD[6.495574] → [6.495574:495607]
```
    MR_RES_POISON | MR_RES_COLD,
```
[6.495574]
[6.495607]
```
    MR_RES_POISON | mrd(MR_RES_COLD, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 483 [7.1826214]
∅:D[10.3670] → [6.496044:496091]
∅:D[4.4131] → [6.496044:496091]
∅:D[11.20205] → [6.496044:496091]
B:BD[6.496044] → [6.496044:496091]
```
    MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD,
```
[4.4131]
[6.496091]
```
    MR_RES_POISON | mrd(MR_RES_FIRE, 2) | MR_VUL_COLD,
```

Replacement in crawl-ref/source/mon-data.h at line 540 [7.1826214]

B:BD[6.496624] → [6.496624:496687]

    MR_RES_POISON | MR_RES_ASPHYX | MR_VUL_FIRE | MR_RES_COLD,

[6.496624]

[6.496687]

    MR_RES_POISON | MR_RES_ASPHYX | MR_VUL_FIRE | mrd(MR_RES_COLD, 3),

Replacement in crawl-ref/source/mon-data.h at line 551 [7.1826214]
B:BD[12.12203] → [13.473:522]
```
    MR_RES_POISON | MR_RES_ASPHYX | MR_RES_ACID,
```
[12.12203]
[6.496825]
```
    MR_RES_POISON | MR_RES_ASPHYX | mrd(MR_RES_ACID, 3),
```
Replacement in crawl-ref/source/mon-data.h at line 573 [7.1826214]
B:BD[6.497010] → [6.497010:497057]
```
    MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC,
```
[6.497010]
[6.497057]
```
    MR_RES_POISON | mrd(MR_RES_COLD, 2) | MR_RES_ELEC,
```
Replacement in crawl-ref/source/mon-data.h at line 729 [7.1826214]
B:BD[6.498503] → [6.498503:498536]
```
    MR_RES_POISON | MR_RES_COLD,
```
[6.498503]
[6.498536]
```
    MR_RES_POISON | mrd(MR_RES_COLD, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 833 [7.1826214]
B:BD[6.499432] → [6.499432:499465]
```
    MR_RES_POISON | MR_RES_COLD,
```
[6.499432]
[6.499465]
```
    MR_RES_POISON | mrd(MR_RES_COLD, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 866 [7.1826214]
∅:D[9.3491] → [6.499742:499775]
B:BD[6.499742] → [6.499742:499775]
```
    MR_RES_POISON | MR_RES_COLD,
```
[9.3491]
[6.499775]
```
    MR_RES_POISON | mrd(MR_RES_COLD, 3),
```
Replacement in crawl-ref/source/mon-data.h at line 877 [7.1826214]
∅:D[14.1048] → [6.499864:499897]
∅:D[9.3548] → [6.499864:499897]
B:BD[6.499864] → [6.499864:499897]
```
    MR_RES_POISON | MR_RES_COLD,
```
[9.3548]
[6.499897]
```
    MR_RES_POISON | mrd(MR_RES_COLD, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 921 [7.1826214]
B:BD[6.500318] → [6.500318:500365]
```
    MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD,
```
[6.500318]
[6.500365]
```
    MR_RES_POISON | mrd(MR_RES_FIRE, 3) | MR_VUL_COLD,
```
Replacement in crawl-ref/source/mon-data.h at line 998 [7.1826214]
∅:D[10.3752] → [6.501109:501156]
∅:D[11.25032] → [6.501109:501156]
B:BD[6.501109] → [6.501109:501156]
```
    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
```
[11.25032]
[6.501156]
```
    MR_RES_POISON | MR_VUL_FIRE | mrd(MR_RES_COLD, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 1020 [7.1826214]
B:BD[6.501362] → [6.501362:501409]
```
    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
```
[6.501362]
[6.501409]
```
    MR_RES_POISON | MR_VUL_FIRE | mrd(MR_RES_COLD, 3),
```
Replacement in crawl-ref/source/mon-data.h at line 1120 [7.1826214]
∅:D[14.1110] → [6.502633:502680]
B:BD[6.502633] → [6.502633:502680]
```
    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
```
[14.1110]
[6.502680]
```
    MR_RES_POISON | MR_VUL_FIRE | mrd(MR_RES_COLD, 3),
```
Replacement in crawl-ref/source/mon-data.h at line 1131 [7.1826214]
B:BD[6.502762] → [6.502762:502809]
```
    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
```
[6.502762]
[6.502809]
```
    MR_RES_POISON | MR_VUL_FIRE | mrd(MR_RES_COLD, 3),
```
Replacement in crawl-ref/source/mon-data.h at line 1198 [7.1826214]
∅:D[10.3792] → [6.503424:503441]
∅:D[11.26950] → [6.503424:503441]
B:BD[7.1856420] → [6.503424:503441]
```
    MR_NO_FLAGS,
```
[11.26950]
[6.503441]
```
    MR_RES_STEAM,
```
Replacement in crawl-ref/source/mon-data.h at line 1265 [7.1826214]
B:BD[6.504043] → [6.504043:504076]
```
    MR_RES_POISON | MR_RES_COLD,
```
[6.504043]
[6.504076]
```
    MR_RES_POISON | mrd(MR_RES_COLD, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 1277 [7.1826214]
B:BD[6.504157] → [6.504157:504190]
```
    MR_RES_POISON | MR_RES_COLD,
```
[6.504157]
[6.504190]
```
    MR_RES_POISON | mrd(MR_RES_COLD, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 1288 [7.1826214]
∅:D[15.399] → [6.504320:504337]
B:BD[6.504320] → [6.504320:504337]
```
    MR_RES_FIRE,
```
[15.399]
[6.504337]
```
    mrd(MR_RES_FIRE, 2),
```

Replacement in crawl-ref/source/mon-data.h at line 1370 [7.1826214]

B:BD[6.505091] → [6.505091:505152]

    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,

[6.505091]

[6.505152]

    mrd(MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 3),

Replacement in crawl-ref/source/mon-data.h at line 1392 [7.1826214]

B:BD[6.505389] → [6.505389:505450]

    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,

[6.505389]

[6.505450]

    mrd(MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 3),

Replacement in crawl-ref/source/mon-data.h at line 1403 [7.1826214]

B:BD[6.505540] → [6.505540:505601]

    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,

[6.505540]

[6.505601]

    mrd(MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 3),

Replacement in crawl-ref/source/mon-data.h at line 1414 [7.1826214]
∅:D[16.31654] → [6.505690:505751]
B:BD[6.505690] → [6.505690:505751]
```
    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
```
[16.31654]
[6.505751]
```
    mrd(MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 3),
```

Replacement in crawl-ref/source/mon-data.h at line 1447 [7.1826214]

B:BD[6.506174] → [6.506174:506235]

    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,

[6.506174]

[6.506235]

    mrd(MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 3),

Replacement in crawl-ref/source/mon-data.h at line 1457 [7.1826214]

B:BD[7.1863475] → [6.506317:506330]

B:BD[6.506330] → [9.3549:3632]

    M_FLIES,
    MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD | MR_RES_ELEC | M_INSUBSTANTIAL,

[7.1863475]

[6.506395]

    M_FLIES | M_INSUBSTANTIAL,
    MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD | MR_RES_ELEC,

Replacement in crawl-ref/source/mon-data.h at line 1469 [7.1826214]
∅:D[9.3691] → [6.506516:506549]
B:BD[6.506516] → [6.506516:506549]
```
    MR_RES_ELEC | MR_RES_POISON,
```
[9.3691]
[6.506549]
```
    mrd(MR_RES_ELEC, 3) | MR_RES_POISON,
```
Replacement in crawl-ref/source/mon-data.h at line 1482 [7.1826214]
∅:D[10.3885] → [6.506691:506738]
B:BD[6.506691] → [6.506691:506738]
```
    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
```
[10.3885]
[6.506738]
```
    MR_RES_POISON | MR_VUL_FIRE | mrd(MR_RES_COLD, 3),
```
Replacement in crawl-ref/source/mon-data.h at line 1493 [7.1826214]
B:BD[6.506850] → [6.506850:506897]
```
    MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC,
```
[6.506850]
[6.506897]
```
    MR_RES_POISON | mrd(MR_RES_COLD, 2) | MR_RES_ELEC,
```
Replacement in crawl-ref/source/mon-data.h at line 1548 [7.1826214]
∅:D[10.3925] → [6.507430:507461]
∅:D[4.4195] → [6.507430:507461]
∅:D[11.30293] → [6.507430:507461]
B:BD[6.507430] → [6.507430:507461]
```
    MR_RES_ELEC | MR_RES_COLD,
```
[4.4195]
[6.507461]
```
    mrd(MR_RES_ELEC, 3) | MR_RES_COLD,
```
Replacement in crawl-ref/source/mon-data.h at line 1636 [7.1826214]
∅:D[9.3746] → [6.508245:508306]
B:BD[6.508245] → [6.508245:508306]
```
    MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD,
```
[9.3746]
[6.508306]
```
    mrd(MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 1647 [7.1826214]
∅:D[9.3834] → [6.508463:508496]
B:BD[6.508463] → [6.508463:508496]
```
    MR_RES_ELEC | MR_RES_POISON,
```
[9.3834]
[6.508496]
```
    mrd(MR_RES_ELEC, 3) | MR_RES_POISON,
```
Replacement in crawl-ref/source/mon-data.h at line 1682 [7.1826214]
∅:D[15.428] → [6.508812:508877]
B:BD[6.508812] → [6.508812:508877]
```
    MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD | MR_RES_ELEC,
```
[15.428]
[6.508877]
```
    mrd(MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD, 3) | MR_RES_ELEC,
```
Replacement in crawl-ref/source/mon-data.h at line 1693 [7.1826214]
∅:D[15.498] → [6.509014:509031]
∅:D[14.1202] → [6.509014:509031]
B:BD[6.509014] → [6.509014:509031]
```
    MR_RES_ELEC,
```
[14.1202]
[6.509031]
```
    mrd(MR_RES_ELEC, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 1885 [7.1826214]
∅:D[15.568] → [6.510765:510782]
∅:D[14.1355] → [6.510765:510782]
B:BD[6.510765] → [6.510765:510782]
```
    MR_RES_FIRE,
```
[14.1355]
[6.510782]
```
    mrd(MR_RES_FIRE, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 1896 [7.1826214]
∅:D[15.638] → [6.510904:510921]
∅:D[14.1427] → [6.510904:510921]
B:BD[6.510904] → [6.510904:510921]
```
    MR_RES_COLD,
```
[14.1427]
[6.510921]
```
    mrd(MR_RES_COLD, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 1918 [7.1826214]
∅:D[17.133] → [6.511185:511218]
∅:D[10.4065] → [6.511185:511218]
∅:D[11.33930] → [6.511185:511218]
B:BD[6.511185] → [6.511185:511218]
```
    MR_RES_POISON | MR_RES_COLD,
```
[11.33930]
[6.511218]
```
    MR_RES_POISON | mrd(MR_RES_COLD, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 2127 [7.1826214]
B:BD[6.513446] → [6.513446:513463]
```
    MR_RES_COLD,
```
[6.513446]
[6.513463]
```
    mrd(MR_RES_COLD, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 2215 [7.1826214]
∅:D[9.3891] → [6.514285:514318]
B:BD[6.514285] → [6.514285:514318]
```
    MR_RES_POISON | MR_RES_FIRE,
```
[9.3891]
[6.514318]
```
    MR_RES_POISON | mrd(MR_RES_FIRE, 2),
```

Replacement in crawl-ref/source/mon-data.h at line 2259 [7.1826214]

B:BD[6.514883] → [6.514883:514944]

    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD | MR_RES_ELEC,

[6.514883]

[6.514944]

    MR_RES_POISON | MR_VUL_FIRE | mrd(MR_RES_COLD, 2) | MR_RES_ELEC,

Replacement in crawl-ref/source/mon-data.h at line 2314 [7.1826214]
B:BD[6.515683] → [6.515683:515716]
```
    MR_RES_COLD | MR_RES_POISON,
```
[6.515683]
[6.515716]
```
    mrd(MR_RES_COLD, 2) | MR_RES_POISON,
```
Replacement in crawl-ref/source/mon-data.h at line 2325 [7.1826214]
B:BD[6.515807] → [6.515807:515840]
```
    MR_RES_POISON | MR_RES_COLD,
```
[6.515807]
[6.515840]
```
    MR_RES_POISON | mrd(MR_RES_COLD, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 2448 [7.1826214]
B:BD[6.517174] → [6.517174:517221]
```
    MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE,
```
[6.517174]
[6.517221]
```
    MR_RES_POISON | MR_RES_ELEC | mrd(MR_RES_FIRE, 3),
```
Replacement in crawl-ref/source/mon-data.h at line 3052 [7.1826214]
∅:D[2.141] → [6.524027:524074]
∅:D[10.4185] → [6.524027:524074]
∅:D[11.44442] → [6.524027:524074]
B:BD[6.524027] → [6.524027:524074]
```
    MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD,
```
[2.141]
[3.682]
```
    MR_RES_POISON | mrd(MR_RES_FIRE, 2) | MR_VUL_COLD,
```

Replacement in crawl-ref/source/mon-data.h at line 3168 [7.1826214]

B:BD[6.525791] → [6.525791:525852]

    MR_RES_POISON | MR_RES_COLD | MR_RES_FIRE | MR_RES_ELEC,

[6.525791]

[6.525852]

    MR_RES_POISON | mrd(MR_RES_COLD, 2) | MR_RES_FIRE | MR_RES_ELEC,

Replacement in crawl-ref/source/mon-data.h at line 3205 [7.1826214]

B:BD[6.526144] → [6.526144:526209]

    MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD,

[6.526144]

[6.526209]

    MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | mrd(MR_RES_COLD, 2),

Replacement in crawl-ref/source/mon-data.h at line 3428 [7.1826214]
∅:D[18.299] → [6.529568:529586]
B:BD[6.529568] → [6.529568:529586]
```
    MR_RES_FIRE, 
```
[18.299]
[6.529586]
```
    MR_RES_STEAM, 
```
Replacement in crawl-ref/source/mon-data.h at line 3583 [7.1826214]
∅:D[16.31699] → [6.534386:534447]
B:BD[6.534386] → [6.534386:534447]
```
    MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD,
```
[16.31699]
[11.49076]
```
    mrd(MR_RES_ELEC, 3) | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD,
```
Replacement in crawl-ref/source/mon-data.h at line 3841 [7.1826214]
B:BD[6.537514] → [6.537514:537545]
```
    MR_RES_FIRE | MR_VUL_COLD,
```
[6.537514]
[6.537545]
```
    mrd(MR_RES_FIRE, 3) | MR_VUL_COLD,
```
Replacement in crawl-ref/source/mon-data.h at line 3852 [7.1826214]
∅:D[15.6236] → [6.537620:537651]
B:BD[6.537620] → [6.537620:537651]
```
    MR_RES_FIRE | MR_VUL_COLD,
```
[15.6236]
[6.537651]
```
    mrd(MR_RES_FIRE, 3) | MR_VUL_COLD,
```
Replacement in crawl-ref/source/mon-data.h at line 4014 [7.1826214]
B:BD[6.538979] → [6.538979:539026]
```
    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
```
[6.538979]
[6.539026]
```
    MR_RES_POISON | MR_VUL_FIRE | mrd(MR_RES_COLD, 3),
```
Replacement in crawl-ref/source/mon-data.h at line 4026 [7.1826214]
B:BD[6.539110] → [6.539110:539157]
```
    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
```
[6.539110]
[6.539157]
```
    MR_RES_POISON | MR_VUL_FIRE | mrd(MR_RES_COLD, 3),
```
Replacement in crawl-ref/source/mon-data.h at line 4117 [7.1826214]
∅:D[16.31734] → [6.539822:539883]
B:BD[6.539822] → [6.539822:539883]
```
    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
```
[16.31734]
[6.539883]
```
    mrd(MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 4128 [7.1826214]
∅:D[16.31769] → [6.540180:540241]
B:BD[6.540180] → [6.540180:540241]
```
    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
```
[16.31769]
[6.540241]
```
    mrd(MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 2),
```
Replacement in crawl-ref/source/mon-data.h at line 4139 [7.1826214]
∅:D[16.31800] → [19.49369:49430]
B:BD[19.49369] → [19.49369:49430]
```
    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD | MR_RES_ELEC,
```
[16.31800]
[19.49430]
```
    MR_RES_POISON | MR_VUL_FIRE | mrd(MR_RES_COLD, 3) | MR_RES_ELEC,
```
Replacement in crawl-ref/source/mon-data.h at line 4150 [7.1826214]
∅:D[20.3702] → [21.1665:1730]
B:BD[21.1665] → [21.1665:1730]
```
    MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD,
```
[20.3702]
[3.942]
```
    MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | mrd(MR_RES_COLD, 2),
```

Replacement in crawl-ref/source/beam.cc at line 1602 [7.4128068]

B:BD[6.1230881] → [5.30991:31188]

        hurted = resist_adjust_damage(monster,
                                      monster->res_fire(),
                                      hurted,
                                      true);

[6.1230881]

[5.31188]

        hurted =
            resist_adjust_damage(
                monster,
                pbolt.flavour == BEAM_FIRE
                ? monster->res_fire()
                : monster->res_steam(),
                hurted,
                true);

Replacement in crawl-ref/source/beam.cc at line 1630 [7.4128068]

B:BD[7.4180816] → [7.4180816:4180893]

                    simple_monster_message(monster, " is burned terribly!");

[7.4180816]

[7.4180893]

                {
                    if (pbolt.flavour == BEAM_FIRE)
                        simple_monster_message(monster,
                                               " is burned terribly!");
                    else
                        simple_monster_message(monster,
                                               " is scalded terribly!");
                }

First cut at new multilevel resists for monsters, needs a lot of work - suggestions welcome.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/ouch.cc at line 119 [7.1104358]

Deletion in crawl-ref/source/monstuff.cc at line 5953 [7.1396662]

Replacement in crawl-ref/source/mon-util.h at line 305 [7.1682293]

Insertion in crawl-ref/source/mon-util.h at line 309 [7.1682293]

Insertion in crawl-ref/source/mon-util.h at line 314 [7.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 934 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5730 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5753 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5757 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5769 [7.1699344]

Replacement in crawl-ref/source/mon-data.h at line 322 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 393 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 439 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 483 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 540 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 551 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 573 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 729 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 833 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 866 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 877 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 921 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 998 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1020 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1120 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1131 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1198 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1265 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1277 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1288 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1370 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1392 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1403 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1414 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1447 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1457 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1469 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1482 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1493 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1548 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1636 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1647 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1682 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1693 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1885 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1896 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1918 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2127 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2215 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2259 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2314 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2325 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2448 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3052 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3168 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3205 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3428 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3583 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3841 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3852 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4014 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4026 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4117 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4128 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4139 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4150 [7.1826214]

Replacement in crawl-ref/source/beam.cc at line 1602 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 1630 [7.4128068]