fiddlerwoaroof/crawl - Change PHTCOVKTGDX2ZN4QTG2X2Y2M6HAW2EZJQ5WXWQ3NDFAFF2DR6WDQC

Fix [2504221]: if a monster gets both Slow and Haste (by being slowed and

then speeding up from Zin's Recitation power) don't give a confusing description. I left in the possibility of actually having both enchantments at once; arguably Slow should just be deleted in this case. Fixed doubled message when enchanting a creature with haste/slow.

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

Created by haranp on February 3, 2009

PHTCOVKTGDX2ZN4QTG2X2Y2M6HAW2EZJQ5WXWQ3NDFAFF2DR6WDQC

Dependencies

In channels

main

Change contents

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

[3.4848]

[4.473888]


    if (ench.ench == ENCH_HASTE && mons.has_ench(ENCH_SLOW))
        return "";
    if (ench.ench == ENCH_SLOW && mons.has_ench(ENCH_HASTE))
        return "";

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

B:BD[6.32861] → [6.32861:32883]

B:BD[6.32883] → [7.1412:1439]

∅:D[7.1439] → [8.1646:1666]

B:BD[6.32937] → [8.1646:1666]

B:BD[8.1666] → [7.1440:1463]

∅:D[7.1463] → [6.32937:32956]

∅:D[8.1716] → [6.32937:32956]

B:BD[6.32937] → [6.32937:32956]

B:BD[6.32956] → [7.1464:1522]

∅:D[7.1522] → [6.33041:33066]

B:BD[6.33041] → [6.33041:33066]

B:BD[6.33066] → [7.1523:1556]

∅:D[7.1556] → [6.33126:33146]

B:BD[6.33126] → [6.33126:33146]

B:BD[6.33146] → [7.1557:1589]

∅:D[7.1589] → [9.12112:12135]

B:BD[6.33205] → [9.12112:12135]

B:BD[9.12135] → [7.1590:1616]

B:BD[7.1616] → [3.4849:4919]

∅:D[7.1616] → [6.33205:33226]

∅:D[3.4919] → [6.33205:33226]

∅:D[9.12188] → [6.33205:33226]

B:BD[6.33205] → [6.33205:33226]

B:BD[6.33226] → [7.1617:1655]

∅:D[7.1655] → [6.33291:33316]

B:BD[6.33291] → [6.33291:33316]

B:BD[6.33316] → [7.1656:1698]

∅:D[7.1698] → [6.33396:33417]

B:BD[6.33396] → [6.33396:33417]

B:BD[6.33417] → [7.1699:1738]

∅:D[7.1738] → [6.33483:33504]

B:BD[6.33483] → [6.33483:33504]

B:BD[6.33504] → [7.1739:1772]

∅:D[7.1772] → [6.33564:33592]

B:BD[6.33564] → [6.33564:33592]

B:BD[6.33592] → [7.1773:1816]

B:BD[7.1816] → [10.2430:2450]

∅:D[10.2450] → [7.1817:1854]

B:BD[11.25601] → [7.1817:1854]

B:BD[7.1854] → [12.9094:9209]

B:BD[12.9209] → [13.2857:2922]

∅:D[7.1854] → [6.33662:33675]

∅:D[13.2922] → [6.33662:33675]

∅:D[12.9209] → [6.33662:33675]

∅:D[11.25658] → [6.33662:33675]

B:BD[6.33662] → [6.33662:33675]

B:BD[6.33675] → [7.1855:1874]

    case ENCH_POISON:
        return "poisoned";
    case ENCH_SICK:
        return "sick";
    case ENCH_ROT:
        return "rotting away"; //jmf: "covered in sores"?
    case ENCH_BACKLIGHT:
        return "softly glowing";
    case ENCH_SLOW:
        return "moving slowly";
    case ENCH_BERSERK:
        return "berserk";
    case ENCH_BATTLE_FRENZY:
        return "consumed by blood-lust";
    case ENCH_HASTE:
        return "moving very quickly";
    case ENCH_CONFUSION:
        return "bewildered and confused";
    case ENCH_INVIS:
        return "slightly transparent";
    case ENCH_CHARM:
        return "in your thrall";
    case ENCH_STICKY_FLAME:
        return "covered in liquid flames";
    case ENCH_HELD:
        return "entangled in a net";
    case ENCH_PETRIFIED:
        return "petrified";
    case ENCH_PETRIFYING:
        return "slowly petrifying";
    case ENCH_LOWERED_MR:
        return "susceptible to magic";
    default:
        return "";

[6.32861]

[14.19995]

    case ENCH_POISON:        return "poisoned";
    case ENCH_SICK:          return "sick";
    case ENCH_ROT:           return "rotting away"; //jmf: "covered in sores"?
    case ENCH_BACKLIGHT:     return "softly glowing";
    case ENCH_SLOW:          return "moving slowly";
    case ENCH_BERSERK:       return "berserk";
    case ENCH_BATTLE_FRENZY: return "consumed by blood-lust";
    case ENCH_HASTE:         return "moving very quickly";
    case ENCH_CONFUSION:     return "bewildered and confused";
    case ENCH_INVIS:         return "slightly transparent";
    case ENCH_CHARM:         return "in your thrall";
    case ENCH_STICKY_FLAME:  return "covered in liquid flames";
    case ENCH_HELD:          return "entangled in a net";
    case ENCH_PETRIFIED:     return "petrified";
    case ENCH_PETRIFYING:    return "slowly petrifying";
    case ENCH_LOWERED_MR:    return "susceptible to magic";
    default:                 return "";

Replacement in crawl-ref/source/beam.cc at line 4825 [5.4128068]
B:BD[2.60882] → [2.60882:60921]
```
        if (mon->del_ench(ENCH_HASTE))
```
[2.60882]
[2.60921]
```
        if (mon->del_ench(ENCH_HASTE, true))
```
Replacement in crawl-ref/source/beam.cc at line 4846 [5.4128068]
B:BD[2.61553] → [2.61553:61591]
```
        if (mon->del_ench(ENCH_SLOW))
```
[2.61553]
[2.61591]
```
        if (mon->del_ench(ENCH_SLOW, true))
```