fiddlerwoaroof/crawl - Change WHY6LRRJ5T2NSBE3IUCR4X3TOAH7TTK5NPUPUIFT7TPNJ6J4HBDAC

Implemented David Ploog's "Lucy" abyssal god. An altar has a 20%

chance of showing up in each Abyss area. Many things still need to be done: better naming, better descriptive text, differentiation from Makhleb in preferences, etc. Playtesting and debugging required. Breaks savefiles.

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

Created by haranp on December 23, 2006

WHY6LRRJ5T2NSBE3IUCR4X3TOAH7TTK5NPUPUIFT7TPNJ6J4HBDAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 1712 [4.16817]
[3.15239]
[3.15239]
```
        case DNGN_ALTAR_LUCY:
```

Insertion in crawl-ref/source/view.cc at line 3053 [4.16817]

[4.98278]

[5.60571]

        case DNGN_ALTAR_LUCY:
            Feature[i].colour = GREEN;
            Feature[i].symbol = Options.char_table[ DCHAR_ALTAR ];
            Feature[i].notable = true;
            Feature[i].map_colour = DARKGREY;
            Feature[i].seen_colour = GREEN;
            break;

Insertion in crawl-ref/source/travel.cc at line 604 [3.39949]
[3.58305]
[3.58305]
```
    traversable_terrain[DNGN_ALTAR_LUCY] =
```
Insertion in crawl-ref/source/religion.cc at line 78 [4.804403]
[6.1132]
[6.1132]
```
    " is consumed by the void.",
```
Replacement in crawl-ref/source/religion.cc at line 111 [4.804403]
B:BD[2.1146] → [2.1146:1180]
```
    { "", "", "",
      "", "" },
```
[2.1146]
[2.1180]
```
    { "", "", "", "", "" },
```
Replacement in crawl-ref/source/religion.cc at line 142 [4.804403]
B:BD[2.2171] → [2.2171:2205]
```
    { "", "", "",
      "", "" },
```
[2.2171]
[2.2205]
```
    { "", "", "", "", "" },
```

Replacement in crawl-ref/source/religion.cc at line 148 [4.804403]

B:BD[2.2415] → [2.2415:2467]

      "call upon Elyvilon for incredible healing" }

[2.2415]

[2.2467]

      "call upon Elyvilon for incredible healing" },
    // Lucy
    { "depart the Abyss - at a permanent cost",
      "",
      "summon the demons of the Abyss to your aid",
      "",
      "gate yourself to the Abyss" }

Replacement in crawl-ref/source/religion.cc at line 186 [4.804403]
B:BD[2.3331] → [2.3331:3365]
```
    { "", "", "",
      "", "" },
```
[2.3331]
[2.3365]
```
    { "", "", "", "", "" },
```
Replacement in crawl-ref/source/religion.cc at line 218 [4.804403]
B:BD[2.4315] → [2.4315:4349]
```
    { "", "", "",
      "", "" },
```
[2.4315]
[2.4349]
```
    { "", "", "", "", "" },
```

Replacement in crawl-ref/source/religion.cc at line 224 [4.804403]

B:BD[2.4559] → [2.4559:4611]

      "call upon Elyvilon for incredible healing" }

[2.4559]

[4.806351]

      "call upon Elyvilon for incredible healing" },
    // Lucy
    { "depart the Abyss at will",
      "",
      "summon the demons of the Abyss to your aid",
      "",
      "gate yourself to the Abyss" }

Insertion in crawl-ref/source/religion.cc at line 239 [4.804403]

[4.806513]


static bool is_evil_god(int god)
{
    return
        god == GOD_KIKUBAAQUDGHA ||
        god == GOD_MAKHLEB ||
        god == GOD_YREDELEMNUL ||
        god == GOD_VEHUMET ||
        god == GOD_LUCY;
}

Insertion in crawl-ref/source/religion.cc at line 757 [4.804403]

[4.822582]

    case GOD_LUCY:
        sprintf(godname_buff, "Lucy");
        break;

