fiddlerwoaroof/crawl - Change APMT6XTVAD4ZCXCMUPTW5KCNR7TXW6W37SNYUP5A6NLFLXT3BCYQC

Removed portable altars. Nemelex prayers will now sacrifice everything

on the current square. (This will need some interface improvements to prevent players from 'p'ing away their stash…) Also removed some unused enums and enum values. Breaks savefiles.

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

Created by haranp on May 12, 2007

APMT6XTVAD4ZCXCMUPTW5KCNR7TXW6W37SNYUP5A6NLFLXT3BCYQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/tags.cc at line 834 [5.164589]
∅:D[2.137] → [4.20:84]
B:BD[6.131186] → [4.20:84]
```
    marshallString(th, you.last_altar_inscription.c_str(), 80);
```
Deletion in crawl-ref/source/tags.cc at line 1136 [5.164589]
∅:D[2.179] → [7.22:81]
B:BD[8.5016] → [7.22:81]
```
    you.last_altar_inscription = unmarshallString(th, 80);
```

Replacement in crawl-ref/source/religion.cc at line 416 [5.804403]

B:BD[9.173331] → [9.173331:173404]

                && (!you.attribute[ATTR_CARD_TABLE] || one_chance_in(3))

[9.173331]

[9.173404]

                && one_chance_in(3)

Deletion in crawl-ref/source/religion.cc at line 422 [5.804403]

∅:D[9.173637] → [5.812799:812800]

B:BD[5.812799] → [5.812799:812800]

B:BD[5.812800] → [9.173638:173906]

∅:D[9.173906] → [5.812937:812938]

B:BD[5.812937] → [5.812937:812938]

B:BD[5.812938] → [9.173907:174457]


                if (!you.attribute[ATTR_CARD_TABLE])
                {
                    thing_created = items( 1, OBJ_MISCELLANY,
                                           MISC_PORTABLE_ALTAR_OF_NEMELEX, 
                                           true, 1, 250 );
                    if (thing_created != NON_ITEM)
                        you.attribute[ATTR_CARD_TABLE] = 1;
                }
                else
                {
                    if (random2(200) <= you.piety && one_chance_in(4))
                        gift_type = MISC_DECK_OF_SUMMONINGS;
                    if (random2(200) <= you.piety && coinflip())
                        gift_type = MISC_DECK_OF_WONDERS;
                    if (random2(200) <= you.piety && one_chance_in(4))
                        gift_type = MISC_DECK_OF_POWER;

Replacement in crawl-ref/source/religion.cc at line 423 [5.804403]

B:BD[5.813519] → [9.174458:174609]

                    thing_created = items( 1, OBJ_MISCELLANY, gift_type, 
                                           true, 1, 250 );
                }

[5.813519]

[5.813646]

                if (random2(200) <= you.piety && one_chance_in(4))
                    gift_type = MISC_DECK_OF_SUMMONINGS;
                if (random2(200) <= you.piety && coinflip())
                    gift_type = MISC_DECK_OF_WONDERS;
                if (random2(200) <= you.piety && one_chance_in(4))
                    gift_type = MISC_DECK_OF_POWER;
                
                thing_created = items( 1, OBJ_MISCELLANY, gift_type, 
                                       true, 1, 250 );

Insertion in crawl-ref/source/religion.cc at line 688 [5.804403]

[10.2118]

    // Nemelexites can offer everywhere
    if ( you.religion == GOD_NEMELEX_XOBEH && altar_god == GOD_NO_GOD )
        offer_items();

Deletion in crawl-ref/source/makeitem.cc at line 2788 [11.927]
B:BD[11.95995] → [11.95995:96067]
```
                || (mitm[p].sub_type == MISC_PORTABLE_ALTAR_OF_NEMELEX)
```

Replacement in crawl-ref/source/items.cc at line 1051 [5.2584728]

B:BD[6.348044] → [6.348044:348371]

            && (item.base_type != OBJ_FOOD || item.sub_type != FOOD_CHUNK)
            // Portable altars cannot be tracked meaningfully with Crawl's
            // current handling for portable altars.
            && (item.base_type != OBJ_MISCELLANY || 
                    item.sub_type != MISC_PORTABLE_ALTAR_OF_NEMELEX));

