fiddlerwoaroof/crawl - Change KDK4YJQS4P7HRB334SZ3EFCW27AEGRPE3PXW6S6TKRIG6HLOKQNAC

Add monster-specific rotting resistance.

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

Created by dolorous on September 20, 2009

KDK4YJQS4P7HRB334SZ3EFCW27AEGRPE3PXW6S6TKRIG6HLOKQNAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tags.h at line 74 [5.161012]

B:BD[4.327] → [4.327:402]

    TAG_MINOR_VERSION  = 21      // Current version.  (Keep equal to max.)

[4.327]

[6.493]

    TAG_MINOR_ROTTING  = 22,     // Added monster-specific rotting resistance.
    TAG_MINOR_VERSION  = 22      // Current version.  (Keep equal to max.)

Replacement in crawl-ref/source/tags.cc at line 193 [5.164589]

B:BD[7.4891] → [7.4891:5013]

static void marshallResists(writer &, const mon_resist_def &);
static void unmarshallResists(reader &, mon_resist_def &);

[7.4891]

[7.5013]

static void marshallResists(writer &th, const mon_resist_def &res);
static void unmarshallResists(reader &th, mon_resist_def &res,
                              char minorVersion);

Insertion in crawl-ref/source/tags.cc at line 2407 [5.164589]
[8.951]
[8.951]
```
    marshallByte(th, res.rotting);
```

Replacement in crawl-ref/source/tags.cc at line 2413 [5.164589]

B:BD[5.215965] → [7.11678:11741]

static void unmarshallResists(reader &th, mon_resist_def &res)

[5.215965]

[8.1123]

static void unmarshallResists(reader &th, mon_resist_def &res,
                              char minorVersion)

Insertion in crawl-ref/source/tags.cc at line 2425 [5.164589]

[8.1457]

[9.8200]


    if (minorVersion >= TAG_MINOR_ROTTING)
        res.rotting  = unmarshallByte(th);

Replacement in crawl-ref/source/tags.cc at line 2505 [5.164589]
∅:D[4.740] → [8.3284:3326]
B:BD[5.216369] → [8.3284:3326]
```
    unmarshallResists(th, ghost.resists);
```
[4.740]
[8.3326]
```
    unmarshallResists(th, ghost.resists, minorVersion);
```

Replacement in crawl-ref/source/mon-util.h at line 247 [5.1682293]

B:BD[10.4466] → [10.4466:4501]

    MR_RES_STEAM         = (1<<18)

[10.4466]

[11.70674]


    // Immune to rotting.
    MR_RES_ROTTING       = (1<<18),
    MR_RES_STEAM         = (1<<19)

Insertion in crawl-ref/source/mon-util.h at line 390 [5.1682293]
[8.10798]
[8.10798]
```
    bool rotting;
```
Insertion in crawl-ref/source/mon-util.h at line 622 [5.1682293]
[12.2847]
[13.3937]
```
int mons_res_rotting(const monsters *mon);
```

Insertion in crawl-ref/source/mon-util.cc at line 1367 [5.1699344]

[12.3017]

