diff options
| -rw-r--r-- | crawl-ref/source/artefact.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/artefact.h | 18 | ||||
| -rw-r--r-- | crawl-ref/source/effects.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/fight.cc | 11 | ||||
| -rw-r--r-- | crawl-ref/source/invent.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/it_use2.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/it_use3.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/item_use.cc | 43 | ||||
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 7 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/shopping.cc | 20 | ||||
| -rw-r--r-- | crawl-ref/source/tilepick.cc | 113 |
14 files changed, 120 insertions, 142 deletions
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index e026b73baf..76383f05c6 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -1581,8 +1581,7 @@ int find_okay_unrandart(unsigned char aclass, unsigned char atype, // Never randomly generated until lost in the abyss. if ((!in_abyss || status != UNIQ_LOST_IN_ABYSS) - && index >= SPWPN_START_NOGEN_FIXEDARTS - && index <= SPWPN_END_FIXEDARTS) + && index >= UNRAND_CEREBOV && index <= UNRAND_ASMODEUS) { continue; } diff --git a/crawl-ref/source/artefact.h b/crawl-ref/source/artefact.h index d3b195c2b1..5379e66a00 100644 --- a/crawl-ref/source/artefact.h +++ b/crawl-ref/source/artefact.h @@ -20,24 +20,6 @@ // Reserving the upper bits for later expansion/versioning. #define RANDART_SEED_MASK 0x00ffffff -#define SPWPN_SINGING_SWORD UNRAND_SINGING_SWORD -#define SPWPN_WRATH_OF_TROG UNRAND_TROG -#define SPWPN_SCYTHE_OF_CURSES UNRAND_CURSES -#define SPWPN_MACE_OF_VARIABILITY UNRAND_VARIABILITY -#define SPWPN_GLAIVE_OF_PRUNE UNRAND_PRUNE -#define SPWPN_SCEPTRE_OF_TORMENT UNRAND_TORMENT -#define SPWPN_SWORD_OF_ZONGULDROK UNRAND_ZONGULDROK -#define SPWPN_SWORD_OF_POWER UNRAND_POWER -#define SPWPN_STAFF_OF_OLGREB UNRAND_OLGREB -#define SPWPN_VAMPIRES_TOOTH UNRAND_VAMPIRES_TOOTH -#define SPWPN_STAFF_OF_WUCAD_MU UNRAND_WUCAD_MU -#define SPWPN_SWORD_OF_CEREBOV UNRAND_CEREBOV -#define SPWPN_STAFF_OF_DISPATER UNRAND_DISPATER -#define SPWPN_SCEPTRE_OF_ASMODEUS UNRAND_ASMODEUS - -#define SPWPN_START_NOGEN_FIXEDARTS UNRAND_CEREBOV -#define SPWPN_END_FIXEDARTS UNRAND_ASMODEUS - enum unrand_special_type { UNRANDSPEC_EITHER, diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index dc0e4f3f20..b3508346fb 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1647,8 +1647,8 @@ bool acquirement(object_class_type class_wanted, int agent, int brand = get_weapon_brand(doodad); if (brand == SPWPN_PAIN || is_unrandom_artefact(doodad) - && (doodad.special == SPWPN_WRATH_OF_TROG - || doodad.special == SPWPN_STAFF_OF_WUCAD_MU)) + && (doodad.special == UNRAND_TROG + || doodad.special == UNRAND_WUCAD_MU)) { destroy_item(thing_created, true); thing_created = NON_ITEM; diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 2af9d86542..9657d2e40e 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1887,9 +1887,9 @@ void melee_attack::player_check_weapon_effects() { switch (weapon->special) { - case SPWPN_SCEPTRE_OF_ASMODEUS: - case SPWPN_STAFF_OF_DISPATER: - case SPWPN_SWORD_OF_CEREBOV: + case UNRAND_ASMODEUS: + case UNRAND_DISPATER: + case UNRAND_CEREBOV: did_god_conduct(DID_UNHOLY, 3); break; default: @@ -2112,7 +2112,7 @@ void melee_attack::calc_elemental_brand_damage( beam_type flavour, int melee_attack::fire_res_apply_cerebov_downgrade(int res) { - if (weapon && weapon->special == SPWPN_SWORD_OF_CEREBOV) + if (weapon && weapon->special == UNRAND_CEREBOV) --res; return (res); @@ -3103,7 +3103,6 @@ bool melee_attack::apply_damage_brand() break; case SPWPN_VENOM: - case SPWPN_STAFF_OF_OLGREB: if (!one_chance_in(4)) { int old_poison; @@ -3192,7 +3191,7 @@ bool melee_attack::apply_damage_brand() // Thus is probably more valuable on larger weapons? if (weapon && is_unrandom_artefact(*weapon) - && weapon->special == SPWPN_VAMPIRES_TOOTH) + && weapon->special == UNRAND_VAMPIRES_TOOTH) { hp_boost = damage_done; } diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index c271abc2aa..fc8010879a 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -1758,10 +1758,10 @@ bool item_is_evokable(const item_def &item, bool known, bool all_wands, { switch (item.special) { - case SPWPN_SCEPTRE_OF_ASMODEUS: - case SPWPN_STAFF_OF_WUCAD_MU: - case SPWPN_STAFF_OF_DISPATER: - case SPWPN_STAFF_OF_OLGREB: + case UNRAND_ASMODEUS: + case UNRAND_WUCAD_MU: + case UNRAND_DISPATER: + case UNRAND_OLGREB: if (!wielded) { if (msg) diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc index 44a56efb8d..57290d22a0 100644 --- a/crawl-ref/source/it_use2.cc +++ b/crawl-ref/source/it_use2.cc @@ -423,19 +423,19 @@ bool unwield_item(bool showMsgs) { switch (item.special) { - case SPWPN_SINGING_SWORD: + case UNRAND_SINGING_SWORD: if (showMsgs) mpr("The Singing Sword sighs.", MSGCH_TALK); break; - case SPWPN_WRATH_OF_TROG: + case UNRAND_TROG: if (showMsgs) mpr("You feel less violent."); break; - case SPWPN_STAFF_OF_OLGREB: + case UNRAND_OLGREB: item.plus = 0; item.plus2 = 0; break; - case SPWPN_STAFF_OF_WUCAD_MU: + case UNRAND_WUCAD_MU: item.plus = 0; item.plus2 = 0; MiscastEffect( &you, WIELD_MISCAST, SPTYP_DIVINATION, 9, 90, @@ -459,7 +459,6 @@ bool unwield_item(bool showMsgs) switch (brand) { - case SPWPN_SWORD_OF_CEREBOV: case SPWPN_FLAMING: if (showMsgs) mprf("%s stops flaming.", msg.c_str()); diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index fb978d7583..79fa14e527 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -853,7 +853,7 @@ bool evoke_item(int slot) { switch (item.special) { - case SPWPN_STAFF_OF_DISPATER: + case UNRAND_DISPATER: if (you.duration[DUR_DEATHS_DOOR] || !enough_hp(11, true) || !enough_mp(5, true)) { @@ -872,7 +872,7 @@ bool evoke_item(int slot) did_work = true; break; - case SPWPN_SCEPTRE_OF_ASMODEUS: + case UNRAND_ASMODEUS: if (evoke_sceptre_of_asmodeus()) { make_hungry(200, false, true); @@ -881,7 +881,7 @@ bool evoke_item(int slot) } break; - case SPWPN_STAFF_OF_OLGREB: + case UNRAND_OLGREB: if (!enough_mp( 4, true ) || you.skills[SK_EVOCATIONS] < random2(6)) { @@ -901,7 +901,7 @@ bool evoke_item(int slot) your_spells( SPELL_VENOM_BOLT, power, false ); break; - case SPWPN_STAFF_OF_WUCAD_MU: + case UNRAND_WUCAD_MU: if (you.magic_points == you.max_magic_points || you.skills[SK_EVOCATIONS] < random2(25)) { diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 1efb978e9b..866dd8ac09 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -451,31 +451,31 @@ int item_special_wield_effect(const item_def &item) switch (i_eff) { - case SPWPN_SINGING_SWORD: + case UNRAND_SINGING_SWORD: return (SPWLD_SING); - case SPWPN_WRATH_OF_TROG: + case UNRAND_TROG: return (SPWLD_TROG); - case SPWPN_SCYTHE_OF_CURSES: + case UNRAND_CURSES: return (SPWLD_CURSE); - case SPWPN_MACE_OF_VARIABILITY: + case UNRAND_VARIABILITY: return (SPWLD_VARIABLE); - case SPWPN_SCEPTRE_OF_TORMENT: + case UNRAND_TORMENT: return (SPWLD_TORMENT); - case SPWPN_SWORD_OF_ZONGULDROK: + case UNRAND_ZONGULDROK: return (SPWLD_ZONGULDROK); - case SPWPN_SWORD_OF_POWER: + case UNRAND_POWER: return (SPWLD_POWER); - case SPWPN_STAFF_OF_OLGREB: + case UNRAND_OLGREB: return (SPWLD_OLGREB); - case SPWPN_STAFF_OF_WUCAD_MU: + case UNRAND_WUCAD_MU: return (SPWLD_WUCAD_MU); default: @@ -577,7 +577,6 @@ void wield_effects(int item_wield_2, bool showMsgs) { switch (special) { - case SPWPN_SWORD_OF_CEREBOV: case SPWPN_FLAMING: mpr("It bursts into flame!"); break; @@ -667,7 +666,7 @@ void wield_effects(int item_wield_2, bool showMsgs) mpr("It is briefly surrounded by shifting shadows."); break; - case SPWPN_SINGING_SWORD: + case UNRAND_SINGING_SWORD: if (!was_known) { mprf(MSGCH_TALK, "%s says, " @@ -678,38 +677,38 @@ void wield_effects(int item_wield_2, bool showMsgs) mpr("The Singing Sword hums in delight!", MSGCH_TALK); break; - case SPWPN_WRATH_OF_TROG: + case UNRAND_TROG: mpr("You feel bloodthirsty!"); break; - case SPWPN_SCYTHE_OF_CURSES: + case UNRAND_CURSES: mpr("A shiver runs down your spine."); break; - case SPWPN_GLAIVE_OF_PRUNE: + case UNRAND_PRUNE: mpr("You feel pruney."); break; - case SPWPN_SCEPTRE_OF_TORMENT: + case UNRAND_TORMENT: mpr("A terribly searing pain shoots up your arm!"); break; - case SPWPN_SWORD_OF_ZONGULDROK: + case UNRAND_ZONGULDROK: mpr("You sense an extremely unholy aura."); break; - case SPWPN_SWORD_OF_POWER: + case UNRAND_POWER: mpr("You sense an aura of extreme power."); break; - case SPWPN_STAFF_OF_OLGREB: + case UNRAND_OLGREB: if (player_can_smell()) mpr("You smell chlorine."); else mpr("The staff glows slightly green."); break; - case SPWPN_VAMPIRES_TOOTH: + case UNRAND_VAMPIRES_TOOTH: if (you.is_undead != US_UNDEAD) { mpr("You feel a strange hunger, and smell blood in " @@ -746,12 +745,12 @@ void wield_effects(int item_wield_2, bool showMsgs) } break; - case SPWPN_SCYTHE_OF_CURSES: + case UNRAND_CURSES: if (!item_cursed(item) && one_chance_in(3)) do_curse_item(item, false); break; - case SPWPN_STAFF_OF_WUCAD_MU: + case UNRAND_WUCAD_MU: MiscastEffect(&you, WIELD_MISCAST, SPTYP_DIVINATION, 9, 90, "the Staff of Wucad Mu" ); break; @@ -768,7 +767,7 @@ void wield_effects(int item_wield_2, bool showMsgs) mpr("It sticks to your hand!"); int amusement = 16; if (!known_cursed - && !(was_known && special == SPWPN_SCYTHE_OF_CURSES)) + && !(was_known && special == UNRAND_CURSES)) { amusement *= 2; god_type god; diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 96e4b80f85..40cf5bd8fd 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -3734,17 +3734,16 @@ static item_make_species_type _give_weapon(monsters *mon, int level, case MONS_CEREBOV: force_item = true; - make_item_unrandart( item, SPWPN_SWORD_OF_CEREBOV ); - break; + make_item_unrandart( item, UNRAND_CEREBOV ); break; case MONS_DISPATER: force_item = true; - make_item_unrandart( item, SPWPN_STAFF_OF_DISPATER ); + make_item_unrandart( item, UNRAND_DISPATER ); break; case MONS_ASMODEUS: force_item = true; - make_item_unrandart( item, SPWPN_SCEPTRE_OF_ASMODEUS ); + make_item_unrandart( item, UNRAND_ASMODEUS ); break; case MONS_GERYON: diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 28e2f5185b..04aa3a9916 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -4621,11 +4621,11 @@ static bool _is_signature_weapon(monsters *monster, const item_def &weapon) { switch (weapon.special) { - case SPWPN_SCEPTRE_OF_ASMODEUS: + case UNRAND_ASMODEUS: return (monster->type == MONS_ASMODEUS); - case SPWPN_STAFF_OF_DISPATER: + case UNRAND_DISPATER: return (monster->type == MONS_DISPATER); - case SPWPN_SWORD_OF_CEREBOV: + case UNRAND_CEREBOV: return (monster->type == MONS_CEREBOV); } } diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 86c6540f8b..d42da805ce 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -1243,7 +1243,7 @@ int player_hunger_rate(void) if (player_equip_ego_type( EQ_WEAPON, SPWPN_VAMPIRICISM )) { hunger += 6; - hunger += 3 * player_equip_unrand( SPWPN_VAMPIRES_TOOTH ); + hunger += 3 * player_equip_unrand( UNRAND_VAMPIRES_TOOTH ); } } else @@ -1251,7 +1251,7 @@ int player_hunger_rate(void) if (player_equip_ego_type( EQ_WEAPON, SPWPN_VAMPIRICISM )) { hunger += 1; - hunger += 1 * player_equip_unrand( SPWPN_VAMPIRES_TOOTH ); + hunger += 1 * player_equip_unrand( UNRAND_VAMPIRES_TOOTH ); } } @@ -1856,7 +1856,7 @@ int player_spec_poison() // Staves sp += player_equip( EQ_STAFF, STAFF_POISON ); - if (player_equip_unrand(SPWPN_STAFF_OF_OLGREB)) + if (player_equip_unrand(UNRAND_OLGREB)) sp++; return sp; diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index d65e74b46f..049c1f7cd6 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3458,9 +3458,9 @@ bool is_evil_item(const item_def& item) const int item_eff = item_special_wield_effect(item); retval = (is_demonic(item) - || item.special == SPWPN_SCEPTRE_OF_ASMODEUS - || item.special == SPWPN_STAFF_OF_DISPATER - || item.special == SPWPN_SWORD_OF_CEREBOV + || item.special == UNRAND_ASMODEUS + || item.special == UNRAND_DISPATER + || item.special == UNRAND_CEREBOV || item_eff == SPWLD_CURSE || item_eff == SPWLD_TORMENT || item_eff == SPWLD_ZONGULDROK diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index 2334052f0c..48f4a8dd07 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -627,34 +627,34 @@ unsigned int item_value( item_def item, bool ident ) { switch (item.special) { - case SPWPN_SWORD_OF_CEREBOV: + case UNRAND_CEREBOV: valued += 2000; break; - case SPWPN_SCEPTRE_OF_ASMODEUS: + case UNRAND_ASMODEUS: valued += 1500; break; - case SPWPN_SWORD_OF_ZONGULDROK: + case UNRAND_ZONGULDROK: valued += 1250; break; - case SPWPN_SCEPTRE_OF_TORMENT: - case SPWPN_SINGING_SWORD: - case SPWPN_STAFF_OF_DISPATER: + case UNRAND_TORMENT: + case UNRAND_SINGING_SWORD: + case UNRAND_DISPATER: valued += 1200; break; - case SPWPN_GLAIVE_OF_PRUNE: - case SPWPN_WRATH_OF_TROG: + case UNRAND_PRUNE: + case UNRAND_TROG: valued += 1000; break; - case SPWPN_SCYTHE_OF_CURSES: + case UNRAND_CURSES: valued += 800; break; - case SPWPN_MACE_OF_VARIABILITY: + case UNRAND_VARIABILITY: valued += 700; break; diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index eae2663e46..a779e2d01b 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1083,20 +1083,20 @@ static int _tileidx_unrand_artefact(int idx) { switch (idx) { - case SPWPN_SINGING_SWORD: return TILE_SPWPN_SINGING_SWORD; - case SPWPN_WRATH_OF_TROG: return TILE_SPWPN_WRATH_OF_TROG; - case SPWPN_SCYTHE_OF_CURSES: return TILE_SPWPN_SCYTHE_OF_CURSES; - case SPWPN_MACE_OF_VARIABILITY: return TILE_SPWPN_MACE_OF_VARIABILITY; - case SPWPN_GLAIVE_OF_PRUNE: return TILE_SPWPN_GLAIVE_OF_PRUNE; - case SPWPN_SCEPTRE_OF_TORMENT: return TILE_SPWPN_SCEPTRE_OF_TORMENT; - case SPWPN_SWORD_OF_ZONGULDROK: return TILE_SPWPN_SWORD_OF_ZONGULDROK; - case SPWPN_SWORD_OF_CEREBOV: return TILE_SPWPN_SWORD_OF_CEREBOV; - case SPWPN_STAFF_OF_DISPATER: return TILE_SPWPN_STAFF_OF_DISPATER; - case SPWPN_SCEPTRE_OF_ASMODEUS: return TILE_SPWPN_SCEPTRE_OF_ASMODEUS; - case SPWPN_SWORD_OF_POWER: return TILE_SPWPN_SWORD_OF_POWER; - case SPWPN_STAFF_OF_OLGREB: return TILE_SPWPN_STAFF_OF_OLGREB; - case SPWPN_VAMPIRES_TOOTH: return TILE_SPWPN_VAMPIRES_TOOTH; - case SPWPN_STAFF_OF_WUCAD_MU: return TILE_SPWPN_STAFF_OF_WUCAD_MU; + case UNRAND_SINGING_SWORD: return TILE_SPWPN_SINGING_SWORD; + case UNRAND_TROG: return TILE_SPWPN_WRATH_OF_TROG; + case UNRAND_CURSES: return TILE_SPWPN_SCYTHE_OF_CURSES; + case UNRAND_VARIABILITY: return TILE_SPWPN_MACE_OF_VARIABILITY; + case UNRAND_PRUNE: return TILE_SPWPN_GLAIVE_OF_PRUNE; + case UNRAND_TORMENT: return TILE_SPWPN_SCEPTRE_OF_TORMENT; + case UNRAND_ZONGULDROK: return TILE_SPWPN_SWORD_OF_ZONGULDROK; + case UNRAND_CEREBOV: return TILE_SPWPN_SWORD_OF_CEREBOV; + case UNRAND_DISPATER: return TILE_SPWPN_STAFF_OF_DISPATER; + case UNRAND_ASMODEUS: return TILE_SPWPN_SCEPTRE_OF_ASMODEUS; + case UNRAND_POWER: return TILE_SPWPN_SWORD_OF_POWER; + case UNRAND_OLGREB: return TILE_SPWPN_STAFF_OF_OLGREB; + case UNRAND_VAMPIRES_TOOTH: return TILE_SPWPN_VAMPIRES_TOOTH; + case UNRAND_WUCAD_MU: return TILE_SPWPN_STAFF_OF_WUCAD_MU; case UNRAND_BLOODBANE: return TILE_URAND_BLOODBANE; case UNRAND_SHADOWS: return TILE_URAND_SHADOWS; @@ -3391,48 +3391,49 @@ int tilep_equ_weapon(const item_def &item) { switch (find_unrandart_index(item)) { - case SPWPN_SINGING_SWORD: return TILEP_HAND1_SINGING_SWORD; - case SPWPN_WRATH_OF_TROG: return TILEP_HAND1_AXE_TROG; - case SPWPN_SCYTHE_OF_CURSES: return TILEP_HAND1_FINISHER; - case SPWPN_MACE_OF_VARIABILITY: return TILEP_HAND1_MACE_OF_VARIABILITY; - case SPWPN_GLAIVE_OF_PRUNE: return TILEP_HAND1_GLAIVE_OF_PRUNE; - case SPWPN_SCEPTRE_OF_TORMENT: return TILEP_HAND1_MACE_RUBY; - case SPWPN_SWORD_OF_ZONGULDROK: return TILEP_HAND1_ZONGULDROK; - case SPWPN_SWORD_OF_CEREBOV: return TILEP_HAND1_SWORD_TWIST; - case SPWPN_STAFF_OF_DISPATER: return TILEP_HAND1_DISPATER; - case SPWPN_SCEPTRE_OF_ASMODEUS: return TILEP_HAND1_ASMODEUS; - case SPWPN_STAFF_OF_OLGREB: return TILEP_HAND1_OLGREB; - case SPWPN_SWORD_OF_POWER: return TILEP_HAND1_SWORD_OF_POWER; - case SPWPN_VAMPIRES_TOOTH: return TILEP_HAND1_VAMPIRES_TOOTH; - case SPWPN_STAFF_OF_WUCAD_MU: return TILEP_HAND1_WUCAD_MU; - - case UNRAND_BLOODBANE: return TILEP_HAND1_BLOODBANE; - case UNRAND_FLAMING_DEATH: return TILEP_HAND1_FLAMING_DEATH; - case UNRAND_BRILLIANCE: return TILEP_HAND1_MACE_OF_BRILLIANCE; - case UNRAND_LEECH: return TILEP_HAND1_LEECH; - case UNRAND_CHILLY_DEATH: return TILEP_HAND1_CHILLY_DEATH; - case UNRAND_MORG: return TILEP_HAND1_MORG; - case UNRAND_FINISHER: return TILEP_HAND1_FINISHER; - case UNRAND_PUNK: return TILEP_HAND1_PUNK; - case UNRAND_KRISHNA: return TILEP_HAND1_KRISHNA; - case UNRAND_SKULLCRUSHER: return TILEP_HAND1_GIANT_CLUB_SLANT; - case UNRAND_GUARD: return TILEP_HAND1_GLAIVE_OF_THE_GUARD; - case UNRAND_JIHAD: return TILEP_HAND1_JIHAD; - case UNRAND_HELLFIRE: return TILEP_HAND1_FIERY_DEVIL; - case UNRAND_DOOM_KNIGHT: return TILEP_HAND1_DOOM_KNIGHT; - case UNRAND_EOS: return TILEP_HAND1_EOS; - case UNRAND_BOTONO: return TILEP_HAND1_VOODOO; - case UNRAND_OCTOPUS_KING: return TILEP_HAND1_TRIDENT_OCTOPUS_KING; - case UNRAND_ARGA: return TILEP_HAND1_ARGA; - case UNRAND_ELEMENTAL_STAFF: return TILEP_HAND1_ELEMENTAL_STAFF; - case UNRAND_SNIPER: return TILEP_HAND1_SNIPER; - case UNRAND_PLUTONIUM_SWORD: return TILEP_HAND1_PLUTONIUM_SWORD; - case UNRAND_BLOWGUN_ASSASSIN: return TILEP_HAND1_BLOWGUN_ASSASSIN; - case UNRAND_WYRMBANE: return TILEP_HAND1_WYRMBANE; - case UNRAND_SPRIGGANS_KNIFE: return TILEP_HAND1_SPRIGGANS_KNIFE; - case UNRAND_SERPENT_SCOURGE: return TILEP_HAND1_SERPENT_SCOURGE; - case UNRAND_ACCURACY: return TILEP_HAND1_KNIFE_OF_ACCURACY; - case UNRAND_PIERCER: return TILEP_HAND1_GREAT_BOW; + case UNRAND_SINGING_SWORD: return TILEP_HAND1_SINGING_SWORD; + case UNRAND_TROG: return TILEP_HAND1_AXE_TROG; + case UNRAND_CURSES: return TILEP_HAND1_FINISHER; + case UNRAND_VARIABILITY: return TILEP_HAND1_MACE_OF_VARIABILITY; + case UNRAND_PRUNE: return TILEP_HAND1_GLAIVE_OF_PRUNE; + case UNRAND_TORMENT: return TILEP_HAND1_MACE_RUBY; + case UNRAND_ZONGULDROK: return TILEP_HAND1_ZONGULDROK; + case UNRAND_CEREBOV: return TILEP_HAND1_SWORD_TWIST; + case UNRAND_DISPATER: return TILEP_HAND1_DISPATER; + case UNRAND_ASMODEUS: return TILEP_HAND1_ASMODEUS; + case UNRAND_OLGREB: return TILEP_HAND1_OLGREB; + case UNRAND_POWER: return TILEP_HAND1_SWORD_OF_POWER; + case UNRAND_VAMPIRES_TOOTH: return TILEP_HAND1_VAMPIRES_TOOTH; + case UNRAND_WUCAD_MU: return TILEP_HAND1_WUCAD_MU; + + case UNRAND_BLOODBANE: return TILEP_HAND1_BLOODBANE; + case UNRAND_FLAMING_DEATH: return TILEP_HAND1_FLAMING_DEATH; + case UNRAND_BRILLIANCE: return TILEP_HAND1_MACE_OF_BRILLIANCE; + case UNRAND_LEECH: return TILEP_HAND1_LEECH; + case UNRAND_CHILLY_DEATH: return TILEP_HAND1_CHILLY_DEATH; + case UNRAND_MORG: return TILEP_HAND1_MORG; + case UNRAND_FINISHER: return TILEP_HAND1_FINISHER; + case UNRAND_PUNK: return TILEP_HAND1_PUNK; + case UNRAND_KRISHNA: return TILEP_HAND1_KRISHNA; + case UNRAND_SKULLCRUSHER: return TILEP_HAND1_GIANT_CLUB_SLANT; + case UNRAND_GUARD: return TILEP_HAND1_GLAIVE_OF_THE_GUARD; + case UNRAND_JIHAD: return TILEP_HAND1_JIHAD; + case UNRAND_HELLFIRE: return TILEP_HAND1_FIERY_DEVIL; + case UNRAND_DOOM_KNIGHT: return TILEP_HAND1_DOOM_KNIGHT; + case UNRAND_EOS: return TILEP_HAND1_EOS; + case UNRAND_BOTONO: return TILEP_HAND1_VOODOO; + case UNRAND_OCTOPUS_KING: return TILEP_HAND1_TRIDENT_OCTOPUS_KING; + + case UNRAND_ARGA: return TILEP_HAND1_ARGA; + case UNRAND_ELEMENTAL_STAFF: return TILEP_HAND1_ELEMENTAL_STAFF; + case UNRAND_SNIPER: return TILEP_HAND1_SNIPER; + case UNRAND_PLUTONIUM_SWORD: return TILEP_HAND1_PLUTONIUM_SWORD; + case UNRAND_BLOWGUN_ASSASSIN: return TILEP_HAND1_BLOWGUN_ASSASSIN; + case UNRAND_WYRMBANE: return TILEP_HAND1_WYRMBANE; + case UNRAND_SPRIGGANS_KNIFE: return TILEP_HAND1_SPRIGGANS_KNIFE; + case UNRAND_SERPENT_SCOURGE: return TILEP_HAND1_SERPENT_SCOURGE; + case UNRAND_ACCURACY: return TILEP_HAND1_KNIFE_OF_ACCURACY; + case UNRAND_PIERCER: return TILEP_HAND1_GREAT_BOW; } } |