diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-25 20:59:40 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-25 20:59:40 +0000 |
| commit | 048093d6df17f7a9d57c3de999f8d2b71289bc19 (patch) | |
| tree | 9c7f7d042acd02a812d0da4e234374712d8846cb | |
| parent | cc56c117f13850eb30bb09303acea9040ebfc0f9 (diff) | |
| download | crawl-ref-048093d6df17f7a9d57c3de999f8d2b71289bc19.tar.gz crawl-ref-048093d6df17f7a9d57c3de999f8d2b71289bc19.zip | |
Add more semi-animations to the dungeon. This just means that some tiles
with 2 or more variants get a random one whenever the buffer is
refilled. Right now the following tiles are variable like that:
* Item: orb of Zot (should be the only animated item in the game)
* Features: portal, abyssal exit, altars to Xom/Makhleb, lava
I also added tiles for the crystal spear (nice) and the ratskin cloak
(abysmal). I also tidied up the tiles some more.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10043 c06c8d41-db1a-0410-9941-cceddc491573
42 files changed, 192 insertions, 163 deletions
diff --git a/crawl-ref/source/art-data.h b/crawl-ref/source/art-data.h index 9f37c68dba..c25124fef0 100644 --- a/crawl-ref/source/art-data.h +++ b/crawl-ref/source/art-data.h @@ -654,7 +654,7 @@ /* 38: UNRAND_WYRMBANE */ { "Wyrmbane", "scale-covered lance", - OBJ_WEAPONS, WPN_SPEAR, +9, +6, GREEN, + OBJ_WEAPONS, WPN_SPEAR, +9, +6, LIGHTGREEN, { SPWPN_DRAGON_SLAYING, 5, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, @@ -758,7 +758,7 @@ "Lehudib's crystal spear", "crystal spear", OBJ_WEAPONS, WPN_SPEAR, +6, +6, GREEN, { - SPWPN_NORMAL, 0, 0, 0, 0, 0, + SPWPN_NORMAL, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -767,7 +767,7 @@ }, "", "", - "Presumably this relic led to the invention of the famous spell.", + "Presumably this relic led to the invention of the famous spell, or maybe the other way around.", }, /* 45: UNRAND_IGNORANCE */ diff --git a/crawl-ref/source/art-data.txt b/crawl-ref/source/art-data.txt index f923715fde..c5bcb4d4cf 100644 --- a/crawl-ref/source/art-data.txt +++ b/crawl-ref/source/art-data.txt @@ -410,7 +410,7 @@ NAME: Wyrmbane APPEAR: scale-covered lance OBJ: OBJ_WEAPONS/WPN_SPEAR PLUS: +9/+6 -COLOUR: GREEN +COLOUR: LIGHTGREEN BRAND: SPWPN_DRAGON_SLAYING AC: 5 FIRE: 1 @@ -473,7 +473,8 @@ APPEAR: crystal spear OBJ: OBJ_WEAPONS/WPN_SPEAR PLUS: +6/+6 COLOUR: GREEN -DESC_END: Presumably this relic led to the invention of the famous spell. +INT: 3 +DESC_END: Presumably this relic led to the invention of the famous spell, or maybe the other way around. NAME: shield of Ignorance APPEAR: dull large shield diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt index aaefdab206..2ee6b70836 100644 --- a/crawl-ref/source/rltiles/dc-dngn.txt +++ b/crawl-ref/source/rltiles/dc-dngn.txt @@ -6,6 +6,8 @@ dngn_unseen DNGN_UNSEEN +# Multiple tile definitions are STATIC, that is they may change between +# saves but are otherwise fixed. wall/brick_brown0 WALL_NORMAL wall/brick_brown1 wall/brick_brown2 @@ -180,11 +182,11 @@ floor/rough_red3 floor/floor_sand_stone0 FLOOR_SAND_STONE floor/floor_sand_stone1 floor/floor_sand_stone2 -floor/floor_sand_stone3 -floor/floor_sand_stone4 -floor/floor_sand_stone5 -floor/floor_sand_stone6 -floor/floor_sand_stone7 +floor/floor_sand_stone3 +floor/floor_sand_stone4 +floor/floor_sand_stone5 +floor/floor_sand_stone6 +floor/floor_sand_stone7 wall/wall_yellow_rock0 WALL_YELLOW_ROCK wall/wall_yellow_rock1 @@ -206,7 +208,7 @@ floor/grass1 floor/grass2 floor/grass_n HALO_GRASS -floor/grass_ne +floor/grass_ne floor/grass_e floor/grass_se floor/grass_s @@ -301,7 +303,7 @@ floor/dirt1 floor/dirt2 floor/dirt_n HALO_DIRT -floor/dirt_ne +floor/dirt_ne floor/dirt_e floor/dirt_se floor/dirt_s @@ -310,17 +312,6 @@ floor/dirt_w floor/dirt_nw floor/dirt_full -floor/lava0 DNGN_LAVA -floor/lava1 -floor/lava2 -floor/lava3 -dngn_deep_water DNGN_DEEP_WATER -dngn_shallow_water DNGN_SHALLOW_WATER -dngn_shallow_water_disturbance DNGN_SHALLOW_WATER_DISTURBANCE -dngn_deep_water_murky DNGN_DEEP_WATER_MURKY -dngn_shallow_water_murky DNGN_SHALLOW_WATER_MURKY -dngn_shallow_water_murky_disturbance DNGN_SHALLOW_WATER_MURKY_DISTURBANCE - wall/stone2_gray0 DNGN_STONE_WALL wall/stone2_gray1 wall/stone2_gray2 @@ -342,9 +333,6 @@ gate_open_right DNGN_GATE_OPEN_RIGHT dngn_orcish_idol DNGN_ORCISH_IDOL dngn_granite_statue DNGN_GRANITE_STATUE -%rim 1 -dngn_enter_hell DNGN_ENTER_HELL -%rim 0 dngn_branch_stairs DNGN_BRANCH_STAIRS dngn_trap_dart DNGN_TRAP_DART dngn_trap_arrow DNGN_TRAP_ARROW @@ -381,6 +369,22 @@ shop_potions SHOP_POTIONS dngn_abandoned_shop DNGN_ABANDONED_SHOP %sdir dc-dngn +## from here on multiple tile definitions are CHANGEABLE, i.e. they may +## change from turn to turn +floor/lava0 DNGN_LAVA +floor/lava1 +floor/lava2 +floor/lava3 +dngn_deep_water DNGN_DEEP_WATER +dngn_shallow_water DNGN_SHALLOW_WATER +dngn_shallow_water_disturbance DNGN_SHALLOW_WATER_DISTURBANCE +dngn_deep_water_murky DNGN_DEEP_WATER_MURKY +dngn_shallow_water_murky DNGN_SHALLOW_WATER_MURKY +dngn_shallow_water_murky_disturbance DNGN_SHALLOW_WATER_MURKY_DISTURBANCE + +%rim 1 +dngn_enter_hell DNGN_ENTER_HELL +%rim 0 dngn_enter_labyrinth DNGN_ENTER_LABYRINTH dngn_enter_dis DNGN_ENTER_DIS dngn_enter_gehenna DNGN_ENTER_GEHENNA @@ -389,11 +393,14 @@ dngn_enter_tartarus DNGN_ENTER_TARTARUS dngn_enter_abyss DNGN_ENTER_ABYSS dngn_exit DNGN_EXIT_ABYSS +dngn_exit_flickering dngn_stone_arch DNGN_STONE_ARCH dngn_enter_pandemonium DNGN_ENTER_PANDEMONIUM dngn_portal DNGN_PORTAL +dngn_portal_rotated dngn_exit DNGN_EXIT_PANDEMONIUM +dngn_exit_flickering %rim 1 dngn_transit_pandemonium DNGN_TRANSIT_PANDEMONIUM %rim 0 @@ -401,28 +408,39 @@ dngn_enter DNGN_ENTER %rim 1 dngn_return DNGN_RETURN %rim 0 + +%sdir dc-dngn/altars dngn_altar_zin DNGN_ALTAR_ZIN dngn_altar_shining_one DNGN_ALTAR_SHINING_ONE dngn_altar_kikubaaqudgha DNGN_ALTAR_KIKUBAAQUDGHA dngn_altar_yredelemnul DNGN_ALTAR_YREDELEMNUL -dngn_altar_xom DNGN_ALTAR_XOM +dngn_altar_xom_blue DNGN_ALTAR_XOM +dngn_altar_xom_green +dngn_altar_xom_pink +dngn_altar_xom_red +dngn_altar_xom_turquoise +dngn_altar_xom_yellow dngn_altar_vehumet DNGN_ALTAR_VEHUMET dngn_altar_okawaru DNGN_ALTAR_OKAWARU dngn_altar_makhleb DNGN_ALTAR_MAKHLEB +dngn_altar_makhleb_flipped dngn_altar_sif_muna DNGN_ALTAR_SIF_MUNA dngn_altar_trog DNGN_ALTAR_TROG dngn_altar_nemelex_xobeh DNGN_ALTAR_NEMELEX_XOBEH dngn_altar_elyvilon DNGN_ALTAR_ELYVILON dngn_altar_lugonu DNGN_ALTAR_LUGONU dngn_altar_beogh DNGN_ALTAR_BEOGH + +%sdir dc-dngn dngn_blue_fountain DNGN_BLUE_FOUNTAIN dngn_sparkling_fountain DNGN_SPARKLING_FOUNTAIN dngn_blood_fountain DNGN_BLOOD_FOUNTAIN dngn_dry_fountain DNGN_DRY_FOUNTAIN -## Miscellaneous entries that get drawn on the background +## Miscellaneous entries that get drawn on the background. +## Flavour is fixed again. dc-misc/blood_red BLOOD -dc-misc/blood_red1 +dc-misc/blood_red1 dc-misc/blood_red2 dc-misc/blood_red3 dc-misc/blood_red4 diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar.png Binary files differindex 641dc18260..641dc18260 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_beogh.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_beogh.png Binary files differindex aaf4a12b75..aaf4a12b75 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_beogh.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_beogh.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_elyvilon.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_elyvilon.png Binary files differindex 8af21dced2..8af21dced2 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_elyvilon.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_elyvilon.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_kikubaaqudgha.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_kikubaaqudgha.png Binary files differindex faab38026e..faab38026e 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_kikubaaqudgha.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_kikubaaqudgha.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_lugonu.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_lugonu.png Binary files differindex 88e67672e1..88e67672e1 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_lugonu.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_lugonu.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_makhleb.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_makhleb.png Binary files differindex de97e5f4a9..de97e5f4a9 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_makhleb.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_makhleb.png diff --git a/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_makhleb_flipped.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_makhleb_flipped.png Binary files differnew file mode 100644 index 0000000000..336450b0f2 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_makhleb_flipped.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_nemelex_xobeh.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_nemelex_xobeh.png Binary files differindex e394ee24ee..e394ee24ee 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_nemelex_xobeh.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_nemelex_xobeh.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_okawaru.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_okawaru.png Binary files differindex 7b110545df..7b110545df 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_okawaru.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_okawaru.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_shining_one.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_shining_one.png Binary files differindex d39fbbb3dd..d39fbbb3dd 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_shining_one.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_shining_one.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_sif_muna.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_sif_muna.png Binary files differindex 6dfd8be77c..6dfd8be77c 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_sif_muna.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_sif_muna.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_trog.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_trog.png Binary files differindex 89102a7ba6..89102a7ba6 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_trog.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_trog.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_vehumet.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_vehumet.png Binary files differindex 1405e957eb..1405e957eb 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_vehumet.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_vehumet.png diff --git a/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_blue.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_blue.png Binary files differnew file mode 100644 index 0000000000..dbab39f827 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_blue.png diff --git a/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_green.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_green.png Binary files differnew file mode 100644 index 0000000000..5d5742649a --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_green.png diff --git a/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_pink.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_pink.png Binary files differnew file mode 100644 index 0000000000..6a2eb4448b --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_pink.png diff --git a/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_red.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_red.png Binary files differnew file mode 100644 index 0000000000..c00411a834 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_red.png diff --git a/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_turquoise.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_turquoise.png Binary files differnew file mode 100644 index 0000000000..760ff6e15e --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_turquoise.png diff --git a/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_yellow.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_yellow.png Binary files differnew file mode 100644 index 0000000000..8bef6631a8 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_xom_yellow.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_yredelemnul.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_yredelemnul.png Binary files differindex 71a9b5f1bc..71a9b5f1bc 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_yredelemnul.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_yredelemnul.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_zin.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_zin.png Binary files differindex d3bf4281d6..d3bf4281d6 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_zin.png +++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_zin.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_xom.png b/crawl-ref/source/rltiles/dc-dngn/dngn_altar_xom.png Binary files differdeleted file mode 100644 index cc228b60e4..0000000000 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_altar_xom.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_exit_flickering.png b/crawl-ref/source/rltiles/dc-dngn/dngn_exit_flickering.png Binary files differnew file mode 100644 index 0000000000..d3a73132e9 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_exit_flickering.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_portal_rotated.png b/crawl-ref/source/rltiles/dc-dngn/dngn_portal_rotated.png Binary files differnew file mode 100644 index 0000000000..3dd824c48a --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_portal_rotated.png diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt index 361c4923c0..75f0ee504a 100644 --- a/crawl-ref/source/rltiles/dc-item.txt +++ b/crawl-ref/source/rltiles/dc-item.txt @@ -739,6 +739,7 @@ i-rod_venom ROD_VENOM #OBJ_ORBS
%sdir item/misc
misc_orb ORB
+misc_orb2
#OBJ_MISCELLANY
misc_bottle MISC_BOTTLED_EFREET
diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt index fa5e5575f1..c26ce2c695 100644 --- a/crawl-ref/source/rltiles/dc-misc.txt +++ b/crawl-ref/source/rltiles/dc-misc.txt @@ -38,7 +38,7 @@ unseen_item UNSEEN_ITEM unseen_monster UNSEEN_CORPSE
%corpse 0
%back none
-dc-dngn/dngn_altar UNSEEN_ALTAR
+dc-dngn/altars/dngn_altar UNSEEN_ALTAR
dc-dngn/dngn_entrance UNSEEN_ENTRANCE
%back none
diff --git a/crawl-ref/source/rltiles/dc-player.txt b/crawl-ref/source/rltiles/dc-player.txt index ac435cb5af..eded1e8a1c 100644 --- a/crawl-ref/source/rltiles/dc-player.txt +++ b/crawl-ref/source/rltiles/dc-player.txt @@ -28,14 +28,10 @@ mummy_f MUMMY mummy_m
naga_f NAGA
naga_m
-gnome_f GNOME
-gnome_m
ogre_f OGRE
ogre_m
troll_f TROLL
troll_m
-ogre_mage_f OGRE_MAGE
-ogre_mage_m
draconian_f DRACONIAN
draconian_m
draconian_black_f DRACONIAN_BLACK
@@ -104,6 +100,7 @@ sticky_flame STICKY_FLAME ###Cloak
%parts_ctg CLOAK
%sdir player/cloak
+ratskin RATSKIN_CLOAK
red RED
blue BLUE
magenta MAGENTA
@@ -215,6 +212,7 @@ robe_rainbow ROBE_RAINBOW gandalf_g GANDALF_G
saruman SARUMAN
robe_black_hood ROBE_BLACK_HOOD
+robe_of_night ROBE_OF_NIGHT
monk_blue MONK_BLUE
monk_black MONK_BLACK
dress_green DRESS_GREEN
@@ -233,6 +231,7 @@ robe_brown2 ROBE_BROWN2 robe_green_gold ROBE_GREEN_GOLD
robe_brown3 ROBE_BROWN3
robe_gray2 ROBE_GRAY2
+# dresses
robe_misfortune ROBE_MISFORTUNE
dress_white DRESS_WHITE
arwen ARWEN
@@ -345,7 +344,6 @@ vanhel1 maxwell MAXWELL
lears_chain_mail LEARS_CHAIN_MAIL
-robe_of_night ROBE_OF_NIGHT
%end
@@ -394,22 +392,23 @@ 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
+wucad_mu WUCAD_MU
mace_of_variability MACE_OF_VARIABILITY
mace_of_brilliance MACE_OF_BRILLIANCE
undeadhunter UNDEADHUNTER
+eos EOS
+serpent_scourge SERPENT_SCOURGE
## polearms
trident_octopus_king TRIDENT_OCTOPUS_KING
glaive_of_prune GLAIVE_OF_PRUNE
-voodoo VOODOO
+botono BOTONO
finisher FINISHER
glaive_of_the_guard GLAIVE_OF_THE_GUARD
+wyrmbane WYRMBANE
+crystal_spear CRYSTAL_SPEAR
## staves
elemental_staff ELEMENTAL_STAFF
asmodeus ASMODEUS
diff --git a/crawl-ref/source/rltiles/dc-urand.txt b/crawl-ref/source/rltiles/dc-urand.txt index 5277353281..83f15f1585 100644 --- a/crawl-ref/source/rltiles/dc-urand.txt +++ b/crawl-ref/source/rltiles/dc-urand.txt @@ -14,21 +14,23 @@ 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_botono URAND_BOTONO urand_octopus_king URAND_OCTOPUS_KING urand_arga URAND_ARGA urand_elemental URAND_ELEMENTAL urand_sniper URAND_SNIPER -urand_erchidel URAND_ERCHIDEL +urand_piercer URAND_PIERCER urand_plutonium URAND_PLUTONIUM urand_undeadhunter URAND_UNDEADHUNTER +urand_crystal_spear URAND_CRYSTAL_SPEAR %rim 1 -urand_blowgun URAND_BLOWGUN +urand_blowgun URAND_BLOWGUN_ASSASSIN 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 + %sdir item/armour/artefact urand_ignorance URAND_IGNORANCE urand_augmentation URAND_AUGMENTATION @@ -37,7 +39,7 @@ urand_bullseye URAND_BULLSEYE urand_dyrovepreva URAND_DYROVEPREVA urand_misfortune URAND_MISFORTUNE urand_flash URAND_FLASH -urand_assassin URAND_ASSASSIN +urand_assassin URAND_BOOTS_ASSASSIN urand_lear URAND_LEAR urand_zhor URAND_ZHOR urand_salamander URAND_SALAMANDER @@ -51,11 +53,14 @@ urand_dragon_king URAND_DRAGON_KING urand_alchemist URAND_ALCHEMIST urand_fencer URAND_FENCER urand_starlight URAND_STARLIGHT +urand_ratskin_cloak URAND_RATSKIN_CLOAK + %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 diff --git a/crawl-ref/source/rltiles/item/armour/artefact/urand_ratskin_cloak.png b/crawl-ref/source/rltiles/item/armour/artefact/urand_ratskin_cloak.png Binary files differnew file mode 100644 index 0000000000..3100e6f330 --- /dev/null +++ b/crawl-ref/source/rltiles/item/armour/artefact/urand_ratskin_cloak.png diff --git a/crawl-ref/source/rltiles/item/misc/misc_orb2.png b/crawl-ref/source/rltiles/item/misc/misc_orb2.png Binary files differnew file mode 100644 index 0000000000..349f48f999 --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/misc_orb2.png diff --git a/crawl-ref/source/rltiles/item/weapon/artefact/urand_voo_doo.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_botono.png Binary files differindex 1aab10efca..1aab10efca 100644 --- a/crawl-ref/source/rltiles/item/weapon/artefact/urand_voo_doo.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_botono.png diff --git a/crawl-ref/source/rltiles/item/weapon/artefact/urand_crystal_spear.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_crystal_spear.png Binary files differnew file mode 100644 index 0000000000..ad9f54193b --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_crystal_spear.png diff --git a/crawl-ref/source/rltiles/item/weapon/artefact/urand_erchidel.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_piercer.png Binary files differindex 52985f7969..52985f7969 100644 --- a/crawl-ref/source/rltiles/item/weapon/artefact/urand_erchidel.png +++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_piercer.png diff --git a/crawl-ref/source/rltiles/player/base/ogre_mage_f.png b/crawl-ref/source/rltiles/player/base/ogre_mage_f.png Binary files differdeleted file mode 100644 index 0d86d8cc71..0000000000 --- a/crawl-ref/source/rltiles/player/base/ogre_mage_f.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/player/base/ogre_mage_m.png b/crawl-ref/source/rltiles/player/base/ogre_mage_m.png Binary files differdeleted file mode 100644 index 22c70971b8..0000000000 --- a/crawl-ref/source/rltiles/player/base/ogre_mage_m.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/player/cloak/ratskin.png b/crawl-ref/source/rltiles/player/cloak/ratskin.png Binary files differnew file mode 100644 index 0000000000..774dca6393 --- /dev/null +++ b/crawl-ref/source/rltiles/player/cloak/ratskin.png diff --git a/crawl-ref/source/rltiles/player/hand1/artefact/voodoo.png b/crawl-ref/source/rltiles/player/hand1/artefact/botono.png Binary files differindex 511a7d25aa..511a7d25aa 100644 --- a/crawl-ref/source/rltiles/player/hand1/artefact/voodoo.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/botono.png diff --git a/crawl-ref/source/rltiles/player/hand1/artefact/crystal_spear.png b/crawl-ref/source/rltiles/player/hand1/artefact/crystal_spear.png Binary files differnew file mode 100644 index 0000000000..3dd0071a10 --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/artefact/crystal_spear.png diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index a779e2d01b..0e719e0bea 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1098,64 +1098,71 @@ static int _tileidx_unrand_artefact(int idx) case UNRAND_VAMPIRES_TOOTH: return TILE_SPWPN_VAMPIRES_TOOTH; case UNRAND_WUCAD_MU: return TILE_SPWPN_STAFF_OF_WUCAD_MU; + // Weapons case UNRAND_BLOODBANE: return TILE_URAND_BLOODBANE; - case UNRAND_SHADOWS: return TILE_URAND_SHADOWS; case UNRAND_FLAMING_DEATH: return TILE_URAND_FLAMING_DEATH; - case UNRAND_IGNORANCE: return TILE_URAND_IGNORANCE; - case UNRAND_AIR: return TILE_URAND_AIR; - case UNRAND_AUGMENTATION: return TILE_URAND_AUGMENTATION; case UNRAND_BRILLIANCE: return TILE_URAND_BRILLIANCE; - case UNRAND_THIEF: return TILE_URAND_THIEF; - case UNRAND_BULLSEYE: return TILE_URAND_BULLSEYE; - case UNRAND_DYROVEPREVA: return TILE_URAND_DYROVEPREVA; case UNRAND_LEECH: return TILE_URAND_LEECH; - case UNRAND_CEKUGOB: return TILE_URAND_CEKUGOB; - case UNRAND_MISFORTUNE: return TILE_URAND_MISFORTUNE; case UNRAND_CHILLY_DEATH: return TILE_URAND_CHILLY_DEATH; - case UNRAND_FOUR_WINDS: return TILE_URAND_FOUR_WINDS; case UNRAND_MORG: return TILE_URAND_MORG; case UNRAND_FINISHER: return TILE_URAND_FINISHER; case UNRAND_PUNK: return TILE_URAND_PUNK; case UNRAND_KRISHNA: return TILE_URAND_KRISHNA; - case UNRAND_FLASH: return TILE_URAND_FLASH; case UNRAND_SKULLCRUSHER: return TILE_URAND_SKULLCRUSHER; - case UNRAND_BLOWGUN_ASSASSIN: return TILE_URAND_ASSASSIN; + case UNRAND_BLOWGUN_ASSASSIN: return TILE_URAND_BLOWGUN_ASSASSIN; case UNRAND_GUARD: return TILE_URAND_GUARD; case UNRAND_JIHAD: return TILE_URAND_JIHAD; + case UNRAND_DOOM_KNIGHT: return TILE_URAND_DOOM_KNIGHT; + case UNRAND_EOS: return TILE_URAND_EOS; + case UNRAND_BOTONO: return TILE_URAND_BOTONO; + case UNRAND_OCTOPUS_KING: return TILE_URAND_OCTOPUS_KING; + case UNRAND_ARGA: return TILE_URAND_ARGA; + case UNRAND_ELEMENTAL_STAFF: return TILE_URAND_ELEMENTAL; + case UNRAND_SNIPER: return TILE_URAND_SNIPER; + case UNRAND_PLUTONIUM_SWORD: return TILE_URAND_PLUTONIUM; + case UNRAND_UNDEADHUNTER: return TILE_URAND_UNDEADHUNTER; + case UNRAND_WYRMBANE: return TILE_URAND_WYRMBANE; + case UNRAND_SPRIGGANS_KNIFE: return TILE_URAND_SPRIGGANS_KNIFE; + case UNRAND_SERPENT_SCOURGE: return TILE_URAND_SERPENT_SCOURGE; + case UNRAND_ACCURACY: return TILE_URAND_KNIFE_OF_ACCURACY; + case UNRAND_HELLFIRE: return TILE_URAND_FIERY_DEVIL; + case UNRAND_PIERCER: return TILE_URAND_PIERCER; + case UNRAND_CRYSTAL_SPEAR: return TILE_URAND_CRYSTAL_SPEAR; + + // Armour + case UNRAND_IGNORANCE: return TILE_URAND_IGNORANCE; + case UNRAND_AUGMENTATION: return TILE_URAND_AUGMENTATION; + case UNRAND_THIEF: return TILE_URAND_THIEF; + case UNRAND_BULLSEYE: return TILE_URAND_BULLSEYE; + case UNRAND_DYROVEPREVA: return TILE_URAND_DYROVEPREVA; + case UNRAND_MISFORTUNE: return TILE_URAND_MISFORTUNE; + case UNRAND_FLASH: return TILE_URAND_FLASH; case UNRAND_LEAR: return TILE_URAND_LEAR; case UNRAND_ZHOR: return TILE_URAND_ZHOR; case UNRAND_SALAMANDER: return TILE_URAND_SALAMANDER; case UNRAND_WAR: return TILE_URAND_WAR; - case UNRAND_DOOM_KNIGHT: return TILE_URAND_DOOM_KNIGHT; case UNRAND_RESISTANCE: return TILE_URAND_RESISTANCE; case UNRAND_FOLLY: return TILE_URAND_FOLLY; - case UNRAND_BLOODLUST: return TILE_URAND_BLOODLUST; - case UNRAND_EOS: return TILE_URAND_EOS; - case UNRAND_SHAOLIN: return TILE_URAND_SHAOLIN; - case UNRAND_ROBUSTNESS: return TILE_URAND_ROBUSTNESS; case UNRAND_MAXWELL: return TILE_URAND_MAXWELL; - case UNRAND_BOTONO: return TILE_URAND_VOO_DOO; - case UNRAND_OCTOPUS_KING: return TILE_URAND_OCTOPUS_KING; case UNRAND_DRAGONMASK: return TILE_URAND_DRAGONMASK; - case UNRAND_ARGA: return TILE_URAND_ARGA; - case UNRAND_ELEMENTAL_STAFF: return TILE_URAND_ELEMENTAL; - case UNRAND_SNIPER: return TILE_URAND_SNIPER; case UNRAND_NIGHT: return TILE_URAND_NIGHT; - case UNRAND_PLUTONIUM_SWORD: return TILE_URAND_PLUTONIUM; - case UNRAND_UNDEADHUNTER: return TILE_URAND_UNDEADHUNTER; case UNRAND_DRAGON_KING: return TILE_URAND_DRAGON_KING; case UNRAND_ALCHEMIST: return TILE_URAND_ALCHEMIST; case UNRAND_FENCERS_GLOVES: return TILE_URAND_FENCER; - case UNRAND_MAGE: return TILE_URAND_MAGE; - case UNRAND_WYRMBANE: return TILE_URAND_WYRMBANE; - case UNRAND_SPRIGGANS_KNIFE: return TILE_URAND_SPRIGGANS_KNIFE; + case UNRAND_BOOTS_ASSASSIN: return TILE_URAND_BOOTS_ASSASSIN; case UNRAND_STARLIGHT: return TILE_URAND_STARLIGHT; + case UNRAND_RATSKIN_CLOAK: return TILE_URAND_RATSKIN_CLOAK; + + // Jewellery + case UNRAND_SHADOWS: return TILE_URAND_SHADOWS; + case UNRAND_AIR: return TILE_URAND_AIR; + case UNRAND_CEKUGOB: return TILE_URAND_CEKUGOB; + case UNRAND_FOUR_WINDS: return TILE_URAND_FOUR_WINDS; + case UNRAND_BLOODLUST: return TILE_URAND_BLOODLUST; + case UNRAND_SHAOLIN: return TILE_URAND_SHAOLIN; + case UNRAND_ROBUSTNESS: return TILE_URAND_ROBUSTNESS; + case UNRAND_MAGE: return TILE_URAND_MAGE; case UNRAND_SHIELDING: return TILE_URAND_BROOCH_OF_SHIELDING; - case UNRAND_SERPENT_SCOURGE: return TILE_URAND_SERPENT_SCOURGE; - case UNRAND_ACCURACY: return TILE_URAND_KNIFE_OF_ACCURACY; - case UNRAND_HELLFIRE: return TILE_URAND_FIERY_DEVIL; - //XXX: What happened to this unrand? - //case UNRAND_ERCHIDEL: return TILE_URAND_ERCHIDEL; default: return TILE_TODO; } } @@ -2157,7 +2164,7 @@ int tileidx_item(const item_def &item) return _tileidx_corpse(item.plus); case OBJ_ORBS: - return TILE_ORB; + return TILE_ORB + random2(tile_main_count(TILE_ORB)); case OBJ_MISCELLANY: return _tileidx_misc(item); @@ -2698,10 +2705,16 @@ static inline void _finalize_tile(unsigned int *tile, (*tile) = wall_flv; else if (orig == TILE_DNGN_CLOSED_DOOR || orig == TILE_DNGN_OPEN_DOOR) (*tile) = orig + std::min((int)special_flv, 3); - else if (orig == TILE_DNGN_LAVA) + else if (orig >= TILE_DNGN_LAVA && orig < TILE_BLOOD) + { + // Tiles may change from turn to turn. (*tile) = orig + random2(tile_dngn_count(orig)); + } else if (orig < TILE_DNGN_MAX) + { + // Tile flavour is fixed. (*tile) = orig + (special_flv % tile_dngn_count(orig)); + } (*tile) |= flag; } @@ -2709,7 +2722,7 @@ static inline void _finalize_tile(unsigned int *tile, void tilep_calc_flags(const int parts[], int flag[]) { for (unsigned i = 0; i < TILEP_PART_MAX; i++) - flag[i] = TILEP_FLAG_NORMAL; + flag[i] = TILEP_FLAG_NORMAL; if (parts[TILEP_PART_HELM] - 1 >= TILEP_HELM_HELM_OFS) flag[TILEP_PART_HAIR] = TILEP_FLAG_HIDE; @@ -2794,7 +2807,6 @@ int tilep_species_to_base_tile(int sp, int level) { case SP_HUMAN: return TILEP_BASE_HUMAN; - case SP_ELF: case SP_HIGH_ELF: case SP_SLUDGE_ELF: return TILEP_BASE_ELF; @@ -3406,34 +3418,34 @@ int tilep_equ_weapon(const item_def &item) 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; + 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_BOTONO; + 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_CRYSTAL_SPEAR: return TILEP_HAND1_CRYSTAL_SPEAR; } } @@ -3519,24 +3531,15 @@ int tilep_equ_armour(const item_def &item) { switch (find_unrandart_index(item) + 1) { - // robe of Augmentation - case 7: return TILEP_BODY_ROBE_WHITE_BLUE; - // robe of Misfortune - case 14: return TILEP_BODY_ROBE_MISFORTUNE; - // Lear's chain mail - case 26: return TILEP_BODY_LEARS_CHAIN_MAIL; - // skin of Zhor - case 27: return TILEP_BODY_ZHOR; break; - // salamander hide armour - case 29: return TILEP_BODY_LEATHER_RED; - // robe of Folly - case 33: return TILEP_BODY_ROBE_RED2; - // Maxwell's patent armour - case 38: return TILEP_BODY_MAXWELL; - // robe of Night - case 46: return TILEP_BODY_ROBE_OF_NIGHT; - // armour of the Dragon King - case 49: break; + case UNRAND_AUGMENTATION: return TILEP_BODY_ROBE_WHITE_BLUE; + case UNRAND_MISFORTUNE: return TILEP_BODY_ROBE_MISFORTUNE; + case UNRAND_LEAR: return TILEP_BODY_LEARS_CHAIN_MAIL; + case UNRAND_ZHOR: return TILEP_BODY_ZHOR; + case UNRAND_SALAMANDER: return TILEP_BODY_LEATHER_RED; + case UNRAND_FOLLY: return TILEP_BODY_ROBE_RED2; + case UNRAND_MAXWELL: return TILEP_BODY_MAXWELL; + case UNRAND_NIGHT: return TILEP_BODY_ROBE_OF_NIGHT; + default: break; } } @@ -3546,24 +3549,24 @@ int tilep_equ_armour(const item_def &item) case ARM_ROBE: switch (item.colour) { - // We've got a zillion robes; let's use 'em! - case BLACK: return TILEP_BODY_ROBE_BLACK_RED; - case BLUE: return TILEP_BODY_ROBE_BLUE; - case LIGHTBLUE: return TILEP_BODY_ROBE_BLUE_WHITE; - case GREEN: return TILEP_BODY_ROBE_GREEN; - case LIGHTGREEN: return TILEP_BODY_ROBE_BLUE_GREEN; - case CYAN: return TILEP_BODY_ROBE_WHITE_GREEN; - case LIGHTCYAN: return TILEP_BODY_ROBE_CYAN; - case RED: return TILEP_BODY_ROBE_RED; - case LIGHTRED: return TILEP_BODY_ROBE_RED_GOLD; - case MAGENTA: return TILEP_BODY_ROBE_MAGENTA; - case LIGHTMAGENTA:return TILEP_BODY_ROBE_RED3; - case BROWN: return TILEP_BODY_ROBE_BROWN; - case YELLOW: return TILEP_BODY_ROBE_YELLOW; - case LIGHTGREY: return TILEP_BODY_ROBE_GRAY2; - case DARKGREY: return TILEP_BODY_GANDALF_G; - case WHITE: return TILEP_BODY_ROBE_WHITE; - default: return 0; + // We've got a zillion robes; let's use 'em! + case BLACK: return TILEP_BODY_ROBE_BLACK_RED; + case BLUE: return TILEP_BODY_ROBE_BLUE; + case LIGHTBLUE: return TILEP_BODY_ROBE_BLUE_WHITE; + case GREEN: return TILEP_BODY_ROBE_GREEN; + case LIGHTGREEN: return TILEP_BODY_ROBE_BLUE_GREEN; + case CYAN: return TILEP_BODY_ROBE_WHITE_GREEN; + case LIGHTCYAN: return TILEP_BODY_ROBE_CYAN; + case RED: return TILEP_BODY_ROBE_RED; + case LIGHTRED: return TILEP_BODY_ROBE_RED_GOLD; + case MAGENTA: return TILEP_BODY_ROBE_MAGENTA; + case LIGHTMAGENTA:return TILEP_BODY_ROBE_RED3; + case BROWN: return TILEP_BODY_ROBE_BROWN; + case YELLOW: return TILEP_BODY_ROBE_YELLOW; + case LIGHTGREY: return TILEP_BODY_ROBE_GRAY2; + case DARKGREY: return TILEP_BODY_GANDALF_G; + case WHITE: return TILEP_BODY_ROBE_WHITE; + default: return 0; } case ARM_LEATHER_ARMOUR: return TILEP_BODY_LEATHER_ARMOUR3; @@ -3611,12 +3614,10 @@ int tilep_equ_shield(const item_def &item) { switch (find_unrandart_index(item) + 1) { - // shield of Ignorance - case 5: return TILEP_HAND2_SHIELD_OF_IGNORANCE; - // Bullseye - case 10: return TILEP_HAND2_BULLSEYE; - // shield of Resistance - case 32: return TILEP_HAND2_SHIELD_OF_RESISTANCE; + case UNRAND_IGNORANCE: return TILEP_HAND2_SHIELD_OF_IGNORANCE; + case UNRAND_BULLSEYE: return TILEP_HAND2_BULLSEYE; + case UNRAND_RESISTANCE: return TILEP_HAND2_SHIELD_OF_RESISTANCE; + default: break; } } @@ -3637,6 +3638,15 @@ int tilep_equ_cloak(const item_def &item) if (item.base_type != OBJ_ARMOUR || item.sub_type != ARM_CLOAK) return 0; + if (is_unrandom_artefact( item )) + { + switch (find_unrandart_index(item) + 1) + { + case UNRAND_RATSKIN_CLOAK: return TILEP_CLOAK_RATSKIN_CLOAK; + default: break; + } + } + switch (item.colour) { case BLACK: @@ -3670,12 +3680,10 @@ int tilep_equ_helm(const item_def &item) { switch (find_unrandart_index(item) + 1) { - case 11: // crown of Dyrovepreva - return TILEP_HELM_DYROVEPREVA; - case 41: // mask of the Dragon - return TILEP_HELM_ART_DRAGONHELM; - case 50: // hat of the Alchemist - return TILEP_HELM_TURBAN_PURPLE; + case UNRAND_DYROVEPREVA: return TILEP_HELM_DYROVEPREVA; + case UNRAND_DRAGONMASK: return TILEP_HELM_ART_DRAGONHELM; + case UNRAND_ALCHEMIST: return TILEP_HELM_TURBAN_PURPLE; + default: break; } // Although there shouldn't be any, just in case @@ -3804,10 +3812,8 @@ int tilep_equ_gloves(const item_def &item) { switch (find_unrandart_index(item) + 1) { - case 30: // gauntlets of War (thick brown) - return TILEP_ARM_GLOVE_BLACK; - case 51: // fencer's gloves (white) - return TILEP_ARM_GLOVE_WHITE; + case UNRAND_WAR: return TILEP_ARM_GLOVE_BLACK; + case UNRAND_FENCERS_GLOVES: return TILEP_ARM_GLOVE_WHITE; } } @@ -3860,11 +3866,10 @@ int tilep_equ_boots(const item_def &item) if (is_unrandom_artefact(item)) { - // in anticipation of more unrandart boots switch (find_unrandart_index(item) + 1) { - case 23: // boots of the assassin - return TILEP_BOOTS_MIDDLE_GRAY; + case UNRAND_BOOTS_ASSASSIN: return TILEP_BOOTS_MIDDLE_GRAY; + default: break; } } |
