fiddlerwoaroof/crawl - Change 36BFWYZWCQGMAMK4EF2R5C66RA2EBLTX3MJW3QDEKN64C3BJQX7AC

Apply n78291's patch in [2877049], with a few tweaks, to expand Jiyva's

wrath, allow uncancelable transformations as part of it, and adjust his Slimify power.

Created by David Lawrence Ramsey on October 12, 2009

36BFWYZWCQGMAMK4EF2R5C66RA2EBLTX3MJW3QDEKN64C3BJQX7AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/transfor.cc at line 526 [7.143977]

[6.1678]


    if (!force && !you.transform_cancellable)
    {
        // Jiyva's wrath-induced transformation is blocking the attempt.
        // May need to be updated if transform_cancellable is used for
        // other uses.
        return (false);
    }

Insertion in crawl-ref/source/transfor.cc at line 972 [7.143977]

[6.2851]

[8.236]

    if (!you.transform_cancellable)
        you.transform_cancellable = true;

Replacement in crawl-ref/source/tags.h at line 73 [7.161012]

B:BD[9.330] → [9.330:405]

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

[9.330]

[10.493]

    TAG_MINOR_TRANS    = 23,     // Keep track of cancellable transformations.
    TAG_MINOR_VERSION  = 23      // Current version.  (Keep equal to max.)

Insertion in crawl-ref/source/tags.cc at line 840 [7.164589]
[11.450]
[12.1663]
```
    marshallByte(th, you.transform_cancellable);
```

Insertion in crawl-ref/source/tags.cc at line 1264 [7.164589]

[11.552]


     if (minorVersion >= TAG_MINOR_TRANS)
         you.transform_cancellable = (bool) unmarshallByte(th);

Insertion in crawl-ref/source/religion.cc at line 77 [7.804403]
[13.47171]
[14.72323]
```
#include "transfor.h"
```

Insertion in crawl-ref/source/religion.cc at line 1091 [7.804403]

