[Magiclysm] Spellcasting proficiencies (#71773)

* Add the first round of stuff

* Spellchecking

* Opps, don't remove stuff

* Add first spell effect

* Add the jmath to prevent errors

* Enhancement addition and animist evocation addition

* Channeling jmath and animist channeling spells

* Summoning jmath and animist summoning classification

* Enhancement jmath and fully completed animist spell list

* Half of biomancer done

* Biomancy completed

* First classless addon

* Half of classess, forgot proficiency category

* Conveyance proficiency and classless spells done.

* Half of druid done

* More druid stuff

* More druid spells

* Full druid spells and conflict fix

* Bugfix

* Begin earthshaper spells

* All earthshaper spells done

* Bugfix

* First kelvinist spells

* All kelvinist spells done

* Start magus

* Magus spells done

* Bugfix

* Half of stormshaper done

* Stormshaper spells done

* Technomancer and mana upgrade spells done

* 6 attunements done

* CF - Grav Mage done

* Ice - Storm Elemental done

* All Attunements done

* Dragon spells done

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

@@ -7,6 +7,7 @@
     "effect": "spawn_item",
     "effect_str": "potion_starter",
     "components": "spell_components_potion_starter",
+    "extra_effects": [ { "id": "eoc_summon_setup" } ],
     "shape": "blast",
     "valid_targets": [ "self" ],
     "flags": [ "SOMATIC", "CONCENTRATE", "VERBAL" ],
@@ -18,9 +19,9 @@
     "base_casting_time": 45000,
     "final_casting_time": 4500,
     "casting_time_increment": -1250,
-    "base_energy_cost": 300,
-    "final_energy_cost": 100,
-    "energy_increment": -6,
+    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(300)" ] },
+    "final_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(100)" ] },
+    "energy_increment": { "math": [ "summoning_proficiency_negate_calculate(-6)" ] },
     "energy_source": "MANA",
     "difficulty": 5
   },
@@ -31,6 +32,7 @@
     "description": "Oversaturates potion starter with mana to create a deadly mana explosion.",
     "valid_targets": [ "none" ],
     "flags": [ "SOMATIC", "PERMANENT_ALL_LEVELS" ],
+    "extra_effects": [ { "id": "eoc_summon_setup" } ],
     "effect": "spawn_item",
     "effect_str": "alchemist_bomb",
     "components": "spell_components_manabomb",
@@ -44,9 +46,9 @@
     "base_casting_time": 180000,
     "final_casting_time": 12000,
     "casting_time_increment": -5000,
-    "base_energy_cost": 400,
-    "final_energy_cost": 800,
-    "energy_increment": 12,
+    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(400)" ] },
+    "final_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(800)" ] },
+    "energy_increment": { "math": [ "summoning_proficiency_negate_calculate(12)" ] },
     "difficulty": 5
   },
   {
@@ -57,6 +59,7 @@
     "//": "In perfect world there will be another spell that create already buried mine, making very effective trap in realtime. But not today.",
     "valid_targets": [ "none" ],
     "flags": [ "SOMATIC", "PERMANENT_ALL_LEVELS" ],
+    "extra_effects": [ { "id": "eoc_summon_setup" } ],
     "effect": "spawn_item",
     "effect_str": "alchemist_mine",
     "shape": "blast",
@@ -70,9 +73,9 @@
     "base_casting_time": 18000,
     "final_casting_time": 1200,
     "casting_time_increment": -500,
-    "base_energy_cost": 400,
-    "final_energy_cost": 800,
-    "energy_increment": 12,
+    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(400)" ] },
+    "final_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(800)" ] },
+    "energy_increment": { "math": [ "summoning_proficiency_negate_calculate(12)" ] },
     "difficulty": 6
   }
 ]

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

@@ -11,6 +11,7 @@
     "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", "MUST_HAVE_CLASS_TO_LEARN" ],
+    "extra_effects": [ { "id": "eoc_channeling_setup" } ],
     "effect": "attack",
     "shape": "line",
     "min_range": 24,
@@ -20,15 +21,15 @@
     "min_duration": 1500,
     "duration_increment": 115,
     "max_duration": 5500,
-    "base_energy_cost": 140,
+    "base_energy_cost": { "math": [ "channeling_proficiency_negate_calculate(140)" ] },
     "components": "spy_wasp",
     "field_id": "fd_clairvoyant",
     "min_field_intensity": 1,
     "max_field_intensity": 1,
     "spell_class": "ARTIFICER",
     "difficulty": 3,
     "max_level": 35,
