Merge pull request CleverRaven#79169 from GuardianDll/run_eocs

Mics EoC edits
Maleclypse · Jan 18, 2025 · cc7e1ca · cc7e1ca
2 parents dc48884 + bfd5fc2
commit cc7e1ca
Show file tree

Hide file tree

Showing 49 changed files with 618 additions and 746 deletions.
diff --git a/data/json/effects_on_condition/bionic_active_eocs.json b/data/json/effects_on_condition/bionic_active_eocs.json
@@ -76,9 +76,7 @@
         "then": [ { "u_lose_effect": "meth" }, { "u_add_effect": "meth", "duration": "200 s" } ]
       },
       {
-        "foreach": "array",
-        "var": { "context_val": "effect_id" },
-        "target": [
+        "u_lose_effect": [
           "fungus",
           "dermatik",
           "bloodworms",
@@ -107,8 +105,7 @@
           "venom_weaken",
           "venom_dmg",
           "paralyzepoison"
-        ],
-        "effect": { "u_lose_effect": { "context_val": "effect_id" } }
+        ]
       },
       { "math": [ "u_val('pkill') = 0" ] },
       { "math": [ "u_val('stim') = 0" ] },

diff --git a/data/json/effects_on_condition/medicine_eocs/contant_lenses_eocs.json b/data/json/effects_on_condition/medicine_eocs/contant_lenses_eocs.json
@@ -53,9 +53,7 @@
     "type": "effect_on_condition",
     "id": "EOC_CONTACTS3",
     "effect": [
-      { "u_lose_effect": "contacts" },
-      { "u_lose_effect": "transition_contacts" },
-      { "u_lose_effect": "transition_contacts_plano" },
+      { "u_lose_effect": [ "contacts", "transition_contacts", "transition_contacts_plano" ] },
       { "u_add_effect": { "context_val": "effect" }, "duration": { "math": [ "rng(_time * 0.94, _time * 1.06)" ] } },
       { "u_consume_item": { "context_val": "id" } }
     ]

diff --git a/data/json/effects_on_condition/misc_effect_on_condition.json b/data/json/effects_on_condition/misc_effect_on_condition.json
@@ -90,21 +90,16 @@
     "condition": { "and": [ { "u_has_effect": "hallucination_attacks" }, { "x_in_y_chance": { "x": 1, "y": 6 } } ] },
     "effect": [
       {
-        "run_eocs": {
-          "id": "EOC_HALLUCINATION_ATTACKS",
-          "condition": { "math": [ "u_monsters_nearby() > 1" ] },
-          "effect": [
-            {
-              "u_spawn_monster": "GROUP_YOUR_FEARS",
-              "group": true,
-              "real_count": 0,
-              "hallucination_count": { "math": [ "rand(2) + 1" ] },
-              "outdoor_only": false,
-              "min_radius": 10,
-              "max_radius": 40,
-              "lifespan": [ "1 hours", "4 hours" ]
-            }
-          ]
+        "if": { "math": [ "u_monsters_nearby() > 1" ] },
+        "then": {
+          "u_spawn_monster": "GROUP_YOUR_FEARS",
+          "group": true,
+          "real_count": 0,
+          "hallucination_count": { "math": [ "rand(2) + 1" ] },
+          "outdoor_only": false,
+          "min_radius": 10,
+          "max_radius": 40,
+          "lifespan": [ "1 hours", "4 hours" ]
         }
       }
     ]

diff --git a/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json b/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json
@@ -691,8 +691,7 @@
       ]
     },
     "effect": [
-      { "u_lose_effect": "social_dissatisfied" },
-      { "u_lose_effect": "social_satisfied" },
+      { "u_lose_effect": [ "social_dissatisfied", "social_satisfied" ] },
       { "u_add_effect": "social_satisfied", "duration": "2 hours" }
     ]
   },