[15.3874]

        }
        else if (god == GOD_JIYVA)
        {
            if (you.duration[DUR_SLIMIFY])
                you.duration[DUR_SLIMIFY] = 0;

Insertion in crawl-ref/source/religion.cc at line 5384 [7.804403]

[16.9474]


    if (you.can_safely_mutate() && one_chance_in(7))
    {
        const int mutat = 1 + random2(3);

Replacement in crawl-ref/source/religion.cc at line 5389 [7.804403]

B:BD[16.9475] → [17.2640:2694]

    if (!you.can_safely_mutate() || one_chance_in(4))

[16.9475]

[16.9581]

        god_speaks(god, "You feel Jiyva alter your body.");
        for (int i = 0; i < mutat; ++i)
            mutate(RANDOM_BAD_MUTATION, true, false, true);
    }
    else if (there_are_monsters_nearby() && coinflip())
    {
        int tries = 0;
        bool found_one = false;
        monsters *mon;
        while (tries < 10)
        {
            mon = choose_random_nearby_monster(0);
            if (!mon || !mon_can_be_slimified(mon)
                || mon->attitude != ATT_HOSTILE)
            {
                tries++;
                continue;
            }
            else
            {
                found_one = true;
                break;
            }
        }
        if (found_one)
        {
            mprf(MSGCH_GOD, "Jiyva's putrescence saturates the %s!",
                 mon->name(DESC_NOCAP_THE).c_str());
            slimify_monster(mon, true);
        }
    }
    else if (!one_chance_in(3))
    {
            god_speaks(god, "Mutagenic energy floods into your body!");
            contaminate_player(random2(you.penance[GOD_JIYVA]) / 2);
            if (coinflip())
            {
                transformation_type form = TRAN_NONE;
                switch (random2(3))
                {
                    case 0:
                        form = TRAN_BAT;
                        break;
                    case 1:
                        form = TRAN_STATUE;
                        break;
                    case 2:
                        form = TRAN_SPIDER;
                        break;
                }
                if (transform(random2(you.penance[GOD_JIYVA]) * 2, form, true))
                    you.transform_cancellable = false;
            }
    }
    else

Replacement in crawl-ref/source/religion.cc at line 5466 [7.804403]

B:BD[16.10134] → [16.10134:10195]

            const monster_type mon = RANDOM_ELEMENT(slimes);

[16.10134]

[16.10195]

            const monster_type slime = RANDOM_ELEMENT(slimes);

Replacement in crawl-ref/source/religion.cc at line 5469 [7.804403]

B:BD[16.10228] → [18.2685:2759]

                    mgen_data::hostile_at(static_cast<monster_type>(mon),

[16.10228]

[16.10303]

                    mgen_data::hostile_at(static_cast<monster_type>(slime),

Deletion in crawl-ref/source/religion.cc at line 5479 [7.804403]
B:BD[16.10605] → [16.10605:10662]
```
    else
    {
        const int mutat = 1 + random2(4);
```
Deletion in crawl-ref/source/religion.cc at line 5480 [7.804403]
∅:D[18.2761] → [16.10662:10722]
B:BD[16.10662] → [16.10662:10722]
B:BD[16.10722] → [18.2762:2763]
∅:D[18.2763] → [16.10722:10762]
B:BD[16.10722] → [16.10722:10762]
B:BD[16.10762] → [19.2829:2889]
∅:D[19.2889] → [16.10821:10827]
B:BD[16.10821] → [16.10821:10827]
B:BD[16.10827] → [4.2790:2791]
```
        god_speaks(god, "You feel Jiyva alter your body.");
        for (int i = 0; i < mutat; ++i)
            mutate(RANDOM_BAD_MUTATION, true, false, true);
    }
```

Insertion in crawl-ref/source/religion.cc at line 6900 [7.804403]

[18.3883]

[3.2643]

        if (you.duration[DUR_SLIMIFY])
            you.duration[DUR_SLIMIFY] = 0;

Replacement in crawl-ref/source/religion.cc at line 6907 [7.804403]
B:BD[18.3948] → [3.2759:2799]
```
            for (int i = 0; i < 4; ++i)
```
[18.3948]
[3.2799]
```
            for (int i = 0; i < 2; ++i)
```
Insertion in crawl-ref/source/player.cc at line 3928 [7.962854]
[20.3687]
[2.2842]
```
    case DUR_SLIMIFY:
```

Insertion in crawl-ref/source/output.cc at line 714 [7.1088282]

[21.3090]

[22.10473]

    if (you.duration[DUR_SLIMIFY])
    {
        int color = _dur_colour(GREEN, dur_expiring(DUR_SLIMIFY));
        out.push_back(status_light(color, "Slime"));
    }

Insertion in crawl-ref/source/output.cc at line 2531 [7.1088282]

[20.13748]

[23.5643]


    if (you.duration[DUR_SLIMIFY])
        status.push_back(_get_expiration_string(DUR_SLIMIFY, "slimy"));

Insertion in crawl-ref/source/monstuff.h at line 98 [7.1390580]

[11.4256]

[24.5245]


void slimify_monster(monsters *monster, bool hostile = false);
bool mon_can_be_slimified(monsters *monster);

Insertion in crawl-ref/source/monstuff.cc at line 2532 [7.1396662]

[25.420372]

[26.2823]

}
bool mon_can_be_slimified(monsters *monster)
{
    return (mons_holiness(monster) == MH_UNDEAD
            || mons_holiness(monster) == MH_NATURAL
                && !mons_is_slime(monster));

Insertion in crawl-ref/source/monstuff.cc at line 2540 [7.1396662]

[26.2825]

[27.2637]


void slimify_monster(monsters *mon, bool hostile)
{
        if (mons_holiness(mon) == MH_UNDEAD)
            monster_polymorph(mon, MONS_DEATH_OOZE);
        else
        {
            const int x = mon->hit_dice + (coinflip() ? 1 : -1) * random2(5);

Insertion in crawl-ref/source/monstuff.cc at line 2549 [7.1396662]

[27.2638]

            if (x < 3)
                monster_polymorph(mon, MONS_OOZE);
            else if (x >= 3 && x < 5)
                monster_polymorph(mon, MONS_JELLY);
            else if (x >= 5 && x < 7)
                monster_polymorph(mon, MONS_BROWN_OOZE);
            else if (x >= 7 && x <= 11)
            {
                if (coinflip())
                    monster_polymorph(mon, MONS_SLIME_CREATURE);
                else
                    monster_polymorph(mon, MONS_GIANT_AMOEBA);
            }
            else
            {
                if (coinflip())
                    monster_polymorph(mon, MONS_ACID_BLOB);
                else
                    monster_polymorph(mon, MONS_AZURE_JELLY);
            }
        }
    if (!mons_eats_items(mon))
        mon->add_ench(ENCH_EAT_ITEMS);
    if (!hostile)
        mon->attitude = ATT_STRICT_NEUTRAL;
    else
        mon->attitude = ATT_HOSTILE;
    mons_make_god_gift(mon, GOD_JIYVA);
}

Replacement in crawl-ref/source/monstuff.cc at line 5584 [7.1396662]
B:BD[5.3666] → [5.3666:3713]
```
        // These don't care about deep water. 
```
[5.3666]
[5.3713]
```
        // These don't care about deep water.
```

Replacement in crawl-ref/source/monstuff.cc at line 5589 [7.1396662]

B:BD[5.3876] → [5.3876:3927]

        if (grd(cloud.pos) == DNGN_SHALLOW_WATER)

[5.3876]

[5.3927]

        if (grd(cloud.pos) == DNGN_SHALLOW_WATER)

Insertion in crawl-ref/source/monstuff.cc at line 9509 [7.1396662]
[5.4536]
[5.4536]
```
        break;
```
Deletion in crawl-ref/source/monstuff.cc at line 9511 [7.1396662]
B:BD[5.4537] → [5.4537:4560]
```
        break;       
```

Insertion in crawl-ref/source/fight.cc at line 861 [7.3140790]

[7.3148919]

[28.838]

        if (you.duration[DUR_SLIMIFY]
            && mon_can_be_slimified(defender_as_monster()))
        {
            // Bail out after sliming so we don't get aux unarmed and
            // attack a fellow slime.
            damage_done = 0;
            slimify_monster(defender_as_monster());
            you.duration[DUR_SLIMIFY] = 0;
            return (true);
        }

Insertion in crawl-ref/source/externs.h at line 839 [7.3270163]
[11.6921]
[7.3277418]
```
  bool transform_cancellable;
```
Deletion in crawl-ref/source/enum.h at line 248 [7.3287960]
∅:D[29.4256] → [16.26725:26741]
B:BD[30.7071] → [16.26725:26741]
```
    BEAM_SLIME,
```
Insertion in crawl-ref/source/enum.h at line 1255 [7.3287960]
[31.14389]
[32.8385]
```
    DUR_SLIMIFY,
```

Deletion in crawl-ref/source/beam.cc at line 1264 [7.4128068]

B:BD[33.25521] → [33.25521:25586]

B:BD[33.25586] → [16.30627:30763]

        DCHAR_SPACE,
        false,
        false,
        false
    },
    {
        ZAP_SLIME,
        "0",
        100,
        NULL,
        NULL,
        GREEN,
        true,
        BEAM_SLIME,

Deletion in crawl-ref/source/beam.cc at line 4877 [7.4128068]
B:BD[16.30845] → [16.30845:30964]
∅:D[34.8574] → [30.9392:9408]
∅:D[16.30964] → [30.9392:9408]
B:BD[30.9392] → [30.9392:9408]
```
    case BEAM_SLIME:
        rc = (mons_holiness(mon) == MH_NATURAL
              || mons_holiness(mon) == MH_UNDEAD);
        break;
```

Deletion in crawl-ref/source/beam.cc at line 5056 [7.4128068]

B:BD[7.4245498] → [16.30965:31078]


    case BEAM_SLIME:
        if (mon->hit_dice * 8 / 2 >= random2(ench_power))
            return (MON_RESIST);

Deletion in crawl-ref/source/beam.cc at line 5057 [7.4128068]

B:BD[16.31079] → [16.31079:31110]

∅:D[16.31110] → [7.4246070:4246071]

B:BD[7.4246070] → [7.4246070:4246071]

B:BD[7.4246071] → [16.31111:31156]

B:BD[16.31166] → [16.31166:31219]

B:BD[16.31277] → [16.31277:31402]

B:BD[16.31416] → [16.31416:31467]

B:BD[16.31529] → [16.31529:31567]

B:BD[16.31581] → [16.31581:31633]

B:BD[16.31647] → [16.31647:31685]

B:BD[16.31699] → [16.31699:31756]

B:BD[16.31770] → [16.31770:31856]

B:BD[16.31874] → [16.31874:31939]

B:BD[16.32009] → [16.32009:32030]

B:BD[16.32048] → [16.32048:32111]

B:BD[16.32181] → [16.32181:32415]

B:BD[16.32463] → [16.32463:32473]

B:BD[16.32473] → [35.42488:42568]

∅:D[35.42568] → [17.3190:3265]

B:BD[16.32473] → [17.3190:3265]

∅:D[17.3265] → [16.32503:32504]

B:BD[16.32503] → [16.32503:32504]

        obvious_effect = true;
        if (mons_holiness(mon) == MH_UNDEAD)
            monster_polymorph(mon, MONS_DEATH_OOZE);
        else
        {
            const int x = mon->hit_dice + (coinflip() ? 1 : -1) * random2(5);
            if (x < 3)
                monster_polymorph(mon, MONS_OOZE);
            else if (x >= 3 && x < 5)
                monster_polymorph(mon, MONS_JELLY);
            else if (x >= 5 && x < 7)
                monster_polymorph(mon, MONS_BROWN_OOZE);
            else if (x >= 7 && x <= 11)
            {
                if (coinflip())
                    monster_polymorph(mon, MONS_SLIME_CREATURE);
                else
                    monster_polymorph(mon, MONS_GIANT_AMOEBA);
            }
            else
            {
                if (coinflip())
                    monster_polymorph(mon, MONS_ACID_BLOB);
                else
                    monster_polymorph(mon, MONS_AZURE_JELLY);
            }
        }
        if (!mons_eats_items(mon))
            mon->add_ench(ENCH_EAT_ITEMS);
        mon->attitude = ATT_STRICT_NEUTRAL;
        return (MON_AFFECTED);

Deletion in crawl-ref/source/beam.cc at line 5960 [7.4128068]
B:BD[36.6526] → [36.6526:6580]
```
    case BEAM_SLIME:                return ("slime");
```

Insertion in crawl-ref/source/acr.cc at line 2276 [7.4397395]

[37.7718]

[38.17813]

    _decrement_a_duration(DUR_SLIMIFY, "You feel less slimy.",
                          coinflip(), "Your slime is starting to congeal.");

Replacement in crawl-ref/source/abl-show.cc at line 325 [7.4494389]

B:BD[16.33114] → [16.33114:33180]

    { ABIL_JIYVA_SLIMIFY, "Slimify", 4, 0, 100, 3, ABFLAG_NONE },

[16.33114]

[39.3189]

    { ABIL_JIYVA_SLIMIFY, "Slimify", 4, 0, 100, 8, ABFLAG_NONE },

Replacement in crawl-ref/source/abl-show.cc at line 2045 [7.4494389]

B:BD[16.33821] → [16.33821:33923]

        beam.range = LOS_RADIUS;
        if (!spell_direction(spd, beam))
            return (false);

[16.33821]

[16.33923]

    {
        std::string msg;
        int has_weapon = you.equip[EQ_WEAPON];

Replacement in crawl-ref/source/abl-show.cc at line 2049 [7.4494389]

B:BD[16.33924] → [16.33924:33962]

        if (beam.target == you.pos())

[16.33924]

[16.33962]

        if (has_weapon == -1)
            msg = "your " + you.hand_name(true);
        else

Replacement in crawl-ref/source/abl-show.cc at line 2053 [7.4494389]

B:BD[16.33972] → [40.4201:4250]

∅:D[40.4250] → [16.34019:34047]

B:BD[16.34019] → [16.34019:34047]

            mpr("You cannot slimify yourself!");
            return (false);

[16.33972]

[16.34047]

            item_def& weapon = *you.weapon();
            msg = weapon.name(DESC_NOCAP_YOUR);

Replacement in crawl-ref/source/abl-show.cc at line 2056 [7.4494389]

B:BD[16.34057] → [16.34057:34170]

∅:D[16.34170] → [41.9214:9252]

B:BD[41.9214] → [41.9214:9252]

        if (!zapping(ZAP_SLIME, 16 + you.skills[SK_INVOCATIONS] * 8, beam,
                     true))
        {
            return (false);
        }

[16.34057]

[16.34171]


        mprf(MSGCH_DURATION, "A thick mucus forms on %s.", msg.c_str());
        you.duration[DUR_SLIMIFY] += you.skills[SK_INVOCATIONS] * 3 / 2 + 3;
        if (you.duration[DUR_SLIMIFY] > 100)
            you.duration[DUR_SLIMIFY] = 100;

Insertion in crawl-ref/source/abl-show.cc at line 2065 [7.4494389]
[42.5370]
[16.35015]
```
    }
```

Replacement in crawl-ref/source/abl-show.cc at line 2357 [7.4494389]

B:BD[7.4539414] → [30.10054:10144]

    if (you.duration[DUR_TRANSFORMATION] && you.attribute[ATTR_TRANSFORMATION]!=TRAN_PIG)

[7.4539414]

[43.3833]

    if (you.duration[DUR_TRANSFORMATION]
        && you.attribute[ATTR_TRANSFORMATION] != TRAN_PIG
        && you.transform_cancellable)
    {

Insertion in crawl-ref/source/abl-show.cc at line 2362 [7.4494389]
[43.3904]
[7.4539507]
```
    }
```

Apply n78291's patch in [2877049], with a few tweaks, to expand Jiyva's

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/transfor.cc at line 526 [7.143977]

Insertion in crawl-ref/source/transfor.cc at line 972 [7.143977]

Replacement in crawl-ref/source/tags.h at line 73 [7.161012]

Insertion in crawl-ref/source/tags.cc at line 840 [7.164589]

Insertion in crawl-ref/source/tags.cc at line 1264 [7.164589]

Insertion in crawl-ref/source/religion.cc at line 77 [7.804403]

Insertion in crawl-ref/source/religion.cc at line 1091 [7.804403]

Insertion in crawl-ref/source/religion.cc at line 5384 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 5389 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 5466 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 5469 [7.804403]

Deletion in crawl-ref/source/religion.cc at line 5479 [7.804403]

Deletion in crawl-ref/source/religion.cc at line 5480 [7.804403]

Insertion in crawl-ref/source/religion.cc at line 6900 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 6907 [7.804403]

Insertion in crawl-ref/source/player.cc at line 3928 [7.962854]

Insertion in crawl-ref/source/output.cc at line 714 [7.1088282]

Insertion in crawl-ref/source/output.cc at line 2531 [7.1088282]

Insertion in crawl-ref/source/monstuff.h at line 98 [7.1390580]

Insertion in crawl-ref/source/monstuff.cc at line 2532 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2540 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2549 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5584 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5589 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 9509 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 9511 [7.1396662]

Insertion in crawl-ref/source/fight.cc at line 861 [7.3140790]

Insertion in crawl-ref/source/externs.h at line 839 [7.3270163]

Deletion in crawl-ref/source/enum.h at line 248 [7.3287960]

Insertion in crawl-ref/source/enum.h at line 1255 [7.3287960]