fiddlerwoaroof/crawl - Change THECEUKJWIPEPUHPV3A5H73H6O4QZ65IE4XUXB7VPYM5LRMA6X2AC

Enable monsters to drink potions of might.

This adds new beam and enchantment types, so probably breaks save compatibility.

Created by Robert Vollmert on October 4, 2009

THECEUKJWIPEPUHPV3A5H73H6O4QZ65IE4XUXB7VPYM5LRMA6X2AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 8170 [5.804403]

[4.5870]

        }
        if (mons->has_ench(ENCH_MIGHT))
        {
            exper *= 5;
            exper /= 4;

Insertion in crawl-ref/source/mstuff2.cc at line 2556 [5.1340842]
[6.3138]
[7.4420]
```
                && !mon->has_ench(ENCH_MIGHT)
```
Insertion in crawl-ref/source/mon-util.cc at line 6910 [5.1699344]
[8.15008]
[9.494]
```
        break;
```

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

[9.495]

[8.15008]

    case ENCH_MIGHT:
        if (!quiet)
            simple_monster_message(this, " no longer looks unusually strong.");

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

B:BD[8.18830] → [10.6027:6086]

        case ENCH_SLOW:  case ENCH_HASTE:  case ENCH_FEAR:

[8.18830]

[10.6086]

        case ENCH_SLOW: case ENCH_HASTE: case ENCH_MIGHT: case ENCH_FEAR:

Insertion in crawl-ref/source/mon-util.cc at line 7357 [5.1699344]
[8.19623]
[8.19723]
```
    case ENCH_MIGHT:
```
Insertion in crawl-ref/source/mon-util.cc at line 8311 [5.1699344]
[3.3331]
[3.3331]
```
        case POT_MIGHT:
```

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

[11.2992]

[12.4623]

    case POT_MIGHT:
        return (!has_ench(ENCH_MIGHT) && foe_distance() <= 2);

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

[12.6731]

    case POT_MIGHT:
        if (enchant_monster_with_flavour(this, this, BEAM_MIGHT))
            ident = ID_KNOWN_TYPE;
        break;

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

B:BD[8.27635] → [8.27635:27703]

    "none", "slow", "haste", "fear", "conf", "inv", "pois", "bers",

[8.27635]

[8.27703]

    "none", "slow", "haste", "might", "fear", "conf", "inv", "pois", "bers",

Replacement in crawl-ref/source/mon-util.cc at line 8595 [5.1699344]
B:BD[13.6817] → [14.4582:4634]
∅:D[14.4634] → [13.6868:6883]
B:BD[13.6868] → [13.6868:6883]
```
        cturn = 1000 / _mod_speed(25, mons->speed);
        break;
```
[13.6817]
[13.6883]
```
    case ENCH_MIGHT:
```
Insertion in crawl-ref/source/item_use.cc at line 4773 [5.2781507]
[15.5678]
[15.5678]
```
        ENCH_MIGHT,
```

Replacement in crawl-ref/source/fight.cc at line 4189 [5.3140790]

B:BD[5.3208177] → [16.10754:10796]

B:BD[16.10796] → [17.13609:13664]

    // Berserk monsters get bonus damage.
    if (attacker_as_monster()->has_ench(ENCH_BERSERK))

[5.3208177]

[16.10833]

    // Berserk/mighted/frenzied monsters get bonus damage.
    if (attacker_as_monster()->has_ench(ENCH_BERSERK)
        || attacker_as_monster()->has_ench(ENCH_MIGHT))

Insertion in crawl-ref/source/enum.h at line 227 [5.3287960]
[18.2878]
[19.6844]
```
    BEAM_MIGHT,
```

Replacement in crawl-ref/source/enum.h at line 231 [5.3287960]

B:BD[19.6902] → [18.2879:2942]

    BEAM_INVISIBILITY,
    BEAM_DIGGING,                 // 30

[19.6902]

[19.6943]

    BEAM_INVISIBILITY,            // 30
    BEAM_DIGGING,

Replacement in crawl-ref/source/enum.h at line 236 [5.3287960]

B:BD[19.6998] → [18.2943:3000]

    BEAM_BANISH,
    BEAM_DEGENERATE,              // 35

[19.6998]

[19.7036]

    BEAM_BANISH,                 // 35
    BEAM_DEGENERATE,

Replacement in crawl-ref/source/enum.h at line 241 [5.3287960]

B:BD[19.7076] → [18.3001:3065]

    BEAM_DISPEL_UNDEAD,
    BEAM_DISINTEGRATION,          // 40

[19.7076]

[19.7125]

    BEAM_DISPEL_UNDEAD,         // 40
    BEAM_DISINTEGRATION,

Replacement in crawl-ref/source/enum.h at line 246 [5.3287960]
B:BD[20.905372] → [18.3066:3086]
B:BD[18.3086] → [21.7031:7071]
```
    BEAM_BACKLIGHT,
    BEAM_PORKALATOR,              // 45
```
[20.905372]
[22.26725]
```
    BEAM_BACKLIGHT,            // 45
    BEAM_PORKALATOR,
```
Insertion in crawl-ref/source/enum.h at line 1264 [5.3287960]
[8.31898]
[8.31898]
```
    ENCH_MIGHT,
```

Replacement in crawl-ref/source/enum.h at line 1266 [5.3287960]

B:BD[8.31913] → [8.31913:31980]

    ENCH_CONFUSION,
    ENCH_INVIS,                        //    5

[8.31913]

[8.31980]

    ENCH_CONFUSION,                    //    5
    ENCH_INVIS,

Replacement in crawl-ref/source/enum.h at line 1271 [5.3287960]

B:BD[8.32029] → [8.32029:32093]

    ENCH_SUMMON,
    ENCH_ABJ,                          //   10

[8.32029]

[8.32093]

    ENCH_SUMMON,                       //   10
    ENCH_ABJ,

Replacement in crawl-ref/source/enum.h at line 1276 [5.3287960]

B:BD[8.32152] → [8.32152:32230]

    ENCH_GLOWING_SHAPESHIFTER,
    ENCH_SHAPESHIFTER,                 //   15

[8.32152]

[8.32230]

    ENCH_GLOWING_SHAPESHIFTER,         //   15
    ENCH_SHAPESHIFTER,

Replacement in crawl-ref/source/enum.h at line 1281 [5.3287960]

B:BD[8.32264] → [8.32264:32333]

    ENCH_SHORT_LIVED,
    ENCH_PARALYSIS,                    //   20

[8.32264]

[23.1624]

    ENCH_SHORT_LIVED,                  //   20
    ENCH_PARALYSIS,

Replacement in crawl-ref/source/enum.h at line 1286 [5.3287960]

B:BD[16.11977] → [7.8387:8432]

B:BD[7.8432] → [24.8009:8089]

    ENCH_HELD,           // Caught in a net.
    ENCH_BATTLE_FRENZY,                //   25 -- Monster is in a battle frenzy

[16.11977]

[25.3010]

    ENCH_HELD,           // 25 -- Caught in a net.
    ENCH_BATTLE_FRENZY,  //   Monster is in a battle frenzy

Replacement in crawl-ref/source/enum.h at line 1291 [5.3287960]

B:BD[7.8538] → [15.7501:7522]

B:BD[15.7522] → [24.8090:8137]

    ENCH_LOWERED_MR,
    ENCH_SOUL_RIPE,                    //   30

[7.8538]

[26.5227]

    ENCH_LOWERED_MR,                   //   30
    ENCH_SOUL_RIPE,

Replacement in crawl-ref/source/enum.h at line 1296 [5.3287960]
B:BD[24.8204] → [2.5464:5491]
```
    ENCH_SPORE_PRODUCTION,
```
[24.8204]
[27.3400]
```
    ENCH_SPORE_PRODUCTION,             //   35
```
Replacement in crawl-ref/source/enum.h at line 1300 [5.3287960]
B:BD[27.3493] → [2.5492:5540]
```
    NUM_ENCHANTMENTS                   //    35
```
[27.3493]
[5.3314528]
```
    NUM_ENCHANTMENTS                   //   36
```

Replacement in crawl-ref/source/directn.cc at line 3003 [5.3697945]

B:BD[16.12047] → [28.4726:4795]

    if ((ench.ench == ENCH_HASTE || ench.ench == ENCH_BATTLE_FRENZY)

[16.12047]

[28.4795]

    if ((ench.ench == ENCH_HASTE || ench.ench == ENCH_BATTLE_FRENZY
         || ench.ench == ENCH_MIGHT)

Insertion in crawl-ref/source/directn.cc at line 3029 [5.3697945]
[29.3344]
[29.3344]
```
    case ENCH_MIGHT:         return "unusually strong";
```
Insertion in crawl-ref/source/beam.cc at line 1396 [5.4128068]
[30.17810]
[30.17810]
```
            10, BEAM_MIGHT,
```
Insertion in crawl-ref/source/beam.cc at line 4828 [5.4128068]
[19.10066]
[19.10066]
```
    case BEAM_MIGHT:
```

Insertion in crawl-ref/source/beam.cc at line 5185 [5.4128068]

[31.62175]

    case BEAM_MIGHT:
        if (!mon->has_ench(ENCH_MIGHT)
            && !mons_is_stationary(mon)
            && mon->add_ench(ENCH_MIGHT))
        {
            if (simple_monster_message(mon, " seems to grow stronger."))
            {
                obvious_effect = true;
            }
        }
        return (MON_AFFECTED);

Insertion in crawl-ref/source/beam.cc at line 5984 [5.4128068]
[32.7418]
[32.7418]
```
    case BEAM_MIGHT:                return("might");
```

Enable monsters to drink potions of might.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/religion.cc at line 8170 [5.804403]

Insertion in crawl-ref/source/mstuff2.cc at line 2556 [5.1340842]

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

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

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

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

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

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

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

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

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

Insertion in crawl-ref/source/item_use.cc at line 4773 [5.2781507]

Replacement in crawl-ref/source/fight.cc at line 4189 [5.3140790]

Insertion in crawl-ref/source/enum.h at line 227 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 231 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 236 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 241 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 246 [5.3287960]

Insertion in crawl-ref/source/enum.h at line 1264 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1266 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1271 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1276 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1281 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1286 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1291 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1296 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1300 [5.3287960]

Replacement in crawl-ref/source/directn.cc at line 3003 [5.3697945]

Insertion in crawl-ref/source/directn.cc at line 3029 [5.3697945]

Insertion in crawl-ref/source/beam.cc at line 1396 [5.4128068]

Insertion in crawl-ref/source/beam.cc at line 4828 [5.4128068]

Insertion in crawl-ref/source/beam.cc at line 5185 [5.4128068]

Insertion in crawl-ref/source/beam.cc at line 5984 [5.4128068]