-    "base_casting_time": 700,
+    "base_casting_time": { "math": [ "channeling_proficiency_negate_calculate(700)" ] },
     "energy_source": "MANA"
   },
   {
@@ -90,21 +91,22 @@
     "description": "Artificers have a special pocket dimension with a magical tool that can cover a wide variety of tasks.  It is only a matter of temporarily summoning the item for use.",
     "valid_targets": [ "none" ],
     "flags": [ "CONCENTRATE", "NO_LEGS", "MUST_HAVE_CLASS_TO_LEARN" ],
+    "extra_effects": [ { "id": "eoc_summon_setup" } ],
     "effect": "spawn_item",
     "shape": "blast",
     "effect_str": "artificer_toolkit",
     "min_damage": 1,
     "max_damage": 1,
-    "min_duration": 1680000,
-    "max_duration": 60480000,
-    "duration_increment": 1680000,
+    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(1680000)" ] },
+    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(60480000)" ] },
+    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(1680000)" ] },
     "spell_class": "ARTIFICER",
     "difficulty": 3,
     "max_level": 35,
     "base_casting_time": 1500,
     "final_casting_time": 500,
     "casting_time_increment": -30,
-    "base_energy_cost": 100,
+    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(100)" ] },
     "energy_source": "MANA"
   }
 ]

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

@@ -6,12 +6,13 @@
     "description": "You overclock your flesh and bionics, charging so fast the friction can ignite the air, to wind up for a skull-cracking punch.",
     "valid_targets": [ "hostile", "ground" ],
     "flags": [ "MUST_HAVE_CLASS_TO_LEARN" ],
+    "extra_effects": [ { "id": "eoc_evocation_setup" } ],
     "effect": "dash",
     "effect_str": "downed",
     "shape": "cone",
-    "min_damage": 0,
-    "max_damage": 350,
-    "damage_increment": 10,
+    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(0)" ] },
+    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(350)" ] },
+    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(10)" ] },
     "damage_type": "bash",
     "min_range": 8,
     "max_range": 8,
@@ -35,16 +36,17 @@
     "name": "Jury Rig",
     "description": "Heals a little bit of damage on the target.",
     "valid_targets": [ "self" ],
+    "extra_effects": [ { "id": "eoc_channeling_setup" } ],
     "min_damage": -5,
     "max_damage": -40,
     "damage_increment": -1.0,
     "max_level": 35,
     "effect": "attack",
     "shape": "blast",
-    "base_casting_time": 500,
-    "base_energy_cost": 800,
-    "energy_increment": -20,
-    "final_energy_cost": 100,
+    "base_casting_time": { "math": [ "channeling_proficiency_negate_calculate(500)" ] },
+    "base_energy_cost": { "math": [ "channeling_proficiency_negate_calculate(800)" ] },
+    "energy_increment": { "math": [ "channeling_proficiency_negate_calculate(-20)" ] },
+    "final_energy_cost": { "math": [ "channeling_proficiency_negate_calculate(100)" ] },
     "components": "jury_rig",
     "flags": [ "SOMATIC", "VERBAL", "NO_LEGS", "CONCENTRATE", "MUST_HAVE_CLASS_TO_LEARN" ],
     "spell_class": "BIOTEK",

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

@@ -6,11 +6,12 @@
     "description": "A more advanced version of Banishment, which is a ritual spell that attempts to banish a monster.  Being closely related to blood magic, the Blood Mage is much more specialized to use a spell like this.",
     "valid_targets": [ "hostile" ],
     "flags": [ "SOMATIC", "VERBAL", "MUST_HAVE_CLASS_TO_LEARN", "NO_HANDS" ],
+    "extra_effects": [ { "id": "eoc_evocation_setup" } ],
     "effect": "banishment",
     "shape": "blast",
-    "min_damage": 120,
-    "damage_increment": 15,
-    "max_damage": 640,
+    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(120)" ] },
+    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(15)" ] },
+    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(640)" ] },
     "min_range": 6,
     "max_range": 6,
     "min_aoe": 0,
@@ -60,14 +61,15 @@
     "description": "You allow a demon to possess your body for a short time, giving you great combat abilities.  You still retain control, though lose your spellcasting abilities temporarily.",
     "valid_targets": [ "none" ],
     "flags": [ "SOMATIC", "NO_LEGS", "MUST_HAVE_CLASS_TO_LEARN" ],
+    "extra_effects": [ { "id": "eoc_summon_setup" } ],
     "effect": "spawn_item",
     "shape": "blast",
     "effect_str": "demon_possession_aura",
     "min_damage": 1,
     "max_damage": 1,
-    "min_duration": 360000,
-    "max_duration": 1440000,
-    "duration_increment": 30858,
+    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(360000)" ] },
+    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(1440000)" ] },
+    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(30858)" ] },
     "spell_class": "BLOOD_MAGE",
     "difficulty": 5,
     "max_level": 35,

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

