[Magiclysm] Convert Caustic Blood and Lashing Tentacles to effects (#…

…79046) * Initial commit * Empty out EOC_BIO_CAUSTIC_BLOOD_MUTATION
CleverRaven · Jan 10, 2025 · 26428a5 · 26428a5
1 parent 43ccb71
commit 26428a5
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 52 deletions.
diff --git a/data/mods/Magiclysm/Spells/biomancer.json b/data/mods/Magiclysm/Spells/biomancer.json
@@ -579,8 +579,8 @@
     "valid_targets": [ "self" ],
     "spell_class": "BIOMANCER",
     "flags": [ "TRANSFORMATION_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC" ],
-    "effect": "effect_on_condition",
-    "effect_str": "EOC_LASHING_TENTACLES_MUTATION",
+    "effect": "attack",
+    "effect_str": "effect_biomancer_lashing_tentacles",
     "shape": "blast",
     "difficulty": 6,
     "max_level": 15,
@@ -592,30 +592,6 @@
     "base_energy_cost": 400,
     "base_casting_time": 500
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_LASHING_TENTACLES_MUTATION",
-    "condition": { "not": { "u_has_trait": "BIO_LASHING_TENTACLES" } },
-    "effect": [
-      { "u_message": "Your shoulders itch before two barbed tentacles erupt from them!", "type": "good" },
-      { "u_add_trait": "BIO_LASHING_TENTACLES" },
-      {
-        "run_eocs": "EOC_LASHING_TENTACLES_MUTATION_REMOVE",
-        "time_in_future": {
-          "math": [ "(( u_spell_level('biomancer_lashing_tentacles') * 15 ) + 70 ) * (transformation_proficiency_modifier() )" ]
-        }
-      }
-    ],
-    "false_effect": [ { "u_message": "You already have a pair of lashing tentacles!" } ]
-  },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_LASHING_TENTACLES_MUTATION_REMOVE",
-    "effect": [
-      { "u_message": "The tentacles recede back into your body.", "type": "bad" },
-      { "u_lose_trait": "BIO_LASHING_TENTACLES" }
-    ]
-  },
   {
     "id": "biomancer_cure_disease_minor",
     "type": "SPELL",
@@ -741,8 +717,8 @@
     "valid_targets": [ "self" ],
     "spell_class": "BIOMANCER",
     "flags": [ "ENHANCEMENT_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC" ],
-    "effect": "effect_on_condition",
-    "effect_str": "EOC_BIO_CAUSTIC_BLOOD_MUTATION",
+    "effect": "attack",
+    "effect_str": "effect_biomancer_caustic_blood",
     "shape": "blast",
     "difficulty": 7,
     "max_level": 20,
@@ -754,30 +730,6 @@
     "extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ],
     "base_casting_time": 600
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_BIO_CAUSTIC_BLOOD_MUTATION",
-    "condition": { "and": [ { "not": { "u_has_trait": "ACIDBLOOD" } }, { "not": { "u_has_trait": "ACIDPROOF" } } ] },
-    "effect": [
-      { "u_message": "Your entire body burns for a moment", "type": "mixed" },
-      { "u_add_trait": "ACIDBLOOD" },
-      { "u_add_trait": "ACIDPROOF" },
-      {
-        "run_eocs": "EOC_BIO_CAUSTIC_BLOOD_MUTATION_REMOVE",
-        "time_in_future": { "math": [ "(( u_spell_level('biomancer_caustic_blood') * 600 ) + 1800 ) * ( enhancement_proficiency_modifier() )" ] }
-      }
-    ],
-    "false_effect": [ { "u_message": "Your body is already inured to acid!" } ]
-  },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_BIO_CAUSTIC_BLOOD_MUTATION_REMOVE",
-    "effect": [
-      { "u_message": "The faint burning sensation fades.", "type": "bad" },
-      { "u_lose_trait": "ACIDBLOOD" },
-      { "u_lose_trait": "ACIDPROOF" }
-    ]
-  },
   {
     "id": "biomancer_eat_tons_of_food",
     "type": "SPELL",

diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json
@@ -1327,6 +1327,26 @@
     "flags": [ "WEBBED_HANDS", "WEBBED_FEET" ],
     "base_mods": { "stamina_min": [ 10 ] }
   },
+  {
+    "type": "effect_type",
+    "id": "effect_biomancer_lashing_tentacles",
+    "name": [ "Lashing Tentacles" ],
+    "desc": [ "Two tentacles sprout from your shoulders, ready to attack your enemies." ],
+    "apply_message": "Your shoulders itch before two barbed tentacles erupt from them!",
+    "remove_message": "The tentacles recede back into your body.",
+    "rating": "good",
+    "enchantments": [ { "mutations": [ "BIO_LASHING_TENTACLES" ] } ]
+  },
+  {
+    "type": "effect_type",
+    "id": "effect_biomancer_caustic_blood",
+    "name": [ "Caustic Blood" ],
+    "desc": [ "You have transformed your blood into acid." ],
+    "apply_message": "Your entire body burns for a moment.",
+    "remove_message": "The faint burning sensation fades.",
+    "rating": "good",
+    "enchantments": [ { "mutations": [ "ACIDPROOF", "ACIDBLOOD" ] } ]
+  },
   {
     "id": "effect_biomancer_remove_instability",
     "type": "effect_type",

diff --git a/data/mods/Magiclysm/migration_and_obsoletion/eocs.json b/data/mods/Magiclysm/migration_and_obsoletion/eocs.json
@@ -111,5 +111,32 @@
       { "u_teleport": { "context_val": "raven_form_fly_up_location" } }
     ],
     "false_effect": [ { "u_message": "You cannot fly up with a ceiling above you!", "type": "bad" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_LASHING_TENTACLES_MUTATION",
+    "effect": [  ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_LASHING_TENTACLES_MUTATION_REMOVE",
+    "effect": [
+      { "u_message": "The tentacles recede back into your body.", "type": "bad" },
+      { "u_lose_trait": "BIO_LASHING_TENTACLES" }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_BIO_CAUSTIC_BLOOD_MUTATION",
+    "effect": [  ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_BIO_CAUSTIC_BLOOD_MUTATION_REMOVE",
+    "effect": [
+      { "u_message": "The faint burning sensation fades.", "type": "bad" },
+      { "u_lose_trait": "ACIDBLOOD" },
+      { "u_lose_trait": "ACIDPROOF" }
+    ]
   }
 ]