From c05e097028701eec3dfde379c151d86b8463fca7 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Fri, 11 Sep 2009 13:03:14 +0000 Subject: Move around a couple of spell tiles, reorder spells in the tiles code, and document the missing tiles. Also add a tile for small skeletons, and update the change log. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10653 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/docs/changelog.txt | 10 +- crawl-ref/source/dat/descript/spells.txt | 2 +- .../source/rltiles/UNUSED/spells/detect_curse.png | Bin 0 -> 735 bytes .../source/rltiles/UNUSED/spells/forescry.png | Bin 0 -> 624 bytes .../source/rltiles/UNUSED/spells/identify.png | Bin 0 -> 706 bytes .../source/rltiles/UNUSED/spells/magic_mapping.png | Bin 0 -> 926 bytes .../rltiles/UNUSED/spells/tomb_of_doroklohe.png | Bin 0 -> 647 bytes crawl-ref/source/rltiles/dc-mon.txt | 2 + .../source/rltiles/dc-mon/animals/hog_player.png | Bin 949 -> 935 bytes crawl-ref/source/rltiles/dc-mon/skeleton_small.png | Bin 494 -> 633 bytes crawl-ref/source/rltiles/dc-spells.txt | 11 +- .../rltiles/spells/divination/detect_curse.png | Bin 735 -> 0 bytes .../source/rltiles/spells/divination/forescry.png | Bin 624 -> 0 bytes .../source/rltiles/spells/divination/identify.png | Bin 706 -> 0 bytes .../rltiles/spells/divination/magic_mapping.png | Bin 926 -> 0 bytes .../rltiles/spells/divination/see_invisible.png | Bin 493 -> 0 bytes .../rltiles/spells/earth/tomb_of_doroklohe.png | Bin 647 -> 0 bytes .../source/rltiles/spells/enchantment/paralyse.png | Bin 369 -> 0 bytes .../source/rltiles/spells/enchantment/petrify.png | Bin 0 -> 369 bytes .../rltiles/spells/enchantment/see_invisible.png | Bin 0 -> 493 bytes crawl-ref/source/rltiles/spells/enchantment/temp | 8 +- crawl-ref/source/rltiles/spells/missing_spells.txt | 6 + .../rltiles/spells/necromancy/death_channel.png | Bin 0 -> 667 bytes .../rltiles/spells/necromancy/deaths_door.png | Bin 667 -> 0 bytes .../source/rltiles/spells/translocation/temp.txt | 7 + crawl-ref/source/tilepick.cc | 353 ++++++++++++--------- crawl-ref/source/tilereg.cc | 7 +- 27 files changed, 233 insertions(+), 173 deletions(-) create mode 100644 crawl-ref/source/rltiles/UNUSED/spells/detect_curse.png create mode 100644 crawl-ref/source/rltiles/UNUSED/spells/forescry.png create mode 100644 crawl-ref/source/rltiles/UNUSED/spells/identify.png create mode 100644 crawl-ref/source/rltiles/UNUSED/spells/magic_mapping.png create mode 100644 crawl-ref/source/rltiles/UNUSED/spells/tomb_of_doroklohe.png delete mode 100644 crawl-ref/source/rltiles/spells/divination/detect_curse.png delete mode 100644 crawl-ref/source/rltiles/spells/divination/forescry.png delete mode 100644 crawl-ref/source/rltiles/spells/divination/identify.png delete mode 100644 crawl-ref/source/rltiles/spells/divination/magic_mapping.png delete mode 100644 crawl-ref/source/rltiles/spells/divination/see_invisible.png delete mode 100644 crawl-ref/source/rltiles/spells/earth/tomb_of_doroklohe.png delete mode 100644 crawl-ref/source/rltiles/spells/enchantment/paralyse.png create mode 100644 crawl-ref/source/rltiles/spells/enchantment/petrify.png create mode 100644 crawl-ref/source/rltiles/spells/enchantment/see_invisible.png create mode 100644 crawl-ref/source/rltiles/spells/missing_spells.txt create mode 100644 crawl-ref/source/rltiles/spells/necromancy/death_channel.png delete mode 100644 crawl-ref/source/rltiles/spells/necromancy/deaths_door.png create mode 100644 crawl-ref/source/rltiles/spells/translocation/temp.txt (limited to 'crawl-ref') diff --git a/crawl-ref/docs/changelog.txt b/crawl-ref/docs/changelog.txt index ae42d14bca..30ea3a1912 100644 --- a/crawl-ref/docs/changelog.txt +++ b/crawl-ref/docs/changelog.txt @@ -15,12 +15,14 @@ Stone Soup 0.6 * Reduce the chances for artefacts with only one stat property. * Add !a inscription to prompt when attacking with this wielded item. * Upgrade equipment of Sonja, Psyche and Terence. -* Add some tiles "animations" whenever the screen is redrawn. -* Unrandarts and randarts now share the same, cleaner coding structure. +* Jessica casts Pain and is considered evil. +* Unrandarts and fixedarts share the same, cleaner coding structure. * More vaults. +* Limit Summon Small Mammals to a maximum of two mammals per casting. +* Call Canine Familiar only calls friendly canines. +* Add some tiles "animations" whenever the screen is redrawn. * Tiles: re-added doll editing screen ('-' command). -* Limit Summon Small Mammals to maximum of two mammals per casting. -* Call Canine Familiar now only calls friendly canines. +* Tiles: clickable spells menu. Stone Soup 0.5.1 (20090728) --------------------------- diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt index ab898f9005..e556363f05 100644 --- a/crawl-ref/source/dat/descript/spells.txt +++ b/crawl-ref/source/dat/descript/spells.txt @@ -560,7 +560,7 @@ This spell summons one or more giant scorpions to the caster's assistance. %%%% Summon Small Mammals -This spell summons one or more small creatures to the caster's aid. +This spell summons one or two small creatures to the caster's aid. %%%% Summon Swarm diff --git a/crawl-ref/source/rltiles/UNUSED/spells/detect_curse.png b/crawl-ref/source/rltiles/UNUSED/spells/detect_curse.png new file mode 100644 index 0000000000..1eb9188cbe Binary files /dev/null and b/crawl-ref/source/rltiles/UNUSED/spells/detect_curse.png differ diff --git a/crawl-ref/source/rltiles/UNUSED/spells/forescry.png b/crawl-ref/source/rltiles/UNUSED/spells/forescry.png new file mode 100644 index 0000000000..cc50390c39 Binary files /dev/null and b/crawl-ref/source/rltiles/UNUSED/spells/forescry.png differ diff --git a/crawl-ref/source/rltiles/UNUSED/spells/identify.png b/crawl-ref/source/rltiles/UNUSED/spells/identify.png new file mode 100644 index 0000000000..531cb8b956 Binary files /dev/null and b/crawl-ref/source/rltiles/UNUSED/spells/identify.png differ diff --git a/crawl-ref/source/rltiles/UNUSED/spells/magic_mapping.png b/crawl-ref/source/rltiles/UNUSED/spells/magic_mapping.png new file mode 100644 index 0000000000..5a910b7535 Binary files /dev/null and b/crawl-ref/source/rltiles/UNUSED/spells/magic_mapping.png differ diff --git a/crawl-ref/source/rltiles/UNUSED/spells/tomb_of_doroklohe.png b/crawl-ref/source/rltiles/UNUSED/spells/tomb_of_doroklohe.png new file mode 100644 index 0000000000..2c126a556a Binary files /dev/null and b/crawl-ref/source/rltiles/UNUSED/spells/tomb_of_doroklohe.png differ diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index cc1b367a52..1c61f6de85 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -552,7 +552,9 @@ minotaur MONS_MINOTAUR /*'t'*/ ## Small zombified monsters ('z') zombie_small MONS_ZOMBIE_SMALL +%rim 0 skeleton_small MONS_SKELETON_SMALL +%rim 1 simulacrum_small MONS_SIMULACRUM_SMALL skeletal_warrior MONS_SKELETAL_WARRIOR %rim 0 diff --git a/crawl-ref/source/rltiles/dc-mon/animals/hog_player.png b/crawl-ref/source/rltiles/dc-mon/animals/hog_player.png index 7cec710d5a..fac386991d 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/animals/hog_player.png and b/crawl-ref/source/rltiles/dc-mon/animals/hog_player.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/skeleton_small.png b/crawl-ref/source/rltiles/dc-mon/skeleton_small.png index b1254bdf07..3a8258ae82 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/skeleton_small.png and b/crawl-ref/source/rltiles/dc-mon/skeleton_small.png differ diff --git a/crawl-ref/source/rltiles/dc-spells.txt b/crawl-ref/source/rltiles/dc-spells.txt index b6ea1f520c..3c1c9fc28f 100644 --- a/crawl-ref/source/rltiles/dc-spells.txt +++ b/crawl-ref/source/rltiles/dc-spells.txt @@ -34,14 +34,9 @@ magic_dart MAGIC_DART %sdir spells/divination detect_creatures DETECT_CREATURES -detect_curse DETECT_CURSE detect_items DETECT_ITEMS detect_secret_doors DETECT_SECRET_DOORS detect_traps DETECT_TRAPS -forescry FORESCRY -identify IDENTIFY -magic_mapping MAGIC_MAPPING -see_invisible SEE_INVISIBLE %sdir spells/earth bolt_of_iron BOLT_OF_IRON @@ -55,7 +50,6 @@ shatter SHATTER statue_form STATUE_FORM stone_arrow STONE_ARROW stoneskin STONESKIN -tomb_of_doroklohe TOMB_OF_DOROKLOHE %sdir spells/enchantment berserker_rage BERSERKER_RAGE @@ -67,8 +61,9 @@ enslavement ENSLAVEMENT haste HASTE invisibility INVISIBILITY mass_confusion MASS_CONFUSION -paralyse PARALYSE +petrify PETRIFY projected_noise PROJECTED_NOISE +see_invisible SEE_INVISIBLE selective_amnesia SELECTIVE_AMNESIA slow SLOW sure_blade SURE_BLADE @@ -119,7 +114,7 @@ borgnjors_revivification BORGNJORS_REVIVIFICATION cigotuvis_degeneration CIGOTUVIS_DEGENERATION control_undead CONTROL_UNDEAD corpse_rot CORPSE_ROT -deaths_door DEATHS_DOOR +death_channel DEATH_CHANNEL dispel_undead DISPEL_UNDEAD excruciating_wounds EXCRUCIATING_WOUNDS fulsome_distillation FULSOME_DISTILLATION diff --git a/crawl-ref/source/rltiles/spells/divination/detect_curse.png b/crawl-ref/source/rltiles/spells/divination/detect_curse.png deleted file mode 100644 index 1eb9188cbe..0000000000 Binary files a/crawl-ref/source/rltiles/spells/divination/detect_curse.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/spells/divination/forescry.png b/crawl-ref/source/rltiles/spells/divination/forescry.png deleted file mode 100644 index cc50390c39..0000000000 Binary files a/crawl-ref/source/rltiles/spells/divination/forescry.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/spells/divination/identify.png b/crawl-ref/source/rltiles/spells/divination/identify.png deleted file mode 100644 index 531cb8b956..0000000000 Binary files a/crawl-ref/source/rltiles/spells/divination/identify.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/spells/divination/magic_mapping.png b/crawl-ref/source/rltiles/spells/divination/magic_mapping.png deleted file mode 100644 index 5a910b7535..0000000000 Binary files a/crawl-ref/source/rltiles/spells/divination/magic_mapping.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/spells/divination/see_invisible.png b/crawl-ref/source/rltiles/spells/divination/see_invisible.png deleted file mode 100644 index f90e961f2a..0000000000 Binary files a/crawl-ref/source/rltiles/spells/divination/see_invisible.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/spells/earth/tomb_of_doroklohe.png b/crawl-ref/source/rltiles/spells/earth/tomb_of_doroklohe.png deleted file mode 100644 index 2c126a556a..0000000000 Binary files a/crawl-ref/source/rltiles/spells/earth/tomb_of_doroklohe.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/spells/enchantment/paralyse.png b/crawl-ref/source/rltiles/spells/enchantment/paralyse.png deleted file mode 100644 index 559beced54..0000000000 Binary files a/crawl-ref/source/rltiles/spells/enchantment/paralyse.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/spells/enchantment/petrify.png b/crawl-ref/source/rltiles/spells/enchantment/petrify.png new file mode 100644 index 0000000000..559beced54 Binary files /dev/null and b/crawl-ref/source/rltiles/spells/enchantment/petrify.png differ diff --git a/crawl-ref/source/rltiles/spells/enchantment/see_invisible.png b/crawl-ref/source/rltiles/spells/enchantment/see_invisible.png new file mode 100644 index 0000000000..f90e961f2a Binary files /dev/null and b/crawl-ref/source/rltiles/spells/enchantment/see_invisible.png differ diff --git a/crawl-ref/source/rltiles/spells/enchantment/temp b/crawl-ref/source/rltiles/spells/enchantment/temp index 782e9f009f..e4c2e9785f 100644 --- a/crawl-ref/source/rltiles/spells/enchantment/temp +++ b/crawl-ref/source/rltiles/spells/enchantment/temp @@ -1,3 +1,5 @@ -control undead? -extension? -remove curse? +alternative suggestions: + +slow -> extension +enslavement -> slow +unknown2 -> enslavement diff --git a/crawl-ref/source/rltiles/spells/missing_spells.txt b/crawl-ref/source/rltiles/spells/missing_spells.txt new file mode 100644 index 0000000000..2e8cd08d8b --- /dev/null +++ b/crawl-ref/source/rltiles/spells/missing_spells.txt @@ -0,0 +1,6 @@ +Stonemail +Portal Projectile +Phase Shift +Warp Brand +Death's Door +Summon Ugly Thing diff --git a/crawl-ref/source/rltiles/spells/necromancy/death_channel.png b/crawl-ref/source/rltiles/spells/necromancy/death_channel.png new file mode 100644 index 0000000000..22ff2ea5f5 Binary files /dev/null and b/crawl-ref/source/rltiles/spells/necromancy/death_channel.png differ diff --git a/crawl-ref/source/rltiles/spells/necromancy/deaths_door.png b/crawl-ref/source/rltiles/spells/necromancy/deaths_door.png deleted file mode 100644 index 22ff2ea5f5..0000000000 Binary files a/crawl-ref/source/rltiles/spells/necromancy/deaths_door.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/spells/translocation/temp.txt b/crawl-ref/source/rltiles/spells/translocation/temp.txt new file mode 100644 index 0000000000..36337acdab --- /dev/null +++ b/crawl-ref/source/rltiles/spells/translocation/temp.txt @@ -0,0 +1,7 @@ +portal projectile? +warp brand? +phase shift? + +alternative suggestions: +banishment -> dispersal +unknown -> banishment diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 05bf12d264..b01bfb3d23 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2715,163 +2715,203 @@ int tileidx_spell(spell_type spell) { switch (spell) { - case SPELL_NO_SPELL: return TILEG_ERROR; - case SPELL_TELEPORT_SELF: return TILEG_TELEPORT; - case SPELL_CAUSE_FEAR: return TILEG_CAUSE_FEAR; - case SPELL_MAGIC_DART: return TILEG_MAGIC_DART; - case SPELL_FIREBALL: return TILEG_FIREBALL; - case SPELL_APPORTATION: return TILEG_APPORTATION; - case SPELL_DELAYED_FIREBALL: return TILEG_DELAYED_FIREBALL; - case SPELL_STRIKING: return TILEG_TODO; - case SPELL_CONJURE_FLAME: return TILEG_CONJURE_FLAME; - case SPELL_DIG: return TILEG_DIG; - case SPELL_BOLT_OF_FIRE: return TILEG_BOLT_OF_FIRE; - case SPELL_BOLT_OF_COLD: return TILEG_BOLT_OF_COLD; - case SPELL_LIGHTNING_BOLT: return TILEG_LIGHTNING_BOLT; - case SPELL_BOLT_OF_MAGMA: return TILEG_BOLT_OF_MAGMA; - case SPELL_POLYMORPH_OTHER: return TILEG_POLYMORPH_OTHER; - case SPELL_SLOW: return TILEG_SLOW; - case SPELL_HASTE: return TILEG_HASTE; - case SPELL_PARALYSE: return TILEG_PARALYSE; - case SPELL_CONFUSE: return TILEG_CONFUSE; - case SPELL_INVISIBILITY: return TILEG_INVISIBILITY; - case SPELL_THROW_FLAME: return TILEG_THROW_FLAME; - case SPELL_THROW_FROST: return TILEG_THROW_FROST; - case SPELL_CONTROLLED_BLINK: return TILEG_CONTROLLED_BLINK; - case SPELL_FREEZING_CLOUD: return TILEG_FREEZING_CLOUD; - case SPELL_MEPHITIC_CLOUD: return TILEG_MEPHITIC_CLOUD; - case SPELL_RING_OF_FLAMES: return TILEG_RING_OF_FLAMES; - case SPELL_VENOM_BOLT: return TILEG_VENOM_BOLT; - case SPELL_OLGREBS_TOXIC_RADIANCE: return TILEG_OLGREBS_TOXIC_RADIANCE; - case SPELL_TELEPORT_OTHER: return TILEG_TELEPORT_OTHER; - case SPELL_MINOR_HEALING: return TILEG_TODO; - case SPELL_MAJOR_HEALING: return TILEG_TODO; - case SPELL_DEATHS_DOOR: return TILEG_DEATHS_DOOR; - case SPELL_SELECTIVE_AMNESIA: return TILEG_SELECTIVE_AMNESIA; - case SPELL_MASS_CONFUSION: return TILEG_MASS_CONFUSION; - case SPELL_SMITING: return TILEG_TODO; - case SPELL_SUMMON_SMALL_MAMMALS: return TILEG_SUMMON_SMALL_MAMMALS; - case SPELL_ABJURATION: return TILEG_ABJURATION; - case SPELL_SUMMON_SCORPIONS: return TILEG_SUMMON_SCORPIONS; - case SPELL_LEVITATION: return TILEG_LEVITATION; - case SPELL_BOLT_OF_DRAINING: return TILEG_BOLT_OF_DRAINING; - case SPELL_LEHUDIBS_CRYSTAL_SPEAR: return TILEG_LEHUDIBS_CRYSTAL_SPEAR; - case SPELL_BOLT_OF_INACCURACY: return TILEG_TODO; - case SPELL_POISONOUS_CLOUD: return TILEG_POISONOUS_CLOUD; - case SPELL_FIRE_STORM: return TILEG_FIRE_STORM; - case SPELL_DETECT_TRAPS: return TILEG_DETECT_TRAPS; - case SPELL_BLINK: return TILEG_BLINK; - case SPELL_ISKENDERUNS_MYSTIC_BLAST: return TILEG_ISKENDERUNS_MYSTIC_BLAST; - case SPELL_SUMMON_SWARM: return TILEG_TODO; - case SPELL_SUMMON_HORRIBLE_THINGS: return TILEG_SUMMON_HORRIBLE_THINGS; - case SPELL_ENSLAVEMENT: return TILEG_ENSLAVEMENT; - case SPELL_ANIMATE_DEAD: return TILEG_ANIMATE_DEAD; - case SPELL_PAIN: return TILEG_PAIN; - case SPELL_EXTENSION: return TILEG_TODO; - case SPELL_CONTROL_UNDEAD: return TILEG_CONTROL_UNDEAD; - case SPELL_ANIMATE_SKELETON: return TILEG_ANIMATE_SKELETON; - case SPELL_VAMPIRIC_DRAINING: return TILEG_VAMPIRIC_DRAINING; - case SPELL_SUMMON_WRAITHS: return TILEG_SUMMON_WRAITHS; - case SPELL_DETECT_ITEMS: return TILEG_DETECT_ITEMS; + case SPELL_NO_SPELL: + case SPELL_DEBUGGING_RAY: + return TILEG_ERROR; + + // Air + case SPELL_SHOCK: return TILEG_SHOCK; + case SPELL_SWIFTNESS: return TILEG_SWIFTNESS; + case SPELL_LEVITATION: return TILEG_LEVITATION; + case SPELL_REPEL_MISSILES: return TILEG_REPEL_MISSILES; + case SPELL_MEPHITIC_CLOUD: return TILEG_MEPHITIC_CLOUD; + case SPELL_DISCHARGE: return TILEG_STATIC_DISCHARGE; + case SPELL_FLY: return TILEG_FLIGHT; + case SPELL_INSULATION: return TILEG_INSULATION; + case SPELL_LIGHTNING_BOLT: return TILEG_LIGHTNING_BOLT; + case SPELL_AIRSTRIKE: return TILEG_AIRSTRIKE; + case SPELL_SILENCE: return TILEG_SILENCE; + case SPELL_DEFLECT_MISSILES: return TILEG_DEFLECT_MISSILES; + case SPELL_CONJURE_BALL_LIGHTNING: return TILEG_CONJURE_BALL_LIGHTNING; + case SPELL_CHAIN_LIGHTNING: return TILEG_CHAIN_LIGHTNING; + + // Earth + case SPELL_SANDBLAST: return TILEG_SANDBLAST; + case SPELL_MAXWELLS_SILVER_HAMMER: return TILEG_MAXWELLS_SILVER_HAMMER; + case SPELL_STONESKIN: return TILEG_STONESKIN; + case SPELL_PASSWALL: return TILEG_PASSWALL; + case SPELL_STONE_ARROW: return TILEG_STONE_ARROW; + case SPELL_DIG: return TILEG_DIG; + case SPELL_BOLT_OF_MAGMA: return TILEG_BOLT_OF_MAGMA; + case SPELL_FRAGMENTATION: return TILEG_LEES_RAPID_DECONSTRUCTION; + case SPELL_BOLT_OF_IRON: return TILEG_BOLT_OF_IRON; + case SPELL_LEHUDIBS_CRYSTAL_SPEAR: return TILEG_LEHUDIBS_CRYSTAL_SPEAR; + case SPELL_SHATTER: return TILEG_SHATTER; + + // Fire + case SPELL_FLAME_TONGUE: return TILEG_FLAME_TONGUE; + case SPELL_EVAPORATE: return TILEG_EVAPORATE; + case SPELL_FIRE_BRAND: return TILEG_FIRE_BRAND; + case SPELL_THROW_FLAME: return TILEG_THROW_FLAME; + case SPELL_CONJURE_FLAME: return TILEG_CONJURE_FLAME; + case SPELL_STICKY_FLAME: return TILEG_STICKY_FLAME; + case SPELL_BOLT_OF_FIRE: return TILEG_BOLT_OF_FIRE; + case SPELL_IGNITE_POISON: return TILEG_IGNITE_POISON; + case SPELL_FIREBALL: return TILEG_FIREBALL; + case SPELL_DELAYED_FIREBALL: return TILEG_DELAYED_FIREBALL; + case SPELL_RING_OF_FLAMES: return TILEG_RING_OF_FLAMES; + case SPELL_FIRE_STORM: return TILEG_FIRE_STORM; + + // Ice + case SPELL_FREEZE: return TILEG_FREEZE; + case SPELL_THROW_FROST: return TILEG_THROW_FROST; + case SPELL_FREEZING_AURA: return TILEG_FREEZING_AURA; + case SPELL_SLEEP: return TILEG_ENSORCELLED_HIBERNATION; + case SPELL_OZOCUBUS_ARMOUR: return TILEG_OZOCUBUS_ARMOUR; + case SPELL_ICE_BOLT: return TILEG_ICE_BOLT; + case SPELL_CONDENSATION_SHIELD: return TILEG_CONDENSATION_SHIELD; + case SPELL_OZOCUBUS_REFRIGERATION: return TILEG_OZOCUBUS_REFRIGERATION; + case SPELL_BOLT_OF_COLD: return TILEG_BOLT_OF_COLD; + case SPELL_FREEZING_CLOUD: return TILEG_FREEZING_CLOUD; + case SPELL_MASS_SLEEP: return TILEG_METABOLIC_ENGLACIATION; + case SPELL_SIMULACRUM: return TILEG_SIMULACRUM; + case SPELL_ICE_STORM: return TILEG_ICE_STORM; + + // Poison + case SPELL_STING: return TILEG_STING; + case SPELL_CURE_POISON: return TILEG_CURE_POISON; + case SPELL_POISON_WEAPON: return TILEG_POISON_BRAND; + case SPELL_INTOXICATE: return TILEG_ALISTAIRS_INTOXICATION; + case SPELL_OLGREBS_TOXIC_RADIANCE: return TILEG_OLGREBS_TOXIC_RADIANCE; + case SPELL_POISON_AMMUNITION: return TILEG_POISON_AMMUNITION; + case SPELL_RESIST_POISON: return TILEG_RESIST_POISON; + case SPELL_VENOM_BOLT: return TILEG_VENOM_BOLT; + case SPELL_POISON_ARROW: return TILEG_POISON_ARROW; + case SPELL_POISONOUS_CLOUD: return TILEG_POISONOUS_CLOUD; + + // Enchantment + case SPELL_CONFUSING_TOUCH: return TILEG_CONFUSING_TOUCH; + case SPELL_BACKLIGHT: return TILEG_CORONA; + case SPELL_PROJECTED_NOISE: return TILEG_PROJECTED_NOISE; + case SPELL_SURE_BLADE: return TILEG_SURE_BLADE; + case SPELL_TUKIMAS_VORPAL_BLADE: return TILEG_TUKIMAS_VORPAL_BLADE; + case SPELL_BERSERKER_RAGE: return TILEG_BERSERKER_RAGE; + case SPELL_CONFUSE: return TILEG_CONFUSE; + case SPELL_SLOW: return TILEG_SLOW; + case SPELL_TUKIMAS_DANCE: return TILEG_TUKIMAS_DANCE; + case SPELL_SELECTIVE_AMNESIA: return TILEG_SELECTIVE_AMNESIA; + case SPELL_ENSLAVEMENT: return TILEG_ENSLAVEMENT; + case SPELL_SEE_INVISIBLE: return TILEG_SEE_INVISIBLE; + case SPELL_PETRIFY: return TILEG_PETRIFY; + case SPELL_CAUSE_FEAR: return TILEG_CAUSE_FEAR; + case SPELL_TAME_BEASTS: return TILEG_TAME_BEASTS; + case SPELL_HASTE: return TILEG_HASTE; + case SPELL_INVISIBILITY: return TILEG_INVISIBILITY; + case SPELL_MASS_CONFUSION: return TILEG_MASS_CONFUSION; + + // Translocation + case SPELL_APPORTATION: return TILEG_APPORTATION; + case SPELL_BLINK: return TILEG_BLINK; + case SPELL_BANISHMENT: return TILEG_BANISHMENT; + case SPELL_CONTROL_TELEPORT: return TILEG_CONTROLLED_TELEPORT; + case SPELL_TELEPORT_OTHER: return TILEG_TELEPORT_OTHER; + case SPELL_TELEPORT_SELF: return TILEG_TELEPORT; + case SPELL_CONTROLLED_BLINK: return TILEG_CONTROLLED_BLINK; + case SPELL_PORTAL: return TILEG_PORTAL; + + // Summoning + case SPELL_SUMMON_BUTTERFLIES: return TILEG_SUMMON_BUTTERFLIES; + case SPELL_SUMMON_SMALL_MAMMALS: return TILEG_SUMMON_SMALL_MAMMALS; + case SPELL_RECALL: return TILEG_RECALL; + case SPELL_CALL_CANINE_FAMILIAR: return TILEG_CALL_CANINE_FAMILIAR; + case SPELL_CALL_IMP: return TILEG_CALL_IMP; + case SPELL_ABJURATION: return TILEG_ABJURATION; + case SPELL_SUMMON_SCORPIONS: return TILEG_SUMMON_SCORPIONS; + case SPELL_SUMMON_ELEMENTAL: return TILEG_SUMMON_ELEMENTAL; + case SPELL_SUMMON_DEMON: return TILEG_SUMMON_DEMON; + case SPELL_SHADOW_CREATURES: return TILEG_SUMMON_SHADOW_CREATURES; + case SPELL_SUMMON_ICE_BEAST: return TILEG_SUMMON_ICE_BEAST; + case SPELL_DEMONIC_HORDE: return TILEG_DEMONIC_HORDE; + case SPELL_SUMMON_GREATER_DEMON: return TILEG_SUMMON_GREATER_DEMON; + case SPELL_SUMMON_WRAITHS: return TILEG_SUMMON_WRAITHS; + case SPELL_SUMMON_HORRIBLE_THINGS: return TILEG_SUMMON_HORRIBLE_THINGS; + + // Necromancy + case SPELL_ANIMATE_SKELETON: return TILEG_ANIMATE_SKELETON; + case SPELL_PAIN: return TILEG_PAIN; + case SPELL_FULSOME_DISTILLATION: return TILEG_FULSOME_DISTILLATION; + case SPELL_CORPSE_ROT: return TILEG_CORPSE_ROT; + case SPELL_LETHAL_INFUSION: return TILEG_LETHAL_INFUSION; + case SPELL_SUBLIMATION_OF_BLOOD: return TILEG_SUBLIMATION_OF_BLOOD; + case SPELL_BONE_SHARDS: return TILEG_BONE_SHARDS; + case SPELL_VAMPIRIC_DRAINING: return TILEG_VAMPIRIC_DRAINING; + case SPELL_REGENERATION: return TILEG_REGENERATION; + case SPELL_ANIMATE_DEAD: return TILEG_ANIMATE_DEAD; + case SPELL_DISPEL_UNDEAD: return TILEG_DISPEL_UNDEAD; case SPELL_BORGNJORS_REVIVIFICATION: return TILEG_BORGNJORS_REVIVIFICATION; - case SPELL_FREEZE: return TILEG_FREEZE; - case SPELL_SUMMON_ELEMENTAL: return TILEG_SUMMON_ELEMENTAL; - case SPELL_OZOCUBUS_REFRIGERATION: return TILEG_OZOCUBUS_REFRIGERATION; - case SPELL_STICKY_FLAME: return TILEG_STICKY_FLAME; - case SPELL_SUMMON_ICE_BEAST: return TILEG_SUMMON_ICE_BEAST; - case SPELL_OZOCUBUS_ARMOUR: return TILEG_OZOCUBUS_ARMOUR; - case SPELL_CALL_IMP: return TILEG_CALL_IMP; - case SPELL_REPEL_MISSILES: return TILEG_REPEL_MISSILES; - case SPELL_BERSERKER_RAGE: return TILEG_BERSERKER_RAGE; - case SPELL_DISPEL_UNDEAD: return TILEG_DISPEL_UNDEAD; - case SPELL_FULSOME_DISTILLATION: return TILEG_FULSOME_DISTILLATION; - case SPELL_POISON_ARROW: return TILEG_POISON_ARROW; - case SPELL_TWISTED_RESURRECTION: return TILEG_TWISTED_RESURRECTION; - case SPELL_REGENERATION: return TILEG_REGENERATION; - case SPELL_BONE_SHARDS: return TILEG_BONE_SHARDS; - case SPELL_BANISHMENT: return TILEG_BANISHMENT; - case SPELL_CIGOTUVIS_DEGENERATION: return TILEG_CIGOTUVIS_DEGENERATION; - case SPELL_STING: return TILEG_STING; - case SPELL_SUBLIMATION_OF_BLOOD: return TILEG_SUBLIMATION_OF_BLOOD; - case SPELL_TUKIMAS_DANCE: return TILEG_TUKIMAS_DANCE; - case SPELL_HELLFIRE: return TILEG_TODO; - case SPELL_SUMMON_DEMON: return TILEG_SUMMON_DEMON; - case SPELL_DEMONIC_HORDE: return TILEG_DEMONIC_HORDE; - case SPELL_SUMMON_GREATER_DEMON: return TILEG_SUMMON_GREATER_DEMON; - case SPELL_CORPSE_ROT: return TILEG_CORPSE_ROT; - case SPELL_TUKIMAS_VORPAL_BLADE: return TILEG_TUKIMAS_VORPAL_BLADE; - case SPELL_FIRE_BRAND: return TILEG_FIRE_BRAND; - case SPELL_FREEZING_AURA: return TILEG_FREEZING_AURA; - case SPELL_LETHAL_INFUSION: return TILEG_LETHAL_INFUSION; - case SPELL_BOLT_OF_IRON: return TILEG_BOLT_OF_IRON; - case SPELL_STONE_ARROW: return TILEG_STONE_ARROW; - case SPELL_STONEMAIL: return TILEG_TODO; - case SPELL_SHOCK: return TILEG_SHOCK; - case SPELL_SWIFTNESS: return TILEG_SWIFTNESS; - case SPELL_FLY: return TILEG_FLIGHT; - case SPELL_INSULATION: return TILEG_INSULATION; - case SPELL_DETECT_CREATURES: return TILEG_DETECT_CREATURES; - case SPELL_CURE_POISON: return TILEG_CURE_POISON; - case SPELL_CONTROL_TELEPORT: return TILEG_CONTROLLED_TELEPORT; - case SPELL_POISON_AMMUNITION: return TILEG_POISON_AMMUNITION; - case SPELL_POISON_WEAPON: return TILEG_POISON_BRAND; - case SPELL_RESIST_POISON: return TILEG_RESIST_POISON; - case SPELL_PROJECTED_NOISE: return TILEG_PROJECTED_NOISE; - case SPELL_ALTER_SELF: return TILEG_ALTER_SELF; - case SPELL_DEBUGGING_RAY: return TILEG_TODO; - case SPELL_RECALL: return TILEG_RECALL; - case SPELL_PORTAL: return TILEG_PORTAL; - case SPELL_AGONY: return TILEG_AGONY; - case SPELL_SPIDER_FORM: return TILEG_SPIDER_FORM; - case SPELL_DISRUPT: return TILEG_TODO; - case SPELL_DISINTEGRATE: return TILEG_TODO; - case SPELL_BLADE_HANDS: return TILEG_BLADE_HANDS; - case SPELL_STATUE_FORM: return TILEG_STATUE_FORM; - case SPELL_ICE_FORM: return TILEG_ICE_FORM; - case SPELL_DRAGON_FORM: return TILEG_DRAGON_FORM; - case SPELL_NECROMUTATION: return TILEG_NECROMUTATION; - case SPELL_DEATH_CHANNEL: return TILEG_TODO; - case SPELL_SYMBOL_OF_TORMENT: return TILEG_SYMBOL_OF_TORMENT; - case SPELL_DEFLECT_MISSILES: return TILEG_DEFLECT_MISSILES; - case SPELL_ICE_BOLT: return TILEG_ICE_BOLT; - case SPELL_ICE_STORM: return TILEG_ICE_STORM; - case SPELL_AIRSTRIKE: return TILEG_AIRSTRIKE; - case SPELL_SHADOW_CREATURES: return TILEG_SUMMON_SHADOW_CREATURES; - case SPELL_CONFUSING_TOUCH: return TILEG_CONFUSING_TOUCH; - case SPELL_SURE_BLADE: return TILEG_SURE_BLADE; - case SPELL_FLAME_TONGUE: return TILEG_FLAME_TONGUE; - case SPELL_PASSWALL: return TILEG_PASSWALL; - case SPELL_IGNITE_POISON: return TILEG_IGNITE_POISON; - case SPELL_STICKS_TO_SNAKES: return TILEG_STICKS_TO_SNAKES; - case SPELL_CALL_CANINE_FAMILIAR: return TILEG_CALL_CANINE_FAMILIAR; - case SPELL_SUMMON_DRAGON: return TILEG_TODO; - case SPELL_TAME_BEASTS: return TILEG_TAME_BEASTS; - case SPELL_SLEEP: return TILEG_TODO; - case SPELL_MASS_SLEEP: return TILEG_TODO; - case SPELL_DETECT_SECRET_DOORS: return TILEG_DETECT_SECRET_DOORS; - case SPELL_SEE_INVISIBLE: return TILEG_SEE_INVISIBLE; - case SPELL_PHASE_SHIFT: return TILEG_TODO; - case SPELL_SUMMON_BUTTERFLIES: return TILEG_SUMMON_BUTTERFLIES; - case SPELL_WARP_BRAND: return TILEG_TODO; - case SPELL_SILENCE: return TILEG_SILENCE; - case SPELL_SHATTER: return TILEG_TODO; - case SPELL_DISPERSAL: return TILEG_TODO; - case SPELL_DISCHARGE: return TILEG_TODO; - case SPELL_BACKLIGHT: return TILEG_TODO; - case SPELL_INTOXICATE: return TILEG_ALISTAIRS_INTOXICATION; - case SPELL_EVAPORATE: return TILEG_EVAPORATE; - case SPELL_FRAGMENTATION: return TILEG_TODO; - case SPELL_SANDBLAST: return TILEG_SANDBLAST; - case SPELL_MAXWELLS_SILVER_HAMMER: return TILEG_MAXWELLS_SILVER_HAMMER; - case SPELL_CONDENSATION_SHIELD: return TILEG_CONDENSATION_SHIELD; - case SPELL_STONESKIN: return TILEG_STONESKIN; - case SPELL_SIMULACRUM: return TILEG_SIMULACRUM; - case SPELL_CONJURE_BALL_LIGHTNING: return TILEG_CONJURE_BALL_LIGHTNING; - case SPELL_CHAIN_LIGHTNING: return TILEG_CHAIN_LIGHTNING; - case SPELL_EXCRUCIATING_WOUNDS: return TILEG_EXCRUCIATING_WOUNDS; - case SPELL_PORTAL_PROJECTILE: return TILEG_TODO; - case SPELL_SUMMON_UGLY_THING: return TILEG_TODO; - case SPELL_PETRIFY: return TILEG_TODO; + case SPELL_CIGOTUVIS_DEGENERATION: return TILEG_CIGOTUVIS_DEGENERATION; + case SPELL_AGONY: return TILEG_AGONY; + case SPELL_TWISTED_RESURRECTION: return TILEG_TWISTED_RESURRECTION; + case SPELL_EXCRUCIATING_WOUNDS: return TILEG_EXCRUCIATING_WOUNDS; + case SPELL_CONTROL_UNDEAD: return TILEG_CONTROL_UNDEAD; + case SPELL_BOLT_OF_DRAINING: return TILEG_BOLT_OF_DRAINING; + case SPELL_SYMBOL_OF_TORMENT: return TILEG_SYMBOL_OF_TORMENT; + case SPELL_DEATH_CHANNEL: return TILEG_DEATH_CHANNEL; + + // Transformation + case SPELL_STICKS_TO_SNAKES: return TILEG_STICKS_TO_SNAKES; + case SPELL_SPIDER_FORM: return TILEG_SPIDER_FORM; + case SPELL_ICE_FORM: return TILEG_ICE_FORM; + case SPELL_BLADE_HANDS: return TILEG_BLADE_HANDS; + case SPELL_POLYMORPH_OTHER: return TILEG_POLYMORPH_OTHER; + case SPELL_STATUE_FORM: return TILEG_STATUE_FORM; + case SPELL_ALTER_SELF: return TILEG_ALTER_SELF; + case SPELL_DRAGON_FORM: return TILEG_DRAGON_FORM; + case SPELL_NECROMUTATION: return TILEG_NECROMUTATION; + + // pure Conjuration + case SPELL_MAGIC_DART: return TILEG_MAGIC_DART; + case SPELL_ISKENDERUNS_MYSTIC_BLAST: return TILEG_ISKENDERUNS_MYSTIC_BLAST; + + // Divination (soon to be obsolete, or moved to abilities) + case SPELL_DETECT_SECRET_DOORS: return TILEG_DETECT_SECRET_DOORS; + case SPELL_DETECT_TRAPS: return TILEG_DETECT_TRAPS; + case SPELL_DETECT_ITEMS: return TILEG_DETECT_ITEMS; + case SPELL_DETECT_CREATURES: return TILEG_DETECT_CREATURES; + + // Spells still missing tiles: + case SPELL_PORTAL_PROJECTILE: + case SPELL_DEATHS_DOOR: + case SPELL_SUMMON_UGLY_THING: + case SPELL_PHASE_SHIFT: + case SPELL_WARP_BRAND: + case SPELL_STONEMAIL: + // These two may already have tiles. + case SPELL_DISPERSAL: + case SPELL_EXTENSION: + return TILEG_TODO; + + // -------------------------------------------- + // Rods and abilities (tiles needed for later) + // Abilities + case SPELL_SMITING: // Beogh power + case SPELL_MINOR_HEALING: // Ely power + case SPELL_MAJOR_HEALING: // Ely power + case SPELL_HELLFIRE: // Demonspawn ability + + // Rod-only spells + case SPELL_PARALYSE: + return TILEG_PETRIFY; // similar effect + case SPELL_STRIKING: + case SPELL_BOLT_OF_INACCURACY: + case SPELL_SUMMON_SWARM: + return TILEG_TODO; + + // -------------------------------------------- + // Spells that don't need icons: + case SPELL_SUMMON_DRAGON: // Xom + case SPELL_DISRUPT: // in development? + case SPELL_DISINTEGRATE: // wand and card // Monster spells (mostly?) case SPELL_HELLFIRE_BURST: @@ -2898,6 +2938,7 @@ int tileidx_spell(spell_type spell) case SPELL_DRACONIAN_BREATH: case SPELL_WATER_ELEMENTALS: case SPELL_PORKALATOR: + case NUM_SPELLS: default: return TILE_ERROR; diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 00a343b141..6c29f9ac13 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -1702,7 +1702,12 @@ void InventoryRegion::pack_buffers() InventoryTile &item = m_items[i++]; - if (item.flag & TILEI_FLAG_EQUIP) + if (Options.tile_display_spells) + { + if (item.flag & TILEI_FLAG_MELDED) + m_buf_main.add(TILE_MESH, x, y); + } + else if (item.flag & TILEI_FLAG_EQUIP) { if (item.flag & TILEI_FLAG_CURSE) m_buf_main.add(TILE_ITEM_SLOT_EQUIP_CURSED, x, y); -- cgit v1.2.3-54-g00ecf