3 files changed, 75 insertions, 68 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 6ef42b9a85..a45d5d25d7 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -4575,7 +4575,7 @@ static void _compile_time_asserts()
     COMPILE_CHECK(SP_VAMPIRE == 34              , c3);
     COMPILE_CHECK(SPELL_BOLT_OF_MAGMA == 18     , c4);
     COMPILE_CHECK(SPELL_POISON_ARROW == 94      , c5);
-    COMPILE_CHECK(SPELL_SUMMON_MUSHROOMS == 221 , c6);
+    COMPILE_CHECK(SPELL_SUMMON_MUSHROOMS == 222 , c6);
 
     //jmf: NEW ASSERTS: we ought to do a *lot* of these
     COMPILE_CHECK(NUM_SPELLS < SPELL_NO_SPELL   , c7);
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 5424c2f331..134cfda43f 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2553,26 +2553,26 @@ enum spell_type
     SPELL_CHAIN_LIGHTNING,
     SPELL_EXCRUCIATING_WOUNDS,
     SPELL_PORTAL_PROJECTILE,
+    SPELL_SUMMON_UGLY_THING,           //  205
 
     // Mostly monster-only spells after this point:
-    SPELL_HELLFIRE_BURST,             // 205
+    SPELL_HELLFIRE_BURST,
     SPELL_VAMPIRE_SUMMON,
     SPELL_BRAIN_FEED,
     SPELL_FAKE_RAKSHASA_SUMMON,
-    SPELL_STEAM_BALL,
-    SPELL_SUMMON_UFETUBUS,            // 210
+    SPELL_STEAM_BALL,                  //  210
+    SPELL_SUMMON_UFETUBUS,
     SPELL_SUMMON_BEAST,
     SPELL_ENERGY_BOLT,
     SPELL_POISON_SPLASH,
-    SPELL_SUMMON_UNDEAD,
-    SPELL_CANTRIP,                    // 215
+    SPELL_SUMMON_UNDEAD,               //  215
+    SPELL_CANTRIP,
     SPELL_QUICKSILVER_BOLT,
     SPELL_METAL_SPLINTERS,
     SPELL_MIASMA,
-    SPELL_SUMMON_DRAKES,
-    SPELL_BLINK_OTHER,                // 220
+    SPELL_SUMMON_DRAKES,               //  220
+    SPELL_BLINK_OTHER,
     SPELL_SUMMON_MUSHROOMS,
-    SPELL_SUMMON_UGLY_THING,
 
     NUM_SPELLS,
     SPELL_NO_SPELL = 250               //  255 - added 22jan2000 {dlb}
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index 3072809df5..3c240a03a9 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -238,6 +238,37 @@
 {
   SPELL_TWIST, "Twist",
     SPTYP_TRANSLOCATION,
+    SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF,
+    1,
+    25,
+    NULL,
+    true
+},
+
+{
+  SPELL_FAR_STRIKE, "Far Strike",
+    SPTYP_TRANSLOCATION,
+    SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF,
+    3,
+    100,
+    NULL,
+    true
+},
+
+{
+  SPELL_DELAYED_FIREBALL, "Delayed Fireball",
+    SPTYP_FIRE | SPTYP_CONJURATION,
+    SPFLAG_NONE,
+    7,
+    0,
+     NULL,
+     false,
+    false
+},
+
+{
+  SPELL_STRIKING, "Striking",
+    0,
     SPFLAG_DIR_OR_TARGET,
     1,
     25,
@@ -853,7 +884,7 @@
      false,
     false
 },
-  
+
 {
     SPELL_VAMPIRIC_DRAINING, "Vampiric Draining",
      SPTYP_NECROMANCY,
@@ -1093,6 +1124,27 @@
 },
 
 {
+  SPELL_FULSOME_DISTILLATION, "Fulsome Distillation",
+    SPTYP_TRANSMIGRATION | SPTYP_NECROMANCY,
+    SPFLAG_NONE,
+    1,
+    50,
+     NULL,
+     false,
+    false
+},
+
+{
+  SPELL_POISON_ARROW, "Poison Arrow",
+    SPTYP_CONJURATION | SPTYP_POISON,
+    SPFLAG_DIR_OR_TARGET,
+    6,
+    200,
+    NULL,
+    true
+},
+
+{
     SPELL_TWISTED_RESURRECTION, "Twisted Resurrection",
      SPTYP_NECROMANCY,
      SPFLAG_NONE,
@@ -1721,11 +1773,8 @@
     false
 },
 
-
-
   //jmf: new spells
 
-
 {
     SPELL_FLAME_TONGUE, "Flame Tongue",
      SPTYP_CONJURATION | SPTYP_FIRE,
@@ -1880,17 +1929,6 @@
 },
 
 {
-    SPELL_EXCRUCIATING_WOUNDS, "Excruciating Wounds",
-     SPTYP_ENCHANTMENT | SPTYP_NECROMANCY,
-     SPFLAG_NONE,
-     5,     // fairly high level - potentially one of the best brands
-     200,
-     NULL,
-     false,
-    false
-},
-
-{
     SPELL_WARP_BRAND, "Warp Weapon",
      SPTYP_ENCHANTMENT | SPTYP_TRANSLOCATION,
      SPFLAG_NONE,
@@ -2119,38 +2157,17 @@
 },
 
 {
-  SPELL_DELAYED_FIREBALL, "Delayed Fireball",
-    SPTYP_FIRE | SPTYP_CONJURATION,
-    SPFLAG_NONE,
-    7,
-    0,
-     NULL,
-     false,
-    false
-},
-
-{
-  SPELL_FULSOME_DISTILLATION, "Fulsome Distillation",
-    SPTYP_TRANSMIGRATION | SPTYP_NECROMANCY,
-    SPFLAG_NONE,
-    1,
-    50,
+    SPELL_EXCRUCIATING_WOUNDS, "Excruciating Wounds",
+     SPTYP_ENCHANTMENT | SPTYP_NECROMANCY,
+     SPFLAG_NONE,
+     5,     // fairly high level - potentially one of the best brands
+     200,
      NULL,
      false,
     false
 },
 
 {
-  SPELL_POISON_ARROW, "Poison Arrow",
-    SPTYP_CONJURATION | SPTYP_POISON,
-    SPFLAG_DIR_OR_TARGET,
-    6,
-    200,
-    NULL,
-    true
-},
-
-{
     SPELL_PORTAL_PROJECTILE, "Portal Projectile",
     SPTYP_TRANSLOCATION,
     SPFLAG_TARGET,
@@ -2162,13 +2179,14 @@
 },
 
 {
-  SPELL_STRIKING, "Striking",
-    0,
-    SPFLAG_DIR_OR_TARGET,
-    1,
-    25,
+    SPELL_SUMMON_UGLY_THING, "Summon Ugly Thing",
+    SPTYP_SUMMONING,
+    SPFLAG_NONE,
+    5,
+    200,
     NULL,
-    true
+    false,
+    false
 },
 
 {
@@ -2179,7 +2197,7 @@
      200,
      NULL,
      false,
-    false 
+    false
 },
 
 {
@@ -2350,17 +2368,6 @@
 },
 
 {
-    SPELL_SUMMON_UGLY_THING, "Summon Ugly Thing",
-    SPTYP_SUMMONING,
-    SPFLAG_NONE,
-    5,
-    200,
-    NULL,
-    false,
-    false
-},
-
-{
     SPELL_NO_SPELL, "nonexistent spell",
      0,
      0,