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.)

1 files changed, 2 insertions, 7 deletions

diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 82b097bd4d..2312740a28 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1059,9 +1059,7 @@ static void _maybe_cancel_repeat(spell_type spell)
 {
     switch (spell)
     {
-    case SPELL_DELAYED_FIREBALL:
-    case SPELL_TUKIMAS_DANCE:
-        crawl_state.cant_cmd_repeat(make_stringf("You can't repeat %s.",
+    case SPELL_DELAYED_FIREBALL:        crawl_state.cant_cmd_repeat(make_stringf("You can't repeat %s.",
                                                  spell_title(spell)));
         break;
 
@@ -1182,6 +1180,7 @@ static targetter* _spell_targetter(spell_type spell, int pow, int range)
     case SPELL_POLYMORPH:
     case SPELL_DISPEL_UNDEAD:
     case SPELL_CRYSTAL_BOLT:
+    case SPELL_TUKIMAS_DANCE:
         return new targetter_beam(&you, range, spell_to_zap(spell), pow, 0, 0);
     case SPELL_RANDOM_BOLT:
         return new targetter_beam(&you, range, ZAP_CRYSTAL_BOLT, pow, 0, 0);
@@ -1683,10 +1682,6 @@ static spret_type _do_cast(spell_type spell, int powc,
     case SPELL_SUMMON_MANA_VIPER:
         return cast_summon_mana_viper(powc, god, fail);
 
-    case SPELL_TUKIMAS_DANCE:
-        // Temporarily turns a wielded weapon into a dancing weapon.
-        return cast_tukimas_dance(powc, god, false, fail);
-
     case SPELL_CONJURE_BALL_LIGHTNING:
         return cast_conjure_ball_lightning(powc, god, fail);