diff --git a/data/mods/Magiclysm/Spells/druid.json b/data/mods/Magiclysm/Spells/druid.json
index 479a44714bece..62d1524383cef 100644
--- a/data/mods/Magiclysm/Spells/druid.json
+++ b/data/mods/Magiclysm/Spells/druid.json
@@ -1181,7 +1181,7 @@
     "name": "Aquatic Mantle",
     "description": "Cover yourself in a thin layer of magical seaweed, preventing you from getting wet and allowing you to breathe underwater.",
     "valid_targets": [ "self" ],
-    "flags": [ "CONCENTRATE", "VERBAL", "SOMATIC", "NO_LEGS" ],
+    "flags": [ "ENHANCEMENT_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC", "NO_LEGS" ],
     "min_damage": 1,
     "max_damage": 1,
     "effect": "spawn_item",
diff --git a/data/mods/Magiclysm/Spells/kelvinist.json b/data/mods/Magiclysm/Spells/kelvinist.json
index 454fdd7d1e872..fc19f686aa500 100644
--- a/data/mods/Magiclysm/Spells/kelvinist.json
+++ b/data/mods/Magiclysm/Spells/kelvinist.json
@@ -5,14 +5,14 @@
     "name": "Point Flare",
     "description": "Generates strong heat at the targeted location, damaging anything susceptible to high temperatures.",
     "valid_targets": [ "hostile" ],
