summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/xom.cc
diff options
context:
space:
mode:
authorJeekaroose <sneakcow@gmail.com>2014-04-29 18:13:57 +0000
committerNicholas Feinberg <pleasingfung@gmail.com>2014-05-27 19:18:48 -0700
commitea3f500ce5e3dedb9d6dd4b2878e6bc9e9833bc2 (patch)
tree872614b46ea2bd88440fb48c74ef4d2ed8fcdbff /crawl-ref/source/xom.cc
parent6d64fec83a704290ab625343839f31141b2310a3 (diff)
downloadcrawl-ref-ea3f500ce5e3dedb9d6dd4b2878e6bc9e9833bc2.tar.gz
crawl-ref-ea3f500ce5e3dedb9d6dd4b2878e6bc9e9833bc2.zip
Change Tukima to be a targeted spell
(Committer's note: The old Tukima's Dance was fiddly and not well-liked. Changing it into something hexier seemed like a popular & reasonable idea. I refactored the spell code & fixed a few small issues.)
Diffstat (limited to 'crawl-ref/source/xom.cc')
-rw-r--r--crawl-ref/source/xom.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 18b53921e7..3b9bf224cc 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -103,7 +103,7 @@ static const spell_type _xom_tension_spells[] =
SPELL_BLINK, SPELL_CONFUSING_TOUCH, SPELL_CAUSE_FEAR, SPELL_ENGLACIATION,
SPELL_DISPERSAL, SPELL_STONESKIN, SPELL_RING_OF_FLAMES, SPELL_DISCORD,
SPELL_OLGREBS_TOXIC_RADIANCE, SPELL_EXCRUCIATING_WOUNDS,
- SPELL_WARP_BRAND, SPELL_TUKIMAS_DANCE, SPELL_SUMMON_BUTTERFLIES,
+ SPELL_WARP_BRAND, SPELL_SUMMON_BUTTERFLIES,
SPELL_SUMMON_SMALL_MAMMAL, SPELL_SUMMON_SWARM,
SPELL_BEASTLY_APPENDAGE, SPELL_SPIDER_FORM, SPELL_STATUE_FORM,
SPELL_ICE_FORM, SPELL_DRAGON_FORM, SPELL_SHADOW_CREATURES,
@@ -456,9 +456,6 @@ static bool _spell_weapon_check(const spell_type spell)
{
switch (spell)
{
- case SPELL_TUKIMAS_DANCE:
- // Requires a wielded weapon.
- return player_weapon_wielded() && !player_in_branch(BRANCH_ABYSS);
case SPELL_EXCRUCIATING_WOUNDS:
case SPELL_WARP_BRAND:
{