Insertion in crawl-ref/source/religion.cc at line 1246 [4.804403]
[4.837184]
[5.183377]
```
        case GOD_LUCY:
```
Insertion in crawl-ref/source/religion.cc at line 1271 [4.804403]
[5.183885]
[4.837555]
```
        case GOD_LUCY:
```
Insertion in crawl-ref/source/religion.cc at line 1288 [4.804403]
[4.837899]
[4.837925]
```
        case GOD_LUCY:
```
Insertion in crawl-ref/source/religion.cc at line 1341 [4.804403]
[5.185212]
[5.185212]
```
        case GOD_LUCY:
```
Insertion in crawl-ref/source/religion.cc at line 1378 [4.804403]
[4.840008]
[4.840008]
```
        case GOD_LUCY:
```
Insertion in crawl-ref/source/religion.cc at line 1394 [4.804403]
[5.186372]
[5.186372]
```
        case GOD_LUCY:
```

Replacement in crawl-ref/source/religion.cc at line 1597 [4.804403]

B:BD[5.191452] → [5.191452:191569]

         (you.religion == GOD_SHINING_ONE || you.religion == GOD_ZIN) &&
         you.num_gifts[you.religion] == 0 )

[5.191452]

[5.191569]

         (you.religion == GOD_SHINING_ONE || you.religion == GOD_ZIN ||
          you.religion == GOD_LUCY) && you.num_gifts[you.religion] == 0 )

Replacement in crawl-ref/source/religion.cc at line 1617 [4.804403]

B:BD[5.191754] → [5.191754:191876]

            (you.religion == GOD_SHINING_ONE || you.religion == GOD_ZIN) &&
            you.num_gifts[you.religion] == 0)

[5.191754]

[5.191876]

            (you.religion == GOD_SHINING_ONE || you.religion == GOD_ZIN ||
             you.religion == GOD_LUCY) && you.num_gifts[you.religion] == 0)

Replacement in crawl-ref/source/religion.cc at line 1682 [4.804403]

B:BD[4.862668] → [4.862668:862824]

        if (you.religion == GOD_KIKUBAAQUDGHA || you.religion == GOD_MAKHLEB
            || you.religion == GOD_YREDELEMNUL || you.religion == GOD_VEHUMET)

[4.862668]

[4.862824]

        if (is_evil_god(you.religion))

Replacement in crawl-ref/source/religion.cc at line 1734 [4.804403]

B:BD[4.864389] → [4.864389:864545]

        if (you.religion == GOD_KIKUBAAQUDGHA || you.religion == GOD_MAKHLEB
            || you.religion == GOD_YREDELEMNUL || you.religion == GOD_VEHUMET)

[4.864389]

[4.864545]

        if (is_evil_god(you.religion))

Insertion in crawl-ref/source/religion.cc at line 2100 [4.804403]