[2.2477]

        res += 1;
    return (res);
}
int mons_res_rotting(const monsters *mon)
{
    int res = get_mons_resists(mon).rotting;
    if (mons_holiness(mon) != MH_NATURAL)

Insertion in crawl-ref/source/mon-util.cc at line 6064 [5.1699344]
[12.3137]
[12.3137]
```
}
int monsters::res_rotting() const
{
    return (mons_res_rotting(this));
```
Deletion in crawl-ref/source/mon-util.cc at line 6094 [5.1699344]
B:BD[14.14627] → [14.14627:14630]
B:BD[14.14630] → [15.2887:2979]
```
}
int monsters::res_rotting() const
{
    return (mons_holiness(this) == MH_NATURAL ? 0 : 1);
```

Replacement in crawl-ref/source/mon-util.cc at line 9276 [5.1699344]

B:BD[8.15251] → [8.15251:15309]

      asphyx(0), acid(0), sticky_flame(false), pierce(0),

[8.15251]

[8.15309]

      asphyx(0), acid(0), sticky_flame(false), rotting(false), pierce(0),

Replacement in crawl-ref/source/mon-util.cc at line 9299 [5.1699344]

B:BD[8.15464] → [8.15464:15522]

      asphyx(0), acid(0), sticky_flame(false), pierce(0),

[8.15464]

[8.15522]

      asphyx(0), acid(0), sticky_flame(false), rotting(false), pierce(0),

Insertion in crawl-ref/source/mon-util.cc at line 9334 [5.1699344]
[8.16639]
[8.16639]
```
        case MR_RES_ROTTING:      rotting      = true; break;
```
Insertion in crawl-ref/source/mon-util.cc at line 9354 [5.1699344]
[8.17042]
[8.17042]
```
    rotting      = rotting      || o.rotting;
```
Insertion in crawl-ref/source/externs.h at line 391 [5.3270163]
[16.4085]
[17.3230]
```
    virtual int res_rotting() const = 0;
```
Deletion in crawl-ref/source/externs.h at line 394 [5.3270163]
B:BD[14.85828] → [15.3099:3140]
```
    virtual int res_rotting() const = 0;
```
Insertion in crawl-ref/source/externs.h at line 1118 [5.3270163]
[16.4120]
[17.3297]
```
    int res_rotting() const;
```
Deletion in crawl-ref/source/externs.h at line 1121 [5.3270163]
B:BD[14.87431] → [15.3141:3170]
```
    int res_rotting() const;
```
Insertion in crawl-ref/source/externs.h at line 1479 [5.3270163]
[16.4155]
[17.3344]
```
    int res_rotting() const;
```
Deletion in crawl-ref/source/externs.h at line 1482 [5.3270163]
B:BD[14.88934] → [15.3171:3200]
```
    int res_rotting() const;
```

Replacement in crawl-ref/source/debug.cc at line 2684 [5.4016436]

B:BD[18.3143] → [3.3065:3114]

                            "acid=%d sticky=%s",

[18.3143]

[19.99845]

                            "acid=%d sticky=%s rot=%s",

Replacement in crawl-ref/source/debug.cc at line 2691 [5.4016436]

B:BD[18.3270] → [3.3115:3172]

         mons_res_sticky_flame( &mons ) ? "yes" : "no");

[18.3270]

[5.4050019]

         mons_res_sticky_flame( &mons ) ? "yes" : "no",
         mons_res_rotting( &mons ) ? "yes" : "no");

Add monster-specific rotting resistance.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tags.h at line 74 [5.161012]

Replacement in crawl-ref/source/tags.cc at line 193 [5.164589]

Insertion in crawl-ref/source/tags.cc at line 2407 [5.164589]

Replacement in crawl-ref/source/tags.cc at line 2413 [5.164589]

Insertion in crawl-ref/source/tags.cc at line 2425 [5.164589]

Replacement in crawl-ref/source/tags.cc at line 2505 [5.164589]

Replacement in crawl-ref/source/mon-util.h at line 247 [5.1682293]

Insertion in crawl-ref/source/mon-util.h at line 390 [5.1682293]

Insertion in crawl-ref/source/mon-util.h at line 622 [5.1682293]

Insertion in crawl-ref/source/mon-util.cc at line 1367 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 6064 [5.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 6094 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 9276 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 9299 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 9334 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 9354 [5.1699344]

Insertion in crawl-ref/source/externs.h at line 391 [5.3270163]

Deletion in crawl-ref/source/externs.h at line 394 [5.3270163]

Insertion in crawl-ref/source/externs.h at line 1118 [5.3270163]

Deletion in crawl-ref/source/externs.h at line 1121 [5.3270163]

Insertion in crawl-ref/source/externs.h at line 1479 [5.3270163]

Deletion in crawl-ref/source/externs.h at line 1482 [5.3270163]

Replacement in crawl-ref/source/debug.cc at line 2684 [5.4016436]

Replacement in crawl-ref/source/debug.cc at line 2691 [5.4016436]