[6.348044]

[6.348371]

            && (item.base_type != OBJ_FOOD || item.sub_type != FOOD_CHUNK));

Deletion in crawl-ref/source/items.cc at line 1186 [5.2584728]
B:BD[5.2607724] → [5.2607724:2607739]
```
    int m = 0;
```

Deletion in crawl-ref/source/items.cc at line 1199 [5.2584728]

B:BD[5.2608179] → [5.2608179:2608478]

B:BD[5.2608478] → [12.79885:79991]

∅:D[12.79991] → [5.2608565:2608798]

B:BD[5.2608565] → [5.2608565:2608798]

B:BD[5.2608798] → [13.7172:7669]

∅:D[13.7669] → [5.2609227:2609228]

B:BD[5.2609227] → [5.2609227:2609228]

B:BD[5.2609228] → [13.7670:7771]

∅:D[13.7771] → [5.2609347:2609386]

B:BD[5.2609347] → [5.2609347:2609386]

B:BD[5.2609386] → [13.7772:7840]

∅:D[13.7840] → [5.2609531:2609643]

B:BD[5.2609531] → [5.2609531:2609643]

B:BD[5.2609643] → [14.5423:5453]

∅:D[14.5453] → [5.2609643:2609653]

B:BD[5.2609643] → [5.2609643:2609653]

    }
    // Fortunately, the player is prevented from testing their
    // portable altar in the Ecumenical Temple. -- bwr
    if (grd[you.x_pos][you.y_pos] == DNGN_ALTAR_NEMELEX_XOBEH
        && !player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))
    {
        if (inv_count() >= ENDOFPACK)
        {
            mpr("There is a portable altar here, "
                "but you can't carry anything else.");
            return;
        }
        if (yesno("There is a portable altar here. Pick it up?"))
        {
            for (m = 0; m < ENDOFPACK; m++)
            {
                if (!is_valid_item( you.inv[m] ))
                {
                    item_def& item = you.inv[m];
                    item.base_type = OBJ_MISCELLANY;
                    item.sub_type = MISC_PORTABLE_ALTAR_OF_NEMELEX;
                    item.plus = 0;
                    item.plus2 = 0;
                    item.special = 0;
                    item.colour = LIGHTMAGENTA;
                    item.quantity = 1;
                    item.inscription = you.last_altar_inscription;
                    set_ident_flags( item, ISFLAG_IDENT_MASK );
                    item.x = -1;
                    item.y = -1;
                    item.link = m;
                    burden_change();
                    mpr( item.name(DESC_INVENTORY_EQUIP).c_str() );
                    break;
                }
            }
            grd[you.x_pos][you.y_pos] = DNGN_FLOOR;
            unnotice_altar();
        }

Deletion in crawl-ref/source/itemprop.cc at line 2065 [9.646661]

B:BD[9.707043] → [9.707043:707155]

        if (item.sub_type == MISC_PORTABLE_ALTAR_OF_NEMELEX)
        {
            size = SIZE_SMALL;
        }

Deletion in crawl-ref/source/itemname.cc at line 702 [5.2667494]

B:BD[3.18891] → [3.18891:18984]

        case MISC_PORTABLE_ALTAR_OF_NEMELEX:
            return "portable altar of Nemelex";

Deletion in crawl-ref/source/itemname.cc at line 731 [5.2667494]

B:BD[3.20057] → [3.20057:20150]

        case MISC_PORTABLE_ALTAR_OF_NEMELEX:
            return "portable altar of Nemelex";

Deletion in crawl-ref/source/it_use3.cc at line 640 [5.2870456]

B:BD[5.2891014] → [5.2891014:2891514]

B:BD[5.2891514] → [4.357:465]

∅:D[4.465] → [5.2891514:2891650]

B:BD[5.2891514] → [5.2891514:2891650]

B:BD[5.2891650] → [14.5484:5589]

∅:D[14.5589] → [5.2891650:2891664]

B:BD[5.2891650] → [5.2891650:2891664]

            break;
        case MISC_PORTABLE_ALTAR_OF_NEMELEX:
            if (player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))
            {
                mpr( "Don't you think this level already has more than "
                     "enough altars?" );
            }
            else if (grd[you.x_pos][you.y_pos] != DNGN_FLOOR)
                mpr("You need a clear area to place this item.");
            else
            {
                mpr("You unfold the altar and place it on the floor.");
                you.last_altar_inscription =
                    you.inv[you.equip[EQ_WEAPON]].inscription;
                grd[you.x_pos][you.y_pos] = DNGN_ALTAR_NEMELEX_XOBEH;
                dec_inv_item_quantity( you.equip[EQ_WEAPON], 1 );
                seen_notable_thing(
                    DNGN_ALTAR_NEMELEX_XOBEH, you.x_pos, you.y_pos);
            }