@@ -8,11 +8,11 @@
     "flags": [ "SOMATIC", "MUST_HAVE_CLASS_TO_LEARN", "NO_HANDS" ],
     "effect": "attack",
     "shape": "cone",
-    "extra_effects": [ { "id": "auroral_wave_cold" } ],
+    "extra_effects": [ { "id": "auroral_wave_cold" }, { "id": "eoc_evocation_setup" } ],
     "damage_type": "light",
-    "min_damage": 60,
-    "damage_increment": 3.0,
-    "max_damage": 160,
+    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(60)" ] },
+    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(3.0)" ] },
+    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(160)" ] },
     "min_range": 3,
     "max_range": 7,
     "range_increment": 0.12,
@@ -35,9 +35,9 @@
     "effect": "attack",
     "shape": "cone",
     "valid_targets": [ "hostile", "ground" ],
-    "min_damage": 30,
-    "max_damage": 100,
-    "damage_increment": 2.0,
+    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(30)" ] },
+    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(100)" ] },
+    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(2.0)" ] },
     "min_range": 4,
     "max_range": 12,
     "range_increment": 0.25,
@@ -59,13 +59,14 @@
     "shape": "blast",
     "energy_source": "MANA",
     "flags": [ "CONCENTRATE", "VERBAL", "NO_LEGS" ],
+    "extra_effects": [ { "id": "eoc_summon_setup" } ],
     "difficulty": 9,
     "max_level": 40,
     "base_casting_time": 350,
     "base_energy_cost": 750,
-    "min_duration": 100000,
-    "max_duration": 2000000,
-    "duration_increment": 47500,
+    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(100000)" ] },
+    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(2000000)" ] },
+    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(47500)" ] },
     "spell_class": "BOREAL_MAGE"
   }
 ]

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

@@ -6,6 +6,7 @@
     "description": "Speak a short phrase and transform your footsteps into burning pits of flame, leaving a trail of fire behind you.  Each step will consume mana, but you will be immune to fire while the spell is in effect.",
     "valid_targets": [ "self" ],
     "flags": [ "CONCENTRATE", "VERBAL", "NO_HANDS", "MUST_HAVE_CLASS_TO_LEARN", "NO_FAIL" ],
+    "extra_effects": [ { "id": "eoc_enhancement_setup" } ],
     "effect": "effect_on_condition",
     "effect_str": "EOC_CLEANSING_FLAME_FIRE_FOOSTEPS",
     "shape": "blast",
@@ -15,7 +16,11 @@
     "min_damage": 1,
     "max_damage": 1,
     "max_level": 1,