-    "flags": [ "CONCENTRATE", "SOMATIC", "LOUD", "NO_PROJECTILE" ],
+    "flags": [ "EVOCATION_SPELL", "CONCENTRATE", "SOMATIC", "LOUD", "NO_PROJECTILE" ],
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "effect": "attack",
     "shape": "blast",
     "damage_type": "heat",
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(16, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(4.0, 0.0625)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(80, 0.5)" ] },
+    "min_damage": 16,
+    "damage_increment": 4.0,
+    "max_damage": 80,
     "min_range": 3,
     "range_increment": 0.5,
     "max_range": 11,
@@ -29,15 +29,15 @@
     "name": "Nova Flare",
     "description": "Generates an intense heat at the location, greatly damaging anything susceptible to high temperatures.",
     "valid_targets": [ "hostile" ],
-    "flags": [ "CONCENTRATE", "SOMATIC", "LOUD", "NO_PROJECTILE" ],
+    "flags": [ "EVOCATION_SPELL", "CONCENTRATE", "SOMATIC", "LOUD", "NO_PROJECTILE" ],
     "components": "spell_components_nova_flare",
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "effect": "attack",
     "shape": "blast",
     "damage_type": "heat",
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(45, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(6.0, 0.067)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(135, 1)" ] },
+    "min_damage": 45,
+    "damage_increment": 6.0,
+    "max_damage": 135,
     "min_range": 3,
     "range_increment": 0.5,
     "max_range": 11,
@@ -54,23 +54,23 @@
     "name": "Finger Firelighter",
     "description": "Summons a small flame that does not affect you, but can be used to light things on fire.  It seems to need you to have some intent to light things on fire, since you are able to put it in your pocket with no issue.",
     "valid_targets": [ "none" ],
-    "flags": [ "NO_LEGS" ],
+    "flags": [ "CONJURATION_SPELL", "NO_LEGS" ],
     "effect": "spawn_item",
     "effect_str": "finger_firelighter",
     "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
     "shape": "blast",
     "min_damage": 1,
     "max_damage": 1,
-    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(6000, 100)" ] },
-    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(60000, 100)" ] },
-    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(5400, 0.1)" ] },
+    "min_duration": 6000,
+    "max_duration": 60000,
+    "duration_increment": 5400,
     "max_level": 10,
     "spell_class": "KELVINIST",
     "energy_source": "MANA",
     "base_casting_time": 250,
     "final_casting_time": 50,
     "casting_time_increment": -20.0,
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(65, 0.5)" ] },
+    "base_energy_cost": 65,
     "difficulty": 0
   },
   {
@@ -79,13 +79,13 @@
     "name": "Ice Spike",
     "description": "Causes jagged icicles to form in the air above the target, falling and damaging them.",
     "valid_targets": [ "hostile" ],
-    "flags": [ "CONCENTRATE", "SOMATIC", "LOUD", "VERBAL", "NO_PROJECTILE" ],
+    "flags": [ "EVOCATION_SPELL", "CONCENTRATE", "SOMATIC", "LOUD", "VERBAL", "NO_PROJECTILE" ],
     "effect": "attack",
     "shape": "blast",
     "damage_type": "cold",
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(30, 0.5)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(100, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(3.5, 0.05)" ] },
+    "min_damage": 30,
+    "max_damage": 100,
+    "damage_increment": 3.5,
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "min_range": 4,
     "max_range": 12,
@@ -105,12 +105,12 @@
     "effect": "attack",
     "shape": "blast",
     "valid_targets": [ "self", "ally", "hostile", "ground" ],
-    "flags": [ "SOMATIC", "VERBAL", "NO_LEGS", "IGNITE_FLAMMABLE" ],
+    "flags": [ "EVOCATION_SPELL", "SOMATIC", "VERBAL", "NO_LEGS", "IGNITE_FLAMMABLE" ],
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "max_level": 20,
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(24, 0.5)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(68, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(2.2, 0.05)" ] },
+    "min_damage": 24,
+    "max_damage": 68,
+    "damage_increment": 2.2,
     "min_aoe": 3,
     "max_aoe": 5,
     "aoe_increment": 0.1,
@@ -132,11 +132,11 @@
     "effect": "attack",
     "shape": "cone",
     "valid_targets": [ "ally", "hostile", "ground" ],
-    "flags": [ "SOMATIC", "VERBAL" ],
+    "flags": [ "EVOCATION_SPELL", "SOMATIC", "VERBAL" ],
     "max_level": 20,
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(24, 0.5)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(68, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(2.2, 0.05)" ] },
+    "min_damage": 24,
+    "max_damage": 68,
+    "damage_increment": 2.2,
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "min_aoe": 30,
     "max_aoe": 60,
@@ -163,12 +163,12 @@
     "effect": "attack",
     "shape": "cone",
     "valid_targets": [ "ally", "hostile", "ground" ],
-    "flags": [ "SOMATIC", "VERBAL", "IGNITE_FLAMMABLE", "NO_HANDS" ],
+    "flags": [ "EVOCATION_SPELL", "SOMATIC", "VERBAL", "IGNITE_FLAMMABLE", "NO_HANDS" ],
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "max_level": 20,
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(8, 0.3)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(65, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(4.0, 0.07)" ] },
+    "min_damage": 8,
+    "max_damage": 65,
+    "damage_increment": 4.0,
     "min_range": 3,
     "max_range": 5,
     "range_increment": 0.25,
@@ -192,12 +192,12 @@
     "shape": "cone",
     "affected_body_parts": [ "torso" ],
     "valid_targets": [ "ally", "hostile", "ground" ],
-    "flags": [ "SOMATIC", "VERBAL", "NO_HANDS" ],
+    "flags": [ "EVOCATION_SPELL", "SOMATIC", "VERBAL", "NO_HANDS" ],
     "max_level": 20,
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(8, 0.3)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(65, 0.3)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(4.0, 0.07)" ] },
+    "min_damage": 8,
+    "max_damage": 65,
+    "damage_increment": 4.0,
     "min_range": 3,
     "max_range": 5,
     "range_increment": 0.25,
@@ -217,16 +217,16 @@
     "name": "Chilling Touch",
     "description": "Freezes the touched target with intense cold.",
     "valid_targets": [ "hostile" ],
-    "flags": [ "SOMATIC", "NO_PROJECTILE" ],
+    "flags": [ "EVOCATION_SPELL", "SOMATIC", "NO_PROJECTILE" ],
     "effect": "attack",
     "effect_str": "cold",
     "shape": "blast",
     "affected_body_parts": [ "torso" ],
     "damage_type": "cold",
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(3, 0.3)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(4.0, 0.1)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(40, 0.3)" ] },
+    "min_damage": 3,
+    "damage_increment": 4.0,
+    "max_damage": 40,
     "min_range": 1,
     "max_range": 1,
     "base_energy_cost": 50,
@@ -242,7 +242,7 @@
     "name": "Glide on Ice",
     "description": "Encases your feet in a magical coating of ice, allowing you to glide along smooth surfaces faster.",
     "valid_targets": [ "none" ],
-    "flags": [ "VERBAL", "NO_HANDS", "NO_LEGS", "CONCENTRATE" ],
+    "flags": [ "CONJURATION_SPELL", "VERBAL", "NO_HANDS", "NO_LEGS", "CONCENTRATE" ],
     "min_damage": 1,
     "max_damage": 1,
     "effect": "spawn_item",
@@ -254,10 +254,10 @@
     "difficulty": 2,
     "max_level": 15,
     "base_casting_time": 650,
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(100, 1)" ] },
-    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(24000, 200)" ] },
-    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(360000, 200)" ] },
-    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(24000, 0.04)" ] },
+    "base_energy_cost": 100,
+    "min_duration": 24000,
+    "max_duration": 360000,
+    "duration_increment": 24000,
     "learn_spells": { "glide_ice_plus": 15 }
   },
   {
@@ -266,7 +266,7 @@
     "name": "Enhanced Glide on Ice",
     "description": "Encases your feet in a magical coating of ice, allowing you to glide along smooth surfaces faster.  Now you know this spell like the back of your hand, and have started to design your own version.",
     "valid_targets": [ "none" ],
-    "flags": [ "VERBAL", "NO_HANDS", "NO_LEGS", "NO_FAIL" ],
+    "flags": [ "CONJURATION_SPELL", "VERBAL", "NO_HANDS", "NO_LEGS", "NO_FAIL" ],
     "min_damage": 1,
     "max_damage": 1,
     "effect": "spawn_item",
@@ -280,12 +280,12 @@
     "final_casting_time": 100,
     "casting_time_increment": -22,
     "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(100, 0.5)" ] },
-    "final_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(50, 0.5)" ] },
-    "energy_increment": { "math": [ "summoning_proficiency_negate_calculate(-2, 0.04)" ] },
-    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(360000, 400)" ] },
-    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(9000000, 400)" ] },
-    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(360000, 0.042)" ] }
+    "base_energy_cost": 100,
+    "final_energy_cost": 50,
+    "energy_increment": -2,
+    "min_duration": 360000,
+    "max_duration": 9000000,
+    "duration_increment": 360000
   },
   {
     "id": "hoary_blast",
@@ -297,12 +297,12 @@
     "shape": "blast",
     "affected_body_parts": [ "torso" ],
     "valid_targets": [ "self", "ally", "hostile", "ground" ],
-    "flags": [ "SOMATIC", "VERBAL", "NO_LEGS" ],
+    "flags": [ "EVOCATION_SPELL", "SOMATIC", "VERBAL", "NO_LEGS" ],
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "max_level": 20,
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(24, 0.5)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(68, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(2.2, 0.05)" ] },
+    "min_damage": 24,
+    "max_damage": 68,
+    "damage_increment": 2.2,
     "min_aoe": 3,
     "max_aoe": 5,
     "aoe_increment": 0.1,
@@ -322,7 +322,7 @@
     "name": "Ice Shield",
     "description": "Creates a magical shield of ice on your arm, with which you can defend yourself in melee and use it to bash.",
     "valid_targets": [ "self" ],
-    "flags": [ "NO_LEGS", "CONCENTRATE", "VERBAL" ],
+    "flags": [ "CONJURATION_SPELL", "NO_LEGS", "CONCENTRATE", "VERBAL" ],
     "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
     "min_damage": 1,
     "max_damage": 1,
@@ -334,10 +334,10 @@
     "difficulty": 3,
     "max_level": 15,
     "base_casting_time": 150,
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(100, 1)" ] },
-    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(24000, 200)" ] },
-    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(360000, 200)" ] },
-    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(24000, 0.04)" ] },
+    "base_energy_cost": 100,
+    "min_duration": 24000,
+    "max_duration": 360000,
+    "duration_increment": 24000,
     "learn_spells": { "ice_shield_plus": 15 }
   },
   {
@@ -346,7 +346,7 @@
     "name": "Enhanced Ice Shield",
     "description": "Creates a magical shield of ice on your arm, with which you can defend yourself and use it to bash.  Now you know this spell like the back of your hand, and have started to design your own version.",
     "valid_targets": [ "self" ],
-    "flags": [ "NO_LEGS", "VERBAL", "NO_FAIL" ],
+    "flags": [ "CONJURATION_SPELL", "NO_LEGS", "VERBAL", "NO_FAIL" ],
     "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
     "min_damage": 1,
     "max_damage": 1,
@@ -360,12 +360,12 @@
     "base_casting_time": 150,
     "final_casting_time": 50,
     "casting_time_increment": -4,
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(100, 0.5)" ] },
-    "final_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(50, 0.5)" ] },
-    "energy_increment": { "math": [ "summoning_proficiency_negate_calculate(-2, 0.04)" ] },
-    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(360000, 400)" ] },
-    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(9000000, 400)" ] },
-    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(360000, 0.04)" ] }
+    "base_energy_cost": 100,
+    "final_energy_cost": 50,
+    "energy_increment": -2,
+    "min_duration": 360000,
+    "max_duration": 9000000,
+    "duration_increment": 360000
   },
   {
     "id": "frost_armor",
@@ -373,7 +373,7 @@
     "name": "Frost Armor",
     "description": "Covers you in a thin layer of reactive magical ice to attack those who harm you.",
     "valid_targets": [ "self" ],
-    "flags": [ "NO_LEGS", "CONCENTRATE", "VERBAL", "SOMATIC" ],
+    "flags": [ "CONJURATION_SPELL", "NO_LEGS", "CONCENTRATE", "VERBAL", "SOMATIC" ],
     "effect": "spawn_item",
     "effect_str": "armor_frost",
     "shape": "blast",
@@ -384,10 +384,10 @@
     "difficulty": 5,
     "max_level": 15,
     "base_casting_time": 200,
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(550, 2)" ] },
-    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(24000, 200)" ] },
-    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(360000, 200)" ] },
-    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(24000, 0.04)" ] },
+    "base_energy_cost": 550,
+    "min_duration": 24000,
+    "max_duration": 360000,
+    "duration_increment": 24000,
     "learn_spells": { "frost_armor_plus": 15 }
   },
   {
@@ -396,7 +396,7 @@
     "name": "Enhanced Frost Armor",
     "description": "Covers you in a thin layer of reactive magical ice to attack those who harm you.  Now you know this spell like the back of your hand, and have started to design your own version.",
     "valid_targets": [ "self" ],
-    "flags": [ "NO_LEGS", "VERBAL", "SOMATIC", "NO_FAIL" ],
+    "flags": [ "CONJURATION_SPELL", "NO_LEGS", "VERBAL", "SOMATIC", "NO_FAIL" ],
     "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
     "effect": "spawn_item",
     "effect_str": "armor_frost",
@@ -409,12 +409,12 @@
     "base_casting_time": 200,
     "final_casting_time": 100,
     "casting_time_increment": -4,
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(550, 2)" ] },
-    "final_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(200, 2)" ] },
-    "energy_increment": { "math": [ "summoning_proficiency_negate_calculate(-14, 0.04)" ] },
-    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(360000, 400)" ] },
-    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(9000000, 400)" ] },
-    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(72000, 0.04)" ] }
+    "base_energy_cost": 550,
+    "final_energy_cost": 200,
+    "energy_increment": -14,
+    "min_duration": 360000,
+    "max_duration": 9000000,
+    "duration_increment": 72000
   },
   {
     "id": "create_rune_kelvinist",
@@ -428,7 +428,7 @@
     "effect_str": "rune_kelvinist",
     "extra_effects": [ { "id": "eoc_channeling_setup", "hit_self": true } ],
     "shape": "blast",
-    "base_casting_time": { "math": [ "channeling_proficiency_negate_calculate(5000, 70)" ] },
+    "base_casting_time": 5000,
     "base_energy_cost": 5,
     "min_duration": 1,
     "max_duration": 2,
@@ -437,7 +437,7 @@
     "max_level": 0,
     "spell_class": "KELVINIST",
     "energy_source": "MANA",
-    "flags": [ "PERMANENT", "NO_LEGS", "CONCENTRATE" ]
+    "flags": [ "CHANNELING_SPELL", "PERMANENT", "NO_LEGS", "CONCENTRATE" ]
   },
   {
     "id": "kelvinist_summon_flamesword",
@@ -445,7 +445,7 @@
     "name": "Flamesword",
     "description": "This spell ignites a wooden sword, creating a flaming blade able to burn, bruise, and chop.",
     "valid_targets": [ "self" ],
-    "flags": [ "NO_LEGS", "SOMATIC" ],
+    "flags": [ "CONJURATION_SPELL", "NO_LEGS", "SOMATIC" ],
     "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
     "effect": "spawn_item",
     "effect_str": "flamesword",
@@ -453,14 +453,14 @@
     "components": "spell_components_flamesword",
     "min_damage": 1,
     "max_damage": 1,
-    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(24000, 200)" ] },
-    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(360000, 200)" ] },
-    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(24000, 0.04)" ] },
+    "min_duration": 24000,
+    "max_duration": 360000,
+    "duration_increment": 24000,
     "max_level": 15,
     "spell_class": "KELVINIST",
     "energy_source": "MANA",
     "base_casting_time": 250,
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(300, 1)" ] },
+    "base_energy_cost": 300,
     "difficulty": 4,
     "learn_spells": { "kelvinist_summon_flamesword_plus": 15 }
   },
