fiddlerwoaroof/crawl - Change VQ3YSHLG7WW6JKAFJJDJVXQ4OEVTDT2E7K6ZSBUHSUSMHQNE5ZEAC

Revert radiance and refrigeration patches for the moment.

There's a couple of issues with these that were missed.

This reverts commits 70c41610927b7f9adfc3a0fd6c72c7af6756427e dce44e60507ec723f3cf94cdeadc6762ee492786 6525d257d208e990f5d62213adf6a062943e6626 6d9b6f226847487b3fd9e2ff408d7c0f42361c93.

Created by Robert Vollmert on October 16, 2009

VQ3YSHLG7WW6JKAFJJDJVXQ4OEVTDT2E7K6ZSBUHSUSMHQNE5ZEAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-data.h at line 489 [6.268152]
B:BD[4.3690] → [5.77:89]
```
     false,
```
[4.3690]
[7.1632]
```
     true,
```
Replacement in crawl-ref/source/spl-data.h at line 932 [6.268152]
B:BD[4.5026] → [5.90:102]
```
     false,
```
[4.5026]
[7.2498]
```
     true,
```

Replacement in crawl-ref/source/spells2.h at line 26 [6.562867]

B:BD[8.386] → [3.86:197]

∅:D[9.147] → [5.112:165]

∅:D[3.197] → [5.112:165]

B:BD[6.566056] → [5.112:165]

void cast_refrigeration(int pow, bool monster_cast = false,
                        int caster = NON_MONSTER);
void cast_toxic_radiance(bool monster_cast = false);

[8.386]

[6.566788]

void cast_refrigeration(int pow);
void cast_toxic_radiance(void);

Replacement in crawl-ref/source/spells2.cc at line 512 [6.569242]
B:BD[10.18191] → [5.167:211]
```
void cast_toxic_radiance(bool monster_cast)
```
[10.18191]
[6.589639]
```
void cast_toxic_radiance()
```
Replacement in crawl-ref/source/spells2.cc at line 514 [6.569242]
B:BD[6.589641] → [9.149:171]
```
    kill_category kc;
```
[6.589641]
[9.171]
```
    mpr("You radiate a sickly green light!");
```
Deletion in crawl-ref/source/spells2.cc at line 516 [6.569242]
∅:D[9.172] → [5.212:234]
B:BD[6.589641] → [5.212:234]
B:BD[5.234] → [9.173:179]
∅:D[9.179] → [5.234:284]
B:BD[5.234] → [5.234:284]
B:BD[5.284] → [9.180:253]
∅:D[9.253] → [5.284:293]
B:BD[5.284] → [5.284:293]
B:BD[5.293] → [9.254:260]
∅:D[9.260] → [5.293:343]
B:BD[5.293] → [5.293:343]
B:BD[5.343] → [9.261:288]
∅:D[9.288] → [6.589718:589719]
∅:D[5.343] → [6.589718:589719]
B:BD[6.589718] → [6.589718:589719]
```
    if (monster_cast)
    {
        mpr("Sickly green light fills the air!");
        // Friendlies will never cast this.
        kc = KC_OTHER;
    }
    else
    {
        mpr("You radiate a sickly green light!");
        kc = KC_YOU;
    }
```

Replacement in crawl-ref/source/spells2.cc at line 546 [6.569242]

B:BD[11.241] → [9.289:355]

                    poison_monster(monster, kc, 1, false, false);

[11.241]

[6.590398]

                    poison_monster(monster, KC_YOU, 1, false, false);

Replacement in crawl-ref/source/spells2.cc at line 548 [6.569242]

B:BD[6.590399] → [9.356:433]

                if (coinflip() && poison_monster(monster, kc, false, false))

[6.590399]

[11.393]

                if (coinflip() && poison_monster(monster, KC_YOU, false, false))

Replacement in crawl-ref/source/spells2.cc at line 580 [6.569242]
B:BD[6.590942] → [3.199:263]
```
void cast_refrigeration(int pow, bool monster_cast, int caster)
```
[6.590942]
[6.590975]
```
void cast_refrigeration(int pow)
```

Replacement in crawl-ref/source/spells2.cc at line 596 [6.569242]

B:BD[6.591485] → [3.264:314]

        ouch(hurted, caster, KILLED_BY_FREEZING);

[6.591485]

[6.591532]

        ouch(hurted, NON_MONSTER, KILLED_BY_FREEZING);