@@ -709,8 +708,7 @@
       ]
     },
     "effect": [
-      { "u_lose_effect": "social_dissatisfied" },
-      { "u_lose_effect": "social_satisfied" },
+      { "u_lose_effect": [ "social_dissatisfied", "social_satisfied" ] },
       { "u_add_effect": "social_satisfied", "duration": "6 hours" }
     ]
   },
@@ -752,8 +750,7 @@
       ]
     },
     "effect": [
-      { "u_lose_effect": "asocial_dissatisfied" },
-      { "u_lose_effect": "asocial_satisfied" },
+      { "u_lose_effect": [ "asocial_dissatisfied", "asocial_satisfied" ] },
       { "u_add_effect": "asocial_satisfied", "duration": "2 hours" }
     ]
   },
@@ -806,7 +803,7 @@
         { "or": [ { "u_has_effect": "social_dissatisfied" }, { "u_has_effect": "social_dissatisfied" } ] }
       ]
     },
-    "effect": [ { "u_lose_effect": "asocial_dissatisfied" }, { "u_lose_effect": "social_dissatisfied" } ]
+    "effect": [ { "u_lose_effect": [ "asocial_dissatisfied", "social_dissatisfied" ] } ]
   },
   {
     "type": "effect_on_condition",

diff --git a/data/json/effects_on_condition/nether_eocs/portal_dependent_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/portal_dependent_effect_on_condition.json
@@ -32,24 +32,21 @@
       }
     },
     "effect": {
-      "run_eocs": {
-        "id": "EOC_PDEPENDENT_STRONG_WEAK_EFFECTS_ACCEPTANCE",
-        "condition": { "math": [ "ps_str > 4" ] },
-        "effect": {
-          "weighted_list_eocs": [
-            [ "EOC_PORTAL_DEPENDENT_MESSAGES_GOOD", 10 ],
-            [ "EOC_PORTAL_DEPENDENT_MORALE_GOOD", 6 ],
-            [ "EOC_PORTAL_DEPENDENT_FOCUS_GOOD", 3 ],
-            [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE", 1 ]
-          ]
-        },
-        "false_effect": {
-          "weighted_list_eocs": [
-            [ "EOC_PORTAL_DEPENDENT_MESSAGES_GOOD", 10 ],
-            [ "EOC_PORTAL_DEPENDENT_MORALE_GOOD", 5 ],
-            [ "EOC_PORTAL_DEPENDENT_FOCUS_GOOD", 2 ]
-          ]
-        }
+      "if": { "math": [ "ps_str > 4" ] },
+      "then": {
+        "weighted_list_eocs": [
+          [ "EOC_PORTAL_DEPENDENT_MESSAGES_GOOD", 10 ],
+          [ "EOC_PORTAL_DEPENDENT_MORALE_GOOD", 6 ],
+          [ "EOC_PORTAL_DEPENDENT_FOCUS_GOOD", 3 ],
+          [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE", 1 ]
+        ]
+      },
+      "else": {
+        "weighted_list_eocs": [
+          [ "EOC_PORTAL_DEPENDENT_MESSAGES_GOOD", 10 ],
+          [ "EOC_PORTAL_DEPENDENT_MORALE_GOOD", 5 ],
+          [ "EOC_PORTAL_DEPENDENT_FOCUS_GOOD", 2 ]
+        ]
       }
     }
   },
@@ -142,20 +139,17 @@
       ]
     },
     "effect": {
-      "run_eocs": {
-        "id": "EOC_PORTAL_DEPENDENT_ACCEPTANCE_OUTSIDE",
-        "condition": "u_is_outside",
-        "effect": [
-          {
-            "u_message": "You suddenly feel a profound sense of belonging take root inside you, spreading throughout your body.  It fades quickly, but something warm remains…",
-            "type": "good"
-          },
-          { "u_add_trait": "REALITY_GRASP" }
-        ],
-        "false_effect": {
-          "u_message": "You suddenly feel a profound sense of belonging take root inside you, but then abruptly grow cold.  You reach out for it, but it's gone now, taken away by the indoors.  You long for the sky…",
-          "type": "warning"
-        }
+      "if": "u_is_outside",
+      "then": [
+        {
+          "u_message": "You suddenly feel a profound sense of belonging take root inside you, spreading throughout your body.  It fades quickly, but something warm remains…",
+          "type": "good"
+        },
+        { "u_add_trait": "REALITY_GRASP" }
+      ],
+      "else": {
+        "u_message": "You suddenly feel a profound sense of belonging take root inside you, but then abruptly grow cold.  You reach out for it, but it's gone now, taken away by the indoors.  You long for the sky…",
+        "type": "warning"
       }
     }
   },
