adjust json to use new spell shape

data/mods/Magiclysm/Spells/animist.json

@@ -10,7 +10,8 @@
     "damage_increment": 15.0,
     "min_range": 1,
     "max_range": 1,
-    "effect": "target_attack",
+    "effect": "attack",
+    "shape": "blast",
     "base_casting_time": 85,
     "base_energy_cost": 250,
     "spell_class": "ANIMIST",
@@ -32,6 +33,7 @@
     "max_level": 35,
     "effect": "recover_energy",
     "effect_str": "MANA",
+    "shape": "blast",
     "spell_class": "ANIMIST",
     "energy_source": "HP",
     "base_casting_time": 500,
@@ -54,6 +56,7 @@
     "spell_class": "ANIMIST",
     "effect": "recover_energy",
     "effect_str": "PAIN",
+    "shape": "blast",
     "energy_source": "STAMINA",
     "base_casting_time": 50000,
     "base_energy_cost": 5000,
@@ -76,6 +79,7 @@
     "spell_class": "ANIMIST",
     "effect": "summon",
     "effect_str": "mon_zombie",
+    "shape": "blast",
     "energy_source": "HP",
     "base_energy_cost": 6,
     "//2": "one minute",
@@ -104,6 +108,7 @@
     "spell_class": "ANIMIST",
     "effect": "summon",
     "effect_str": "mon_skeleton",
+    "shape": "blast",
     "energy_source": "HP",
     "base_energy_cost": 14,
     "//2": "one minute",
@@ -132,6 +137,7 @@
     "spell_class": "ANIMIST",
     "effect": "summon",
     "effect_str": "mon_zougar",
+    "shape": "blast",
     "energy_source": "HP",
     "base_energy_cost": 30,
     "//2": "one minute",
@@ -151,7 +157,8 @@
     "name": "Necrotic Gaze",
     "description": "You use the power of your own blood to imbue necrotic energy into your gaze, damaging the target you look at.",
     "valid_targets": [ "hostile" ],
-    "effect": "target_attack",
+    "effect": "attack",
+    "shape": "blast",
     "spell_class": "ANIMIST",
     "energy_source": "HP",
     "flags": [ "NO_LEGS", "CONCENTRATE", "SOMATIC" ],
@@ -177,6 +184,7 @@
     "max_damage": 1,
     "effect": "spawn_item",
     "effect_str": "rune_animist",
+    "shape": "blast",
     "base_casting_time": 5000,
     "base_energy_cost": 5,
     "min_duration": 1,
@@ -197,6 +205,7 @@
     "flags": [ "NO_LEGS", "LOUD", "SOMATIC", "POLYMORPH_GROUP", "FRIENDLY_POLY" ],
     "effect": "targeted_polymorph",
     "effect_str": "GROUP_POLYMORPH_SHADOW",
+    "shape": "blast",
     "spell_class": "ANIMIST",
     "energy_source": "MANA",
     "difficulty": 15,
@@ -220,6 +229,7 @@
     "valid_targets": [ "ground" ],
     "effect": "summon",
     "effect_str": "mon_wisp",
+    "shape": "blast",
     "flags": [ "LOUD", "SOMATIC" ],
     "energy_source": "MANA",
     "spell_class": "ANIMIST",
@@ -246,6 +256,7 @@
     "description": "This spell links your live blood to the dead blood & bones, creating a club hungry for the flesh of the living.",
     "effect": "spawn_item",
     "effect_str": "decaying_boneclub",
+    "shape": "blast",
     "valid_targets": [ "self" ],
     "flags": [ "SOMATIC", "CONCENTRATE", "VERBAL" ],
     "components": "spell_components_decayingboneclub",

data/mods/Magiclysm/Spells/attunements/Artificer.json

@@ -11,7 +11,8 @@
     "description": "Sends out a partly magical, partly electronic spy drone shaped like a wasp that reveals terrain in a line in front of you.  The wasp can travel through walls.",
     "valid_targets": [ "hostile", "ground" ],
     "flags": [ "CONCENTRATE", "IGNORE_WALLS", "NO_LEGS", "SILENT" ],
-    "effect": "line_attack",
+    "effect": "attack",
+    "shape": "line",
     "min_range": 24,
     "max_range": 24,
     "min_aoe": 7,
@@ -91,6 +92,7 @@
     "valid_targets": [ "none" ],
     "flags": [ "CONCENTRATE", "NO_LEGS" ],
     "effect": "spawn_item",
+    "shape": "blast",
     "effect_str": "artificer_toolkit",
     "min_damage": 1,
     "max_damage": 1,

data/mods/Magiclysm/Spells/attunements/Biotek.json

@@ -37,7 +37,8 @@
     "max_damage": -40,
     "damage_increment": -1.0,
     "max_level": 35,
-    "effect": "target_attack",
+    "effect": "attack",
+    "shape": "blast",
     "base_casting_time": 500,
     "base_energy_cost": 800,
     "energy_increment": -20,

data/mods/Magiclysm/Spells/attunements/Blood_Mage.json