Deletion in crawl-ref/source/externs.h at line 697 [5.3270163]

B:BD[5.3279865] → [4.486:641]


  // Hard-coded to store and restore the inscription of any altar
  // you 'E'voke. Got to do this better sometime.
  std::string last_altar_inscription;

Deletion in crawl-ref/source/enum.h at line 179 [5.3287960]
B:BD[6.448204] → [9.904282:904315]
∅:D[9.904315] → [5.3292719:3292832]
B:BD[5.3292719] → [5.3292719:3292832]
B:BD[5.3292832] → [6.448205:448209]
```
enum ammunition_description_type
{
    DAMMO_ORCISH = 3,                  //    3
    DAMMO_ELVEN,
    DAMMO_DWARVEN                      //    5
};
```

Deletion in crawl-ref/source/enum.h at line 235 [5.3287960]

B:BD[5.3293799] → [5.3293799:3293803]

B:BD[5.3293803] → [9.904483:904579]

∅:D[9.904579] → [5.3293828:3294105]

B:BD[5.3293828] → [5.3293828:3294105]

};
// these are for the old system (still used for reading old files)
enum armour_description_type
{
    DARM_PLAIN,                 // added for the heck of it, 15 Apr 2000 {dlb}
    DARM_EMBROIDERED_SHINY = 1, // which it is dependent upon armour subtype {dlb}
    DARM_RUNED,
    DARM_GLOWING,
    DARM_ELVEN,
    DARM_DWARVEN,                      //    5
    DARM_ORCISH

Replacement in crawl-ref/source/enum.h at line 246 [5.3287960]

B:BD[5.3294347] → [5.3294347:3294429]

B:BD[5.3294429] → [9.904628:904679]

∅:D[9.904679] → [5.3294465:3294534]

B:BD[5.3294465] → [5.3294465:3294534]

    // ATTR_SPEC_AIR,                  // don't use this!
    // ATTR_SPEC_EARTH,
    ATTR_CONTROL_TELEPORT = 3,         // obsolete
    ATTR_WALK_SLOWLY,
    ATTR_TRANSFORMATION,               //    5

[5.3294347]

[5.3294534]

    ATTR_TRANSFORMATION,

Deletion in crawl-ref/source/enum.h at line 248 [5.3287960]
B:BD[5.3294559] → [5.3294559:3294580]
```
    ATTR_CARD_TABLE,
```

Deletion in crawl-ref/source/enum.h at line 251 [5.3287960]

B:BD[5.3294752] → [5.3294752:3294944]

    ATTR_EXPENSIVE_FLIGHT,      //jmf: flag for "manual flight" (ie wings)
    ATTR_DEMONIC_SCALES,        //jmf: remember which kind of scales to improve
    ATTR_WALLS,
    ATTR_LAST_WALLS,

Deletion in crawl-ref/source/enum.h at line 252 [5.3287960]

B:BD[5.3295002] → [9.904680:904822]

