fiddlerwoaroof/crawl - Change HDPWEY6JHVKHZMEQVXL4BE2WUOEDACFUKZDWPEH75PAEYOWBNRIAC

Merge monster berserk and might; improve ordering of timeout messages.

ENCH_BERSERK now implies ENCH_MIGHT as with ENCH_HASTE, and ENCH_MIGHT is responsible for increased damage.

ENCH_HASTE gets a timeout message (monster is no longer moving quickly).

This unsubmerged a lurking bug where sub-enchantments could time out before or after the master enchantment depending on the ordering of ench_type. ench_type is reordered to have the master enchantments come first and appropriate comments are added

Breaks save compatibility.

Created by Robert Vollmert on October 4, 2009

HDPWEY6JHVKHZMEQVXL4BE2WUOEDACFUKZDWPEH75PAEYOWBNRIAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 8179 [4.804403]

B:BD[3.5923] → [3.5923:5947]

            exper *= 2;

[3.5923]

[3.5947]

        {
            // in addition to haste and might bonuses above
            exper *= 3;
            exper /= 2;
        }

Replacement in crawl-ref/source/mon-util.cc at line 5883 [4.1699344]
B:BD[5.6194] → [5.6194:6220]
```
    del_ench(ENCH_HASTE);
```
[5.6194]
[6.9291]
```
    del_ench(ENCH_HASTE, true);
```
Insertion in crawl-ref/source/mon-util.cc at line 5889 [4.1699344]
[7.1468]
[5.6398]
```
    add_ench(mon_enchant(ENCH_MIGHT, 0, KC_OTHER, duration * 10));
```
Replacement in crawl-ref/source/mon-util.cc at line 6911 [4.1699344]
B:BD[8.15008] → [2.3131:3132]
[8.15008]
[2.3132]
```
        if (!quiet)
            simple_monster_message(this, " is no longer moving quickly.");
```

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

∅:D[7.2899] → [5.7356:7390]

B:BD[5.7356] → [5.7356:7390]

            del_ench(ENCH_HASTE);

[7.2899]

[8.18995]

            del_ench(ENCH_HASTE, true);
            del_ench(ENCH_MIGHT, true);

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

∅:D[9.2558] → [5.7729:7763]

B:BD[5.7729] → [5.7729:7763]

            del_ench(ENCH_HASTE);

[5.7729]

[7.4593]

            del_ench(ENCH_HASTE, true);
            del_ench(ENCH_MIGHT, true);

Insertion in crawl-ref/source/mon-util.cc at line 7777 [4.1699344]

[10.11904]

[11.386]

    // The ordering in enchant_type makes sure that "super-enchantments"
    // like berserk time out before their parts.

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

B:BD[2.3884] → [2.3884:3994]

    if (attacker_as_monster()->has_ench(ENCH_BERSERK)
        || attacker_as_monster()->has_ench(ENCH_MIGHT))

[2.3884]

[5.10833]

    if (attacker_as_monster()->has_ench(ENCH_MIGHT))

Insertion in crawl-ref/source/enum.h at line 1259 [4.3287960]

[12.3399]

[13.915311]

// Enchantments that imply other enchantments should come first
// to avoid timeout message confusion. Currently:
//     berserk -> haste, might; fatigue -> slow

Replacement in crawl-ref/source/enum.h at line 1265 [4.3287960]
B:BD[4.3312386] → [4.3312386:3312401]
```
    ENCH_SLOW,
```
[4.3312386]
[8.31882]
```
    ENCH_BERSERK,
```

Insertion in crawl-ref/source/enum.h at line 1268 [4.3287960]

[2.4273]

[8.31898]

    ENCH_FATIGUE,        // Post-berserk fatigue.
    ENCH_SLOW,                         //    5

Replacement in crawl-ref/source/enum.h at line 1271 [4.3287960]
B:BD[8.31913] → [2.4274:4321]
```
    ENCH_CONFUSION,                    //    5
```
[8.31913]
[2.4321]
```
    ENCH_CONFUSION,
```

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

B:BD[8.31997] → [8.31997:32029]

B:BD[8.32029] → [2.4338:4385]

    ENCH_BERSERK,
    ENCH_ROT,
    ENCH_SUMMON,                       //   10

[8.31997]

[2.4385]

    ENCH_ROT,                          //   10
    ENCH_SUMMON,

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

B:BD[8.32129] → [8.32129:32152]

B:BD[8.32152] → [2.4400:4447]

    ENCH_STICKY_FLAME,
    ENCH_GLOWING_SHAPESHIFTER,         //   15

[8.32129]

[2.4447]

    ENCH_STICKY_FLAME,                 //   15
    ENCH_GLOWING_SHAPESHIFTER,

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

B:BD[4.3314360] → [8.32244:32264]

B:BD[8.32264] → [2.4471:4518]

    ENCH_SUBMERGED,
    ENCH_SHORT_LIVED,                  //   20

[4.3314360]

[2.4518]

    ENCH_SUBMERGED,                    //   20
    ENCH_SHORT_LIVED,

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

B:BD[14.1639] → [15.529:598]

B:BD[15.598] → [5.11927:11977]

B:BD[5.11977] → [2.4539:4590]

    ENCH_SLEEPY,         // Monster can't wake until this wears off.
    ENCH_FATIGUE,        // Post-berserk fatigue.
    ENCH_HELD,           // 25 -- Caught in a net.

[14.1639]

[2.4590]

    ENCH_SLEEPY,         //   Monster can't wake until this wears off.
    ENCH_HELD,           //   25 -- Caught in a net.