diff options
Diffstat (limited to 'crawl-ref/source')
223 files changed, 313 insertions, 257 deletions
diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des index 6d6a3ce8b0..30b5de2144 100644 --- a/crawl-ref/source/dat/lab.des +++ b/crawl-ref/source/dat/lab.des @@ -362,3 +362,13 @@ KMONS: x = trapdoor spider / w:3 wandering mushroom MAP x ENDMAP + +# Death by starvation? +NAME: labyrinth_hungry_ghost +TAGS: lab allow_dup generate_awake +WEIGHT: 5 +KFEAT: x = . +KMONS: x = hungry ghost +MAP +x +ENDMAP diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 3340fbeaf3..b80634e36b 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -866,9 +866,6 @@ static std::string _describe_weapon(const item_def &item, bool verbose) description += "It rewards the powerful with power " "and the meek with weakness."; break; - case SPWPN_KNIFE_OF_ACCURACY: - description += "It is almost unerringly accurate."; - break; case SPWPN_STAFF_OF_OLGREB: description += "It was the magical weapon wielded by the " "mighty wizard Olgreb before he met his " diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index b972967274..7543eac61b 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -671,10 +671,8 @@ bool InvMenu::process_key( int key ) && type == MT_DROP && (key == CONTROL('D') || key == '@')) { - int newflag = - is_set(MF_MULTISELECT)? - MF_SINGLESELECT | MF_ANYPRINTABLE - : MF_MULTISELECT; + int newflag = is_set(MF_MULTISELECT) ? MF_SINGLESELECT | MF_ANYPRINTABLE + : MF_MULTISELECT; flags &= ~(MF_SINGLESELECT | MF_MULTISELECT | MF_ANYPRINTABLE); flags |= newflag; @@ -789,8 +787,10 @@ std::vector<SelItem> select_items( const std::vector<const item_def*> &items, if (mtype == MT_PICKUP) menu.set_tag("pickup"); menu.load_items(items); - menu.set_flags(noselect ? MF_NOSELECT | MF_SHOW_PAGENUMBERS : - MF_MULTISELECT | MF_ALLOW_FILTER | MF_SHOW_PAGENUMBERS); + int new_flags = noselect ? MF_NOSELECT + : MF_MULTISELECT | MF_ALLOW_FILTER; + new_flags |= MF_SHOW_PAGENUMBERS; + menu.set_flags(new_flags); menu.show(); selected = menu.get_selitems(); } @@ -1041,9 +1041,8 @@ std::vector<SelItem> prompt_invent_items( } else if (keyin == '?' || keyin == '*' || keyin == ',') { - int selmode = - Options.drop_mode == DM_SINGLE - && (!pre_select || pre_select->empty())? + int selmode = Options.drop_mode == DM_SINGLE + && (!pre_select || pre_select->empty()) ? MF_SINGLESELECT | MF_EASY_EXIT | MF_ANYPRINTABLE : MF_MULTISELECT | MF_ALLOW_FILTER; diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index d28de4113f..198fd61ad0 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -447,9 +447,6 @@ int item_special_wield_effect(const item_def &item) case SPWPN_MACE_OF_VARIABILITY: return (SPWLD_VARIABLE); - case SPWPN_GLAIVE_OF_PRUNE: - return (SPWLD_NONE); - case SPWPN_SCEPTRE_OF_TORMENT: return (SPWLD_TORMENT); @@ -475,7 +472,7 @@ int item_special_wield_effect(const item_def &item) // other places *cough* auto-butchering *cough*. {gdl} void wield_effects(int item_wield_2, bool showMsgs) { - unsigned char i_dam = 0; + unsigned char special = 0; item_def &item = you.inv[item_wield_2]; const bool artefact = is_random_artefact(item); @@ -538,7 +535,7 @@ void wield_effects(int item_wield_2, bool showMsgs) if (artefact) { - i_dam = randart_wpn_property(item, RAP_BRAND); + special = randart_wpn_property(item, RAP_BRAND); use_randart(item_wield_2); if (!was_known) { @@ -553,14 +550,14 @@ void wield_effects(int item_wield_2, bool showMsgs) } } else - i_dam = item.special; + special = item.special; - if (i_dam != SPWPN_NORMAL) + if (special != SPWPN_NORMAL) { // message first if (showMsgs) { - switch (i_dam) + switch (special) { case SPWPN_SWORD_OF_CEREBOV: case SPWPN_FLAMING: @@ -695,7 +692,7 @@ void wield_effects(int item_wield_2, bool showMsgs) } // effect second - switch (i_dam) + switch (special) { case SPWPN_PROTECTION: you.redraw_armour_class = true; @@ -708,56 +705,27 @@ void wield_effects(int item_wield_2, bool showMsgs) xom_is_stimulated(32); break; - case SPWPN_SINGING_SWORD: - you.special_wield = SPWLD_SING; - break; - - case SPWPN_WRATH_OF_TROG: - you.special_wield = SPWLD_TROG; - break; - case SPWPN_SCYTHE_OF_CURSES: - you.special_wield = SPWLD_CURSE; if (!item_cursed(item) && one_chance_in(3)) do_curse_item(item, false); break; - case SPWPN_MACE_OF_VARIABILITY: - you.special_wield = SPWLD_VARIABLE; - break; - - case SPWPN_GLAIVE_OF_PRUNE: - you.special_wield = SPWLD_NONE; - break; - - case SPWPN_SCEPTRE_OF_TORMENT: - you.special_wield = SPWLD_TORMENT; - break; - - case SPWPN_SWORD_OF_ZONGULDROK: - you.special_wield = SPWLD_ZONGULDROK; - break; - - case SPWPN_SWORD_OF_POWER: - you.special_wield = SPWLD_POWER; - break; - - case SPWPN_STAFF_OF_OLGREB: - you.special_wield = SPWLD_OLGREB; - break; - case SPWPN_STAFF_OF_WUCAD_MU: MiscastEffect(&you, WIELD_MISCAST, SPTYP_DIVINATION, 9, 90, "the Staff of Wucad Mu" ); - you.special_wield = SPWLD_WUCAD_MU; + break; + + default: break; } + if (is_fixed_artefact(item)) + you.special_wield = item_special_wield_effect(item); } if (item_cursed(item)) { mpr("It sticks to your hand!"); - if (known_cursed) + if (known_cursed || was_known && special == SPWPN_SCYTHE_OF_CURSES) xom_is_stimulated(32); else xom_is_stimulated(64); diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index b13d633ed0..a12e1c7804 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -1030,11 +1030,13 @@ std::string item_def::name_aux( description_level_type desc, } if (!basename && !dbname && know_racial) - // always give racial type (it does have game effects) + { + // Always give racial type (it does have game effects). buff << racial_description_string(*this, terse); + } - if (know_brand && !terse && - (get_weapon_brand(*this) == SPWPN_VAMPIRICISM)) + if (know_brand && !terse + && get_weapon_brand(*this) == SPWPN_VAMPIRICISM) { buff << "vampiric "; } diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h index 786ca39b1a..36a3e12c4f 100644 --- a/crawl-ref/source/itemprop.h +++ b/crawl-ref/source/itemprop.h @@ -92,11 +92,11 @@ enum brand_type // equivalent to (you.inv[].special or mitm[].special) % 30 SPWPN_VAMPIRICISM, SPWPN_PAIN, // 15 SPWPN_DISTORTION, - SPWPN_REACHING, // 17 + SPWPN_REACHING, + SPWPN_RETURNING, // 18 - MAX_PAN_LORD_BRANDS, // 18 + MAX_PAN_LORD_BRANDS = SPWPN_RETURNING, - SPWPN_RETURNING = MAX_PAN_LORD_BRANDS, SPWPN_CONFUSE, SPWPN_RANDART_I = 25, // 25 SPWPN_RANDART_II, @@ -117,7 +117,6 @@ enum brand_type // equivalent to (you.inv[].special or mitm[].special) % 30 SPWPN_SCEPTRE_OF_TORMENT, SPWPN_SWORD_OF_ZONGULDROK, SPWPN_SWORD_OF_POWER, - SPWPN_KNIFE_OF_ACCURACY, SPWPN_STAFF_OF_OLGREB, SPWPN_VAMPIRES_TOOTH, SPWPN_STAFF_OF_WUCAD_MU, diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index a9f4f33109..4eef9c0424 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -952,9 +952,8 @@ bool slider_menu::process_key(int key) return (false); } - if (Menu::is_set(MF_NOWRAP) && - selected == 0 && - (key == CK_UP || key == CK_PGUP || key == '<' || key == ';')) + if (Menu::is_set(MF_NOWRAP) && selected == 0 + && (key == CK_UP || key == CK_PGUP || key == '<' || key == ';')) { oldselect = selected; selected = -1; diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc index ffaec3a50d..500ee5ffa8 100644 --- a/crawl-ref/source/randart.cc +++ b/crawl-ref/source/randart.cc @@ -1599,18 +1599,6 @@ const fixedart_setting fixedarts[] = { }, { - SPWPN_KNIFE_OF_ACCURACY, - "Knife of Accuracy", - "thin dagger", - OBJ_WEAPONS, - WPN_DAGGER, - 27, - -1, - LIGHTCYAN, - false - }, - - { SPWPN_STAFF_OF_OLGREB, "Staff of Olgreb", "green glowing staff", diff --git a/crawl-ref/source/randart.h b/crawl-ref/source/randart.h index e33d81e765..df381b19da 100644 --- a/crawl-ref/source/randart.h +++ b/crawl-ref/source/randart.h @@ -13,7 +13,7 @@ #include "externs.h" // used in files.cc, newgame.cc, randart.cc {dlb} -#define NO_UNRANDARTS 58 +#define NO_UNRANDARTS 59 #define RA_PROPERTIES RAP_NUM_PROPERTIES // Reserving the upper bits for later expansion/versioning. diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt index d110e7eb5c..504bc49978 100644 --- a/crawl-ref/source/rltiles/dc-item.txt +++ b/crawl-ref/source/rltiles/dc-item.txt @@ -15,7 +15,7 @@ #####OBJ_WEAPONS
#####ARTIFACTS
-%sdir item/weapon
+%sdir item/weapon/artefact
spwpn_singing_sword SPWPN_SINGING_SWORD
spwpn_wrath_of_trog SPWPN_WRATH_OF_TROG
spwpn_scythe_of_curses SPWPN_SCYTHE_OF_CURSES
@@ -29,7 +29,6 @@ spwpn_staff_of_dispater SPWPN_STAFF_OF_DISPATER spwpn_sceptre_of_asmodeus SPWPN_SCEPTRE_OF_ASMODEUS
spwpn_sword_of_power SPWPN_SWORD_OF_POWER
%rim 0
-spwpn_knife_of_accuracy SPWPN_KNIFE_OF_ACCURACY
spwpn_staff_of_olgreb SPWPN_STAFF_OF_OLGREB
spwpn_vampires_tooth SPWPN_VAMPIRES_TOOTH
spwpn_wucad_mu SPWPN_STAFF_OF_WUCAD_MU
@@ -155,6 +154,33 @@ longbow WPN_LONGBOW lajatang WPN_LAJATANG
lajatang2
+%sdir item/weapon/brands
+%shrink 0
+%rim 0
+i-flaming BRAND_FLAMING
+i-freezing BRAND_FREEZING
+i-holy_wrath BRAND_HOLY_WRATH
+i-electrocution BRAND_ELECTROCUTION
+i-orc_slaying BRAND_ORC_SLAYING
+i-dragon_slaying BRAND_DRAGON_SLAYING
+i-venom BRAND_VENOM
+i-protection BRAND_PROTECTION
+i-draining BRAND_DRAINING
+i-speed BRAND_SPEED
+i-vorpal BRAND_VORPAL
+i-flaming BRAND_FLAME
+i-freezing BRAND_ICE
+i-vampiricism BRAND_VAMPIRICISM
+i-pain BRAND_PAIN
+i-distortion BRAND_DISTORTION
+i-reaching BRAND_REACHING
+i-returning BRAND_RETURNING
+i-venom BRAND_POISONED
+i-curare BRAND_CURARE
+%rim 1
+%shrink 1
+%sdir item/weapon
+
######OBJ_MISSILES
item/gem/stone MI_STONE
effect/stone0 MI_STONE0
@@ -225,8 +251,9 @@ effect/net_trap TRAP_NET item/gem/rock MI_LARGE_ROCK
effect/rock0 MI_LARGE_ROCK0
+
######OBJ_ARMOUR
-%sdir item/armor
+%sdir item/armour
robe ARM_ROBE
robe2
robe3
diff --git a/crawl-ref/source/rltiles/dc-player.txt b/crawl-ref/source/rltiles/dc-player.txt index f28972b83a..69835fa9b5 100644 --- a/crawl-ref/source/rltiles/dc-player.txt +++ b/crawl-ref/source/rltiles/dc-player.txt @@ -375,8 +375,55 @@ claws CLAWS # Hand 1
%parts_ctg HAND1
-%sdir player/hand1
+###Artefacts
+%sdir player/hand1/artefact
+# blades
+bloodbane BLOODBANE
+chilly_death CHILLY_DEATH
+doom_knight DOOM_KNIGHT
+flaming_death FLAMING_DEATH
+leech LEECH
+morg MORG
+plutonium_sword PLUTONIUM_SWORD
+jihad JIHAD
+singing_sword SINGING_SWORD
+zonguldrok ZONGULDROK
+sword_of_power SWORD_OF_POWER
+knife_of_accuracy KNIFE_OF_ACCURACY
+vampires_tooth VAMPIRES_TOOTH
+wucad_mu WUCAD_MU
+dire_lajatang DIRE_LAJATANG
+wyrmbane WYRMBANE
+spriggans_knife SPRIGGANS_KNIFE
+eos EOS
+## blunt
+serpent_scourge SERPENT_SCOURGE
+mace_of_variability MACE_OF_VARIABILITY
+mace_of_brilliance MACE_OF_BRILLIANCE
+undeadhunter UNDEADHUNTER
+## polearms
+trident_octopus_king TRIDENT_OCTOPUS_KING
+glaive_of_prune GLAIVE_OF_PRUNE
+voodoo VOODOO
+finisher FINISHER
+glaive_of_the_guard GLAIVE_OF_THE_GUARD
+## staves
+elemental_staff ELEMENTAL_STAFF
+asmodeus ASMODEUS
+dispater DISPATER
+olgreb OLGREB
+## axes
+axe_trog AXE_TROG
+arga ARGA
+## launchers
+blowgun_assassin BLOWGUN_ASSASSIN
+punk PUNK
+sniper SNIPER
+crossbow_fire FIERY_DEVIL
+krishna KRISHNA
+
+%sdir player/hand1
# blades
dagger DAGGER
dagger_slant DAGGER_SLANT
@@ -408,25 +455,6 @@ sabre SABRE sword3 SWORD3
sword_breaker SWORD_BREAKER
sword_jag SWORD_JAG
-###Artifacts
-bloodbane BLOODBANE
-chilly_death CHILLY_DEATH
-doom_knight DOOM_KNIGHT
-flaming_death FLAMING_DEATH
-leech LEECH
-morg MORG
-plutonium_sword PLUTONIUM_SWORD
-jihad JIHAD
-singing_sword SINGING_SWORD
-zonguldrok ZONGULDROK
-sword_of_power SWORD_OF_POWER
-knife_of_accuracy KNIFE_OF_ACCURACY
-vampires_tooth VAMPIRES_TOOTH
-wucad_mu WUCAD_MU
-dire_lajatang DIRE_LAJATANG
-wyrmbane WYRMBANE
-spriggans_knife SPRIGGANS_KNIFE
-eos EOS
## blunt
club CLUB
@@ -450,7 +478,6 @@ morningstar2 MORNINGSTAR eveningstar EVENINGSTAR
large_mace LARGE_MACE
black_whip BLACK_WHIP
-serpent_scourge SERPENT_SCOURGE
hammer3 HAMMER
hammer HAMMER1
hammer2 HAMMER2
@@ -463,9 +490,6 @@ frail_balls FRAIL_BALLS frail_ball3 FRAIL_BALL3
frail_ball4 FRAIL_BALL4
nunchaku NUNCHAKU
-mace_of_variability MACE_OF_VARIABILITY
-mace_of_brilliance MACE_OF_BRILLIANCE
-undeadhunter UNDEADHUNTER
## polearms
spear1 SPEAR
@@ -481,7 +505,6 @@ trident_demon DEMON_TRIDENT trident_elec TRIDENT_ELEC
trident2 TRIDENT2
trident3 TRIDENT3
-trident_octopus_king TRIDENT_OCTOPUS_KING
lance LANCE
lance2 LANCE2
scythe SCYTHE
@@ -498,10 +521,6 @@ glaive3 GLAIVE3 d_glaive D_GLAIVE
pole_forked POLE_FORKED
fork2 FORK2
-glaive_of_prune GLAIVE_OF_PRUNE
-voodoo VOODOO
-finisher FINISHER
-glaive_of_the_guard GLAIVE_OF_THE_GUARD
## staves
@@ -521,10 +540,6 @@ staff_evil STAFF_EVIL staff_ring_blue STAFF_RING_BLUE
staff_mummy STAFF_MUMMY
staff_fork STAFF_FORK
-elemental_staff ELEMENTAL_STAFF
-asmodeus ASMODEUS
-dispater DISPATER
-olgreb OLGREB
## rods
# These 10 rods correspond to the same order as item/rod/
@@ -549,8 +564,6 @@ axe_executioner EXECUTIONERS_AXE axe_double AXE_DOUBLE
axe_blood AXE_BLOOD
axe_short AXE_SHORT
-axe_trog AXE_TROG
-arga ARGA
## launchers
sling SLING
@@ -564,11 +577,6 @@ crossbow2 CROSSBOW2 crossbow3 CROSSBOW3
crossbow4 CROSSBOW4
blowgun BLOWGUN
-blowgun_assassin BLOWGUN_ASSASSIN
-punk PUNK
-sniper SNIPER
-crossbow_fire FIERY_DEVIL
-krishna KRISHNA
##missiles
dirt DIRT
diff --git a/crawl-ref/source/rltiles/dc-urand.txt b/crawl-ref/source/rltiles/dc-urand.txt index e8de4b3c97..5277353281 100644 --- a/crawl-ref/source/rltiles/dc-urand.txt +++ b/crawl-ref/source/rltiles/dc-urand.txt @@ -1,61 +1,65 @@ -%sdir item -weapon/urand_bloodbane URAND_BLOODBANE -weapon/urand_flaming_death URAND_FLAMING_DEATH -weapon/urand_brilliance URAND_BRILLIANCE -weapon/urand_leech URAND_LEECH -weapon/urand_chilly_death URAND_CHILLY_DEATH -weapon/urand_morg URAND_MORG -weapon/urand_finisher URAND_FINISHER -weapon/urand_punk URAND_PUNK -weapon/urand_krishna URAND_KRISHNA -weapon/urand_skullcrusher URAND_SKULLCRUSHER -weapon/urand_guard URAND_GUARD -weapon/urand_jihad URAND_JIHAD -weapon/urand_fiery_devil URAND_FIERY_DEVIL -weapon/urand_doom_knight URAND_DOOM_KNIGHT -weapon/urand_eos URAND_EOS -weapon/urand_voo_doo URAND_VOO_DOO -weapon/urand_octopus_king URAND_OCTOPUS_KING -weapon/urand_arga URAND_ARGA -weapon/urand_elemental URAND_ELEMENTAL -weapon/urand_sniper URAND_SNIPER -weapon/urand_erchidel URAND_ERCHIDEL -weapon/urand_plutonium URAND_PLUTONIUM -weapon/urand_undeadhunter URAND_UNDEADHUNTER +%sdir item/weapon/artefact +urand_bloodbane URAND_BLOODBANE +urand_flaming_death URAND_FLAMING_DEATH +urand_brilliance URAND_BRILLIANCE +urand_leech URAND_LEECH +urand_chilly_death URAND_CHILLY_DEATH +urand_morg URAND_MORG +urand_finisher URAND_FINISHER +urand_punk URAND_PUNK +urand_krishna URAND_KRISHNA +urand_skullcrusher URAND_SKULLCRUSHER +urand_guard URAND_GUARD +urand_jihad URAND_JIHAD +urand_fiery_devil URAND_FIERY_DEVIL +urand_doom_knight URAND_DOOM_KNIGHT +urand_eos URAND_EOS +urand_voo_doo URAND_VOO_DOO +urand_octopus_king URAND_OCTOPUS_KING +urand_arga URAND_ARGA +urand_elemental URAND_ELEMENTAL +urand_sniper URAND_SNIPER +urand_erchidel URAND_ERCHIDEL +urand_plutonium URAND_PLUTONIUM +urand_undeadhunter URAND_UNDEADHUNTER %rim 1 -weapon/urand_blowgun URAND_BLOWGUN -weapon/urand_serpent_scourge URAND_SERPENT_SCOURGE -weapon/urand_wyrmbane URAND_WYRMBANE -weapon/urand_spriggans_knife URAND_SPRIGGANS_KNIFE +urand_blowgun URAND_BLOWGUN +urand_serpent_scourge URAND_SERPENT_SCOURGE +urand_wyrmbane URAND_WYRMBANE +urand_spriggans_knife URAND_SPRIGGANS_KNIFE +urand_knife_of_accuracy URAND_KNIFE_OF_ACCURACY %rim 0 -armor/urand_ignorance URAND_IGNORANCE -armor/urand_augmentation URAND_AUGMENTATION -armor/urand_thief URAND_THIEF -armor/urand_bullseye URAND_BULLSEYE -armor/urand_dyrovepreva URAND_DYROVEPREVA -armor/urand_misfortune URAND_MISFORTUNE -armor/urand_flash URAND_FLASH -armor/urand_assassin URAND_ASSASSIN -armor/urand_lear URAND_LEAR -armor/urand_zhor URAND_ZHOR -armor/urand_salamander URAND_SALAMANDER -armor/urand_war URAND_WAR -armor/urand_resistance URAND_RESISTANCE -armor/urand_folly URAND_FOLLY -armor/urand_maxwell URAND_MAXWELL -armor/urand_dragonmask URAND_DRAGONMASK -armor/urand_night URAND_NIGHT -armor/urand_dragon_king URAND_DRAGON_KING -armor/urand_alchemist URAND_ALCHEMIST -armor/urand_fencer URAND_FENCER -armor/urand_starlight URAND_STARLIGHT -ring/urand_shadows URAND_SHADOWS -ring/urand_shaolin URAND_SHAOLIN -ring/urand_robustness URAND_ROBUSTNESS -ring/urand_mage URAND_MAGE -amulet/urand_cekugob URAND_CEKUGOB -amulet/urand_four_winds URAND_FOUR_WINDS -amulet/urand_bloodlust URAND_BLOODLUST -amulet/urand_brooch_of_shielding URAND_BROOCH_OF_SHIELDING -amulet/urand_air URAND_AIR +%sdir item/armour/artefact +urand_ignorance URAND_IGNORANCE +urand_augmentation URAND_AUGMENTATION +urand_thief URAND_THIEF +urand_bullseye URAND_BULLSEYE +urand_dyrovepreva URAND_DYROVEPREVA +urand_misfortune URAND_MISFORTUNE +urand_flash URAND_FLASH +urand_assassin URAND_ASSASSIN +urand_lear URAND_LEAR +urand_zhor URAND_ZHOR +urand_salamander URAND_SALAMANDER +urand_war URAND_WAR +urand_resistance URAND_RESISTANCE +urand_folly URAND_FOLLY +urand_maxwell URAND_MAXWELL +urand_dragonmask URAND_DRAGONMASK +urand_night URAND_NIGHT +urand_dragon_king URAND_DRAGON_KING +urand_alchemist URAND_ALCHEMIST +urand_fencer URAND_FENCER +urand_starlight URAND_STARLIGHT +%sdir item/ring/artefact +urand_shadows URAND_SHADOWS +urand_shaolin URAND_SHAOLIN +urand_robustness URAND_ROBUSTNESS +urand_mage URAND_MAGE +%sdir item/amulet/artefact +urand_cekugob URAND_CEKUGOB +urand_four_winds URAND_FOUR_WINDS +urand_bloodlust URAND_BLOODLUST +urand_brooch_of_shielding URAND_BROOCH_OF_SHIELDING +urand_air URAND_AIR diff --git a/crawl-ref/source/rltiles/item/amulet/urand_air.png b/crawl-ref/source/rltiles/item/amulet/artefact/urand_air.png Binary files differindex ec60ba05cf..ec60ba05cf 100644 --- a/crawl-ref/source/rltiles/item/amulet/urand_air.png +++ b/crawl-ref/source/rltiles/item/amulet/artefact/urand_air.png diff --git a/crawl-ref/source/rltiles/item/amulet/urand_bloodlust.png b/crawl-ref/source/rltiles/item/amulet/artefact/urand_bloodlust.png Binary files differindex 5b94e62dd8..5b94e62dd8 100644 --- a/crawl-ref/source/rltiles/item/amulet/urand_bloodlust.png +++ b/crawl-ref/source/rltiles/item/amulet/artefact/urand_bloodlust.png diff --git a/crawl-ref/source/rltiles/item/amulet/urand_brooch_of_shielding.png b/crawl-ref/source/rltiles/item/amulet/artefact/urand_brooch_of_shielding.png Binary files differindex c5e41d2755..c5e41d2755 100644 --- a/crawl-ref/source/rltiles/item/amulet/urand_brooch_of_shielding.png +++ b/crawl-ref/source/rltiles/item/amulet/artefact/urand_brooch_of_shielding.png diff --git a/crawl-ref/source/rltiles/item/amulet/urand_cekugob.png b/crawl-ref/source/rltiles/item/amulet/artefact/urand_cekugob.png Binary files differindex 17e1feec43..17e1feec43 100644 --- a/crawl-ref/source/rltiles/item/amulet/urand_cekugob.png +++ b/crawl-ref/source/rltiles/item/amulet/artefact/urand_cekugob.png diff --git a/crawl-ref/source/rltiles/item/amulet/urand_four_winds.png b/crawl-ref/source/rltiles/item/amulet/artefact/urand_four_winds.png Binary files differindex 70083a8531..70083a8531 100644 --- a/crawl-ref/source/rltiles/item/amulet/urand_four_winds.png +++ b/crawl-ref/source/rltiles/item/amulet/artefact/urand_four_winds.png diff --git a/crawl-ref/source/rltiles/item/armor/animal_skin.png b/crawl-ref/source/rltiles/item/armor/animal_skin.png Binary files differdeleted file mode 100644 index f853066667..0000000000 --- a/crawl-ref/source/rltiles/item/armor/animal_skin.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/animal_skin2.png b/crawl-ref/source/rltiles/item/armor/animal_skin2.png Binary files differdeleted file mode 100644 index bae7dbba9a..0000000000 --- a/crawl-ref/source/rltiles/item/armor/animal_skin2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/banded_mail.png b/crawl-ref/source/rltiles/item/armor/banded_mail.png Binary files differdeleted file mode 100644 index 6d69e1a50e..0000000000 --- a/crawl-ref/source/rltiles/item/armor/banded_mail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/blue_dragon_scale_mail.png b/crawl-ref/source/rltiles/item/armor/blue_dragon_scale_mail.png Binary files differdeleted file mode 100644 index 808cc96a01..0000000000 --- a/crawl-ref/source/rltiles/item/armor/blue_dragon_scale_mail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/blue_dragon_scales.png b/crawl-ref/source/rltiles/item/armor/blue_dragon_scales.png Binary files differdeleted file mode 100644 index 698dcdfdc4..0000000000 --- a/crawl-ref/source/rltiles/item/armor/blue_dragon_scales.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/boots_brown1.png b/crawl-ref/source/rltiles/item/armor/boots_brown1.png Binary files differdeleted file mode 100644 index 7ef530f05a..0000000000 --- a/crawl-ref/source/rltiles/item/armor/boots_brown1.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/boots_green2.png b/crawl-ref/source/rltiles/item/armor/boots_green2.png Binary files differdeleted file mode 100644 index 618e9ca669..0000000000 --- a/crawl-ref/source/rltiles/item/armor/boots_green2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/boots_stripe1.png b/crawl-ref/source/rltiles/item/armor/boots_stripe1.png Binary files differdeleted file mode 100644 index 7640355a61..0000000000 --- a/crawl-ref/source/rltiles/item/armor/boots_stripe1.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/breast_plate2.png b/crawl-ref/source/rltiles/item/armor/breast_plate2.png Binary files differdeleted file mode 100644 index c32bc8939e..0000000000 --- a/crawl-ref/source/rltiles/item/armor/breast_plate2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/buckler.png b/crawl-ref/source/rltiles/item/armor/buckler.png Binary files differdeleted file mode 100644 index b66db87c8e..0000000000 --- a/crawl-ref/source/rltiles/item/armor/buckler.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/buckler2.png b/crawl-ref/source/rltiles/item/armor/buckler2.png Binary files differdeleted file mode 100644 index 4dccc433ed..0000000000 --- a/crawl-ref/source/rltiles/item/armor/buckler2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/buckler3.png b/crawl-ref/source/rltiles/item/armor/buckler3.png Binary files differdeleted file mode 100644 index 79a2eec666..0000000000 --- a/crawl-ref/source/rltiles/item/armor/buckler3.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/centaur_barding_blue.png b/crawl-ref/source/rltiles/item/armor/centaur_barding_blue.png Binary files differdeleted file mode 100644 index 6a37744b8d..0000000000 --- a/crawl-ref/source/rltiles/item/armor/centaur_barding_blue.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/centaur_barding_magenta.png b/crawl-ref/source/rltiles/item/armor/centaur_barding_magenta.png Binary files differdeleted file mode 100644 index afb44bb273..0000000000 --- a/crawl-ref/source/rltiles/item/armor/centaur_barding_magenta.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/centaur_barding_metal.png b/crawl-ref/source/rltiles/item/armor/centaur_barding_metal.png Binary files differdeleted file mode 100644 index 217af60128..0000000000 --- a/crawl-ref/source/rltiles/item/armor/centaur_barding_metal.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/centaur_barding_red.png b/crawl-ref/source/rltiles/item/armor/centaur_barding_red.png Binary files differdeleted file mode 100644 index 461c7947c6..0000000000 --- a/crawl-ref/source/rltiles/item/armor/centaur_barding_red.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/chain_mail1.png b/crawl-ref/source/rltiles/item/armor/chain_mail1.png Binary files differdeleted file mode 100644 index f5852127fc..0000000000 --- a/crawl-ref/source/rltiles/item/armor/chain_mail1.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/chain_mail2.png b/crawl-ref/source/rltiles/item/armor/chain_mail2.png Binary files differdeleted file mode 100644 index 450e496344..0000000000 --- a/crawl-ref/source/rltiles/item/armor/chain_mail2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/chain_mail3.png b/crawl-ref/source/rltiles/item/armor/chain_mail3.png Binary files differdeleted file mode 100644 index 5c8cbc80d7..0000000000 --- a/crawl-ref/source/rltiles/item/armor/chain_mail3.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/cloak2.png b/crawl-ref/source/rltiles/item/armor/cloak2.png Binary files differdeleted file mode 100644 index c121f30d04..0000000000 --- a/crawl-ref/source/rltiles/item/armor/cloak2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/cloak3.png b/crawl-ref/source/rltiles/item/armor/cloak3.png Binary files differdeleted file mode 100644 index 3d86fe45a5..0000000000 --- a/crawl-ref/source/rltiles/item/armor/cloak3.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/cloak4.png b/crawl-ref/source/rltiles/item/armor/cloak4.png Binary files differdeleted file mode 100644 index 985b781237..0000000000 --- a/crawl-ref/source/rltiles/item/armor/cloak4.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/crystal_plate_mail.png b/crawl-ref/source/rltiles/item/armor/crystal_plate_mail.png Binary files differdeleted file mode 100644 index c10095f165..0000000000 --- a/crawl-ref/source/rltiles/item/armor/crystal_plate_mail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/dwarven_ringmail.png b/crawl-ref/source/rltiles/item/armor/dwarven_ringmail.png Binary files differdeleted file mode 100644 index 366c896897..0000000000 --- a/crawl-ref/source/rltiles/item/armor/dwarven_ringmail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/elven_leather_armor.png b/crawl-ref/source/rltiles/item/armor/elven_leather_armor.png Binary files differdeleted file mode 100644 index c270622624..0000000000 --- a/crawl-ref/source/rltiles/item/armor/elven_leather_armor.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/elven_leather_helm.png b/crawl-ref/source/rltiles/item/armor/elven_leather_helm.png Binary files differdeleted file mode 100644 index 9f6fcaf475..0000000000 --- a/crawl-ref/source/rltiles/item/armor/elven_leather_helm.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/elven_ringmail.png b/crawl-ref/source/rltiles/item/armor/elven_ringmail.png Binary files differdeleted file mode 100644 index 42184f11a1..0000000000 --- a/crawl-ref/source/rltiles/item/armor/elven_ringmail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/elven_scalemail.png b/crawl-ref/source/rltiles/item/armor/elven_scalemail.png Binary files differdeleted file mode 100644 index 966f62cfed..0000000000 --- a/crawl-ref/source/rltiles/item/armor/elven_scalemail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/elven_shield.png b/crawl-ref/source/rltiles/item/armor/elven_shield.png Binary files differdeleted file mode 100644 index 0c58604e12..0000000000 --- a/crawl-ref/source/rltiles/item/armor/elven_shield.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/etched_helmet.png b/crawl-ref/source/rltiles/item/armor/etched_helmet.png Binary files differdeleted file mode 100644 index 7e1a9286ba..0000000000 --- a/crawl-ref/source/rltiles/item/armor/etched_helmet.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/gauntlet2.png b/crawl-ref/source/rltiles/item/armor/gauntlet2.png Binary files differdeleted file mode 100644 index 8880bd4a1f..0000000000 --- a/crawl-ref/source/rltiles/item/armor/gauntlet2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/glove1.png b/crawl-ref/source/rltiles/item/armor/glove1.png Binary files differdeleted file mode 100644 index 30d1c321c4..0000000000 --- a/crawl-ref/source/rltiles/item/armor/glove1.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/glove3.png b/crawl-ref/source/rltiles/item/armor/glove3.png Binary files differdeleted file mode 100644 index 9143f23d3e..0000000000 --- a/crawl-ref/source/rltiles/item/armor/glove3.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/glove5.png b/crawl-ref/source/rltiles/item/armor/glove5.png Binary files differdeleted file mode 100644 index eb2b818144..0000000000 --- a/crawl-ref/source/rltiles/item/armor/glove5.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/gold_dragon_armour.png b/crawl-ref/source/rltiles/item/armor/gold_dragon_armour.png Binary files differdeleted file mode 100644 index 74440e58f9..0000000000 --- a/crawl-ref/source/rltiles/item/armor/gold_dragon_armour.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/gold_dragon_hide.png b/crawl-ref/source/rltiles/item/armor/gold_dragon_hide.png Binary files differdeleted file mode 100644 index b34a435624..0000000000 --- a/crawl-ref/source/rltiles/item/armor/gold_dragon_hide.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/green_dragon_scale_mail.png b/crawl-ref/source/rltiles/item/armor/green_dragon_scale_mail.png Binary files differdeleted file mode 100644 index a47610b69f..0000000000 --- a/crawl-ref/source/rltiles/item/armor/green_dragon_scale_mail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/green_dragon_scales.png b/crawl-ref/source/rltiles/item/armor/green_dragon_scales.png Binary files differdeleted file mode 100644 index a31fbc85f0..0000000000 --- a/crawl-ref/source/rltiles/item/armor/green_dragon_scales.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/helm3.png b/crawl-ref/source/rltiles/item/armor/helm3.png Binary files differdeleted file mode 100644 index 886bfe9909..0000000000 --- a/crawl-ref/source/rltiles/item/armor/helm3.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/helm_visor1.png b/crawl-ref/source/rltiles/item/armor/helm_visor1.png Binary files differdeleted file mode 100644 index 4365622169..0000000000 --- a/crawl-ref/source/rltiles/item/armor/helm_visor1.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/ice_dragon_armour.png b/crawl-ref/source/rltiles/item/armor/ice_dragon_armour.png Binary files differdeleted file mode 100644 index ab618ea6e0..0000000000 --- a/crawl-ref/source/rltiles/item/armor/ice_dragon_armour.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/ice_dragon_hide.png b/crawl-ref/source/rltiles/item/armor/ice_dragon_hide.png Binary files differdeleted file mode 100644 index f29ced1fba..0000000000 --- a/crawl-ref/source/rltiles/item/armor/ice_dragon_hide.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/jackboots.png b/crawl-ref/source/rltiles/item/armor/jackboots.png Binary files differdeleted file mode 100644 index 990dfbe938..0000000000 --- a/crawl-ref/source/rltiles/item/armor/jackboots.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/large_shield.png b/crawl-ref/source/rltiles/item/armor/large_shield.png Binary files differdeleted file mode 100644 index 6b09465f66..0000000000 --- a/crawl-ref/source/rltiles/item/armor/large_shield.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/leather_armor2.png b/crawl-ref/source/rltiles/item/armor/leather_armor2.png Binary files differdeleted file mode 100644 index a63a108d4b..0000000000 --- a/crawl-ref/source/rltiles/item/armor/leather_armor2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/leather_armor4.png b/crawl-ref/source/rltiles/item/armor/leather_armor4.png Binary files differdeleted file mode 100644 index 8385c441eb..0000000000 --- a/crawl-ref/source/rltiles/item/armor/leather_armor4.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/leather_cloak.png b/crawl-ref/source/rltiles/item/armor/leather_cloak.png Binary files differdeleted file mode 100644 index 2ec84beb55..0000000000 --- a/crawl-ref/source/rltiles/item/armor/leather_cloak.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/mottled_dragon_armour.png b/crawl-ref/source/rltiles/item/armor/mottled_dragon_armour.png Binary files differdeleted file mode 100644 index c3bf9fa2cf..0000000000 --- a/crawl-ref/source/rltiles/item/armor/mottled_dragon_armour.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/mottled_dragon_hide.png b/crawl-ref/source/rltiles/item/armor/mottled_dragon_hide.png Binary files differdeleted file mode 100644 index 3bc7d9e6c3..0000000000 --- a/crawl-ref/source/rltiles/item/armor/mottled_dragon_hide.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/naga_barding_blue.png b/crawl-ref/source/rltiles/item/armor/naga_barding_blue.png Binary files differdeleted file mode 100644 index af9c2976d0..0000000000 --- a/crawl-ref/source/rltiles/item/armor/naga_barding_blue.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/naga_barding_magenta.png b/crawl-ref/source/rltiles/item/armor/naga_barding_magenta.png Binary files differdeleted file mode 100644 index 98e683a4a1..0000000000 --- a/crawl-ref/source/rltiles/item/armor/naga_barding_magenta.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/naga_barding_metal.png b/crawl-ref/source/rltiles/item/armor/naga_barding_metal.png Binary files differdeleted file mode 100644 index 71f01b7e5c..0000000000 --- a/crawl-ref/source/rltiles/item/armor/naga_barding_metal.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/naga_barding_red.png b/crawl-ref/source/rltiles/item/armor/naga_barding_red.png Binary files differdeleted file mode 100644 index b58c5521b2..0000000000 --- a/crawl-ref/source/rltiles/item/armor/naga_barding_red.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/orcish_chain_mail.png b/crawl-ref/source/rltiles/item/armor/orcish_chain_mail.png Binary files differdeleted file mode 100644 index b16cb68939..0000000000 --- a/crawl-ref/source/rltiles/item/armor/orcish_chain_mail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/orcish_leather_armor.png b/crawl-ref/source/rltiles/item/armor/orcish_leather_armor.png Binary files differdeleted file mode 100644 index f2cdb9976f..0000000000 --- a/crawl-ref/source/rltiles/item/armor/orcish_leather_armor.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/orcish_platemail.png b/crawl-ref/source/rltiles/item/armor/orcish_platemail.png Binary files differdeleted file mode 100644 index 8730c6527a..0000000000 --- a/crawl-ref/source/rltiles/item/armor/orcish_platemail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/orcish_ringmail.png b/crawl-ref/source/rltiles/item/armor/orcish_ringmail.png Binary files differdeleted file mode 100644 index 6ad96a5ddb..0000000000 --- a/crawl-ref/source/rltiles/item/armor/orcish_ringmail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/plate_mail2.png b/crawl-ref/source/rltiles/item/armor/plate_mail2.png Binary files differdeleted file mode 100644 index d988a75142..0000000000 --- a/crawl-ref/source/rltiles/item/armor/plate_mail2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/ring_mail.png b/crawl-ref/source/rltiles/item/armor/ring_mail.png Binary files differdeleted file mode 100644 index f6059b6f81..0000000000 --- a/crawl-ref/source/rltiles/item/armor/ring_mail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/ring_mail2.png b/crawl-ref/source/rltiles/item/armor/ring_mail2.png Binary files differdeleted file mode 100644 index 8739459881..0000000000 --- a/crawl-ref/source/rltiles/item/armor/ring_mail2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/robe.png b/crawl-ref/source/rltiles/item/armor/robe.png Binary files differdeleted file mode 100644 index d468386baa..0000000000 --- a/crawl-ref/source/rltiles/item/armor/robe.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/robe2.png b/crawl-ref/source/rltiles/item/armor/robe2.png Binary files differdeleted file mode 100644 index da989d6e34..0000000000 --- a/crawl-ref/source/rltiles/item/armor/robe2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/robe3.png b/crawl-ref/source/rltiles/item/armor/robe3.png Binary files differdeleted file mode 100644 index c91365205b..0000000000 --- a/crawl-ref/source/rltiles/item/armor/robe3.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/scale_mail.png b/crawl-ref/source/rltiles/item/armor/scale_mail.png Binary files differdeleted file mode 100644 index 48c66fa1f5..0000000000 --- a/crawl-ref/source/rltiles/item/armor/scale_mail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/scale_mail2.png b/crawl-ref/source/rltiles/item/armor/scale_mail2.png Binary files differdeleted file mode 100644 index f3a1663a50..0000000000 --- a/crawl-ref/source/rltiles/item/armor/scale_mail2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/shield_kite2.png b/crawl-ref/source/rltiles/item/armor/shield_kite2.png Binary files differdeleted file mode 100644 index 10945d6503..0000000000 --- a/crawl-ref/source/rltiles/item/armor/shield_kite2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/shield_kite3.png b/crawl-ref/source/rltiles/item/armor/shield_kite3.png Binary files differdeleted file mode 100644 index 51ce9eeafc..0000000000 --- a/crawl-ref/source/rltiles/item/armor/shield_kite3.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/shield_large2.png b/crawl-ref/source/rltiles/item/armor/shield_large2.png Binary files differdeleted file mode 100644 index 63f39f432c..0000000000 --- a/crawl-ref/source/rltiles/item/armor/shield_large2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/shield_round2.png b/crawl-ref/source/rltiles/item/armor/shield_round2.png Binary files differdeleted file mode 100644 index 512f1c5293..0000000000 --- a/crawl-ref/source/rltiles/item/armor/shield_round2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/silver_dragon_scale_mail.png b/crawl-ref/source/rltiles/item/armor/silver_dragon_scale_mail.png Binary files differdeleted file mode 100644 index f9211a73d8..0000000000 --- a/crawl-ref/source/rltiles/item/armor/silver_dragon_scale_mail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/silver_dragon_scales.png b/crawl-ref/source/rltiles/item/armor/silver_dragon_scales.png Binary files differdeleted file mode 100644 index 05f625c69e..0000000000 --- a/crawl-ref/source/rltiles/item/armor/silver_dragon_scales.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/splint_mail.png b/crawl-ref/source/rltiles/item/armor/splint_mail.png Binary files differdeleted file mode 100644 index d895a81afa..0000000000 --- a/crawl-ref/source/rltiles/item/armor/splint_mail.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/swamp_dragon_armour.png b/crawl-ref/source/rltiles/item/armor/swamp_dragon_armour.png Binary files differdeleted file mode 100644 index 90ea15cf64..0000000000 --- a/crawl-ref/source/rltiles/item/armor/swamp_dragon_armour.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/swamp_dragon_hide.png b/crawl-ref/source/rltiles/item/armor/swamp_dragon_hide.png Binary files differdeleted file mode 100644 index 92d2f4acf6..0000000000 --- a/crawl-ref/source/rltiles/item/armor/swamp_dragon_hide.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/troll_hide.png b/crawl-ref/source/rltiles/item/armor/troll_hide.png Binary files differdeleted file mode 100644 index 172ccdb9b7..0000000000 --- a/crawl-ref/source/rltiles/item/armor/troll_hide.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/troll_leather_armour.png b/crawl-ref/source/rltiles/item/armor/troll_leather_armour.png Binary files differdeleted file mode 100644 index 28282a0d2b..0000000000 --- a/crawl-ref/source/rltiles/item/armor/troll_leather_armour.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_alchemist.png b/crawl-ref/source/rltiles/item/armor/urand_alchemist.png Binary files differdeleted file mode 100644 index d2d840a342..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_alchemist.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_assassin.png b/crawl-ref/source/rltiles/item/armor/urand_assassin.png Binary files differdeleted file mode 100644 index 976068e4d2..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_assassin.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_augmentation.png b/crawl-ref/source/rltiles/item/armor/urand_augmentation.png Binary files differdeleted file mode 100644 index 73da7b8370..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_augmentation.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_bullseye.png b/crawl-ref/source/rltiles/item/armor/urand_bullseye.png Binary files differdeleted file mode 100644 index 4fc150c4e1..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_bullseye.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_dragon_king.png b/crawl-ref/source/rltiles/item/armor/urand_dragon_king.png Binary files differdeleted file mode 100644 index d78fe47af7..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_dragon_king.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_dragonmask.png b/crawl-ref/source/rltiles/item/armor/urand_dragonmask.png Binary files differdeleted file mode 100644 index 306c9eb1ad..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_dragonmask.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_dyrovepreva.png b/crawl-ref/source/rltiles/item/armor/urand_dyrovepreva.png Binary files differdeleted file mode 100644 index 6253d01101..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_dyrovepreva.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_fencer.png b/crawl-ref/source/rltiles/item/armor/urand_fencer.png Binary files differdeleted file mode 100644 index 66ffcc0695..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_fencer.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_flash.png b/crawl-ref/source/rltiles/item/armor/urand_flash.png Binary files differdeleted file mode 100644 index d923019c06..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_flash.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_folly.png b/crawl-ref/source/rltiles/item/armor/urand_folly.png Binary files differdeleted file mode 100644 index 7c65ab4e7c..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_folly.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_ignorance.png b/crawl-ref/source/rltiles/item/armor/urand_ignorance.png Binary files differdeleted file mode 100644 index b02076f354..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_ignorance.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_lear.png b/crawl-ref/source/rltiles/item/armor/urand_lear.png Binary files differdeleted file mode 100644 index e6deddd956..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_lear.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_maxwell.png b/crawl-ref/source/rltiles/item/armor/urand_maxwell.png Binary files differdeleted file mode 100644 index acaa6a8cee..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_maxwell.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_misfortune.png b/crawl-ref/source/rltiles/item/armor/urand_misfortune.png Binary files differdeleted file mode 100644 index 7c4e54916d..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_misfortune.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_night.png b/crawl-ref/source/rltiles/item/armor/urand_night.png Binary files differdeleted file mode 100644 index 1f953803dd..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_night.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_resistance.png b/crawl-ref/source/rltiles/item/armor/urand_resistance.png Binary files differdeleted file mode 100644 index 8281db484a..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_resistance.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_salamander.png b/crawl-ref/source/rltiles/item/armor/urand_salamander.png Binary files differdeleted file mode 100644 index fa43c1bc86..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_salamander.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_starlight.png b/crawl-ref/source/rltiles/item/armor/urand_starlight.png Binary files differdeleted file mode 100644 index ffa2101acb..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_starlight.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_thief.png b/crawl-ref/source/rltiles/item/armor/urand_thief.png Binary files differdeleted file mode 100644 index c49c1e1d4c..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_thief.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_war.png b/crawl-ref/source/rltiles/item/armor/urand_war.png Binary files differdeleted file mode 100644 index bd511ef70b..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_war.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/urand_zhor.png b/crawl-ref/source/rltiles/item/armor/urand_zhor.png Binary files differdeleted file mode 100644 index f3da9a696a..0000000000 --- a/crawl-ref/source/rltiles/item/armor/urand_zhor.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/visored_helmet.png b/crawl-ref/source/rltiles/item/armor/visored_helmet.png Binary files differdeleted file mode 100644 index 95c42bf332..0000000000 --- a/crawl-ref/source/rltiles/item/armor/visored_helmet.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/wizard_hat.png b/crawl-ref/source/rltiles/item/armor/wizard_hat.png Binary files differdeleted file mode 100644 index 2a3334f357..0000000000 --- a/crawl-ref/source/rltiles/item/armor/wizard_hat.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/armor/wizard_hat2.png b/crawl-ref/source/rltiles/item/armor/wizard_hat2.png Binary files differdeleted file mode 100644 index 2a37b4d47b..0000000000 --- a/crawl-ref/source/rltiles/item/armor/wizard_hat2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/ring/urand_mage.png b/crawl-ref/source/rltiles/item/ring/artefact/urand_mage.png Binary files differindex 442e59b05b..442e59b05b 100644 --- a/crawl-ref/source/rltiles/item/ring/urand_mage.png +++ b/crawl-ref/source/rltiles/item/ring/artefact/urand_mage.png diff --git a/crawl-ref/source/rltiles/item/ring/urand_robustness.png b/crawl-ref/source/rltiles/item/ring/artefact/urand_robustness.png Binary files differindex ecbe34e047..ecbe34e047 100644 --- a/crawl-ref/source/rltiles/item/ring/urand_robustness.png +++ b/crawl-ref/source/rltiles/item/ring/artefact/urand_robustness.png diff --git a/crawl-ref/source/rltiles/item/ring/urand_shadows.png b/crawl-ref/source/rltiles/item/ring/artefact/urand_shadows.png Binary files differindex 08b01e07c7..08b01e07c7 100644 --- a/crawl-ref/source/rltiles/item/ring/urand_shadows.png +++ b/crawl-ref/source/rltiles/item/ring/artefact/urand_shadows.png diff --git a/crawl-ref/source/rltiles/item/ring/urand_shaolin.png b/crawl-ref/source/rltiles/item/ring/artefact/urand_shaolin.png Binary files differindex 53c3ebab9f..53c3ebab9f 100644 --- a/crawl-ref/source/rltiles/item/ring/urand_shaolin.png +++ b/crawl-ref/source/rltiles/item/ring/artefact/urand_shaolin.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_glaive_of_prune.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_glaive_of_prune.png Binary files differindex cdabe70650..cdabe70650 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_glaive_of_prune.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_glaive_of_prune.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_mace_of_variability.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_mace_of_variability.png Binary files differindex a33512bedb..a33512bedb 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_mace_of_variability.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_mace_of_variability.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_sceptre_of_asmodeus.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_sceptre_of_asmodeus.png Binary files differindex 4eb80e058d..4eb80e058d 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_sceptre_of_asmodeus.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_sceptre_of_asmodeus.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_sceptre_of_torment.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_sceptre_of_torment.png Binary files differindex b2146be4d6..b2146be4d6 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_sceptre_of_torment.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_sceptre_of_torment.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_scythe_of_curses.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_scythe_of_curses.png Binary files differindex cfbd4e94e1..cfbd4e94e1 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_scythe_of_curses.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_scythe_of_curses.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_singing_sword.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_singing_sword.png Binary files differindex 77911f7407..77911f7407 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_singing_sword.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_singing_sword.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_staff_of_dispater.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_staff_of_dispater.png Binary files differindex efb29b6779..efb29b6779 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_staff_of_dispater.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_staff_of_dispater.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_staff_of_olgreb.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_staff_of_olgreb.png Binary files differindex 38b25ce28b..38b25ce28b 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_staff_of_olgreb.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_staff_of_olgreb.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_sword_of_cerebov.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_sword_of_cerebov.png Binary files differindex acf8d2c8fc..acf8d2c8fc 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_sword_of_cerebov.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_sword_of_cerebov.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_sword_of_power.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_sword_of_power.png Binary files differindex 49d4cf2c37..49d4cf2c37 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_sword_of_power.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_sword_of_power.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_sword_of_zonguldrok.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_sword_of_zonguldrok.png Binary files differindex 76872af071..76872af071 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_sword_of_zonguldrok.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_sword_of_zonguldrok.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_vampires_tooth.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_vampires_tooth.png Binary files differindex f85f888d36..f85f888d36 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_vampires_tooth.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_vampires_tooth.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_wrath_of_trog.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_wrath_of_trog.png Binary files differindex fcac031cfe..fcac031cfe 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_wrath_of_trog.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_wrath_of_trog.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_wucad_mu.png b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_wucad_mu.png Binary files differindex 4bbfad60ef..4bbfad60ef 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_wucad_mu.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/spwpn_wucad_mu.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_arga.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_arga.png Binary files differindex 729bedd805..729bedd805 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_arga.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_arga.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_bloodbane.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_bloodbane.png Binary files differindex 2ca586cd1d..2ca586cd1d 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_bloodbane.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_bloodbane.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_blowgun.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_blowgun.png Binary files differindex 365e6e575b..365e6e575b 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_blowgun.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_blowgun.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_brilliance.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_brilliance.png Binary files differindex e8747fe78a..e8747fe78a 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_brilliance.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_brilliance.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_chilly_death.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_chilly_death.png Binary files differindex 14cfe9aff7..14cfe9aff7 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_chilly_death.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_chilly_death.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_doom_knight.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_doom_knight.png Binary files differindex 2b1583b783..2b1583b783 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_doom_knight.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_doom_knight.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_elemental.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_elemental.png Binary files differindex c4afe54e55..c4afe54e55 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_elemental.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_elemental.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_eos.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_eos.png Binary files differindex 13cb4a0ac5..13cb4a0ac5 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_eos.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_eos.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_erchidel.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_erchidel.png Binary files differindex 52985f7969..52985f7969 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_erchidel.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_erchidel.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_fiery_devil.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_fiery_devil.png Binary files differindex b7c751c284..b7c751c284 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_fiery_devil.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_fiery_devil.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_finisher.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_finisher.png Binary files differindex d148a49fef..d148a49fef 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_finisher.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_finisher.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_flaming_death.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_flaming_death.png Binary files differindex 4d1dd7be8c..4d1dd7be8c 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_flaming_death.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_flaming_death.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_guard.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_guard.png Binary files differindex 4de9e32d50..4de9e32d50 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_guard.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_guard.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_jihad.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_jihad.png Binary files differindex 9071ade0fc..9071ade0fc 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_jihad.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_jihad.png diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_knife_of_accuracy.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_knife_of_accuracy.png Binary files differindex 1396a317a0..1396a317a0 100644 --- a/crawl-ref/source/rltiles/item/weapon/spwpn_knife_of_accuracy.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_knife_of_accuracy.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_krishna.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_krishna.png Binary files differindex 80c6a0799f..80c6a0799f 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_krishna.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_krishna.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_leech.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_leech.png Binary files differindex a8d64bce0c..a8d64bce0c 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_leech.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_leech.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_morg.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_morg.png Binary files differindex c58240044e..c58240044e 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_morg.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_morg.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_octopus_king.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_octopus_king.png Binary files differindex b569fe43f1..b569fe43f1 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_octopus_king.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_octopus_king.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_plutonium.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_plutonium.png Binary files differindex 58ed198ee0..58ed198ee0 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_plutonium.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_plutonium.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_punk.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_punk.png Binary files differindex 8a7a06c7d4..8a7a06c7d4 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_punk.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_punk.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_serpent_scourge.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_serpent_scourge.png Binary files differindex 573b62540c..573b62540c 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_serpent_scourge.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_serpent_scourge.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_skullcrusher.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_skullcrusher.png Binary files differindex 1aedbd5488..1aedbd5488 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_skullcrusher.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_skullcrusher.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_sniper.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_sniper.png Binary files differindex 88ab5ce129..88ab5ce129 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_sniper.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_sniper.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_spriggans_knife.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_spriggans_knife.png Binary files differindex 8b74c45c98..8b74c45c98 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_spriggans_knife.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_spriggans_knife.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_undeadhunter.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_undeadhunter.png Binary files differindex 37af09cdfe..37af09cdfe 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_undeadhunter.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_undeadhunter.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_voo_doo.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_voo_doo.png Binary files differindex 1aab10efca..1aab10efca 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_voo_doo.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_voo_doo.png diff --git a/crawl-ref/source/rltiles/item/weapon/urand_wyrmbane.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_wyrmbane.png Binary files differindex 8c2c41c827..8c2c41c827 100644 --- a/crawl-ref/source/rltiles/item/weapon/urand_wyrmbane.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_wyrmbane.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-curare.png b/crawl-ref/source/rltiles/item/weapon/brands/i-curare.png Binary files differnew file mode 100644 index 0000000000..4df46f94d8 --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-curare.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-distortion.png b/crawl-ref/source/rltiles/item/weapon/brands/i-distortion.png Binary files differnew file mode 100644 index 0000000000..a93a9741a2 --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-distortion.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-dragon_slaying.png b/crawl-ref/source/rltiles/item/weapon/brands/i-dragon_slaying.png Binary files differnew file mode 100644 index 0000000000..6aaa67a3b8 --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-dragon_slaying.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-draining.png b/crawl-ref/source/rltiles/item/weapon/brands/i-draining.png Binary files differnew file mode 100644 index 0000000000..21b6a49ecb --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-draining.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-electrocution.png b/crawl-ref/source/rltiles/item/weapon/brands/i-electrocution.png Binary files differnew file mode 100644 index 0000000000..ff16d5590e --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-electrocution.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-flaming.png b/crawl-ref/source/rltiles/item/weapon/brands/i-flaming.png Binary files differnew file mode 100644 index 0000000000..d2a6a02f3f --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-flaming.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-freezing.png b/crawl-ref/source/rltiles/item/weapon/brands/i-freezing.png Binary files differnew file mode 100644 index 0000000000..9470611aab --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-freezing.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-holy_wrath.png b/crawl-ref/source/rltiles/item/weapon/brands/i-holy_wrath.png Binary files differnew file mode 100644 index 0000000000..e02cc2604e --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-holy_wrath.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-orc_slaying.png b/crawl-ref/source/rltiles/item/weapon/brands/i-orc_slaying.png Binary files differnew file mode 100644 index 0000000000..5b3901e75c --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-orc_slaying.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-pain.png b/crawl-ref/source/rltiles/item/weapon/brands/i-pain.png Binary files differnew file mode 100644 index 0000000000..45c46feacc --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-pain.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-protection.png b/crawl-ref/source/rltiles/item/weapon/brands/i-protection.png Binary files differnew file mode 100644 index 0000000000..3d3287f176 --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-protection.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-reaching.png b/crawl-ref/source/rltiles/item/weapon/brands/i-reaching.png Binary files differnew file mode 100644 index 0000000000..0acec2f6f6 --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-reaching.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-returning.png b/crawl-ref/source/rltiles/item/weapon/brands/i-returning.png Binary files differnew file mode 100644 index 0000000000..48f440f747 --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-returning.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-speed.png b/crawl-ref/source/rltiles/item/weapon/brands/i-speed.png Binary files differnew file mode 100644 index 0000000000..92f39316ad --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-speed.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-vampiricism.png b/crawl-ref/source/rltiles/item/weapon/brands/i-vampiricism.png Binary files differnew file mode 100644 index 0000000000..c39ffb019c --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-vampiricism.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-venom.png b/crawl-ref/source/rltiles/item/weapon/brands/i-venom.png Binary files differnew file mode 100644 index 0000000000..329fe8f109 --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-venom.png diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-vorpal.png b/crawl-ref/source/rltiles/item/weapon/brands/i-vorpal.png Binary files differnew file mode 100644 index 0000000000..004fee36cb --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-vorpal.png diff --git a/crawl-ref/source/rltiles/player/hand1/arga.png b/crawl-ref/source/rltiles/player/hand1/artefact/arga.png Binary files differindex f178a32fc0..f178a32fc0 100644 --- a/crawl-ref/source/rltiles/player/hand1/arga.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/arga.png diff --git a/crawl-ref/source/rltiles/player/hand1/asmodeus.png b/crawl-ref/source/rltiles/player/hand1/artefact/asmodeus.png Binary files differindex 8e0cccbff8..8e0cccbff8 100644 --- a/crawl-ref/source/rltiles/player/hand1/asmodeus.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/asmodeus.png diff --git a/crawl-ref/source/rltiles/player/hand1/axe_trog.png b/crawl-ref/source/rltiles/player/hand1/artefact/axe_trog.png Binary files differindex 8f042a1a24..8f042a1a24 100644 --- a/crawl-ref/source/rltiles/player/hand1/axe_trog.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/axe_trog.png diff --git a/crawl-ref/source/rltiles/player/hand1/bloodbane.png b/crawl-ref/source/rltiles/player/hand1/artefact/bloodbane.png Binary files differindex ac1c275030..ac1c275030 100644 --- a/crawl-ref/source/rltiles/player/hand1/bloodbane.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/bloodbane.png diff --git a/crawl-ref/source/rltiles/player/hand1/blowgun_assassin.png b/crawl-ref/source/rltiles/player/hand1/artefact/blowgun_assassin.png Binary files differindex 93659d3744..93659d3744 100644 --- a/crawl-ref/source/rltiles/player/hand1/blowgun_assassin.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/blowgun_assassin.png diff --git a/crawl-ref/source/rltiles/player/hand1/chilly_death.png b/crawl-ref/source/rltiles/player/hand1/artefact/chilly_death.png Binary files differindex a552d7687a..a552d7687a 100644 --- a/crawl-ref/source/rltiles/player/hand1/chilly_death.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/chilly_death.png diff --git a/crawl-ref/source/rltiles/player/hand1/crossbow_fire.png b/crawl-ref/source/rltiles/player/hand1/artefact/crossbow_fire.png Binary files differindex 9746f6234d..9746f6234d 100644 --- a/crawl-ref/source/rltiles/player/hand1/crossbow_fire.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/crossbow_fire.png diff --git a/crawl-ref/source/rltiles/player/hand1/dire_lajatang.png b/crawl-ref/source/rltiles/player/hand1/artefact/dire_lajatang.png Binary files differindex 11d023a118..11d023a118 100644 --- a/crawl-ref/source/rltiles/player/hand1/dire_lajatang.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/dire_lajatang.png diff --git a/crawl-ref/source/rltiles/player/hand1/dispater.png b/crawl-ref/source/rltiles/player/hand1/artefact/dispater.png Binary files differindex 52e9064f56..52e9064f56 100644 --- a/crawl-ref/source/rltiles/player/hand1/dispater.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/dispater.png diff --git a/crawl-ref/source/rltiles/player/hand1/doom_knight.png b/crawl-ref/source/rltiles/player/hand1/artefact/doom_knight.png Binary files differindex 65244eecda..65244eecda 100644 --- a/crawl-ref/source/rltiles/player/hand1/doom_knight.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/doom_knight.png diff --git a/crawl-ref/source/rltiles/player/hand1/elemental_staff.png b/crawl-ref/source/rltiles/player/hand1/artefact/elemental_staff.png Binary files differindex 4e4ee20a8d..4e4ee20a8d 100644 --- a/crawl-ref/source/rltiles/player/hand1/elemental_staff.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/elemental_staff.png diff --git a/crawl-ref/source/rltiles/player/hand1/eos.png b/crawl-ref/source/rltiles/player/hand1/artefact/eos.png Binary files differindex 2aef8e3eed..2aef8e3eed 100644 --- a/crawl-ref/source/rltiles/player/hand1/eos.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/eos.png diff --git a/crawl-ref/source/rltiles/player/hand1/finisher.png b/crawl-ref/source/rltiles/player/hand1/artefact/finisher.png Binary files differindex b707bfdd54..b707bfdd54 100644 --- a/crawl-ref/source/rltiles/player/hand1/finisher.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/finisher.png diff --git a/crawl-ref/source/rltiles/player/hand1/flaming_death.png b/crawl-ref/source/rltiles/player/hand1/artefact/flaming_death.png Binary files differindex 7a95207bf5..7a95207bf5 100644 --- a/crawl-ref/source/rltiles/player/hand1/flaming_death.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/flaming_death.png diff --git a/crawl-ref/source/rltiles/player/hand1/glaive_of_prune.png b/crawl-ref/source/rltiles/player/hand1/artefact/glaive_of_prune.png Binary files differindex b1dc237621..b1dc237621 100644 --- a/crawl-ref/source/rltiles/player/hand1/glaive_of_prune.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/glaive_of_prune.png diff --git a/crawl-ref/source/rltiles/player/hand1/glaive_of_the_guard.png b/crawl-ref/source/rltiles/player/hand1/artefact/glaive_of_the_guard.png Binary files differindex 0f7b4da974..0f7b4da974 100644 --- a/crawl-ref/source/rltiles/player/hand1/glaive_of_the_guard.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/glaive_of_the_guard.png diff --git a/crawl-ref/source/rltiles/player/hand1/jihad.png b/crawl-ref/source/rltiles/player/hand1/artefact/jihad.png Binary files differindex fc88e9b969..fc88e9b969 100644 --- a/crawl-ref/source/rltiles/player/hand1/jihad.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/jihad.png diff --git a/crawl-ref/source/rltiles/player/hand1/knife_of_accuracy.png b/crawl-ref/source/rltiles/player/hand1/artefact/knife_of_accuracy.png Binary files differindex 6f95257240..6f95257240 100644 --- a/crawl-ref/source/rltiles/player/hand1/knife_of_accuracy.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/knife_of_accuracy.png diff --git a/crawl-ref/source/rltiles/player/hand1/krishna.png b/crawl-ref/source/rltiles/player/hand1/artefact/krishna.png Binary files differindex 1814ba50fa..1814ba50fa 100644 --- a/crawl-ref/source/rltiles/player/hand1/krishna.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/krishna.png diff --git a/crawl-ref/source/rltiles/player/hand1/leech.png b/crawl-ref/source/rltiles/player/hand1/artefact/leech.png Binary files differindex 5b72d05c19..5b72d05c19 100644 --- a/crawl-ref/source/rltiles/player/hand1/leech.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/leech.png diff --git a/crawl-ref/source/rltiles/player/hand1/mace_of_brilliance.png b/crawl-ref/source/rltiles/player/hand1/artefact/mace_of_brilliance.png Binary files differindex 365023c3ca..365023c3ca 100644 --- a/crawl-ref/source/rltiles/player/hand1/mace_of_brilliance.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/mace_of_brilliance.png diff --git a/crawl-ref/source/rltiles/player/hand1/mace_of_variability.png b/crawl-ref/source/rltiles/player/hand1/artefact/mace_of_variability.png Binary files differindex 244c008a5c..244c008a5c 100644 --- a/crawl-ref/source/rltiles/player/hand1/mace_of_variability.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/mace_of_variability.png diff --git a/crawl-ref/source/rltiles/player/hand1/morg.png b/crawl-ref/source/rltiles/player/hand1/artefact/morg.png Binary files differindex a353086935..a353086935 100644 --- a/crawl-ref/source/rltiles/player/hand1/morg.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/morg.png diff --git a/crawl-ref/source/rltiles/player/hand1/olgreb.png b/crawl-ref/source/rltiles/player/hand1/artefact/olgreb.png Binary files differindex c59cc797d1..c59cc797d1 100644 --- a/crawl-ref/source/rltiles/player/hand1/olgreb.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/olgreb.png diff --git a/crawl-ref/source/rltiles/player/hand1/plutonium_sword.png b/crawl-ref/source/rltiles/player/hand1/artefact/plutonium_sword.png Binary files differindex 01514d1c92..01514d1c92 100644 --- a/crawl-ref/source/rltiles/player/hand1/plutonium_sword.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/plutonium_sword.png diff --git a/crawl-ref/source/rltiles/player/hand1/punk.png b/crawl-ref/source/rltiles/player/hand1/artefact/punk.png Binary files differindex 500d14af25..500d14af25 100644 --- a/crawl-ref/source/rltiles/player/hand1/punk.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/punk.png diff --git a/crawl-ref/source/rltiles/player/hand1/serpent_scourge.png b/crawl-ref/source/rltiles/player/hand1/artefact/serpent_scourge.png Binary files differindex f5af798ec6..f5af798ec6 100644 --- a/crawl-ref/source/rltiles/player/hand1/serpent_scourge.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/serpent_scourge.png diff --git a/crawl-ref/source/rltiles/player/hand1/singing_sword.png b/crawl-ref/source/rltiles/player/hand1/artefact/singing_sword.png Binary files differindex d135aa978e..d135aa978e 100644 --- a/crawl-ref/source/rltiles/player/hand1/singing_sword.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/singing_sword.png diff --git a/crawl-ref/source/rltiles/player/hand1/sniper.png b/crawl-ref/source/rltiles/player/hand1/artefact/sniper.png Binary files differindex 6f53dcf4fe..6f53dcf4fe 100644 --- a/crawl-ref/source/rltiles/player/hand1/sniper.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/sniper.png diff --git a/crawl-ref/source/rltiles/player/hand1/spriggans_knife.png b/crawl-ref/source/rltiles/player/hand1/artefact/spriggans_knife.png Binary files differindex 88d85cbfc4..88d85cbfc4 100644 --- a/crawl-ref/source/rltiles/player/hand1/spriggans_knife.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/spriggans_knife.png diff --git a/crawl-ref/source/rltiles/player/hand1/sword_of_power.png b/crawl-ref/source/rltiles/player/hand1/artefact/sword_of_power.png Binary files differindex 827ae146b9..827ae146b9 100644 --- a/crawl-ref/source/rltiles/player/hand1/sword_of_power.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/sword_of_power.png diff --git a/crawl-ref/source/rltiles/player/hand1/trident_octopus_king.png b/crawl-ref/source/rltiles/player/hand1/artefact/trident_octopus_king.png Binary files differindex 098652e773..098652e773 100644 --- a/crawl-ref/source/rltiles/player/hand1/trident_octopus_king.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/trident_octopus_king.png diff --git a/crawl-ref/source/rltiles/player/hand1/undeadhunter.png b/crawl-ref/source/rltiles/player/hand1/artefact/undeadhunter.png Binary files differindex 4297b702d4..4297b702d4 100644 --- a/crawl-ref/source/rltiles/player/hand1/undeadhunter.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/undeadhunter.png diff --git a/crawl-ref/source/rltiles/player/hand1/vampires_tooth.png b/crawl-ref/source/rltiles/player/hand1/artefact/vampires_tooth.png Binary files differindex 84e104674b..84e104674b 100644 --- a/crawl-ref/source/rltiles/player/hand1/vampires_tooth.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/vampires_tooth.png diff --git a/crawl-ref/source/rltiles/player/hand1/voodoo.png b/crawl-ref/source/rltiles/player/hand1/artefact/voodoo.png Binary files differindex 511a7d25aa..511a7d25aa 100644 --- a/crawl-ref/source/rltiles/player/hand1/voodoo.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/voodoo.png diff --git a/crawl-ref/source/rltiles/player/hand1/wucad_mu.png b/crawl-ref/source/rltiles/player/hand1/artefact/wucad_mu.png Binary files differindex b1a2db3e25..b1a2db3e25 100644 --- a/crawl-ref/source/rltiles/player/hand1/wucad_mu.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/wucad_mu.png diff --git a/crawl-ref/source/rltiles/player/hand1/wyrmbane.png b/crawl-ref/source/rltiles/player/hand1/artefact/wyrmbane.png Binary files differindex 50c6b8dc6e..50c6b8dc6e 100644 --- a/crawl-ref/source/rltiles/player/hand1/wyrmbane.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/wyrmbane.png diff --git a/crawl-ref/source/rltiles/player/hand1/zonguldrok.png b/crawl-ref/source/rltiles/player/hand1/artefact/zonguldrok.png Binary files differindex e1aba772f6..e1aba772f6 100644 --- a/crawl-ref/source/rltiles/player/hand1/zonguldrok.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/zonguldrok.png diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 925b90ac28..42806e3c7a 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -938,7 +938,6 @@ static int _tileidx_fixed_artefact(int special) 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_KNIFE_OF_ACCURACY: return TILE_SPWPN_KNIFE_OF_ACCURACY; 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; @@ -951,63 +950,64 @@ static int _tileidx_unrand_artefact(int idx) { switch (idx) { - case 1: return TILE_URAND_BLOODBANE; - case 2: return TILE_URAND_SHADOWS; - case 3: return TILE_URAND_FLAMING_DEATH; - case 4: return TILE_URAND_IGNORANCE; - case 5: return TILE_URAND_AIR; - case 6: return TILE_URAND_AUGMENTATION; - case 7: return TILE_URAND_BRILLIANCE; - case 8: return TILE_URAND_THIEF; - case 9: return TILE_URAND_BULLSEYE; - case 10: return TILE_URAND_DYROVEPREVA; - case 11: return TILE_URAND_LEECH; - case 12: return TILE_URAND_CEKUGOB; - case 13: return TILE_URAND_MISFORTUNE; - case 14: return TILE_URAND_CHILLY_DEATH; - case 15: return TILE_URAND_FOUR_WINDS; - case 16: return TILE_URAND_MORG; - case 17: return TILE_URAND_FINISHER; - case 18: return TILE_URAND_PUNK; - case 19: return TILE_URAND_KRISHNA; - case 20: return TILE_URAND_FLASH; - case 21: return TILE_URAND_SKULLCRUSHER; - case 22: return TILE_URAND_ASSASSIN; - case 23: return TILE_URAND_GUARD; - case 24: return TILE_URAND_JIHAD; - case 25: return TILE_URAND_LEAR; - case 26: return TILE_URAND_ZHOR; - case 27: return TILE_URAND_FIERY_DEVIL; - case 28: return TILE_URAND_SALAMANDER; - case 29: return TILE_URAND_WAR; - case 30: return TILE_URAND_DOOM_KNIGHT; - case 31: return TILE_URAND_RESISTANCE; - case 32: return TILE_URAND_FOLLY; - case 33: return TILE_URAND_BLOODLUST; - case 34: return TILE_URAND_EOS; - case 35: return TILE_URAND_SHAOLIN; - case 36: return TILE_URAND_ROBUSTNESS; - case 37: return TILE_URAND_MAXWELL; - case 38: return TILE_URAND_VOO_DOO; - case 39: return TILE_URAND_OCTOPUS_KING; - case 40: return TILE_URAND_DRAGONMASK; - case 41: return TILE_URAND_ARGA; - case 42: return TILE_URAND_ELEMENTAL; - case 43: return TILE_URAND_SNIPER; - case 44: return TILE_URAND_ERCHIDEL; - case 45: return TILE_URAND_NIGHT; - case 46: return TILE_URAND_PLUTONIUM; - case 47: return TILE_URAND_UNDEADHUNTER; - case 48: return TILE_URAND_DRAGON_KING; - case 49: return TILE_URAND_ALCHEMIST; - case 50: return TILE_URAND_FENCER; - case 51: return TILE_URAND_MAGE; - case 52: return TILE_URAND_BLOWGUN; - case 53: return TILE_URAND_WYRMBANE; - case 54: return TILE_URAND_SPRIGGANS_KNIFE; - case 55: return TILE_URAND_STARLIGHT; - case 56: return TILE_URAND_BROOCH_OF_SHIELDING; - case 57: return TILE_URAND_SERPENT_SCOURGE; + case 2: return TILE_URAND_BLOODBANE; + case 3: return TILE_URAND_SHADOWS; + case 4: return TILE_URAND_FLAMING_DEATH; + case 5: return TILE_URAND_IGNORANCE; + case 6: return TILE_URAND_AIR; + case 7: return TILE_URAND_AUGMENTATION; + case 8: return TILE_URAND_BRILLIANCE; + case 9: return TILE_URAND_THIEF; + case 10: return TILE_URAND_BULLSEYE; + case 11: return TILE_URAND_DYROVEPREVA; + case 12: return TILE_URAND_LEECH; + case 13: return TILE_URAND_CEKUGOB; + case 14: return TILE_URAND_MISFORTUNE; + case 15: return TILE_URAND_CHILLY_DEATH; + case 16: return TILE_URAND_FOUR_WINDS; + case 17: return TILE_URAND_MORG; + case 18: return TILE_URAND_FINISHER; + case 19: return TILE_URAND_PUNK; + case 20: return TILE_URAND_KRISHNA; + case 21: return TILE_URAND_FLASH; + case 22: return TILE_URAND_SKULLCRUSHER; + case 23: return TILE_URAND_ASSASSIN; + case 24: return TILE_URAND_GUARD; + case 25: return TILE_URAND_JIHAD; + case 26: return TILE_URAND_LEAR; + case 27: return TILE_URAND_ZHOR; + case 28: return TILE_URAND_FIERY_DEVIL; + case 29: return TILE_URAND_SALAMANDER; + case 30: return TILE_URAND_WAR; + case 31: return TILE_URAND_DOOM_KNIGHT; + case 32: return TILE_URAND_RESISTANCE; + case 33: return TILE_URAND_FOLLY; + case 34: return TILE_URAND_BLOODLUST; + case 35: return TILE_URAND_EOS; + case 36: return TILE_URAND_SHAOLIN; + case 37: return TILE_URAND_ROBUSTNESS; + case 38: return TILE_URAND_MAXWELL; + case 39: return TILE_URAND_VOO_DOO; + case 40: return TILE_URAND_OCTOPUS_KING; + case 41: return TILE_URAND_DRAGONMASK; + case 42: return TILE_URAND_ARGA; + case 43: return TILE_URAND_ELEMENTAL; + case 44: return TILE_URAND_SNIPER; + case 45: return TILE_URAND_ERCHIDEL; + case 46: return TILE_URAND_NIGHT; + case 47: return TILE_URAND_PLUTONIUM; + case 48: return TILE_URAND_UNDEADHUNTER; + case 49: return TILE_URAND_DRAGON_KING; + case 50: return TILE_URAND_ALCHEMIST; + case 51: return TILE_URAND_FENCER; + case 52: return TILE_URAND_MAGE; + case 53: return TILE_URAND_BLOWGUN; + case 54: return TILE_URAND_WYRMBANE; + case 55: return TILE_URAND_SPRIGGANS_KNIFE; + case 56: return TILE_URAND_STARLIGHT; + case 57: return TILE_URAND_BROOCH_OF_SHIELDING; + case 58: return TILE_URAND_SERPENT_SCOURGE; + case 59: return TILE_URAND_KNIFE_OF_ACCURACY; default: return TILE_TODO; } } @@ -1877,7 +1877,7 @@ int tileidx_item(const item_def &item) if (is_fixed_artefact(item)) return _tileidx_fixed_artefact(special); else if (is_unrandom_artefact( item )) - return _tileidx_unrand_artefact(find_unrandart_index(item)); + return _tileidx_unrand_artefact(find_unrandart_index(item) + 1); else return _tileidx_weapon(item); @@ -1886,7 +1886,7 @@ int tileidx_item(const item_def &item) case OBJ_ARMOUR: if (is_unrandom_artefact( item )) - return _tileidx_unrand_artefact(find_unrandart_index(item)); + return _tileidx_unrand_artefact(find_unrandart_index(item) + 1); else return _tileidx_armour(item); @@ -1931,7 +1931,7 @@ int tileidx_item(const item_def &item) else { if (is_unrandom_artefact( item )) - return _tileidx_unrand_artefact(find_unrandart_index(item)); + return _tileidx_unrand_artefact(find_unrandart_index(item) + 1); else if (is_random_artefact( item )) return TILE_AMU_RANDOM_OFFSET + colour - 1; else if (id[ IDTYPE_JEWELLERY][type] == ID_KNOWN_TYPE @@ -2886,7 +2886,7 @@ void tilep_job_default(int job, int gender, int *parts) case JOB_HEALER: parts[TILEP_PART_BODY] = TILEP_BODY_ROBE_WHITE; parts[TILEP_PART_ARM] = TILEP_ARM_GLOVE_WHITE; - parts[TILEP_PART_HAND1] = 38; + parts[TILEP_PART_HAND1] = 38; // ? parts[TILEP_PART_BOOTS] = TILEP_BOOTS_SHORT_BROWN; parts[TILEP_PART_HELM] = TILEP_HELM_FHELM_HEALER; break; @@ -3198,9 +3198,7 @@ int tilep_equ_weapon(const item_def &item) 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_KNIFE_OF_ACCURACY: return TILEP_HAND1_KNIFE_OF_ACCURACY; case SPWPN_VAMPIRES_TOOTH: return TILEP_HAND1_VAMPIRES_TOOTH; case SPWPN_STAFF_OF_WUCAD_MU: return TILEP_HAND1_WUCAD_MU; } @@ -3258,9 +3256,14 @@ int tilep_equ_weapon(const item_def &item) case 48: return TILEP_HAND1_UNDEADHUNTER; // blowgun of the Assassin case 53: return TILEP_HAND1_BLOWGUN_ASSASSIN; + // Wyrmbane case 54: return TILEP_HAND1_WYRMBANE; + // Spriggan's Knife case 55: return TILEP_HAND1_SPRIGGANS_KNIFE; + // whip "Serpent Scourge" case 58: return TILEP_HAND1_SERPENT_SCOURGE; + // knife of Accuracy + case 59: return TILEP_HAND1_KNIFE_OF_ACCURACY; } } diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index e3eb26e384..9d632c4b8e 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -1096,11 +1096,12 @@ void DungeonRegion::clear_overlays() InventoryTile::InventoryTile() { - tile = 0; - idx = -1; + tile = 0; + idx = -1; quantity = -1; - key = 0; - flag = 0; + key = 0; + flag = 0; + special = 0; } bool InventoryTile::empty() const @@ -1142,9 +1143,7 @@ void InventoryRegion::update(unsigned int num, InventoryTile *items) { m_items.clear(); for (unsigned int i = 0; i < num; i++) - { m_items.push_back(items[i]); - } m_need_to_pack = true; } @@ -1232,7 +1231,7 @@ void InventoryRegion::pack_verts() m_need_to_pack = false; m_verts.clear(); - // ensure the cursor has been placed + // Ensure the cursor has been placed. place_cursor(m_cursor); // Pack base separately, as it comes from a different texture... @@ -1330,6 +1329,8 @@ void InventoryRegion::pack_verts() add_quad_char('0' + c1, x, y, offset_x, offset_y); } + if (item.special) + add_quad(TEX_DEFAULT, item.special, x, y, 0, 0, false); if (item.flag & TILEI_FLAG_TRIED) add_quad(TEX_DEFAULT, TILE_TRIED, x, y, 0, TILE_Y / 2, false); @@ -2590,9 +2591,8 @@ void MenuRegion::place_entries() int string_height = m_font_entry->string_height(split); if (string_height > entry_height) - { text_sy = m_entries[i].sy; - } + m_font_buf.add(split, text_sx, text_sy); m_entries[i].ex = entry_start + column_width; diff --git a/crawl-ref/source/tilereg.h b/crawl-ref/source/tilereg.h index 55205ed3e3..e9a053fb98 100644 --- a/crawl-ref/source/tilereg.h +++ b/crawl-ref/source/tilereg.h @@ -337,6 +337,8 @@ public: unsigned short flag; // for inventory items, the slot char key; + // a special property, such as for brands + int special; bool empty() const; }; diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index f64c857b85..26de585f68 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -4,6 +4,7 @@ #include "itemprop.h" #include "mon-util.h" #include "player.h" +#include "randart.h" #include "stuff.h" #include "tiles.h" #include "tilesdl.h" @@ -109,9 +110,7 @@ void TilesFramework::shutdown() m_region_menu = NULL; for (unsigned int i = 0; i < LAYER_MAX; i++) - { m_layers[i].m_regions.clear(); - } for (unsigned int i = 0; i < m_fonts.size(); i++) { @@ -1054,6 +1053,38 @@ static void _fill_item_info(InventoryTile &desc, const item_def &item) desc.quantity = -1; } + if (item.base_type == OBJ_WEAPONS) + { + if (!is_fixed_artefact(item) + && get_weapon_brand(item) != SPWPN_NORMAL) + { + desc.special = TILE_BRAND_FLAMING + get_weapon_brand(item) - 1; + } + } + else if (item.base_type == OBJ_MISSILES) + { + switch (get_ammo_brand(item)) + { + case SPMSL_FLAME: + desc.special = TILE_BRAND_FLAME; + break; + case SPMSL_ICE: + desc.special = TILE_BRAND_ICE; + break; + case SPMSL_POISONED: + desc.special = TILE_BRAND_POISONED; + break; + case SPMSL_CURARE: + desc.special = TILE_BRAND_CURARE; + break; + case SPMSL_RETURNING: + desc.special = TILE_BRAND_RETURNING; + break; + default: + break; + } + } + desc.flag = 0; if (item_cursed(item) && item_ident(item, ISFLAG_KNOW_CURSE)) desc.flag |= TILEI_FLAG_CURSE; diff --git a/crawl-ref/source/unrand.h b/crawl-ref/source/unrand.h index c8cd8a60ba..81f492ee27 100644 --- a/crawl-ref/source/unrand.h +++ b/crawl-ref/source/unrand.h @@ -1211,8 +1211,27 @@ "" }, -/* This is a dummy */ -/* 1 */ +/* 59 */ +{ + // This used to be a fixed artefact but since it has no special + // properties I decided it more closely fits here. (jpeg) + "knife of Accuracy", "thin dagger", + OBJ_WEAPONS, WPN_DAGGER, +27, -1, LIGHTCYAN, + { + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + 0, 0 + } + , + "It is almost unerringly accurate.", + "", + "" +}, + +/* This is a dummy. */ { "Dum", "", /* class, type, plus (to-hit), plus2 (depends on class), colour */ |