@@ -213,34 +207,31 @@
       ]
     },
     "effect": {
-      "run_eocs": {
-        "id": "EOC_PDEPENDENT_STRONG_WEAK_EFFECTS_REJECTION",
-        "condition": { "not": { "u_has_trait": "REALITY_GRASP" } },
-        "effect": {
-          "weighted_list_eocs": [
-            [ "EOC_PORTAL_DEPENDENT_MESSAGES_BAD", 18 ],
-            [ "EOC_PORTAL_DEPENDENT_MORALE_BAD", 6 ],
-            [ "EOC_PORTAL_DEPENDENT_FOCUS_BAD", 5 ],
-            [ "EOC_PORTAL_DEPENDENT_SHAKES", 4 ],
-            [ "EOC_PORTAL_DEPENDENT_NAUSEA", 4 ],
-            [ "EOC_PORTAL_DEPENDENT_STUN", 3 ],
-            [ "EOC_PORTAL_DEPENDENT_DOWNED", 3 ],
-            [ "EOC_PORTAL_DEPENDENT_STATS_BAD", 3 ],
-            [ "EOC_PORTAL_TELEPORT_STUCK_START", 3 ],
-            [ "EOC_PORTAL_DEPENDENT_PAIN", 2 ],
-            [ "EOC_PORTAL_DEPENDENT_PAIN_CONSTANT", 1 ],
-            [ "EOC_PORTAL_DEPENDENT_DAMAGE_CONSTANT", 1 ]
-          ]
-        },
-        "false_effect": {
-          "weighted_list_eocs": [
-            [ "EOC_PORTAL_DEPENDENT_MESSAGES_BAD", 10 ],
-            [ "EOC_PORTAL_DEPENDENT_MORALE_BAD", 3 ],
-            [ "EOC_PORTAL_DEPENDENT_FOCUS_BAD", 2 ],
-            [ "EOC_PORTAL_DEPENDENT_SHAKES", 1 ],
-            [ "EOC_PORTAL_DEPENDENT_NAUSEA", 1 ]
-          ]
-        }
+      "if": { "not": { "u_has_trait": "REALITY_GRASP" } },
+      "then": {
+        "weighted_list_eocs": [
+          [ "EOC_PORTAL_DEPENDENT_MESSAGES_BAD", 18 ],
+          [ "EOC_PORTAL_DEPENDENT_MORALE_BAD", 6 ],
+          [ "EOC_PORTAL_DEPENDENT_FOCUS_BAD", 5 ],
+          [ "EOC_PORTAL_DEPENDENT_SHAKES", 4 ],
+          [ "EOC_PORTAL_DEPENDENT_NAUSEA", 4 ],
+          [ "EOC_PORTAL_DEPENDENT_STUN", 3 ],
+          [ "EOC_PORTAL_DEPENDENT_DOWNED", 3 ],
+          [ "EOC_PORTAL_DEPENDENT_STATS_BAD", 3 ],
+          [ "EOC_PORTAL_TELEPORT_STUCK_START", 3 ],
+          [ "EOC_PORTAL_DEPENDENT_PAIN", 2 ],
+          [ "EOC_PORTAL_DEPENDENT_PAIN_CONSTANT", 1 ],
+          [ "EOC_PORTAL_DEPENDENT_DAMAGE_CONSTANT", 1 ]
+        ]
+      },
+      "else": {
+        "weighted_list_eocs": [
+          [ "EOC_PORTAL_DEPENDENT_MESSAGES_BAD", 10 ],
+          [ "EOC_PORTAL_DEPENDENT_MORALE_BAD", 3 ],
+          [ "EOC_PORTAL_DEPENDENT_FOCUS_BAD", 2 ],
+          [ "EOC_PORTAL_DEPENDENT_SHAKES", 1 ],
+          [ "EOC_PORTAL_DEPENDENT_NAUSEA", 1 ]
+        ]
       }
     }
   },
