[Xedra Evolved] Turn activated learn-recipe Paraclesian traits into P…

…assive ones (CleverRaven#75629) * Initial commit * Salamander traits * Update data/mods/Xedra_Evolved/mutations/paraclesians/salamander_eocs.json --------- Co-authored-by: Maleclypse <[email protected]>
SurFlurer · Aug 13, 2024 · 45f35ec · 45f35ec
1 parent 4bf90cd
commit 45f35ec
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 45 deletions.
diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_eocs.json
@@ -120,14 +120,30 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_SALAMANDER_WATER_TO_BOOZE",
-    "condition": { "u_has_trait": "SALAMANDER_WATER_TO_BOOZE" },
-    "effect": [ { "u_learn_recipe": "mixed_alcohol_strong_from_water" } ]
+    "required_event": "gains_mutation",
+    "eoc_type": "EVENT",
+    "condition": { "compare_string": [ "SALAMANDER_WATER_TO_BOOZE", { "context_val": "trait" } ] },
+    "effect": [
+      { "u_learn_recipe": "mixed_alcohol_strong_from_water" },
+      {
+        "u_message": "From the fiery depths of your spirit, knowledge of how to turn various other water into strong alcohol fills your mind.",
+        "type": "good"
+      }
+    ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_SALAMANDER_WATER_TO_FUEL",
-    "condition": { "u_has_trait": "SALAMANDER_WATER_TO_FUEL" },
-    "effect": [ { "u_learn_recipe": "lamp_oil_from_water" } ]
+    "required_event": "gains_mutation",
+    "eoc_type": "EVENT",
+    "condition": { "compare_string": [ "SALAMANDER_WATER_TO_FUEL", { "context_val": "trait" } ] },
+    "effect": [
+      { "u_learn_recipe": "lamp_oil_from_water" },
+      {
+        "u_message": "From the fiery depths of your spirit, knowledge of how to turn various other water into lamp oil fills your mind.",
+        "type": "good"
+      }
+    ]
   },
   {
     "type": "effect_on_condition",

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json
@@ -210,11 +210,9 @@
     "points": 0,
     "visibility": 0,
     "ugliness": 0,
-    "description": "Upon gaining this ability the Salamander can activate this trait to learn how to convert water into very strong alcohol.",
+    "description": "Upon gaining this ability the Salamander learns how to convert water into very strong alcohol.",
     "prereqs": [ "SALAMANDER_EYES" ],
-    "category": [ "SALAMANDER" ],
-    "active": true,
-    "activated_eocs": [ "EOC_SALAMANDER_WATER_TO_BOOZE" ]
+    "category": [ "SALAMANDER" ]
   },
   {
     "type": "mutation",
@@ -223,11 +221,9 @@
     "points": 6,
     "visibility": 0,
     "ugliness": 0,
-    "description": "Upon gaining this ability the Salamander can activate this trait to learn how to convert water directly into fuel.  This is an intensely draining activity.",
+    "description": "Upon gaining this ability the Salamander learn how to convert water directly into fuel.  This is an intensely draining activity.",
     "prereqs": [ "SALAMANDER_WATER_TO_BOOZE" ],
-    "category": [ "SALAMANDER" ],
-    "active": true,
-    "activated_eocs": [ "EOC_SALAMANDER_WATER_TO_FUEL" ]
+    "category": [ "SALAMANDER" ]
   },
   {
     "type": "mutation",

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/undine_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/undine_eocs.json
@@ -96,40 +96,46 @@
   },
   {
     "type": "effect_on_condition",
-    "id": "EOC_SALTWATER_TO_FRESHWATER",
-    "condition": { "u_has_trait": "SALTWATER_TO_FRESHWATER" },
+    "id": "EOC_UNDINE_LEARN_SALTWATER_TO_FRESHWATER",
+    "eoc_type": "EVENT",
+    "required_event": "gains_mutation",
+    "condition": { "compare_string": [ "SALTWATER_TO_FRESHWATER", { "context_val": "trait" } ] },
     "effect": [
+      { "u_learn_recipe": "salt_water_from_water" },
+      { "u_learn_recipe": "water_from_salt_water" },
       {
-        "u_roll_remainder": [ "salt_water_from_water", "water_from_salt_water" ],
-        "type": "recipe",
-        "true_eocs": [ "EOC_SUCCESFUL_ROLL_REMAINDER_ELEMENTAL_RECIPE" ],
-        "false_eocs": [ "EOC_COMPLETED_ROLL_REMAINDER_ELEMENTAL_RECIPE" ]
+        "u_message": "Drawn from some atavistic well, knowledge of how to turn fresh water into salt water, and vice versa, fills your mind.",
+        "type": "good"
       }
     ]
   },
   {
     "type": "effect_on_condition",
-    "id": "EOC_FOUL_WATER",
-    "condition": { "u_has_trait": "FOUL_WATER" },
+    "id": "EOC_UNDINE_LEARN_FOUL_WATER",
+    "required_event": "gains_mutation",
+    "eoc_type": "EVENT",
+    "condition": { "compare_string": [ "FOUL_WATER", { "context_val": "trait" } ] },
     "effect": [
+      { "u_learn_recipe": "water_from_water_clean" },
+      { "u_learn_recipe": "water_clean_from_water" },
       {
-        "u_roll_remainder": [ "water_from_water_clean", "water_clean_from_water" ],
-        "type": "recipe",
-        "true_eocs": [ "EOC_SUCCESFUL_ROLL_REMAINDER_ELEMENTAL_RECIPE" ],
-        "false_eocs": [ "EOC_COMPLETED_ROLL_REMAINDER_ELEMENTAL_RECIPE" ]
+        "u_message": "Drawn from some atavistic well, knowledge of how to turn foul water into clean, pure water, and vice versa, fills your mind.",
+        "type": "good"
       }
     ]
   },
   {
     "type": "effect_on_condition",
-    "id": "EOC_LIQUID_TO_WATER",
-    "condition": { "u_has_trait": "LIQUID_TO_WATER" },
+    "id": "EOC_UNDINE_LEARN_LIQUID_TO_WATER",
+    "required_event": "gains_mutation",
+    "eoc_type": "EVENT",
+    "condition": { "compare_string": [ "LIQUID_TO_WATER", { "context_val": "trait" } ] },
     "effect": [
+      { "u_learn_recipe": "water_from_liquid" },
+      { "u_learn_recipe": "water_clean_from_water" },
       {
-        "u_roll_remainder": [ "water_from_liquid" ],
-        "type": "recipe",
-        "true_eocs": [ "EOC_SUCCESFUL_ROLL_REMAINDER_ELEMENTAL_RECIPE" ],
-        "false_eocs": [ "EOC_COMPLETED_ROLL_REMAINDER_ELEMENTAL_RECIPE" ]
+        "u_message": "Drawn from some atavistic well, knowledge of how to turn various other liquids directly into water fills your mind.",
+        "type": "good"
       }
     ]
   },

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/undine_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/undine_mutations.json
@@ -126,14 +126,12 @@
   {
     "type": "mutation",
     "id": "SALTWATER_TO_FRESHWATER",
-    "name": { "str": "Saltwater to Freshwater" },
+    "name": { "str": "One Foot in the River and One in the Sea" },
     "points": 0,
     "visibility": 0,
     "ugliness": 0,
-    "description": "Upon gaining this ability the Undine can activate this trait to learn how to convert salt water into freshwater and vice versa.",
-    "category": [ "UNDINE" ],
-    "active": true,
-    "activated_eocs": [ "EOC_SALTWATER_TO_FRESHWATER" ]
+    "description": "Upon gaining this ability the Undine learns how to convert salt water into freshwater and vice versa.",
+    "category": [ "UNDINE" ]
   },
   {
     "type": "mutation",
@@ -149,26 +147,22 @@
   {
     "type": "mutation",
     "id": "FOUL_WATER",
-    "name": { "str": "Foul Water" },
+    "name": { "str": "Cleansing the Poison Well" },
     "points": 0,
     "visibility": 0,
     "ugliness": 0,
-    "description": "Upon gaining this ability the Undine can activate this trait to gain the ability to foul water, making it murky and possibly infested.  Conversely, the Undine can also cleanse water that is not already clean.",
-    "category": [ "UNDINE" ],
-    "active": true,
-    "activated_eocs": [ "EOC_FOUL_WATER" ]
+    "description": "Upon gaining this ability the Undine learns how to foul water, making it murky and possibly infested.  Conversely, the Undine can also cleanse water that is not already clean.",
+    "category": [ "UNDINE" ]
   },
   {
     "type": "mutation",
     "id": "LIQUID_TO_WATER",
-    "name": { "str": "Various liquids to Freshwater" },
+    "name": { "str": "Return to Primordial Waters" },
     "points": 0,
     "visibility": 0,
     "ugliness": 0,
-    "description": "Upon gaining this ability the Undine can activate this trait to gain the ability to convert various liquids into freshwater.",
-    "category": [ "UNDINE" ],
-    "active": true,
-    "activated_eocs": [ "EOC_LIQUID_TO_WATER" ]
+    "description": "Upon gaining this ability the Undine learns how to convert various liquids into freshwater.",
+    "category": [ "UNDINE" ]
   },
   {
     "type": "mutation",