    ATTR_DEMONIC_POWER_1,
    ATTR_DEMONIC_POWER_2,
    ATTR_DEMONIC_POWER_3,
    ATTR_DEMONIC_POWER_4,
    ATTR_DEMONIC_POWER_5,       // 19

Deletion in crawl-ref/source/enum.h at line 1794 [5.3287960]
B:BD[5.3329555] → [5.3329555:3329591]
```
    MISC_PORTABLE_ALTAR_OF_NEMELEX,
```
Deletion in crawl-ref/source/enum.h at line 3474 [5.3287960]
B:BD[5.3369567] → [5.3369567:3369571]
B:BD[5.3369571] → [9.930123:930140]
∅:D[9.930140] → [5.3369589:3369658]
B:BD[5.3369589] → [5.3369589:3369658]
```
};
enum statue_type
{
    STATUE_SILVER,
    STATUE_ORANGE_CRYSTAL,
    NUM_STATUE_TYPES
```
Deletion in crawl-ref/source/effects.cc at line 1118 [5.3382105]
B:BD[5.3416887] → [5.3416887:3416956]
```
                    || type_wanted == MISC_PORTABLE_ALTAR_OF_NEMELEX
```

Deletion in crawl-ref/source/describe.cc at line 2992 [5.3736416]

B:BD[5.3836816] → [5.3836816:3837126]

            break;
        case MISC_PORTABLE_ALTAR_OF_NEMELEX:
            description +=
                "An altar to Nemelex Xobeh, built for easy assembly and "
                "disassembly.  Evoke it to place it on a clear patch of floor, "
                "then pick it up again when you've finished. ";

Deletion in crawl-ref/source/describe.cc at line 3039 [5.3736416]

B:BD[5.3838726] → [5.3838726:3839033]

            break;
        case MISC_PORTABLE_ALTAR_OF_NEMELEX:
            description +=
                "An altar to Nemelex Xobeh, built for easy assembly and "
                "disassembly.  Evoke it to place on a clear patch of floor, "
                "then pick it up again when you've finished. ";

Deletion in crawl-ref/source/abl-show.cc at line 1090 [5.4494389]
B:BD[5.4516026] → [5.4516026:4516094]
```
            // you.attribute[ATTR_EXPENSIVE_FLIGHT] = 1;  // unused
```

Removed portable altars. Nemelex prayers will now sacrifice everything

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/tags.cc at line 834 [5.164589]

Deletion in crawl-ref/source/tags.cc at line 1136 [5.164589]

Replacement in crawl-ref/source/religion.cc at line 416 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 422 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 423 [5.804403]

Insertion in crawl-ref/source/religion.cc at line 688 [5.804403]

Deletion in crawl-ref/source/makeitem.cc at line 2788 [11.927]

Replacement in crawl-ref/source/items.cc at line 1051 [5.2584728]

Deletion in crawl-ref/source/items.cc at line 1186 [5.2584728]

Deletion in crawl-ref/source/items.cc at line 1199 [5.2584728]

Deletion in crawl-ref/source/itemprop.cc at line 2065 [9.646661]

Deletion in crawl-ref/source/itemname.cc at line 702 [5.2667494]

Deletion in crawl-ref/source/itemname.cc at line 731 [5.2667494]

Deletion in crawl-ref/source/it_use3.cc at line 640 [5.2870456]

Deletion in crawl-ref/source/externs.h at line 697 [5.3270163]

Deletion in crawl-ref/source/enum.h at line 179 [5.3287960]

Deletion in crawl-ref/source/enum.h at line 235 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 246 [5.3287960]

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

Deletion in crawl-ref/source/enum.h at line 251 [5.3287960]

Deletion in crawl-ref/source/enum.h at line 252 [5.3287960]

Deletion in crawl-ref/source/enum.h at line 1794 [5.3287960]

Deletion in crawl-ref/source/enum.h at line 3474 [5.3287960]

Deletion in crawl-ref/source/effects.cc at line 1118 [5.3382105]

Deletion in crawl-ref/source/describe.cc at line 2992 [5.3736416]

Deletion in crawl-ref/source/describe.cc at line 3039 [5.3736416]

Deletion in crawl-ref/source/abl-show.cc at line 1090 [5.4494389]