@@ -470,7 +470,7 @@
     "name": "Enhanced Flamesword",
     "description": "This spell ignites a wooden sword, creating a flaming blade able to burn, bruise, and chop.  Now you know this spell like the back of your hand, and have started to design your own version.",
     "valid_targets": [ "self" ],
-    "flags": [ "NO_LEGS", "NO_HANDS", "NO_FAIL" ],
+    "flags": [ "CONJURATION_SPELL", "NO_LEGS", "NO_HANDS", "NO_FAIL" ],
     "effect": "spawn_item",
     "effect_str": "flamesword",
     "shape": "blast",
@@ -478,18 +478,18 @@
     "min_damage": 1,
     "max_damage": 1,
     "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
-    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(360000, 400)" ] },
-    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(2160000, 400)" ] },
-    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(72000, 0.04)" ] },
+    "min_duration": 360000,
+    "max_duration": 2160000,
+    "duration_increment": 72000,
     "max_level": 25,
     "spell_class": "KELVINIST",
     "energy_source": "MANA",
     "base_casting_time": 250,
     "final_casting_time": 100,
     "casting_time_increment": -6,
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(300, 0.5)" ] },
-    "final_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(100, 0.5)" ] },
-    "energy_increment": { "math": [ "summoning_proficiency_negate_calculate(-8, 0.04)" ] },
+    "base_energy_cost": 300,
+    "final_energy_cost": 100,
+    "energy_increment": -8,
     "difficulty": 6
   },
   {
@@ -500,16 +500,16 @@
     "effect": "attack",
     "shape": "cone",
     "valid_targets": [ "ally", "hostile", "ground" ],
-    "flags": [ "SOMATIC", "CONCENTRATE", "IGNITE_FLAMMABLE" ],
+    "flags": [ "EVOCATION_SPELL", "SOMATIC", "CONCENTRATE", "IGNITE_FLAMMABLE" ],
     "components": "spell_components_flamebreath",
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "max_level": 10,
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(25, 0.5)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(45, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(2, 0.1)" ] },
-    "min_dot": { "math": [ "evocation_proficiency_bonus_calculate(2, 0.1)" ] },
-    "max_dot": { "math": [ "evocation_proficiency_bonus_calculate(5, 0.1)" ] },
-    "dot_increment": { "math": [ "evocation_proficiency_bonus_calculate(0.3, 0.1)" ] },
+    "min_damage": 25,
+    "max_damage": 45,
+    "damage_increment": 2,
+    "min_dot": 2,
+    "max_dot": 5,
+    "dot_increment": 0.3,
     "min_duration": 400,
     "max_duration": 1000,
     "duration_increment": 60,
@@ -532,15 +532,15 @@
     "name": "Freezing Touch",
     "description": "Your hands freeze anything they touch at temperatures so cold it slows down your foes.",
     "valid_targets": [ "hostile" ],
-    "flags": [ "NO_PROJECTILE", "SILENT", "NO_HANDS", "NO_HANDS" ],
+    "flags": [ "EVOCATION_SPELL", "NO_PROJECTILE", "SILENT", "NO_HANDS", "NO_HANDS" ],
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "effect": "attack",
     "effect_str": "slow_freeze_effect",
     "shape": "blast",
     "damage_type": "cold",
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(38, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(5, 0.06)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(128, 0.5)" ] },
+    "min_damage": 38,
+    "damage_increment": 5,
+    "max_damage": 128,
     "min_range": 1,
     "max_range": 1,
     "base_energy_cost": 175,
@@ -563,19 +563,19 @@
     "description": "Heat the nearby air, keeping you warm and providing some protection against ice and cold.",
     "valid_targets": [ "self" ],
     "spell_class": "KELVINIST",
-    "flags": [ "CONCENTRATE", "VERBAL", "SOMATIC" ],
+    "flags": [ "ENHANCEMENT_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC" ],
     "effect": "attack",
     "effect_str": "effect_kelvinist_anti_cold",
     "extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ],
     "shape": "blast",
     "difficulty": 4,
     "max_level": 20,
-    "min_duration": { "math": [ "enhancement_proficiency_bonus_calculate(180000, 13200)" ] },
-    "max_duration": { "math": [ "enhancement_proficiency_bonus_calculate(2160000, 13200)" ] },
-    "duration_increment": { "math": [ "enhancement_proficiency_bonus_calculate(99000, 0.05)" ] },
+    "min_duration": 180000,
+    "max_duration": 2160000,
+    "duration_increment": 99000,
     "energy_source": "MANA",
     "base_energy_cost": 250,
-    "base_casting_time": { "math": [ "enhancement_proficiency_negate_calculate(1500, 20)" ] }
+    "base_casting_time": 1500
   },
   {
     "id": "kelvinist_anti_heat",
@@ -584,19 +584,19 @@
     "description": "Cool the nearby air, keeping you cool and providing some protection against heat and flame.",
     "valid_targets": [ "self" ],
     "spell_class": "KELVINIST",
-    "flags": [ "CONCENTRATE", "VERBAL", "SOMATIC" ],
+    "flags": [ "ENHANCEMENT_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC" ],
     "effect": "attack",
     "effect_str": "effect_kelvinist_anti_heat",
     "extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ],
     "shape": "blast",
     "difficulty": 4,
     "max_level": 20,
-    "min_duration": { "math": [ "enhancement_proficiency_bonus_calculate(180000, 13200)" ] },
-    "max_duration": { "math": [ "enhancement_proficiency_bonus_calculate(2160000, 13200)" ] },
-    "duration_increment": { "math": [ "enhancement_proficiency_bonus_calculate(99000, 0.05)" ] },
+    "min_duration": 180000,
+    "max_duration": 2160000,
+    "duration_increment": 99000,
     "energy_source": "MANA",
     "base_energy_cost": 250,
-    "base_casting_time": { "math": [ "enhancement_proficiency_negate_calculate(1500, 20)" ] }
+    "base_casting_time": 1500
   },
   {
     "id": "kelvinist_persuasion_spell",
@@ -605,7 +605,7 @@
     "description": "Like the bonfire gathers revelers around it, the kelvinist becomes the life of the party, as their eyes shine with passion and their voice burns with the heat of their conviction.  You will be more convincing while this spell is in effect.  Before the Cataclysm, this was one of the most common spells that apprentices were desperate to learn and master mages were reluctant to teach.",
     "valid_targets": [ "self" ],
     "spell_class": "KELVINIST",
-    "flags": [ "CONCENTRATE", "VERBAL", "SOMATIC" ],
+    "flags": [ "ENHANCEMENT_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC" ],
     "components": "spell_components_flames_of_passion",
     "effect": "attack",
     "effect_str": "effect_kelvinist_flames_of_passion",
@@ -613,33 +613,36 @@
     "shape": "blast",
     "difficulty": 3,
     "max_level": 20,
-    "min_duration": { "math": [ "enhancement_proficiency_bonus_calculate(90000, 6000)" ] },
-    "max_duration": { "math": [ "enhancement_proficiency_bonus_calculate(990000, 6000)" ] },
-    "duration_increment": { "math": [ "enhancement_proficiency_bonus_calculate(45000, 0.05)" ] },
+    "min_duration": 90000,
+    "max_duration": 990000,
+    "duration_increment": 45000,
     "energy_source": "MANA",
     "base_energy_cost": 350,
-    "base_casting_time": { "math": [ "enhancement_proficiency_negate_calculate(500, 2)" ] }
+    "base_casting_time": 500
   },
   {
     "id": "kelvinist_extinguish_fire_spell",
     "type": "SPELL",
     "name": "Extinguish",
     "description": "Just as the kelvinist can start a fire, they can extinguish it, by transmuting the heat of the fire directly into cold and leaving nothing left to continue the flames.",
-    "flags": [ "CONCENTRATE", "VERBAL", "SOMATIC", "NO_LEGS" ],
+    "flags": [ "ENERVATION_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC", "NO_LEGS" ],
     "spell_class": "KELVINIST",
     "valid_targets": [ "ground" ],
     "difficulty": 5,
     "max_level": 20,
     "effect": "ter_transform",
     "effect_str": "ter_kelvinist_extinguish_transform",
-    "extra_effects": [ { "id": "kelvinist_extinguish_fire_emit_cold", "hit_self": true }, { "id": "eoc_evocation_setup", "hit_self": true } ],
+    "extra_effects": [
+      { "id": "kelvinist_extinguish_fire_emit_cold", "hit_self": true },
+      { "id": "eoc_enervation_setup", "hit_self": true }
+    ],
     "shape": "blast",
     "min_range": 3,
     "max_range": 20,
     "range_increment": 1,
-    "min_aoe": { "math": [ "evocation_proficiency_bonus_calculate(1, 0.1)" ] },
-    "max_aoe": { "math": [ "evocation_proficiency_bonus_calculate(10, 0.1)" ] },
-    "aoe_increment": { "math": [ "evocation_proficiency_bonus_calculate(0.5, 0.06)" ] },
+    "min_aoe": 1,
+    "max_aoe": 10,
+    "aoe_increment": 0.5,
     "energy_source": "MANA",
     "base_energy_cost": 250,
     "base_casting_time": 250
@@ -649,7 +652,7 @@
     "type": "SPELL",
     "name": "Extinguish Cold Emit",
     "description": "The cold emit from the Extinguish spell.  It's a bug if you have it directly.",
-    "flags": [ "SILENT" ],
+    "flags": [ "ENERVATION_SPELL", "SILENT" ],
     "valid_targets": [ "ground" ],
     "max_level": 20,
     "effect": "emit",
@@ -658,18 +661,18 @@
     "min_range": 3,
     "max_range": 20,
     "range_increment": 1,
-    "min_aoe": { "math": [ "evocation_proficiency_bonus_calculate(1, 0.1)" ] },
-    "max_aoe": { "math": [ "evocation_proficiency_bonus_calculate(10, 0.1)" ] },
-    "aoe_increment": { "math": [ "evocation_proficiency_bonus_calculate(0.5, 0.06)" ] }
+    "min_aoe": 1,
+    "max_aoe": 10,
+    "aoe_increment": 0.5
   },
   {
     "id": "kelvinist_summon_freezer_spell",
     "type": "SPELL",
     "name": { "str": "Freezer Field" },
     "description": "Summon a sphere of ice that will preserve anything placed inside while the container lasts.",
-    "flags": [ "CONCENTRATE", "SOMATIC", "VERBAL" ],
+    "flags": [ "CONJURATION_SPELL", "CONCENTRATE", "SOMATIC", "VERBAL" ],
     "valid_targets": [ "self" ],
-    "extra_effects": [ { "id": "eoc_channeling_setup", "hit_self": true } ],
+    "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
     "max_level": 15,
     "difficulty": 6,
     "spell_class": "KELVINIST",
@@ -682,8 +685,8 @@
     "max_duration": 327240000,
     "duration_increment": 18360000,
     "energy_source": "MANA",
-    "base_energy_cost": { "math": [ "channeling_proficiency_negate_calculate(400, 5)" ] },
-    "base_casting_time": { "math": [ "channeling_proficiency_negate_calculate(1500, 10)" ] }
+    "base_energy_cost": 400,
+    "base_casting_time": 1500
   },
   {
     "id": "kelvinist_no_emotion_spell",
@@ -692,7 +695,7 @@
     "description": "Draw on the essence of ice to freeze out all emotion, rendering you comfortably numb.  This spell used to get you on several lists if the government learned that you knew it, back when there was a government to care about that.",
     "valid_targets": [ "self" ],
     "spell_class": "KELVINIST",
-    "flags": [ "CONCENTRATE", "VERBAL", "SOMATIC" ],
+    "flags": [ "ENHANCEMENT_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC" ],
     "effect": "spawn_item",
     "effect_str": "item_kelvinist_frozen_heart",
     "extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ],
@@ -701,12 +704,12 @@
     "max_level": 15,
     "min_damage": 1,
     "max_damage": 1,
-    "min_duration": { "math": [ "enhancement_proficiency_bonus_calculate(60000, 6000)" ] },
-    "max_duration": { "math": [ "enhancement_proficiency_bonus_calculate(960000, 6000)" ] },
-    "duration_increment": { "math": [ "enhancement_proficiency_bonus_calculate(60000, 0.07)" ] },
+    "min_duration": 60000,
+    "max_duration": 960000,
+    "duration_increment": 60000,
     "energy_source": "MANA",
     "base_energy_cost": 650,
-    "base_casting_time": { "math": [ "enhancement_proficiency_negate_calculate(6000, 40)" ] }
+    "base_casting_time": 6000
   },
   {
     "id": "kelvinist_firebolt",
@@ -715,16 +718,16 @@
     "description": "A simple spell that hurls a bolt of fire to the target location.  While not as damaging as some more complex spells, it is quick to cast and will ignite anything flammable at the target.",
     "valid_targets": [ "hostile", "ground", "ally" ],
     "spell_class": "KELVINIST",
-    "flags": [ "VERBAL", "SOMATIC", "NO_LEGS", "IGNITE_FLAMMABLE" ],
+    "flags": [ "EVOCATION_SPELL", "VERBAL", "SOMATIC", "NO_LEGS", "IGNITE_FLAMMABLE" ],
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "difficulty": 2,
     "max_level": 15,
     "effect": "attack",
     "shape": "blast",
     "damage_type": "heat",
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(10, 0.5)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(25, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(1, 0.07)" ] },
+    "min_damage": 10,
+    "max_damage": 25,
+    "damage_increment": 1,
     "min_range": 2,
     "max_range": 15,
     "range_increment": 1,
@@ -742,7 +745,7 @@
     "description": "With the tiniest amount of heat, unfreeze an item of food or drink and heat it up to a comfortable temperature.",
     "valid_targets": [ "self" ],
     "spell_class": "KELVINIST",
-    "flags": [ "CONCENTRATE", "VERBAL", "SOMATIC" ],
+    "flags": [ "CHANNELING_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC" ],
     "effect": "effect_on_condition",
     "effect_str": "EOC_KELVINIST_HEAT_FOOD_SPELL",
     "components": "spell_components_baking_hands",
@@ -751,10 +754,10 @@
     "difficulty": 1,
     "max_level": 15,
     "energy_source": "MANA",
-    "base_energy_cost": { "math": [ "channeling_proficiency_negate_calculate(200, 0.5)" ] },
-    "final_energy_cost": { "math": [ "channeling_proficiency_negate_calculate(50, 0.5)" ] },
-    "energy_increment": { "math": [ "channeling_proficiency_negate_calculate(-10, 0.07)" ] },
-    "base_casting_time": { "math": [ "channeling_proficiency_negate_calculate(750, 5)" ] }
+    "base_energy_cost": 200,
+    "final_energy_cost": 50,
+    "energy_increment": -10,
+    "base_casting_time": 750
   },
   {
     "type": "effect_on_condition",
diff --git a/data/mods/Magiclysm/Spells/magus.json b/data/mods/Magiclysm/Spells/magus.json
index 779eed4d0cdfd..9403770fc247b 100644
--- a/data/mods/Magiclysm/Spells/magus.json
+++ b/data/mods/Magiclysm/Spells/magus.json
@@ -11,8 +11,8 @@
     "shape": "blast",
     "valid_targets": [ "self", "ground" ],
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
-    "min_duration": { "math": [ "evocation_proficiency_bonus_calculate(3000, 1.5)" ] },
-    "max_duration": { "math": [ "evocation_proficiency_bonus_calculate(45000, 1.5)" ] },
+    "min_duration": 3000,
+    "max_duration": 45000,
     "min_range": 10,
     "max_range": 10,
     "min_aoe": 1,
@@ -25,7 +25,7 @@
     "base_energy_cost": 250,
     "base_casting_time": 100,
     "difficulty": 1,
-    "flags": [ "NO_LEGS", "SOMATIC", "CONCENTRATE" ]
+    "flags": [ "EVOCATION_SPELL", "NO_LEGS", "SOMATIC", "CONCENTRATE" ]
   },
   {
     "id": "magic_missile",
@@ -33,12 +33,12 @@
     "name": "Magic Missile",
     "description": "I cast Magic Missile at the darkness!",
     "valid_targets": [ "hostile" ],
-    "flags": [ "VERBAL", "SOMATIC", "NO_LEGS", "SILENT", "NO_PROJECTILE" ],
+    "flags": [ "EVOCATION_SPELL", "VERBAL", "SOMATIC", "NO_LEGS", "SILENT", "NO_PROJECTILE" ],
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(1, 0.2)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(1.5, 0.083)" ] },
+    "min_damage": 1,
+    "damage_increment": 1.5,
     "damage_type": "nether",
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(20, 0.2)" ] },
+    "max_damage": 20,
     "min_range": 8,
     "range_increment": 0.8,
     "max_range": 20,
@@ -59,11 +59,11 @@
     "effect": "short_range_teleport",
     "shape": "blast",
     "valid_targets": [ "none" ],
-    "flags": [ "SOMATIC", "SILENT", "NO_LEGS" ],
+    "flags": [ "CONVEYANCE_SPELL", "SOMATIC", "SILENT", "NO_LEGS" ],
     "extra_effects": [ { "id": "eoc_conveyance_setup", "hit_self": true } ],
-    "min_range": { "math": [ "conveyance_proficiency_bonus_calculate(3, 0.007)" ] },
-    "max_range": { "math": [ "conveyance_proficiency_bonus_calculate(4, 0.007)" ] },
-    "range_increment": { "math": [ "conveyance_proficiency_bonus_calculate(0.1, 0.1)" ] },
+    "min_range": 3,
+    "max_range": 4,
+    "range_increment": 0.1,
     "min_aoe": 2,
     "max_aoe": 4,
     "aoe_increment": 0.2,
@@ -72,7 +72,7 @@
     "spell_class": "MAGUS",
     "base_casting_time": 100,
     "energy_source": "MANA",
-    "base_energy_cost": { "math": [ "conveyance_proficiency_negate_calculate(100, 0.7)" ] },
+    "base_energy_cost": 100,
     "learn_spells": { "dimension_door": 10 }
   },
   {
@@ -83,11 +83,11 @@
     "effect": "short_range_teleport",
     "shape": "blast",
     "valid_targets": [ "ground" ],
-    "flags": [ "SOMATIC", "SILENT", "NO_LEGS", "TARGET_TELEPORT" ],
+    "flags": [ "CONVEYANCE_SPELL", "SOMATIC", "SILENT", "NO_LEGS", "TARGET_TELEPORT" ],
     "extra_effects": [ { "id": "eoc_conveyance_setup", "hit_self": true } ],
-    "min_range": { "math": [ "conveyance_proficiency_bonus_calculate(10, 0.07)" ] },
-    "max_range": { "math": [ "conveyance_proficiency_bonus_calculate(20, 0.07)" ] },
-    "range_increment": { "math": [ "conveyance_proficiency_bonus_calculate(1, 0.1)" ] },
+    "min_range": 10,
+    "max_range": 20,
+    "range_increment": 1,
     "min_aoe": 6,
     "max_aoe": 3,
     "aoe_increment": -0.3,
@@ -96,9 +96,9 @@
     "spell_class": "MAGUS",
     "base_casting_time": 600,
     "energy_source": "MANA",
-    "base_energy_cost": { "math": [ "conveyance_proficiency_negate_calculate(600, 1.7)" ] },
-    "energy_increment": { "math": [ "conveyance_proficiency_negate_calculate(-10, 0.04)" ] },
-    "final_energy_cost": { "math": [ "conveyance_proficiency_negate_calculate(350, 1.7)" ] }
+    "base_energy_cost": 600,
+    "energy_increment": -10,
+    "final_energy_cost": 350
   },
   {
     "id": "gravity_well",
@@ -108,11 +108,11 @@
     "effect": "attack",
     "shape": "blast",
     "valid_targets": [ "self", "ally", "hostile", "ground" ],
-    "flags": [ "SOMATIC", "VERBAL", "CONCENTRATE", "NO_PROJECTILE" ],
+    "flags": [ "EVOCATION_SPELL", "SOMATIC", "VERBAL", "CONCENTRATE", "NO_PROJECTILE" ],
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(21, 0.2)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(45, 0.2)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(1.2, 0.05)" ] },
+    "min_damage": 21,
+    "max_damage": 45,
+    "damage_increment": 1.2,
     "damage_type": "gravity",
     "min_range": 5,
     "max_range": 15,
@@ -133,7 +133,7 @@
     "name": "Mana Blast",
     "description": "A blast of concentrated magical power that obliterates a large area.",
     "valid_targets": [ "hostile", "ground" ],
-    "flags": [ "VERBAL", "SOMATIC", "NO_LEGS" ],
+    "flags": [ "EVOCATION_SPELL", "VERBAL", "SOMATIC", "NO_LEGS" ],
     "effect": "attack",
     "shape": "blast",
     "spell_class": "MAGUS",
@@ -143,9 +143,9 @@
     "base_energy_cost": 200,
     "difficulty": 5,
     "max_level": 20,
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(20, 0.5)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(80, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(3, 0.05)" ] },
+    "min_damage": 20,
+    "max_damage": 80,
+    "damage_increment": 3,
     "damage_type": "nether",
     "min_aoe": 1,
     "max_aoe": 3,
@@ -160,7 +160,7 @@
     "name": "Mana Bolt",
     "description": "A bolt of magical power that only damages your foes.",
     "valid_targets": [ "hostile" ],
-    "flags": [ "VERBAL", "SOMATIC", "NO_LEGS" ],
+    "flags": [ "EVOCATION_SPELL", "VERBAL", "SOMATIC", "NO_LEGS" ],
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "effect": "attack",
     "shape": "blast",
@@ -170,9 +170,9 @@
     "base_energy_cost": 150,
     "difficulty": 5,
     "max_level": 20,
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(20, 0.5)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(120, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(5, 0.05)" ] },
+    "min_damage": 20,
+    "max_damage": 120,
+    "damage_increment": 5,
     "damage_type": "nether",
     "min_range": 5,
     "max_range": 30,
@@ -184,7 +184,7 @@
     "name": "Haste",
     "description": "This spell gives you an enormous boost of speed lasting a short period of time.",
     "valid_targets": [ "self" ],
-    "flags": [ "LOUD", "VERBAL", "SOMATIC", "NO_PROJECTILE" ],
+    "flags": [ "ENHANCEMENT_SPELL", "LOUD", "VERBAL", "SOMATIC", "NO_PROJECTILE" ],
     "extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ],
     "effect": "attack",
     "effect_str": "haste",
@@ -193,14 +193,14 @@
     "energy_source": "MANA",
     "components": "spell_components_haste",
     "difficulty": 8,
-    "base_casting_time": { "math": [ "enhancement_proficiency_negate_calculate(400, 1.3)" ] },
-    "casting_time_increment": { "math": [ "enhancement_proficiency_negate_calculate(-10, 0.05)" ] },
-    "final_casting_time": { "math": [ "enhancement_proficiency_negate_calculate(200, 1.3)" ] },
+    "base_casting_time": 400,
+    "casting_time_increment": -10,
+    "final_casting_time": 200,
     "base_energy_cost": 450,
     "max_level": 20,
-    "min_duration": { "math": [ "enhancement_proficiency_bonus_calculate(600, 76)" ] },
-    "max_duration": { "math": [ "enhancement_proficiency_bonus_calculate(12000, 76)" ] },
-    "duration_increment": { "math": [ "enhancement_proficiency_bonus_calculate(600, 0.052)" ] }
+    "min_duration": 600,
+    "max_duration": 12000,
+    "duration_increment": 600
   },
   {
     "id": "magus_slow",
@@ -208,8 +208,8 @@
     "name": "Slow",
     "description": "This spell gives you an enormous boost of speed lasting a short period of time.",
     "valid_targets": [ "ally", "hostile" ],
-    "flags": [ "LOUD", "VERBAL", "SOMATIC", "NO_PROJECTILE" ],
-    "extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ],
+    "flags": [ "ENERVATION_SPELL", "LOUD", "VERBAL", "SOMATIC", "NO_PROJECTILE" ],
+    "extra_effects": [ { "id": "eoc_enervation_setup", "hit_self": true } ],
     "effect": "attack",
     "effect_str": "magic_slowed",
     "shape": "blast",
@@ -222,9 +222,9 @@
     "min_range": 5,
     "max_range": 30,
     "range_increment": 1.5,
-    "min_duration": { "math": [ "enhancement_proficiency_bonus_calculate(600, 76)" ] },
-    "max_duration": { "math": [ "enhancement_proficiency_bonus_calculate(12000, 76)" ] },
-    "duration_increment": { "math": [ "enhancement_proficiency_bonus_calculate(600, 0.052)" ] }
+    "min_duration": 600,
+    "max_duration": 12000,
+    "duration_increment": 600
   },
   {
     "id": "magus_baleful_polymorph",
@@ -232,20 +232,20 @@
     "name": "Baleful Polymorph",
     "description": "Transform your enemies into frogs.",
     "valid_targets": [ "hostile" ],
-    "flags": [ "VERBAL", "SOMATIC", "NO_LEGS", "NO_PROJECTILE" ],
+    "flags": [ "TRANSFORMATION_SPELL", "VERBAL", "SOMATIC", "NO_LEGS", "NO_PROJECTILE" ],
     "effect": "targeted_polymorph",
     "effect_str": "mon_baleful_polymorph_frog",
-    "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
+    "extra_effects": [ { "id": "eoc_transformation_setup", "hit_self": true } ],
     "shape": "blast",
     "spell_class": "MAGUS",
     "energy_source": "MANA",
     "base_casting_time": 150,
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(150, 1)" ] },
+    "base_energy_cost": 150,
     "difficulty": 8,
     "max_level": 20,
-    "min_damage": { "math": [ "summoning_proficiency_bonus_calculate(20, 0.5)" ] },
-    "max_damage": { "math": [ "summoning_proficiency_bonus_calculate(40, 0.5)" ] },
-    "damage_increment": { "math": [ "summoning_proficiency_bonus_calculate(2, 0.1)" ] },
+    "min_damage": 20,
+    "max_damage": 40,
+    "damage_increment": 2,
     "damage_type": "pure",
     "min_range": 5,
     "max_range": 30,
@@ -257,7 +257,7 @@
     "name": "Mana Beam",
     "description": "A beam of focused magical power that damages any foes in its path.",
     "valid_targets": [ "hostile", "ground" ],
-    "flags": [ "VERBAL", "SOMATIC", "NO_LEGS", "LOUD" ],
+    "flags": [ "EVOCATION_SPELL", "VERBAL", "SOMATIC", "NO_LEGS", "LOUD" ],
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "effect": "attack",
     "shape": "line",
@@ -267,9 +267,9 @@
     "base_energy_cost": 200,
     "difficulty": 4,
     "max_level": 20,
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(15, 0.5)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(60, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(3, 0.066)" ] },
+    "min_damage": 15,
+    "max_damage": 60,
+    "damage_increment": 3,
     "damage_type": "nether",
     "min_aoe": 1,
     "max_aoe": 1,
@@ -285,20 +285,20 @@
     "effect": "short_range_teleport",
     "shape": "blast",
     "valid_targets": [ "none" ],
-    "flags": [ "SOMATIC", "SILENT", "NO_LEGS", "VERBAL" ],
+    "flags": [ "CONVEYANCE_SPELL", "SOMATIC", "SILENT", "NO_LEGS", "VERBAL" ],
     "extra_effects": [ { "id": "eoc_conveyance_setup", "hit_self": true } ],
     "min_aoe": 5,
     "max_aoe": 10,
     "aoe_increment": 0.25,
-    "min_range": { "math": [ "conveyance_proficiency_bonus_calculate(25, 0.07)" ] },
-    "max_range": { "math": [ "conveyance_proficiency_bonus_calculate(35, 0.07)" ] },
-    "range_increment": { "math": [ "conveyance_proficiency_bonus_calculate(0.5, 0.05)" ] },
+    "min_range": 25,
+    "max_range": 35,
+    "range_increment": 0.5,
     "max_level": 20,
     "difficulty": 5,
     "spell_class": "MAGUS",
     "base_casting_time": 100,
     "energy_source": "MANA",
-    "base_energy_cost": { "math": [ "conveyance_proficiency_negate_calculate(250, 1.7)" ] }
+    "base_energy_cost": 250
   },
   {
     "id": "create_rune_magus",
@@ -312,7 +312,7 @@
     "effect_str": "rune_magus",
     "shape": "blast",
     "extra_effects": [ { "id": "eoc_channeling_setup", "hit_self": true } ],
-    "base_casting_time": { "math": [ "channeling_proficiency_negate_calculate(5000, 10)" ] },
+    "base_casting_time": 5000,
     "base_energy_cost": 5,
     "min_duration": 1,
     "max_duration": 2,
@@ -321,7 +321,7 @@
     "max_level": 0,
     "spell_class": "MAGUS",
     "energy_source": "MANA",
-    "flags": [ "PERMANENT", "NO_LEGS", "CONCENTRATE" ]
+    "flags": [ "CHANNELING_SPELL", "PERMANENT", "NO_LEGS", "CONCENTRATE" ]
   },
   {
     "id": "cats_grace",
@@ -330,18 +330,18 @@
     "description": "You align your senses to be closer to those of a cat, becoming more graceful, agile, and coordinated.",
     "valid_targets": [ "self" ],
     "extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ],
-    "min_duration": { "math": [ "enhancement_proficiency_bonus_calculate(6000, 2400)" ] },
-    "max_duration": { "math": [ "enhancement_proficiency_bonus_calculate(360000, 2400)" ] },
-    "duration_increment": { "math": [ "enhancement_proficiency_bonus_calculate(17700, 0.05)" ] },
+    "min_duration": 6000,
+    "max_duration": 360000,
+    "duration_increment": 17700,
     "max_level": 20,
     "spell_class": "MAGUS",
     "energy_source": "MANA",
     "base_energy_cost": 400,
     "energy_increment": -5.0,
     "final_energy_cost": 300,
-    "base_casting_time": { "math": [ "enhancement_proficiency_negate_calculate(250, 2)" ] },
+    "base_casting_time": 250,
     "difficulty": 5,
-    "flags": [ "VERBAL", "SOMATIC", "NO_LEGS", "NO_PROJECTILE" ],
+    "flags": [ "ENHANCEMENT_SPELL", "VERBAL", "SOMATIC", "NO_LEGS", "NO_PROJECTILE" ],
     "shape": "blast",
     "effect": "attack",
     "effect_str": "cats_grace"
@@ -353,18 +353,18 @@
     "description": "You gain the perception of an eagle.",
     "valid_targets": [ "self" ],
     "extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ],
-    "min_duration": { "math": [ "enhancement_proficiency_bonus_calculate(6000, 2400)" ] },
-    "max_duration": { "math": [ "enhancement_proficiency_bonus_calculate(360000, 2400)" ] },
-    "duration_increment": { "math": [ "enhancement_proficiency_bonus_calculate(17700, 0.05)" ] },
+    "min_duration": 6000,
+    "max_duration": 360000,
+    "duration_increment": 17700,
     "max_level": 20,
     "spell_class": "MAGUS",
     "energy_source": "MANA",
     "base_energy_cost": 400,
     "energy_increment": -5.0,
     "final_energy_cost": 300,
-    "base_casting_time": { "math": [ "enhancement_proficiency_negate_calculate(250, 2)" ] },
+    "base_casting_time": 250,
     "difficulty": 5,
-    "flags": [ "VERBAL", "SOMATIC", "NO_LEGS", "NO_PROJECTILE" ],
+    "flags": [ "ENHANCEMENT_SPELL", "VERBAL", "SOMATIC", "NO_LEGS", "NO_PROJECTILE" ],
     "shape": "blast",
     "effect": "attack",
     "effect_str": "eagles_sight"
@@ -376,18 +376,18 @@
     "description": "You gain the strength of an ogre.",
     "valid_targets": [ "self" ],
     "extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ],
-    "min_duration": { "math": [ "enhancement_proficiency_bonus_calculate(6000, 2400)" ] },
-    "max_duration": { "math": [ "enhancement_proficiency_bonus_calculate(360000, 2400)" ] },
-    "duration_increment": { "math": [ "enhancement_proficiency_bonus_calculate(17700, 0.05)" ] },
+    "min_duration": 6000,
+    "max_duration": 360000,
+    "duration_increment": 17700,
     "max_level": 20,
     "spell_class": "MAGUS",
     "energy_source": "MANA",
     "base_energy_cost": 400,
     "energy_increment": -5.0,
     "final_energy_cost": 300,
-    "base_casting_time": { "math": [ "enhancement_proficiency_negate_calculate(250, 2)" ] },
+    "base_casting_time": 250,
     "difficulty": 5,
-    "flags": [ "VERBAL", "SOMATIC", "NO_LEGS", "NO_PROJECTILE" ],
+    "flags": [ "ENHANCEMENT_SPELL", "VERBAL", "SOMATIC", "NO_LEGS", "NO_PROJECTILE" ],
     "shape": "blast",
     "effect": "attack",
     "effect_str": "ogres_strength"
@@ -399,18 +399,18 @@
     "description": "You become wily like a fox.",
     "valid_targets": [ "self" ],
     "extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ],
-    "min_duration": { "math": [ "enhancement_proficiency_bonus_calculate(6000, 2400)" ] },
-    "max_duration": { "math": [ "enhancement_proficiency_bonus_calculate(360000, 2400)" ] },
-    "duration_increment": { "math": [ "enhancement_proficiency_bonus_calculate(17700, 0.05)" ] },
+    "min_duration": 6000,
+    "max_duration": 360000,
+    "duration_increment": 17700,
     "max_level": 20,
     "spell_class": "MAGUS",
     "energy_source": "MANA",
     "base_energy_cost": 400,
     "energy_increment": -5.0,
     "final_energy_cost": 300,
-    "base_casting_time": { "math": [ "enhancement_proficiency_negate_calculate(250, 2)" ] },
+    "base_casting_time": 250,
     "difficulty": 5,
-    "flags": [ "VERBAL", "SOMATIC", "NO_LEGS", "NO_PROJECTILE" ],
+    "flags": [ "ENHANCEMENT_SPELL", "VERBAL", "SOMATIC", "NO_LEGS", "NO_PROJECTILE" ],
     "shape": "blast",
     "effect": "attack",
     "effect_str": "foxs_cunning"
@@ -424,17 +424,17 @@
     "effect_str": "jar_3l_force",
     "shape": "blast",
     "valid_targets": [ "self" ],
-    "flags": [ "SOMATIC", "CONCENTRATE", "VERBAL" ],
+    "flags": [ "CONJURATION_SPELL", "SOMATIC", "CONCENTRATE", "VERBAL" ],
     "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
     "max_level": 15,
     "min_damage": 1,
     "max_damage": 1,
-    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(8640000, 4000)" ] },
-    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(129600000, 4000)" ] },
-    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(8640000, 0.071)" ] },
+    "min_duration": 8640000,
+    "max_duration": 129600000,
+    "duration_increment": 8640000,
     "spell_class": "MAGUS",
     "base_casting_time": 400,
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(350, 2)" ] },
+    "base_energy_cost": 350,
     "energy_source": "MANA",
     "difficulty": 3
   },
@@ -447,18 +447,18 @@
     "effect_str": "impactsling",
     "shape": "blast",
     "valid_targets": [ "self" ],
-    "flags": [ "SOMATIC", "CONCENTRATE", "VERBAL" ],
+    "flags": [ "CONJURATION_SPELL", "SOMATIC", "CONCENTRATE", "VERBAL" ],
     "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
     "components": "spell_components_impactsling",
     "max_level": 15,
     "min_damage": 1,
     "max_damage": 1,
-    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(24000, 200)" ] },
-    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(360000, 200)" ] },
-    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(24000, 0.04)" ] },
+    "min_duration": 24000,
+    "max_duration": 360000,
+    "duration_increment": 24000,
     "spell_class": "MAGUS",
     "base_casting_time": 400,
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(350, 2)" ] },
+    "base_energy_cost": 350,
     "energy_source": "MANA",
     "difficulty": 4,
     "learn_spells": { "magus_summon_impact_sling_plus": 15 }
@@ -472,22 +472,22 @@
     "effect_str": "impactsling",
     "shape": "blast",
     "valid_targets": [ "self" ],
-    "flags": [ "SOMATIC", "VERBAL", "NO_FAIL" ],
+    "flags": [ "CONJURATION_SPELL", "SOMATIC", "VERBAL", "NO_FAIL" ],
     "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
     "components": "spell_components_impactsling",
     "max_level": 25,
     "min_damage": 1,
     "max_damage": 1,
-    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(360000, 400)" ] },
-    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(2160000, 400)" ] },
-    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(72000, 0.04)" ] },
+    "min_duration": 360000,
+    "max_duration": 2160000,
+    "duration_increment": 72000,
     "spell_class": "MAGUS",
     "base_casting_time": 400,
     "final_casting_time": 150,
     "casting_time_increment": -10,
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(350, 1)" ] },
-    "final_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(100, 1)" ] },
-    "energy_increment": { "math": [ "summoning_proficiency_negate_calculate(-10, 0.04)" ] },
+    "base_energy_cost": 350,
+    "final_energy_cost": 100,
+    "energy_increment": -10,
     "energy_source": "MANA",
     "difficulty": 6
   },
@@ -499,12 +499,12 @@
     "effect": "attack",
     "shape": "line",
     "valid_targets": [ "hostile", "ground" ],
-    "flags": [ "SOMATIC", "NO_LEGS", "CONCENTRATE", "SILENT", "NO_PROJECTILE" ],
+    "flags": [ "EVOCATION_SPELL", "SOMATIC", "NO_LEGS", "CONCENTRATE", "SILENT", "NO_PROJECTILE" ],
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "max_level": 30,
-    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(4, 0.5)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(124, 0.5)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(4.0, 0.033)" ] },
+    "min_damage": 4,
+    "max_damage": 124,
+    "damage_increment": 4.0,
     "damage_type": "nether",
     "min_range": 5,
     "max_range": 50,
@@ -525,19 +525,19 @@
     "description": "Reduce the velocity of your falls by a great amount, or to zero if at high mastery.",
     "valid_targets": [ "self" ],
     "spell_class": "MAGUS",
-    "flags": [ "CONCENTRATE", "VERBAL", "SOMATIC" ],
+    "flags": [ "ENHANCEMENT_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC" ],
     "extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ],
     "effect": "attack",
     "effect_str": "effect_magus_slowfall",
     "shape": "blast",
     "difficulty": 2,
     "max_level": 10,
-    "min_duration": { "math": [ "enhancement_proficiency_bonus_calculate(6000, 160)" ] },
-    "max_duration": { "math": [ "enhancement_proficiency_bonus_calculate(30000, 160)" ] },
-    "duration_increment": { "math": [ "enhancement_proficiency_bonus_calculate(2400, 0.1)" ] },
+    "min_duration": 6000,
+    "max_duration": 30000,
+    "duration_increment": 2400,
     "energy_source": "MANA",
     "base_energy_cost": 150,
-    "base_casting_time": { "math": [ "enhancement_proficiency_negate_calculate(150, 2)" ] }
+    "base_casting_time": 150
   },
   {
     "id": "magus_spiderclimb",
@@ -546,19 +546,19 @@
     "description": "Ascend even the most sheer wall with ease as you cling to surfaces.",
     "valid_targets": [ "self" ],
     "spell_class": "MAGUS",
-    "flags": [ "CONCENTRATE", "VERBAL", "SOMATIC" ],
+    "flags": [ "ENHANCEMENT_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC" ],
     "extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ],
     "effect": "attack",
     "effect_str": "effect_magus_spiderclimb",
     "shape": "blast",
     "difficulty": 3,
     "max_level": 15,
-    "min_duration": { "math": [ "enhancement_proficiency_bonus_calculate(30000, 600)" ] },
-    "max_duration": { "math": [ "enhancement_proficiency_bonus_calculate(120000, 600)" ] },
-    "duration_increment": { "math": [ "enhancement_proficiency_bonus_calculate(6000, 0.07)" ] },
+    "min_duration": 30000,
+    "max_duration": 120000,
+    "duration_increment": 6000,
     "energy_source": "MANA",
     "base_energy_cost": 250,
-    "base_casting_time": { "math": [ "enhancement_proficiency_negate_calculate(250, 2)" ] }
+    "base_casting_time": 250
   },
   {
     "id": "magus_teleport_mark",
@@ -567,7 +567,7 @@
     "description": "Mark a particular patch of ground to allow you to return to it later.",
     "valid_targets": [ "self" ],
     "spell_class": "MAGUS",
-    "flags": [ "CONCENTRATE", "VERBAL", "SOMATIC" ],
+    "flags": [ "CONVEYANCE_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC" ],
     "extra_effects": [ { "id": "eoc_conveyance_setup", "hit_self": true } ],
     "effect": "effect_on_condition",
     "effect_str": "EOC_MAGUS_MARK",
@@ -576,8 +576,8 @@
     "difficulty": 5,
     "max_level": 10,
     "energy_source": "MANA",
-    "base_energy_cost": { "math": [ "conveyance_proficiency_negate_calculate(2000, 13.33)" ] },
-    "base_casting_time": { "math": [ "conveyance_proficiency_negate_calculate(90000, 600)" ] }
+    "base_energy_cost": 2000,
+    "base_casting_time": 90000
   },
   {
     "type": "effect_on_condition",
@@ -597,7 +597,7 @@
     "description": "Immediately return to the place you marked with Magus's Mark, no matter how far away it is.",
     "valid_targets": [ "self" ],
     "spell_class": "MAGUS",
-    "flags": [ "VERBAL", "SOMATIC" ],
+    "flags": [ "CONVEYANCE_SPELL", "VERBAL", "SOMATIC" ],
     "extra_effects": [ { "id": "eoc_conveyance_setup", "hit_self": true } ],
     "effect": "effect_on_condition",
     "effect_str": "EOC_MAGUS_RECALL",
@@ -606,8 +606,8 @@
     "difficulty": 8,
     "max_level": 15,
     "energy_source": "MANA",
-    "base_energy_cost": { "math": [ "conveyance_proficiency_negate_calculate(400, 2.7)" ] },
-    "base_casting_time": { "math": [ "conveyance_proficiency_negate_calculate(100, 0.7)" ] }
+    "base_energy_cost": 400,
+    "base_casting_time": 100
   },
   {
     "id": "EOC_MAGUS_RECALL",
@@ -624,18 +624,18 @@
     "description": "A simple but powerful spell, Mageshield will render the caster immune to any single attack.  It is indiscriminate: whether hit by an anti-tank missile or the caster stubbing their toe, it will absorb all energy of the attack and then fade.",
     "valid_targets": [ "self" ],
     "spell_class": "MAGUS",
-    "flags": [ "CONCENTRATE", "VERBAL", "SOMATIC" ],
+    "flags": [ "CONJURATION_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC" ],
     "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ],
     "effect": "attack",
     "effect_str": "effect_magus_mageshield",
     "shape": "blast",
     "difficulty": 2,
     "max_level": 20,
-    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(180000, 400)" ] },
-    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(1380000, 400)" ] },
-    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(60000, 0.005)" ] },
+    "min_duration": 180000,
+    "max_duration": 1380000,
+    "duration_increment": 60000,
     "energy_source": "MANA",
-    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(200, 1.5)" ] },
+    "base_energy_cost": 200,
     "base_casting_time": 1500
   },
   {
@@ -653,15 +653,15 @@
     "description": "Pull a target or set of items to you.",
     "valid_targets": [ "ally", "hostile", "item", "ground" ],
     "spell_class": "MAGUS",
-    "flags": [ "CONCENTRATE", "VERBAL", "SOMATIC", "NO_HANDS" ],
+    "flags": [ "EVOCATION_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC", "NO_HANDS" ],
     "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
     "difficulty": 2,
     "max_level": 10,
     "effect": "directed_push",
     "shape": "blast",
-    "min_damage": { "math": [ "evocation_proficiency_negate_calculate(-1, 0.1)" ] },
-    "max_damage": { "math": [ "evocation_proficiency_negate_calculate(-10, 0.1)" ] },
-    "damage_increment": { "math": [ "evocation_proficiency_negate_calculate(-1, 0.1)" ] },
+    "min_damage": -1,
+    "max_damage": -10,
+    "damage_increment": -1,
     "min_range": 1,
     "max_range": 10,
     "range_increment": 1,
@@ -680,7 +680,7 @@
     "description": "A popular military spell since ancient times, Arrowflight increases the range of bows and, as it later turned out, firearms.",
     "valid_targets": [ "self", "ally" ],
     "spell_class": "MAGUS",
-    "flags": [ "CONCENTRATE", "VERBAL", "SOMATIC" ],
+    "flags": [ "ENHANCEMENT_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC" ],
     "extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ],
     "effect": "attack",
     "effect_str": "effect_magus_ranged_increase",
@@ -689,12 +689,12 @@
     "max_level": 15,
     "min_range": 1,
     "max_range": 1,
-    "min_duration": { "math": [ "enhancement_proficiency_bonus_calculate(36000, 3600)" ] },
-    "max_duration": { "math": [ "enhancement_proficiency_bonus_calculate(576000, 3600)" ] },
-    "duration_increment": { "math": [ "enhancement_proficiency_bonus_calculate(36000, 0.07)" ] },
+    "min_duration": 36000,
+    "max_duration": 576000,
+    "duration_increment": 36000,
     "energy_source": "MANA",
     "base_energy_cost": 350,
-    "base_casting_time": { "math": [ "enhancement_proficiency_negate_calculate(300, 2)" ] }
+    "base_casting_time": 300
   },
   {
     "id": "magus_diamond_imbuement",
@@ -703,7 +703,7 @@
     "description": "Magically infuse a melee weapon with the hardness and resilience of a diamond as well as its industrial cutting capability, making it supremely sharp and durable.  However, like a diamond, any damage the weapon suffers afterwards cannot be repaired.",
     "valid_targets": [ "self" ],
     "spell_class": "MAGUS",
-    "flags": [ "CONCENTRATE", "VERBAL", "NO_HANDS" ],
+    "flags": [ "ENHANCEMENT_SPELL", "CONCENTRATE", "VERBAL", "NO_HANDS" ],
     "extra_effects": [ { "id": "eoc_channeling_setup", "hit_self": true } ],
     "effect": "effect_on_condition",
     "effect_str": "EOC_MAGUS_DIAMOND_IMBUEMENT",
@@ -712,8 +712,8 @@
     "difficulty": 8,
     "max_level": 15,
     "energy_source": "MANA",
-    "base_energy_cost": { "math": [ "channeling_proficiency_negate_calculate(900, 5)" ] },
-    "base_casting_time": { "math": [ "channeling_proficiency_negate_calculate(180000, 1500)" ] }
+    "base_energy_cost": 900,
+    "base_casting_time": 180000
   },
   {
     "type": "effect_on_condition",