-    "base_casting_time": { "math": [ "u_effect_intensity('effect_burning_trail') > -1 ? 0 : 50" ] },
+    "base_casting_time": {
+      "math": [
+        "u_effect_intensity('effect_burning_trail') > -1 ? 0 : 50 - ((u_proficiency('prof_magic_enhancement_beginner', 'format': 'percent') * 1) / 10) + ((u_proficiency('prof_magic_enhancement_apprentice', 'format': 'percent') * 1) / 10) + ((u_proficiency('prof_magic_enhancement_master', 'format': 'percent') * 1) / 10)"
+      ]
+    },
     "base_energy_cost": 25
   },
   {
@@ -102,11 +107,11 @@
     "flags": [ "SOMATIC", "VERBAL", "NO_LEGS", "LOUD", "CONCENTRATE", "IGNITE_FLAMMABLE", "MUST_HAVE_CLASS_TO_LEARN", "NO_HANDS" ],
     "effect": "attack",
     "shape": "blast",
-    "extra_effects": [ { "id": "immolate_transform" }, { "id": "immolate_push" } ],
+    "extra_effects": [ { "id": "immolate_transform" }, { "id": "immolate_push" }, { "id": "eoc_evocation_setup" } ],
     "damage_type": "heat",
-    "min_damage": 90,
-    "damage_increment": 4.9,
-    "max_damage": 260,
+    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(90)" ] },
+    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(4.9)" ] },
+    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(260)" ] },
     "min_range": 4,
     "max_range": 8,
     "range_increment": 0.12,
@@ -150,15 +155,15 @@
     "valid_targets": [ "self" ],
     "effect": "attack",
     "shape": "blast",
-    "base_casting_time": 350,
-    "base_energy_cost": 800,
+    "base_casting_time": { "math": [ "channeling_proficiency_negate_calculate(350)" ] },
+    "base_energy_cost": { "math": [ "channeling_proficiency_negate_calculate(800)" ] },
     "energy_source": "MANA",
     "difficulty": 10,
     "min_damage": -20,
     "max_damage": -120,
     "damage_increment": -2.9,
     "max_level": 35,
-    "extra_effects": [ { "id": "cleansingflame_hermes_burn" }, { "id": "pain_split" } ],
+    "extra_effects": [ { "id": "cleansingflame_hermes_burn" }, { "id": "pain_split" }, { "id": "eoc_channeling_setup" } ],
     "flags": [ "SOMATIC", "VERBAL", "CONCENTRATE", "LOUD" ]
   },
   {

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

@@ -55,19 +55,20 @@
     "description": "Crusaders have the ability to summon a magically enhanced shield to their arm to protect them in armed combat.",
     "valid_targets": [ "self" ],
     "flags": [ "CONCENTRATE", "NO_LEGS", "MUST_HAVE_CLASS_TO_LEARN" ],
+    "extra_effects": [ { "id": "eoc_summon_setup" } ],
     "effect": "spawn_item",
     "shape": "blast",
     "effect_str": "holy_shield",
     "min_damage": 1,
     "max_damage": 1,
-    "min_duration": 360000,
-    "max_duration": 12960000,
-    "duration_increment": 360000,
+    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(360000)" ] },
+    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(12960000)" ] },
+    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(360000)" ] },
     "spell_class": "CRUSADER",
     "difficulty": 4,
     "max_level": 35,
     "base_casting_time": 1500,
-    "base_energy_cost": 500,
+    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(500)" ] },
     "energy_source": "MANA"
   },
   {
@@ -83,10 +84,10 @@
     "effect_str": "longsword_judgement",
     "shape": "blast",
     "base_casting_time": 1500,
-    "base_energy_cost": 500,
-    "min_duration": 360000,
-    "max_duration": 12960000,
-    "duration_increment": 360000,
+    "base_energy_cost": { "math": [ "summoning_proficiency_negate_calculate(500)" ] },
+    "min_duration": { "math": [ "summoning_proficiency_bonus_calculate(360000)" ] },
+    "max_duration": { "math": [ "summoning_proficiency_bonus_calculate(12960000)" ] },
+    "duration_increment": { "math": [ "summoning_proficiency_bonus_calculate(360000)" ] },
     "difficulty": 4,
     "max_level": 35,
     "spell_class": "CRUSADER",

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

@@ -15,9 +15,9 @@
     "shape": "blast",
     "effect_str": "downed",
     "damage_type": "bash",
-    "min_damage": 20,
-    "damage_increment": 4.0,
-    "max_damage": 160,
+    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(20)" ] },
+    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(4.0)" ] },
+    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(160)" ] },
     "min_aoe": 0,
     "max_aoe": 35,
     "aoe_increment": 1,
@@ -32,7 +32,7 @@
     "sound_id": "earth_spell",
     "sound_variant": "strong",
     "energy_source": "MANA",
-    "extra_effects": [ { "id": "quake_transform" }, { "id": "quake_shake" } ]
+    "extra_effects": [ { "id": "quake_transform" }, { "id": "quake_shake" }, { "id": "eoc_evocation_setup" } ]
   },
   {
     "id": "quake_transform",
@@ -79,9 +79,9 @@
     "effect": "attack",
     "shape": "blast",
     "max_level": 35,
-    "min_damage": 20,
-    "max_damage": 180,
-    "damage_increment": 4.6,
+    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(20)" ] },
+    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(180)" ] },
+    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(4.6)" ] },
     "min_range": 8,
     "max_range": 15,
     "range_increment": 0.2,
@@ -94,7 +94,12 @@
     "base_casting_time": 200,
     "final_casting_time": 50,
     "casting_time_increment": -5,
-    "extra_effects": [ { "id": "single_rock_blast" }, { "id": "single_rock_blast" }, { "id": "rock_blast_push" } ]
+    "extra_effects": [
+      { "id": "single_rock_blast" },
+      { "id": "single_rock_blast" },
+      { "id": "rock_blast_push" },
+      { "id": "eoc_evocation_setup" }
+    ]
   },
   {
     "id": "single_rock_blast",
@@ -106,9 +111,9 @@
     "effect": "attack",
     "shape": "blast",
     "max_level": 35,
-    "min_damage": 20,
-    "max_damage": 180,
-    "damage_increment": 4.6,
+    "min_damage": { "math": [ "evocation_proficiency_bonus_calculate(20)" ] },
+    "max_damage": { "math": [ "evocation_proficiency_bonus_calculate(180)" ] },
+    "damage_increment": { "math": [ "evocation_proficiency_bonus_calculate(4.6)" ] },
     "damage_type": "bash",
     "sound_id": "earth_spell",
     "sound_variant": "strong"