fiddlerwoaroof/crawl - Change GQQ6ASWTYODIHG7X32JNUUHP5NMOVZJIHWGS3F3MKRYZGAHP6NVQC

Add yet more Jiyva-related cleanups. Make sure his altars are never

generated if the royal jelly is dead, you don't worship Jiyva, and you're not under penance from Jiyva; don't destroy Jiyva's altars if the royal jelly dies after you start worshipping him or go under penance from him; and clean up the alternate method for unlocking the Slime Pits.

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

Created by dolorous on July 19, 2009

GQQ6ASWTYODIHG7X32JNUUHP5NMOVZJIHWGS3F3MKRYZGAHP6NVQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tags.h at line 71 [10.161012]

B:BD[6.627] → [6.627:702]

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

[6.627]

[11.493]

    TAG_MINOR_JELLY    = 19,     // Remember whether the royal jelly is dead.
    TAG_MINOR_VERSION  = 19      // Current version.  (Keep equal to max.)

Insertion in crawl-ref/source/tags.cc at line 840 [10.164589]
[6.742]
[12.1663]
```
    marshallByte(th, you.royal_jelly_dead);
```
Insertion in crawl-ref/source/tags.cc at line 1256 [10.164589]
[13.770]
[6.743]

Insertion in crawl-ref/source/tags.cc at line 1260 [10.164589]

[6.840]

[13.770]

    if (minorVersion >= TAG_MINOR_JELLY)
        you.royal_jelly_dead = (bool) unmarshallByte(th);

Insertion in crawl-ref/source/religion.h at line 106 [10.800304]
[14.2472]
[15.4964]
```
bool jiyva_is_dead();
```

Replacement in crawl-ref/source/religion.cc at line 855 [10.804403]

B:BD[10.806634] → [10.806634:806692]

            simple_god_message(" seems mollified.", god);

[10.806634]

[16.45]

            you.penance[god] = 0;
            simple_god_message(
                make_stringf("seems mollified%s.",
                             god == GOD_JIYVA && jiyva_is_dead() ?
                                 ", and vanishes" : "").c_str(),
                god);

Deletion in crawl-ref/source/religion.cc at line 864 [10.804403]
∅:D[16.97] → [10.806692:806726]
B:BD[10.806692] → [10.806692:806726]
```
            you.penance[god] = 0;
```

Insertion in crawl-ref/source/religion.cc at line 933 [10.804403]

[17.2869]

[15.6079]

bool jiyva_is_dead()
{
    return (you.royal_jelly_dead
            && you.religion != GOD_JIYVA && !you.penance[GOD_JIYVA]);
}

Insertion in crawl-ref/source/religion.cc at line 5208 [10.804403]
[18.18730]
[10.875793]
```
    if (god == GOD_JIYVA && jiyva_is_dead())
        return (false);
```

Replacement in crawl-ref/source/religion.cc at line 7131 [10.804403]

B:BD[15.12303] → [5.2640:2681]

∅:D[5.2681] → [15.12343:12395]

B:BD[15.12343] → [15.12343:12395]

    // Complimentary jelly upon joining.
    if (you.religion == GOD_JIYVA && !_has_jelly())

[15.12303]

[15.12395]

    // Complimentary jelly upon joining for the first time.
    if (you.religion == GOD_JIYVA && you.worshipped[GOD_JIYVA] == 1)

Replacement in crawl-ref/source/religion.cc at line 7134 [10.804403]

B:BD[15.12401] → [15.12401:12548]

        monster_type mon = MONS_JELLY;
        mgen_data mg(mon, BEH_STRICT_NEUTRAL, 0, 0, you.pos(), MHITNOT, 0,
                     GOD_JIYVA);

[15.12401]

[15.12548]

        slime_vault_change(false);

Replacement in crawl-ref/source/religion.cc at line 7136 [10.804403]

B:BD[15.12549] → [15.12549:12631]

        _delayed_monster(mg);
        simple_god_message(" grants you a jelly!");

[15.12549]