@@ -7,6 +7,7 @@
     "valid_targets": [ "hostile" ],
     "flags": [ "SOMATIC", "VERBAL" ],
     "effect": "banishment",
+    "shape": "blast",
     "min_damage": 120,
     "damage_increment": 15,
     "max_damage": 640,
@@ -57,6 +58,7 @@
     "valid_targets": [ "none" ],
     "flags": [ "SOMATIC", "NO_LEGS" ],
     "effect": "spawn_item",
+    "shape": "blast",
     "effect_str": "demon_possession_aura",
     "min_damage": 1,
     "max_damage": 1,

data/mods/Magiclysm/Spells/attunements/Earth_Elemental.json

@@ -10,8 +10,9 @@
     "name": "Quake",
     "description": "Cause a localized earthquake, knocking down enemies and overturning the earth.",
     "valid_targets": [ "hostile", "ground" ],
-    "flags": [ "LOUD" ],
-    "effect": "target_attack",
+    "flags": [ "LOUD", "NO_PROJECTILE" ],
+    "effect": "attack",
+    "shape": "blast",
     "effect_str": "downed",
     "damage_type": "bash",
     "min_damage": 20,
@@ -40,6 +41,7 @@
     "flags": [ "SILENT" ],
     "effect": "ter_transform",
     "effect_str": "quake_transform",
+    "shape": "blast",
     "min_damage": 12,
     "max_damage": 12,
     "min_aoe": 0,

data/mods/Magiclysm/Spells/attunements/Fire_Elemental.json

@@ -5,8 +5,9 @@
     "name": "Flareup",
     "description": "You channel heat through your hands to severely burn a target you touch.",
     "valid_targets": [ "hostile" ],
-    "flags": [ "CONCENTRATE", "SOMATIC" ],
-    "effect": "target_attack",
+    "flags": [ "CONCENTRATE", "SOMATIC", "NO_PROJECTILE" ],
+    "effect": "attack",
+    "shape": "blast",
     "damage_type": "heat",
     "min_damage": 20,
     "damage_increment": 8.0,
@@ -32,6 +33,7 @@
     "flags": [ "SOMATIC" ],
     "effect": "spawn_item",
     "effect_str": "flarewhip",
+    "shape": "blast",
     "min_damage": 1,
     "max_damage": 1,
     "base_energy_cost": 300,

data/mods/Magiclysm/Spells/attunements/Force_Mage.json

@@ -6,7 +6,8 @@
     "description": "You shoot a blade of concentrated force in a straight line, cutting everything in its path.",
     "valid_targets": [ "hostile", "ground", "ally" ],
     "flags": [ "SOMATIC", "NO_LEGS" ],
-    "effect": "line_attack",
+    "effect": "attack",
+    "shape": "line",
     "spell_class": "FORCE_MAGE",
     "energy_source": "MANA",
     "base_casting_time": 250,
@@ -62,6 +63,7 @@
     "flags": [ "VERBAL", "CONCENTRATE" ],
     "effect": "spawn_item",
     "effect_str": "force_magical_armor",
+    "shape": "blast",
     "spell_class": "FORCE_MAGE",
     "energy_source": "MANA",
     "base_casting_time": 500,

data/mods/Magiclysm/Spells/attunements/Illusionist.json

@@ -6,8 +6,9 @@
     "description": "Shoot directed light from your fingertips that is so bright you can see through the skin of the targets for an instant.",
     "valid_targets": [ "hostile" ],
     "flags": [ "SOMATIC", "VERBAL", "SILENT" ],
-    "effect": "line_attack",
+    "effect": "attack",
     "effect_str": "blind",
+    "shape": "line",
     "damage_type": "stab",
     "min_damage": 40,
     "damage_increment": 15.0,

data/mods/Magiclysm/Spells/attunements/Radiation_Mage.json

@@ -6,7 +6,8 @@
     "description": "Cook nearby monsters (and yourself to an extent)",
     "valid_targets": [ "hostile", "ground", "self" ],
     "flags": [ "SOMATIC" ],
-    "effect": "projectile_attack",
+    "effect": "attack",
+    "shape": "blast",
     "damage_type": "pure",
     "min_damage": 20,
     "max_damage": 20,
@@ -29,7 +30,8 @@
     "description": "Cook nearby monsters (and yourself to an extent)",
     "valid_targets": [ "hostile" ],
     "flags": [ "SOMATIC" ],
-    "effect": "projectile_attack",
+    "effect": "attack",
+    "shape": "blast",
     "damage_type": "heat",
     "min_damage": 70,
     "max_damage": 420,

data/mods/Magiclysm/Spells/attunements/Soulfire.json

@@ -5,8 +5,9 @@
     "name": "Burn at Both Ends",
     "description": "A candle burns the most brightly at both ends, and yet it burns twice as fast.",
     "valid_targets": [ "hostile" ],
-    "flags": [ "CONCENTRATE", "SOMATIC" ],
-    "effect": "target_attack",
+    "flags": [ "CONCENTRATE", "SOMATIC", "NO_PROJECTILE" ],
+    "effect": "attack",
+    "shape": "blast",
     "damage_type": "heat",
     "min_damage": 30,
     "damage_increment": 10.0,