Replacement in crawl-ref/source/spells2.cc at line 637 [6.569242]

B:BD[12.1808] → [9.487:584]

    if (monster_cast)
        beam.thrower = KILL_MON;
    else
        beam.thrower = KILL_YOU;

[12.1808]

[13.1293]

    beam.thrower = KILL_YOU;

Replacement in crawl-ref/source/spells2.cc at line 649 [6.569242]

B:BD[14.1798] → [9.585:740]

            if (monster_cast)
                monster->hurt(NULL, hurt, BEAM_COLD);
            else
                monster->hurt(&you, hurt, BEAM_COLD);

[14.1798]

[6.592505]

            monster->hurt(&you, hurt, BEAM_COLD);

Deletion in crawl-ref/source/mstuff2.cc at line 42 [6.1340842]
B:BD[15.3551] → [5.3043:3064]
```
#include "spells2.h"
```

Deletion in crawl-ref/source/mstuff2.cc at line 482 [6.1340842]

∅:D[16.13171] → [6.1357576:1357593]

∅:D[17.398518] → [6.1357576:1357593]

B:BD[6.1357576] → [6.1357576:1357593]

B:BD[6.1357593] → [5.3065:3179]

B:BD[5.3179] → [3.3014:3127]

        return;
    case SPELL_OZOCUBUS_REFRIGERATION:
        if (!monsterNearby || mons_friendly(monster))
            return;
        cast_refrigeration(random2(12 * monster->hit_dice), true,
                           monster->mindex());

Deletion in crawl-ref/source/mstuff2.cc at line 484 [6.1340842]

B:BD[5.3257] → [5.3257:3423]

    case SPELL_OLGREBS_TOXIC_RADIANCE:
        if (!monsterNearby || mons_friendly(monster))
            return;
        cast_toxic_radiance(true);
        return;

Deletion in crawl-ref/source/mstuff2.cc at line 1161 [6.1340842]
B:BD[4.19032] → [5.3424:3502]
```
    case SPELL_OZOCUBUS_REFRIGERATION:
    case SPELL_OLGREBS_TOXIC_RADIANCE:
```

Deletion in crawl-ref/source/mon-util.cc at line 3495 [6.1699344]

B:BD[18.7854] → [5.3512:3636]

            || hspell_pass[i] == SPELL_OZOCUBUS_REFRIGERATION
            || hspell_pass[i] == SPELL_OLGREBS_TOXIC_RADIANCE

Deletion in crawl-ref/source/ghost.cc at line 50 [20.9890]
B:BD[19.3074] → [2.2877:2911]
```
    SPELL_OZOCUBUS_REFRIGERATION,
```
Deletion in crawl-ref/source/ghost.cc at line 59 [20.9890]
B:BD[20.10909] → [19.3075:3081]
```
// 20
```
Insertion in crawl-ref/source/ghost.cc at line 60 [20.9890]
[5.3776]
[20.10909]
```
// 20
```
Deletion in crawl-ref/source/ghost.cc at line 69 [20.9890]
B:BD[21.1533] → [5.3777:3811]
```
    SPELL_OLGREBS_TOXIC_RADIANCE,
```

Revert radiance and refrigeration patches for the moment.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-data.h at line 489 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 932 [6.268152]

Replacement in crawl-ref/source/spells2.h at line 26 [6.562867]

Replacement in crawl-ref/source/spells2.cc at line 512 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 514 [6.569242]

Deletion in crawl-ref/source/spells2.cc at line 516 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 546 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 548 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 580 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 596 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 637 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 649 [6.569242]

Deletion in crawl-ref/source/mstuff2.cc at line 42 [6.1340842]

Deletion in crawl-ref/source/mstuff2.cc at line 482 [6.1340842]

Deletion in crawl-ref/source/mstuff2.cc at line 484 [6.1340842]

Deletion in crawl-ref/source/mstuff2.cc at line 1161 [6.1340842]

Deletion in crawl-ref/source/mon-util.cc at line 3495 [6.1699344]

Deletion in crawl-ref/source/ghost.cc at line 50 [20.9890]

Deletion in crawl-ref/source/ghost.cc at line 59 [20.9890]

Insertion in crawl-ref/source/ghost.cc at line 60 [20.9890]

Deletion in crawl-ref/source/ghost.cc at line 69 [20.9890]