summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/abl-show.cc1
-rw-r--r--crawl-ref/source/describe.cc12
-rw-r--r--crawl-ref/source/effects.cc1
-rw-r--r--crawl-ref/source/enum.h43
-rw-r--r--crawl-ref/source/externs.h4
-rw-r--r--crawl-ref/source/it_use3.cc20
-rw-r--r--crawl-ref/source/itemname.cc4
-rw-r--r--crawl-ref/source/itemprop.cc4
-rw-r--r--crawl-ref/source/items.cc52
-rw-r--r--crawl-ref/source/makeitem.cc1
-rw-r--r--crawl-ref/source/religion.cc36
-rw-r--r--crawl-ref/source/tags.cc2
12 files changed, 16 insertions, 164 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 55f2b0a801..fa958a625a 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -1087,7 +1087,6 @@ static bool do_ability(const ability_def& abil)
else
{
cast_fly( you.experience_level * 2 );
- // you.attribute[ATTR_EXPENSIVE_FLIGHT] = 1; // unused
}
break;
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 510d3c5441..f29688e730 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2990,12 +2990,6 @@ static std::string describe_misc_item( const item_def &item )
case MISC_DECK_OF_POWER:
description += "A deck of powerful magical cards. ";
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. ";
- break;
default:
DEBUGSTR("Unknown misc item (2)");
}
@@ -3043,12 +3037,6 @@ static std::string describe_misc_item( const item_def &item )
case MISC_DISC_OF_STORMS:
description += "A grey disc. ";
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. ";
- break;
default:
DEBUGSTR("Unknown misc item");
}
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 2427959694..a76041e600 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1115,7 +1115,6 @@ bool acquirement(object_class_type force_class, int agent)
type_wanted = random2(NUM_MISCELLANY);
while (type_wanted == MISC_HORN_OF_GERYON
|| type_wanted == MISC_RUNE_OF_ZOT
- || type_wanted == MISC_PORTABLE_ALTAR_OF_NEMELEX
|| type_wanted == MISC_CRYSTAL_BALL_OF_FIXATION
|| type_wanted == MISC_EMPTY_EBONY_CASKET);
break;
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 29ed9d632c..ac9353569c 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -176,13 +176,6 @@ enum actor_type
ACT_MONSTER
};
-enum ammunition_description_type
-{
- DAMMO_ORCISH = 3, // 3
- DAMMO_ELVEN,
- DAMMO_DWARVEN // 5
-};
-
// Various ways to get the acquirement effect.
enum acquirement_agent_type
{
@@ -241,18 +234,6 @@ enum armour_type
NUM_ARMOURS
};
-// 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
-};
-
enum armour_property_type
{
PARM_AC, // 0
@@ -262,26 +243,12 @@ enum armour_property_type
enum attribute_type
{
ATTR_DIVINE_LIGHTNING_PROTECTION, // 0
- // ATTR_SPEC_AIR, // don't use this!
- // ATTR_SPEC_EARTH,
- ATTR_CONTROL_TELEPORT = 3, // obsolete
- ATTR_WALK_SLOWLY,
- ATTR_TRANSFORMATION, // 5
+ ATTR_TRANSFORMATION,
ATTR_CARD_COUNTDOWN,
- ATTR_CARD_TABLE,
ATTR_NUM_DEMONIC_POWERS,
ATTR_WAS_SILENCED, //jmf: added for silenced messages
ATTR_GOD_GIFT_COUNT, //jmf: added to help manage god gift giving
- 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,
ATTR_DELAYED_FIREBALL, // bwr: reserve fireballs
- ATTR_DEMONIC_POWER_1,
- ATTR_DEMONIC_POWER_2,
- ATTR_DEMONIC_POWER_3,
- ATTR_DEMONIC_POWER_4,
- ATTR_DEMONIC_POWER_5, // 19
NUM_ATTRIBUTES = 30 // must be at least 30
};
@@ -1824,7 +1791,6 @@ enum misc_item_type
MISC_RUNE_OF_ZOT,
MISC_DECK_OF_TRICKS, // 15
MISC_DECK_OF_POWER,
- MISC_PORTABLE_ALTAR_OF_NEMELEX,
NUM_MISCELLANY // mv: used for random generation
};
@@ -3507,13 +3473,6 @@ enum stat_type
STAT_RANDOM = 255 // leave at 255, added for increase_stats() handling {dlb}
};
-enum statue_type
-{
- STATUE_SILVER,
- STATUE_ORANGE_CRYSTAL,
- NUM_STATUE_TYPES
-};
-
enum status_redraw_flag_type
{
REDRAW_HUNGER = 0x00000001,
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index e280cf1872..c0465f2f56 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -695,10 +695,6 @@ public:
int old_hunger; // used for hunger delta-meter (see output.cc)
- // 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;
-
// Warning: these two are quite different.
//
// The spell table is an index to a specific spell slot (you.spells).
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc
index c8d8b2d64f..991f38998d 100644
--- a/crawl-ref/source/it_use3.cc
+++ b/crawl-ref/source/it_use3.cc
@@ -639,26 +639,6 @@ bool evoke_wielded( void )
pract = (coinflip() ? 2 : 1);
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);
- }
- break;
-
default:
did_work = false;
break;
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 2db75c8220..b89363e494 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -699,8 +699,6 @@ static const char* misc_type_name(int type, bool known)
case MISC_STONE_OF_EARTH_ELEMENTALS:
return "stone of earth elementals";
case MISC_BOTTLED_EFREET: return "bottled efreet";
- case MISC_PORTABLE_ALTAR_OF_NEMELEX:
- return "portable altar of Nemelex";
case MISC_RUNE_OF_ZOT:
case NUM_MISCELLANY:
@@ -730,8 +728,6 @@ static const char* misc_type_name(int type, bool known)
case MISC_DISC_OF_STORMS: return "grey disc";
case MISC_STONE_OF_EARTH_ELEMENTALS: return "nondescript stone";
case MISC_BOTTLED_EFREET: return "sealed bronze flask";
- case MISC_PORTABLE_ALTAR_OF_NEMELEX:
- return "portable altar of Nemelex";
case MISC_RUNE_OF_ZOT:
case NUM_MISCELLANY:
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index bf786ca31f..81437d49c1 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -2062,10 +2062,6 @@ size_type item_size( const item_def &item )
break;
case OBJ_MISCELLANY:
- if (item.sub_type == MISC_PORTABLE_ALTAR_OF_NEMELEX)
- {
- size = SIZE_SMALL;
- }
break;
case OBJ_CORPSES:
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 46a52914dc..0e1df7ed03 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -1048,11 +1048,7 @@ bool origin_describable(const item_def &item)
&& (!is_stackable_item(item) || is_rune(item))
&& item.quantity == 1
&& item.base_type != OBJ_CORPSES
- && (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));
+ && (item.base_type != OBJ_FOOD || item.sub_type != FOOD_CHUNK));
}
std::string article_it(const item_def &item)
@@ -1187,7 +1183,6 @@ bool pickup_single_item(int link, int qty)
void pickup()
{
- int m = 0;
int keyin = 'x';
if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR
@@ -1203,51 +1198,6 @@ void pickup()
return;
}
- // 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();
- }
- }
-
int o = igrd[you.x_pos][you.y_pos];
const int num_nonsquelched = count_nonsquelched_items(o);
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 89fc73e2ae..c920c83325 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -2785,7 +2785,6 @@ int items( int allow_uniques, // not just true-false,
while //mv: never generated
((mitm[p].sub_type == MISC_RUNE_OF_ZOT)
|| (mitm[p].sub_type == MISC_HORN_OF_GERYON)
- || (mitm[p].sub_type == MISC_PORTABLE_ALTAR_OF_NEMELEX)
// mv: others are possible but less often
// btw. chances of generating decks are almost the same as
// before, other chances are now distributed more steadily
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 3fee742462..a1d7f0ff31 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -413,34 +413,22 @@ static void do_god_gift()
case GOD_NEMELEX_XOBEH:
if (random2(200) <= you.piety
- && (!you.attribute[ATTR_CARD_TABLE] || one_chance_in(3))
+ && one_chance_in(3)
&& !you.attribute[ATTR_CARD_COUNTDOWN]
&& !grid_destroys_items(grd[you.x_pos][you.y_pos]))
{
int thing_created = NON_ITEM;
unsigned char gift_type = MISC_DECK_OF_TRICKS;
- 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;
-
- thing_created = items( 1, OBJ_MISCELLANY, gift_type,
- true, 1, 250 );
- }
+ 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 );
if (thing_created != NON_ITEM)
{
@@ -697,6 +685,10 @@ void pray()
mprf(MSGCH_PRAY, "You offer a prayer to %s.", god_name(you.religion));
+ // Nemelexites can offer everywhere
+ if ( you.religion == GOD_NEMELEX_XOBEH && altar_god == GOD_NO_GOD )
+ offer_items();
+
you.duration[DUR_PRAYER] = 9 + (random2(you.piety) / 20)
+ (random2(you.piety) / 20);
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index a9be5532a7..0a511cfe10 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -831,7 +831,6 @@ static void tag_construct_you(struct tagHeader &th)
marshallShort(th, you.magic_contamination);
marshallShort(th, you.backlight);
- marshallString(th, you.last_altar_inscription.c_str(), 80);
}
static void tag_construct_you_items(struct tagHeader &th)
@@ -1134,7 +1133,6 @@ static void tag_read_you(struct tagHeader &th, char minorVersion)
you.magic_contamination = unmarshallShort(th);
you.backlight = unmarshallShort(th);
- you.last_altar_inscription = unmarshallString(th, 80);
}
static void tag_read_you_items(struct tagHeader &th, char minorVersion)
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-06-16 03:56:09 +0000