From 9e4917b395de21adb6caa2bb838d4f45f2850f1a Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 19 Jul 2009 12:52:21 +0000 Subject: ATTR_RUNES_IN_ZOT is no longer needed. I couldn't decide if I should simply remove it or leave it for the weak save file compatibility we try to maintain within trunk, so I left its definition in enum.h. Also, change Beogh's altar tile to include the orcish idol. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10305 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/enum.h | 2 +- crawl-ref/source/items.cc | 21 +-------------------- crawl-ref/source/misc.cc | 5 ++--- .../source/rltiles/UNUSED/other/dngn_altar.png | Bin 0 -> 524 bytes .../rltiles/dc-dngn/altars/dngn_altar_beogh.png | Bin 524 -> 1088 bytes crawl-ref/source/xom.cc | 5 ++--- 6 files changed, 6 insertions(+), 27 deletions(-) create mode 100644 crawl-ref/source/rltiles/UNUSED/other/dngn_altar.png (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 8ee1835ff3..b1d476bd15 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -164,7 +164,7 @@ enum attribute_type ATTR_UNIQUE_RUNES, ATTR_DEMONIC_RUNES, ATTR_ABYSSAL_RUNES, - ATTR_RUNES_IN_ZOT, + ATTR_RUNES_IN_ZOT, // Unused but needed for save file compatibility. ATTR_WEAPON_SWAP_INTERRUPTED, ATTR_GOLD_FOUND, ATTR_PURCHASES, // Gold amount spent at shops. diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index a9b4ff1d98..285abfdaad 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -266,9 +266,6 @@ bool dec_mitm_item_quantity( int obj, int amount ) if (mitm[obj].quantity <= amount) amount = mitm[obj].quantity; - if (player_in_branch(BRANCH_HALL_OF_ZOT) && is_rune(mitm[obj])) - you.attribute[ATTR_RUNES_IN_ZOT] -= amount; - if (mitm[obj].quantity == amount) { destroy_item( obj ); @@ -299,9 +296,6 @@ void inc_inv_item_quantity( int obj, int amount, bool suppress_burden ) void inc_mitm_item_quantity( int obj, int amount ) { - if (player_in_branch(BRANCH_HALL_OF_ZOT) && is_rune(mitm[obj])) - you.attribute[ATTR_RUNES_IN_ZOT] += amount; - mitm[obj].quantity += amount; } @@ -531,9 +525,6 @@ static void _handle_gone_item(const item_def &item) else you.attribute[ATTR_DEMONIC_RUNES] -= item.quantity; } - - if (player_in_branch(BRANCH_HALL_OF_ZOT) && !in_inventory(item)) - you.attribute[ATTR_RUNES_IN_ZOT] -= item.quantity; } } @@ -1769,18 +1760,8 @@ bool move_item_to_grid( int *const obj, const coord_def& p ) item.link = igrd(p); igrd(p) = ob; - if (is_rune(item)) - { - if (player_in_branch(BRANCH_HALL_OF_ZOT)) - you.attribute[ATTR_RUNES_IN_ZOT] += item.quantity; - } - else if (item.base_type == OBJ_ORBS && you.level_type == LEVEL_DUNGEON) - { + if (item.base_type == OBJ_ORBS && you.level_type == LEVEL_DUNGEON) set_branch_flags(BFLAG_HAS_ORB); - } - -// if (see_grid(p)) -// StashTrack.update_stash(p); return (true); } diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index c1ba8b9d93..b14ae92f3a 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -1867,9 +1867,8 @@ void up_stairs(dungeon_feature_type force_stair, && branches[BRANCH_HALL_OF_ZOT].branch_flags & BFLAG_HAS_ORB) { int runes_avail = you.attribute[ATTR_UNIQUE_RUNES] - + you.attribute[ATTR_DEMONIC_RUNES] - + you.attribute[ATTR_ABYSSAL_RUNES] - - you.attribute[ATTR_RUNES_IN_ZOT]; + + you.attribute[ATTR_DEMONIC_RUNES] + + you.attribute[ATTR_ABYSSAL_RUNES]; if (runes_avail < NUMBER_OF_RUNES_NEEDED) xom_is_stimulated(255, "Xom snickers loudly.", true); diff --git a/crawl-ref/source/rltiles/UNUSED/other/dngn_altar.png b/crawl-ref/source/rltiles/UNUSED/other/dngn_altar.png new file mode 100644 index 0000000000..aaf4a12b75 Binary files /dev/null and b/crawl-ref/source/rltiles/UNUSED/other/dngn_altar.png differ diff --git a/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_beogh.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_beogh.png index aaf4a12b75..8e102388a6 100644 Binary files a/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_beogh.png and b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_beogh.png differ diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 6a1a389ac1..74c5af7596 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -3064,9 +3064,8 @@ static void _xom_check_less_runes(int runes_gone) } int runes_avail = you.attribute[ATTR_UNIQUE_RUNES] - + you.attribute[ATTR_DEMONIC_RUNES] - + you.attribute[ATTR_ABYSSAL_RUNES] - - you.attribute[ATTR_RUNES_IN_ZOT]; + + you.attribute[ATTR_DEMONIC_RUNES] + + you.attribute[ATTR_ABYSSAL_RUNES]; int was_avail = runes_avail + runes_gone; // No longer enough available runes to get into Zot. -- cgit v1.2.3-54-g00ecf