[15.12631]

        if (!_has_jelly())
        {
            monster_type mon = MONS_JELLY;
            mgen_data mg(mon, BEH_STRICT_NEUTRAL, 0, 0, you.pos(), MHITNOT, 0,
                         GOD_JIYVA);

Replacement in crawl-ref/source/religion.cc at line 7142 [10.804403]

B:BD[15.12632] → [15.12632:13180]

        if (level_id::current() == level_id(BRANCH_SLIME_PITS, 6))
        {
            const level_id target(BRANCH_SLIME_PITS, 6);
            bool done = apply_to_level(target, true, slime_vault_to_floor);
            if (done)
            {
                if (silenced(you.pos()))
                {
                    mpr("An unexplained breeze blows through the dungeon.",
                        MSGCH_GOD);
                }
                else
                    mpr("You hear the sound of toppling stones.", MSGCH_GOD);
            }

[15.12632]

[15.13180]

            _delayed_monster(mg);
            simple_god_message(" grants you a jelly!");

Replacement in crawl-ref/source/player.cc at line 6012 [10.962854]

B:BD[19.355974] → [12.12565:12627]

∅:D[12.12627] → [20.7655:7729]

B:BD[19.356026] → [20.7655:7729]

B:BD[20.7729] → [12.12628:12709]

B:BD[12.12709] → [6.5261:5290]

    your_level      = 0;
    level_type      = LEVEL_DUNGEON;
    entry_cause     = EC_SELF_EXPLICIT;
    entry_cause_god = GOD_NO_GOD;
    where_are_you   = BRANCH_MAIN_DUNGEON;
    char_direction  = GDT_DESCENDING;
    opened_zot      = false;

[19.355974]

[19.356104]

    your_level       = 0;
    level_type       = LEVEL_DUNGEON;
    entry_cause      = EC_SELF_EXPLICIT;
    entry_cause_god  = GOD_NO_GOD;
    where_are_you    = BRANCH_MAIN_DUNGEON;
    char_direction   = GDT_DESCENDING;
    opened_zot       = false;
    royal_jelly_dead = false;

Insertion in crawl-ref/source/monstuff.h at line 98 [10.1390580]
[3.2679]
[21.5245]
```
void slime_vault_change(bool glass);
```
Insertion in crawl-ref/source/monstuff.cc at line 778 [10.1396662]
[22.3626]
[22.3626]
```
static bool _slime_vault_in_los()
{
    bool in_los = false;
```

Replacement in crawl-ref/source/monstuff.cc at line 783 [10.1396662]

∅:D[23.3037] → [24.2545:2588]

∅:D[22.3627] → [24.2545:2588]

B:BD[25.2772] → [24.2545:2588]

static bool _slime_pit_unlock(bool silent)

[22.3627]

[25.2821]

    for (int x = 0; x < GXM && !in_los; ++x)
    {
        for (int y = 0; y < GYM; ++y)
        {
            if ((grd[x][y] == DNGN_STONE_WALL
                    || grd[x][y] == DNGN_CLEAR_STONE_WALL)
                && see_grid(x, y))
            {
                in_los = true;
                break;
            }
        }
    }
    return (in_los);
}
static bool _slime_vault_to_glass(bool silent)

Insertion in crawl-ref/source/monstuff.cc at line 805 [10.1396662]
[24.2669]
[24.2669]

Replacement in crawl-ref/source/monstuff.cc at line 807 [10.1396662]

B:BD[24.2686] → [24.2686:2783]

B:BD[24.2783] → [4.2637:2705]

∅:D[4.2705] → [24.2871:2975]

B:BD[24.2871] → [24.2871:2975]

    {
        for (int x = 0; x < GXM && !in_los; ++x)
            for (int y = 0; y < GYM; ++y)
                if (grd[x][y] == DNGN_STONE_WALL && see_grid(x, y))
                {
                    in_los = true;
                    break;
                }
    }

[24.2686]

[24.2975]

        in_los = _slime_vault_in_los();

Replacement in crawl-ref/source/monstuff.cc at line 829 [10.1396662]
B:BD[26.7852] → [9.3091:3121]
```
    if (!silenced(you.pos()))
```
[26.7852]
[9.3121]
```
    if (silenced(you.pos()))
```

Replacement in crawl-ref/source/monstuff.cc at line 831 [10.1396662]

B:BD[9.3127] → [9.3127:3201]

        mpr("With infernal noise, the power ruling this place vanishes!",

[9.3127]

[9.3201]

        mpr("With an infernal shudder, the power ruling this place vanishes!",

Replacement in crawl-ref/source/monstuff.cc at line 836 [10.1396662]

B:BD[9.3258] → [9.3258:3337]

        mpr("With an infernal shudder, the power ruling this place vanishes!",

[9.3258]

[9.3337]

        mpr("With infernal noise, the power ruling this place vanishes!",

Replacement in crawl-ref/source/monstuff.cc at line 843 [10.1396662]

B:BD[24.3342] → [27.12766:12807]

static bool _slime_pit_unlock_offlevel()

[24.3342]

[27.12807]

static bool _slime_vault_to_glass_offlevel()
{
    return _slime_vault_to_glass(true);
}
static bool _slime_vault_to_glass_onlevel()
{
    return _slime_vault_to_glass(false);
}
static bool _slime_vault_to_floor(bool silent)
{
    unset_level_flags(LFLAG_NO_TELE_CONTROL, silent);
    bool in_los = false;
    if (!silent)
        in_los = _slime_vault_in_los();
    replace_area_wrapper(DNGN_STONE_WALL, DNGN_FLOOR);
    // In case it was already vitrified, but then it's less noticeable.
    replace_area_wrapper(DNGN_CLEAR_STONE_WALL, DNGN_FLOOR);
    if (silenced(you.pos()))
        mpr("An unexplained breeze blows through the dungeon.", MSGCH_GOD);
    else
        mpr("You hear the sound of toppling stones.", MSGCH_GOD);
    return (true);
}
static bool _slime_vault_to_floor_offlevel()
{
    return _slime_vault_to_floor(true);
}
static bool _slime_vault_to_floor_onlevel()

Replacement in crawl-ref/source/monstuff.cc at line 881 [10.1396662]
B:BD[27.12809] → [27.12809:12845]
```
    return _slime_pit_unlock(true);
```
[27.12809]
[27.12845]
```
    return _slime_vault_to_floor(false);
```
Replacement in crawl-ref/source/monstuff.cc at line 883 [10.1396662]
B:BD[27.12847] → [27.12847:12887]
```
static bool _slime_pit_unlock_onlevel()
```
[27.12847]
[27.12887]
```
void slime_vault_change(bool glass)
```

Replacement in crawl-ref/source/monstuff.cc at line 886 [10.1396662]

B:BD[27.12889] → [27.12889:12926]

    return _slime_pit_unlock(false);

[27.12889]

[27.12926]

    const level_id target(BRANCH_SLIME_PITS, 6);
    if (is_existing_level(target))
    {
        if (glass)
        {
            apply_to_level(target, true,
                           target == level_id::current() ?
                               _slime_vault_to_glass_onlevel :
                               _slime_vault_to_glass_offlevel);
        }
        else
        {
            apply_to_level(target, true,
                           target == level_id::current() ?
                               _slime_vault_to_floor_onlevel :
                               _slime_vault_to_floor_offlevel);
        }
    }

Replacement in crawl-ref/source/monstuff.cc at line 948 [10.1396662]

B:BD[28.3679] → [28.3679:3771]

∅:D[28.3771] → [24.3498:3508]

B:BD[29.2864] → [24.3498:3508]

B:BD[24.3508] → [28.3772:3997]

∅:D[30.2988] → [24.3823:3833]

∅:D[28.3997] → [24.3823:3833]

B:BD[24.3823] → [24.3823:3833]

        const level_id target(BRANCH_SLIME_PITS, 6);
        if (is_existing_level(target))
        {
            apply_to_level(
                target,
                true,
                target == level_id::current() ? _slime_pit_unlock_onlevel
                                              : _slime_pit_unlock_offlevel);
        }

[28.3679]

[29.3024]

        you.royal_jelly_dead = true;
        if (jiyva_is_dead())
            slime_vault_change(true);

Deletion in crawl-ref/source/misc.h at line 37 [10.1928926]
B:BD[31.2860] → [15.25084:25113]
```
bool slime_vault_to_floor();
```

Deletion in crawl-ref/source/misc.cc at line 1160 [10.1933596]

B:BD[15.25116] → [15.25116:25172]

∅:D[15.25172] → [32.3624:3625]

B:BD[32.3624] → [32.3624:3625]

B:BD[32.3625] → [15.25173:25379]

bool slime_vault_to_floor()
{
    bool success = false;
    for (rectangle_iterator ri(1); ri; ++ri)
    {
        if (grd(*ri) == DNGN_STONE_WALL)
        {
            grd(*ri) = DNGN_FLOOR;
            success = true;
        }
    }
    return (success);
}

Replacement in crawl-ref/source/misc.cc at line 2446 [10.1933596]

B:BD[10.1959149] → [15.25416:25516]

    if (level_id::current() == level_id(BRANCH_SLIME_PITS, 6)
        && you.religion == GOD_JIYVA)

[10.1959149]

[15.25516]

    if (level_id::current() == level_id(BRANCH_SLIME_PITS, 6))

Deletion in crawl-ref/source/misc.cc at line 2448 [10.1933596]
B:BD[15.25522] → [15.25522:25575]
```
        const level_id target(BRANCH_SLIME_PITS, 6);
```

Replacement in crawl-ref/source/misc.cc at line 2449 [10.1933596]

B:BD[15.25607] → [15.25607:26125]

        {
            if (apply_to_level(target, true, slime_vault_to_floor))
            {
                if (!silenced(you.pos()))
                {
                    mpr("You hear the sound of toppling stones.",
                        MSGCH_MONSTER_ENCHANT);
                }
                else
                {
                    mpr("An unexplained breeze blows through the dungeon.",
                        MSGCH_MONSTER_ENCHANT);
                }
            }
            times_entered++;
        }

[15.25607]

[15.26125]

            slime_vault_change(jiyva_is_dead());
        times_entered++;

Insertion in crawl-ref/source/externs.h at line 840 [10.3270163]
[6.5598]
[10.3277418]
```
  bool royal_jelly_dead;
```
Insertion in crawl-ref/source/dungeon.cc at line 48 [10.3429798]
[10.3431217]
[33.3978]
```
#include "religion.h"
```

Insertion in crawl-ref/source/dungeon.cc at line 4898 [10.3429798]

[10.3607594]

    if (grd(where) == DNGN_ALTAR_JIYVA && jiyva_is_dead())
        grd(where) = DNGN_FLOOR;

Replacement in crawl-ref/source/dungeon.cc at line 5055 [10.3429798]

B:BD[2.3254] → [2.3254:3307]

                // Force it to be generated anyways.

[2.3254]

[2.3307]

                // Force it to be generated anyway.

Replacement in crawl-ref/source/dungeon.cc at line 5347 [10.3429798]
B:BD[10.3634715] → [8.2779:2832]
```
    if (player_in_branch( BRANCH_ECUMENICAL_TEMPLE )
```
[10.3634715]
[10.3634818]
```
    if (player_in_branch(BRANCH_ECUMENICAL_TEMPLE)
```

Replacement in crawl-ref/source/dungeon.cc at line 5398 [10.3429798]

B:BD[15.29103] → [15.29103:29146]

            altar_type = DNGN_ALTAR_JIYVA;

[15.29103]

[15.29146]

            altar_type = jiyva_is_dead() ? DNGN_FLOOR : DNGN_ALTAR_JIYVA;

Insertion in crawl-ref/source/decks.cc at line 2535 [10.3987460]

[34.2737]

[35.10817]


            if (rgod == GOD_JIYVA && jiyva_is_dead())
                rgod = GOD_NO_GOD;

Insertion in crawl-ref/source/artefact.cc at line 49 [10.893152]

[36.3189]

    if (which_god == GOD_JIYVA && jiyva_is_dead())
        return (false);

Replacement in crawl-ref/source/abyss.cc at line 308 [10.4482606]

B:BD[35.16761] → [7.2913:2973]

                       || grd(*ri) == DNGN_ALTAR_ELYVILON);

[35.16761]

[37.647]

                       || grd(*ri) == DNGN_ALTAR_ELYVILON
                       || (jiyva_is_dead() ?
                              grd(*ri) == DNGN_ALTAR_JIYVA : false));

Add yet more Jiyva-related cleanups. Make sure his altars are never

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tags.h at line 71 [10.161012]

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

Insertion in crawl-ref/source/tags.cc at line 1256 [10.164589]

Insertion in crawl-ref/source/tags.cc at line 1260 [10.164589]

Insertion in crawl-ref/source/religion.h at line 106 [10.800304]

Replacement in crawl-ref/source/religion.cc at line 855 [10.804403]

Deletion in crawl-ref/source/religion.cc at line 864 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 933 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 5208 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 7131 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 7134 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 7136 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 7142 [10.804403]

Replacement in crawl-ref/source/player.cc at line 6012 [10.962854]

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

Insertion in crawl-ref/source/monstuff.cc at line 778 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 783 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 805 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 807 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 829 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 831 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 836 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 843 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 881 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 883 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 886 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 948 [10.1396662]

Deletion in crawl-ref/source/misc.h at line 37 [10.1928926]

Deletion in crawl-ref/source/misc.cc at line 1160 [10.1933596]

Replacement in crawl-ref/source/misc.cc at line 2446 [10.1933596]

Deletion in crawl-ref/source/misc.cc at line 2448 [10.1933596]