[4.876503]

        }
        break;
    case GOD_LUCY:
        // abyssal servant theme
        if (random2(you.experience_level) > 7 && !one_chance_in(5))
        {
            if (create_monster(MONS_GREEN_DEATH + random2(3), 0,
                               BEH_HOSTILE, you.x_pos, you.y_pos,
                               MHITYOU, 250) != -1)
            {
                simple_god_message(" sends a demon after you!", god);
            }
	    else
	    {
		simple_god_message("'s demon is unavoidably detained.", god);
	    }

Insertion in crawl-ref/source/religion.cc at line 2118 [4.804403]

[4.876513]

        else
        {
            success = false;
            how_many = 1 + (you.experience_level / 7);
            for (loopy = 0; loopy < how_many; loopy++)
            {
                if (create_monster(MONS_NEQOXEC + random2(5), 0, BEH_HOSTILE,
                                    you.x_pos, you.y_pos, MHITYOU, 250) != -1)
                {
                    success = true;
                }
            }
            if (success)
                simple_god_message(" sends minions to punish you.", god);
	    else
		simple_god_message("'s minions fail to arrive.", god);
        }

Insertion in crawl-ref/source/religion.cc at line 2162 [4.804403]
[4.877073]
[4.877073]

Replacement in crawl-ref/source/religion.cc at line 2221 [4.804403]

B:BD[4.878953] → [4.878953:879024]

        // Penence has to come before retribution to prevent "mollify"

[4.878953]

[4.879024]

        // Penance has to come before retribution to prevent "mollify"

Replacement in crawl-ref/source/religion.cc at line 2232 [4.804403]

B:BD[4.879286] → [4.879286:879335]

    default:
        inc_penance( old_god, 25 );

[4.879286]

[4.879335]

    case GOD_LUCY:
        if ( you.level_type == LEVEL_DUNGEON )
        {
            simple_god_message(" casts you back into the Abyss!", old_god);
            banished(DNGN_ENTER_ABYSS);
        }
        inc_penance(old_god, 50);

Insertion in crawl-ref/source/religion.cc at line 2242 [4.804403]
[4.879398]
[4.879398]
```
        break;
    default:
        inc_penance( old_god, 25 );
```

Replacement in crawl-ref/source/religion.cc at line 2279 [4.804403]

B:BD[5.194366] → [5.194366:194473]

        // as currently only Zin and TSO do this is our permabrand effect:
        holy_word( 100, true );

[5.194366]

[5.194473]

        if ( god != GOD_LUCY )
            holy_word( 100, true );

Insertion in crawl-ref/source/religion.cc at line 2348 [4.804403]

[5.195889]

[4.879849]

    // Lucy blesses weapons with distortion
    if (you.religion == GOD_LUCY
        && !you.num_gifts[GOD_LUCY]
        && !player_under_penance()
        && you.piety > 160)
    {
        const int wpn = get_player_wielded_weapon();
        
        if (wpn != -1 && get_weapon_brand(you.inv[wpn]) != SPWPN_DISTORTION)
            bless_weapon(GOD_LUCY, SPWPN_DISTORTION, RED);
    }

Replacement in crawl-ref/source/religion.cc at line 2512 [4.804403]

B:BD[4.883757] → [4.883757:883905]

    if (you.religion == GOD_KIKUBAAQUDGHA || you.religion == GOD_YREDELEMNUL
        || you.religion == GOD_VEHUMET || you.religion == GOD_MAKHLEB)

[4.883757]

[4.883905]

    if (is_evil_god(you.religion))

Insertion in crawl-ref/source/religion.cc at line 2522 [4.804403]

[4.884250]


    if ( you.religion == GOD_LUCY )
        gain_piety(20);         // allow instant access to first power

Insertion in crawl-ref/source/religion.cc at line 2627 [4.804403]
[4.887349]
[4.887349]
```
        case GOD_LUCY:
```
Insertion in crawl-ref/source/religion.cc at line 2693 [4.804403]
[4.888761]
[4.888761]
```
    case GOD_LUCY:
```

Replacement in crawl-ref/source/misc.cc at line 194 [4.1933596]

B:BD[5.543106] → [5.543106:543169]

    if (grid >= DNGN_ALTAR_ZIN && grid <= DNGN_ALTAR_ELYVILON)

[5.543106]

[5.543169]

    if (grid >= DNGN_ALTAR_ZIN && grid <= DNGN_ALTAR_LUCY)

Insertion in crawl-ref/source/items.cc at line 678 [4.2584728]

[4.2605427]

            case DNGN_ALTAR_LUCY:
                mpr("There is a corrupted altar of Lucy here.");
                break;

Insertion in crawl-ref/source/enum.h at line 112 [4.3287960]

[4.3291976]

    ABIL_LUCY_ABYSS_EXIT,
    ABIL_LUCY_SUMMON_DEMONS,
    ABIL_LUCY_ABYSS_ENTER,

Insertion in crawl-ref/source/enum.h at line 1039 [4.3287960]
[4.3310837]
[4.3310837]
```
    DNGN_ALTAR_LUCY,
```
Insertion in crawl-ref/source/enum.h at line 1372 [4.3287960]
[4.3317793]
[4.3317793]
```
    GOD_LUCY,
```

Insertion in crawl-ref/source/direct.cc at line 1286 [4.3697945]

[3.473472]

    case DNGN_ALTAR_LUCY:
        return ("A corrupt altar of Lucy.");

Insertion in crawl-ref/source/describe.cc at line 6547 [4.3736416]

[4.3949264]

    case GOD_LUCY:
        description =
            "Lucy is a god who revels in the chaos of the Abyss. Followers are sent out" EOL
            "to spread Lucy's word in the world. Lucy enjoys seeing her followers spread" EOL
            "chaos and destruction.";
        break;

Insertion in crawl-ref/source/describe.cc at line 6583 [4.3736416]
[5.991764]
[4.3950612]
```
                    (which_god == GOD_LUCY) ? "Abyssal Lord" :
```
Insertion in crawl-ref/source/describe.cc at line 6609 [4.3736416]
[4.3951646]
[4.3951646]
```
            case GOD_LUCY:
```
Insertion in crawl-ref/source/abyss.cc at line 50 [4.4482606]
[4.4483866]
[4.4483866]
```
    if ( one_chance_in(5) )
        grd[46][35] = DNGN_ALTAR_LUCY;
```

Insertion in crawl-ref/source/abyss.cc at line 384 [4.4482606]

[4.4492960]

    if ( one_chance_in(5) )
        grd[you.x_pos + 1][you.y_pos] = DNGN_ALTAR_LUCY;

Replacement in crawl-ref/source/abl-show.cc at line 130 [4.4494389]

B:BD[2.10641] → [2.10641:10679]

      ABIL_ELYVILON_GREATER_HEALING }