@@ -275,21 +266,14 @@
     "id": "EOC_PORTAL_DEPENDENT_STATS_BAD",
     "//": "Stats debuffs as consequence of your unstable condition.",
     "condition": { "not": { "u_has_effect": "sleep" } },
-    "effect": [
-      {
-        "run_eocs": {
-          "id": "EOC_PORTAL_DEPENDENT_STATS_EFFECTS",
-          "effect": {
-            "weighted_list_eocs": [
-              [ "EOC_PORTAL_DEPENDENT_STR_BAD", 1 ],
-              [ "EOC_PORTAL_DEPENDENT_DEX_BAD", 1 ],
-              [ "EOC_PORTAL_DEPENDENT_PER_BAD", 1 ],
-              [ "EOC_PORTAL_DEPENDENT_INT_BAD", 1 ]
-            ]
-          }
-        }
-      }
-    ]
+    "effect": {
+      "weighted_list_eocs": [
+        [ "EOC_PORTAL_DEPENDENT_STR_BAD", 1 ],
+        [ "EOC_PORTAL_DEPENDENT_DEX_BAD", 1 ],
+        [ "EOC_PORTAL_DEPENDENT_PER_BAD", 1 ],
+        [ "EOC_PORTAL_DEPENDENT_INT_BAD", 1 ]
+      ]
+    }
   },
   {
     "type": "effect_on_condition",
@@ -675,24 +659,21 @@
     "//": "Final reward for experiencing a whole different reality, allowing you to partially anchor yourself to reality again.",
     "effect": [
       {
-        "run_eocs": {
-          "id": "EOC_PORTAL_DEPENDENT_ACCEPTANCE_TRAIT",
-          "condition": { "not": { "u_has_trait": "REALITY_GRASP" } },
-          "effect": [
-            {
-              "u_message": "You suddenly feel a profound sense of belonging take root inside you, spreading throughout your body.  It fades quickly, but something warm remains…",
-              "type": "good"
-            },
-            { "u_add_trait": "REALITY_GRASP" }
-          ],
-          "false_effect": [
-            {
-              "u_message": "You suddenly feel a profound sense of belonging take root inside you, temporally amplifying your grasp of reality.  For some time you will be the master of your surroundings.",
-              "type": "good"
-            },
-            { "u_add_effect": "pd_strengthened_reality", "duration": "14 days", "intensity": 4 }
-          ]
-        }
+        "if": { "not": { "u_has_trait": "REALITY_GRASP" } },
+        "then": [
+          {
+            "u_message": "You suddenly feel a profound sense of belonging take root inside you, spreading throughout your body.  It fades quickly, but something warm remains…",
+            "type": "good"
+          },
+          { "u_add_trait": "REALITY_GRASP" }
+        ],
+        "else": [
+          {
+            "u_message": "You suddenly feel a profound sense of belonging take root inside you, temporally amplifying your grasp of reality.  For some time you will be the master of your surroundings.",
+            "type": "good"
+          },
+          { "u_add_effect": "pd_strengthened_reality", "duration": "14 days", "intensity": 4 }
+        ]
       },
       {
         "u_add_morale": "morale_feeling_good",