From 929d367d195931d5d04ac198e45b800289c724c0 Mon Sep 17 00:00:00 2001 From: Eino Keskitalo Date: Fri, 30 Oct 2009 01:06:43 +0200 Subject: Rename shadows brand into reaping for unique name. Signed-off-by: Eino Keskitalo --- crawl-ref/source/artefact.cc | 2 +- crawl-ref/source/describe.cc | 4 ++-- crawl-ref/source/goditem.cc | 4 ++-- crawl-ref/source/item_use.cc | 20 ++++++++++---------- crawl-ref/source/itemname.cc | 6 +++--- crawl-ref/source/itemprop.h | 4 ++-- crawl-ref/source/makeitem.cc | 2 +- crawl-ref/source/mon-util.cc | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index 1bde2d800e..bdcbe2c8b1 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -768,7 +768,7 @@ void static _get_randart_properties(const item_def &item, proprt[ARTP_BRAND] = (tmp >= 18) ? SPWPN_SPEED : (tmp >= 16) ? SPWPN_PENETRATION : - (tmp >= 13) ? SPWPN_SHADOW : + (tmp >= 13) ? SPWPN_REAPING : (tmp >= 10) ? SPWPN_PROTECTION : (tmp >= 7) ? SPWPN_VENOM : SPWPN_VORPAL + random2(3); diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 2185279562..f4db962376 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -845,7 +845,7 @@ static std::string _describe_weapon(const item_def &item, bool verbose) "targets it hits, potentially hitting all targets in " "its path until it reaches maximum range."; break; - case SPWPN_SHADOW: + case SPWPN_REAPING: description += "If ammo fired by it kills a monster, " "causing it to leave a corpse, the corpse will be " "animated as a zombie friendly to the one who fired it."; @@ -1065,7 +1065,7 @@ static std::string _describe_ammo( const item_def &item ) description += "A skilled user can throw it in such a way " "that it will return to its owner."; break; - case SPMSL_SHADOW: + case SPMSL_REAPING: description += "If it kills a monster, causing it to leave a " "corpse, the corpse will be animated as a zombie friendly " "to the one who " + threw_or_fired + " it."; diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc index 59f8ffbd78..8d33879408 100644 --- a/crawl-ref/source/goditem.cc +++ b/crawl-ref/source/goditem.cc @@ -74,13 +74,13 @@ bool is_evil_item(const item_def& item) || item_brand == SPWPN_DRAINING || item_brand == SPWPN_PAIN || item_brand == SPWPN_VAMPIRICISM - || item_brand == SPWPN_SHADOW); + || item_brand == SPWPN_REAPING); } break; case OBJ_MISSILES: { const int item_brand = get_ammo_brand(item); - retval = is_demonic(item) || item_brand == SPMSL_SHADOW; + retval = is_demonic(item) || item_brand == SPMSL_REAPING; break; } case OBJ_WANDS: diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 700a828473..a873bdbdf9 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -621,7 +621,7 @@ void wield_effects(int item_wield_2, bool showMsgs) you.hand_name(true).c_str()); break; - case SPWPN_SHADOW: + case SPWPN_REAPING: mpr("It is briefly surrounded by shifting shadows."); break; @@ -1732,7 +1732,7 @@ static bool _silver_damages_victim(bolt &beam, actor* victim, int &dmg, return (false); } -static bool _shadow_hit_victim(bolt& beam, actor* victim, int dmg, int corpse) +static bool _reaping_hit_victim(bolt& beam, actor* victim, int dmg, int corpse) { if (beam.is_tracer || victim->alive() || corpse == -1 || corpse == NON_ITEM) @@ -1960,8 +1960,8 @@ bool setup_missile_beam(const actor *agent, bolt &beam, item_def &item, || ammo_brand == SPMSL_PENETRATION)); const bool silver = (ammo_brand == SPMSL_SILVER); const bool disperses = (ammo_brand == SPMSL_DISPERSAL); - const bool shadow = (bow_brand == SPWPN_SHADOW - || ammo_brand == SPMSL_SHADOW); + const bool reaping = (bow_brand == SPWPN_REAPING + || ammo_brand == SPMSL_REAPING); ASSERT(!exploding || !is_artefact(item)); @@ -2026,12 +2026,12 @@ bool setup_missile_beam(const actor *agent, bolt &beam, item_def &item, beam.hit_funcs.push_back(_poison_hit_victim); if (penetrating) beam.range_funcs.push_back(_item_penetrates_victim); - if (shadow) - beam.hit_funcs.push_back(_shadow_hit_victim); + if (reaping) + beam.hit_funcs.push_back(_reaping_hit_victim); if (disperses) beam.hit_funcs.push_back(_dispersal_hit_victim); - if (shadow && ammo.special != SPMSL_SHADOW) + if (reaping && ammo.special != SPMSL_REAPING) { beam.name = "shadowy " + beam.name; ammo_name = "shadowy " + ammo_name; @@ -2126,7 +2126,7 @@ static bool determines_ammo_brand(int bow_brand, int ammo_brand) return (false); if (bow_brand == SPWPN_PENETRATION && ammo_brand == SPMSL_PENETRATION) return (false); - if (bow_brand == SPWPN_SHADOW && ammo_brand == SPMSL_SHADOW) + if (bow_brand == SPWPN_REAPING && ammo_brand == SPMSL_REAPING) return (false); return (true); @@ -2948,10 +2948,10 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus, bow_brand == SPWPN_CHAOS || ammo_brand_known); } - if (ammo_brand == SPMSL_SHADOW || bow_brand == SPWPN_SHADOW) + if (ammo_brand == SPMSL_REAPING || bow_brand == SPWPN_REAPING) { did_god_conduct(DID_NECROMANCY, 2, - bow_brand == SPWPN_SHADOW || ammo_brand_known); + bow_brand == SPWPN_REAPING || ammo_brand_known); } if (did_return) diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 75fc3742f9..fade7228bc 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -340,7 +340,7 @@ const char* weapon_brand_name(const item_def& item, bool terse) case SPWPN_FLAME: return ((terse) ? " (flame)" : " of flame"); case SPWPN_FROST: return ((terse) ? " (frost)" : " of frost"); case SPWPN_PENETRATION: return ((terse) ? " (penet)" : " of penetration"); - case SPWPN_SHADOW: return ((terse) ? " (shadow)" : " of shadows"); + case SPWPN_REAPING: return ((terse) ? " (reap)" : " of reaping"); // both ranged and non-ranged case SPWPN_CHAOS: return ((terse) ? " (chaos)" : " of chaos"); @@ -1165,8 +1165,8 @@ std::string item_def::name_aux(description_level_type desc, case SPMSL_PENETRATION: buff << ((terse) ? " (penet)" : " of penetration"); break; - case SPMSL_SHADOW: - buff << ((terse) ? " (shadow)" : " of shadows"); + case SPMSL_REAPING: + buff << ((terse) ? " (reap)" : " of reaping"); break; case SPMSL_DISPERSAL: buff << ((terse) ? " (disperse)" : " of dispersal"); diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h index 013a048ed9..01379741f5 100644 --- a/crawl-ref/source/itemprop.h +++ b/crawl-ref/source/itemprop.h @@ -111,7 +111,7 @@ enum brand_type // equivalent to (you.inv[].special or mitm[].special) % 30 SPWPN_CONFUSE, // 20 SPWPN_PENETRATION, - SPWPN_SHADOW, + SPWPN_REAPING, SPWPN_DEBUG_RANDART = 25, // 25 NUM_SPECIAL_WEAPONS, SPWPN_DUMMY_CRUSHING // ONLY TEMPORARY USAGE -- converts to VORPAL @@ -350,7 +350,7 @@ enum special_missile_type // to separate from weapons in general {dlb} SPMSL_RETURNING, // 5 SPMSL_CHAOS, SPMSL_PENETRATION, - SPMSL_SHADOW, + SPMSL_REAPING, SPMSL_DISPERSAL, SPMSL_EXPLODING, // 10 SPMSL_STEEL, diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index d44531c53d..77db9297c3 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -1428,7 +1428,7 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level) else if (tmp < 650) rc = SPWPN_PENETRATION; else if (tmp < 800) - rc = SPWPN_SHADOW; + rc = SPWPN_REAPING; else if (tmp < 920) rc = SPWPN_PROTECTION; else if (tmp < 980) diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 7fa99c9ff3..905150c757 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -4277,7 +4277,7 @@ void monsters::equip_weapon(item_def &item, int near, bool msg) hand_name(true).c_str(), pronoun(PRONOUN_NOCAP).c_str()); break; - case SPWPN_SHADOW: + case SPWPN_REAPING: mpr("It is briefly surrounded by shifting shadows."); break; -- cgit v1.2.3-54-g00ecf