[2.10641]

[2.10679]

      ABIL_ELYVILON_GREATER_HEALING },
    // Lucy
    { ABIL_LUCY_ABYSS_EXIT, ABIL_NON_ABILITY,
      ABIL_LUCY_SUMMON_DEMONS, ABIL_NON_ABILITY,
      ABIL_LUCY_ABYSS_ENTER }

Insertion in crawl-ref/source/abl-show.cc at line 257 [4.4494389]

[4.4502991]


    // Lucy
    { ABIL_LUCY_ABYSS_EXIT, "Depart the Abyss", 0, 0, 100, 10, ABFLAG_PAIN },
    { ABIL_LUCY_SUMMON_DEMONS, "Summon Abyssal Servants", 7, 0, 100, 5, ABFLAG_NONE },
    { ABIL_LUCY_ABYSS_ENTER, "Enter the Abyss", 9, 0, 200, 40, ABFLAG_NONE },

Insertion in crawl-ref/source/abl-show.cc at line 1185 [4.4494389]

[4.4528435]

    case ABIL_LUCY_ABYSS_EXIT:
        if ( you.level_type != LEVEL_ABYSS )
        {
            mpr("You aren't in the Abyss!");
            return false;       // don't incur costs
        }
        banished(DNGN_EXIT_ABYSS);
        exercise(SK_INVOCATIONS, 8 + random2(10));
        // Lose 1d2 permanent HP
        you.hp_max -= (coinflip() ? 2 : 1);
        // Deflate HP
        set_hp( 1 + random2(you.hp), false );
        // Lose 1d2 permanent MP
        rot_mp(coinflip() ? 2 : 1);
        // Deflate MP
        if (you.magic_points)
            set_mp(random2(you.magic_points), false);
        break;
    case ABIL_LUCY_SUMMON_DEMONS:
        for ( int i = 0; i < you.skills[SK_INVOCATIONS] / 4; ++i )
            summon_ice_beast_etc( 20 + you.skills[SK_INVOCATIONS] * 3,
                                  summon_any_demon(DEMON_COMMON), true);
        exercise(SK_INVOCATIONS, 6 + random2(6));
        break;
    case ABIL_LUCY_ABYSS_ENTER:
        if (you.level_type == LEVEL_ABYSS)
        {
            mpr("You're already here.");
            return false;
        }
        else if (you.level_type == LEVEL_PANDEMONIUM)
        {
            mpr("That doesn't work from Pandemonium.");
            return false;
        }
        banished(DNGN_ENTER_ABYSS);
        break;

Implemented David Ploog's "Lucy" abyssal god. An altar has a 20%

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 1712 [4.16817]

Insertion in crawl-ref/source/view.cc at line 3053 [4.16817]

Insertion in crawl-ref/source/travel.cc at line 604 [3.39949]

Insertion in crawl-ref/source/religion.cc at line 78 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 111 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 142 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 148 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 186 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 218 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 224 [4.804403]

Insertion in crawl-ref/source/religion.cc at line 239 [4.804403]

Insertion in crawl-ref/source/religion.cc at line 757 [4.804403]

Insertion in crawl-ref/source/religion.cc at line 1246 [4.804403]

Insertion in crawl-ref/source/religion.cc at line 1271 [4.804403]

Insertion in crawl-ref/source/religion.cc at line 1288 [4.804403]

Insertion in crawl-ref/source/religion.cc at line 1341 [4.804403]

Insertion in crawl-ref/source/religion.cc at line 1378 [4.804403]

Insertion in crawl-ref/source/religion.cc at line 1394 [4.804403]