@@ -36,6 +37,7 @@
     "description": "This is a description for a spell the player will never see.",
     "effect": "spawn_item",
     "effect_str": "soul_burn_item",
+    "shape": "blast",
     "min_damage": 1,
     "max_damage": 1,
     "valid_targets": [ "none" ],
@@ -52,6 +54,7 @@
     "valid_targets": [ "self" ],
     "flags": [ "VERBAL", "SILENT" ],
     "effect": "mod_moves",
+    "shape": "blast",
     "min_damage": 750,
     "damage_increment": 50,
     "max_damage": 2500,

data/mods/Magiclysm/Spells/attunements/Storm_Elemental.json

@@ -4,7 +4,8 @@
     "id": "storm_chain_master",
     "name": "Storm Chain",
     "description": "You touch an unwilling subject and lightning dances from you to multiple nearby enemies.",
-    "effect": "target_attack",
+    "effect": "attack",
+    "shape": "blast",
     "damage_type": "electric",
     "spell_class": "STORM_ELEMENTAL",
     "max_level": 35,
@@ -27,7 +28,8 @@
     "id": "storm_chain_1",
     "name": "Storm Chain 1",
     "description": "#1 in the storm chain series of effects",
-    "effect": "line_attack",
+    "effect": "attack",
+    "shape": "line",
     "damage_type": "electric",
     "field_id": "fd_electricity",
     "min_field_intensity": 2,
@@ -52,7 +54,8 @@
     "id": "storm_chain_2",
     "name": "Storm Chain 2",
     "description": "#2 in the storm chain series of effects",
-    "effect": "line_attack",
+    "effect": "attack",
+    "shape": "line",
     "damage_type": "electric",
     "field_id": "fd_electricity",
     "min_field_intensity": 2,
@@ -77,7 +80,8 @@
     "id": "storm_chain_3",
     "name": "Storm Chain 3",
     "description": "#3 in the storm chain series of effects",
-    "effect": "line_attack",
+    "effect": "attack",
+    "shape": "line",
     "damage_type": "electric",
     "field_id": "fd_electricity",
     "min_field_intensity": 2,

data/mods/Magiclysm/Spells/attunements/Sun_Mage.json

@@ -6,7 +6,8 @@
     "description": "Fire a blast of sunlight in a wide beam, blinding everything in its path and leaving it bright enough for you to see for a few seconds.",
     "valid_targets": [ "hostile", "ground" ],
     "flags": [ "SOMATIC" ],
-    "effect": "line_attack",
+    "effect": "attack",
+    "shape": "line",
     "effect_str": "blind",
     "damage_type": "heat",
     "min_damage": 20,

data/mods/Magiclysm/Spells/attunements/Tundra_Mage.json

@@ -4,7 +4,8 @@
     "id": "cold_snap",
     "name": "Cold Snap",
     "description": "With a snap of your fingers, a target takes cold damage and freezes in place.",
-    "effect": "target_attack",
+    "effect": "attack",
+    "shape": "blast",
     "damage_type": "cold",
     "spell_class": "TUNDRA_MAGE",
     "max_level": 35,
@@ -29,6 +30,7 @@
     "name": "Cold Snap Freeze",
     "description": "Freezes the target monster in place",
     "effect": "mod_moves",
+    "shape": "blast",
     "max_level": 35,
     "min_damage": -50,
     "max_damage": -400,
@@ -50,6 +52,7 @@
     "spell_class": "TUNDRA_MAGE",
     "effect": "summon",
     "effect_str": "mon_winter_wolf",
+    "shape": "blast",
     "energy_source": "MANA",
     "base_energy_cost": 600,
     "base_casting_time": 300,

data/mods/Magiclysm/Spells/attunements/Wither_Mage.json

@@ -5,6 +5,7 @@
     "name": "Assassin Teleport",
     "description": "This is a sub-spell for Assassin Strike.  It teleports you.",
     "effect": "teleport_random",
+    "shape": "blast",
     "valid_targets": [ "none" ],
     "flags": [ "SILENT" ],
     "min_range": 8,
@@ -15,7 +16,8 @@
     "id": "assassin_toxic_smoke",
     "name": "Assassin Toxic Smoke",
     "description": "This is a sub-spell for Assassin Strike.  It generates toxic smoke in an area.",
-    "effect": "target_attack",
+    "effect": "attack",
+    "shape": "blast",
     "valid_targets": [ "ground", "hostile" ],
     "field_id": "fd_toxic_gas",
     "min_field_intensity": 2,
@@ -28,7 +30,8 @@
     "id": "assassin_strike",
     "name": "Assassin Strike",
     "description": "You strike a poisonous blow and disappear in a puff of toxic smoke.",
-    "effect": "target_attack",
+    "effect": "attack",
+    "shape": "blast",
     "valid_targets": [ "hostile" ],
     "min_damage": 35,
     "max_damage": 490,