Shorter dialog var names (CleverRaven#53664)

mkrutov · Dec 23, 2021 · aebde3d · aebde3d
1 parent bd79b3f
commit aebde3d
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 230 deletions.
diff --git a/data/json/effect_on_condition.json b/data/json/effect_on_condition.json
@@ -353,14 +353,6 @@
     "deactivate_condition": { "not": { "u_has_bionics": "bio_leaky" } },
     "effect": [ { "u_mod_healthy": -1, "cap": -200 } ]
   },
-  {
-    "id": "EOC_MIGO_INTEREST_INCREASE",
-    "type": "effect_on_condition",
-    "recurrence_min": "7 days",
-    "recurrence_max": "14 days",
-    "condition": { "not": { "one_in_chance": 4 } },
-    "effect": [ { "u_adjust_var": "migo_interest", "type": "migo_interest", "context": "interest", "adjustment": 1 } ]
-  },
   {
     "id": "EOC_DEATH_SWITCH",
     "type": "effect_on_condition",

diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json
@@ -369,35 +369,27 @@
     "effect": [
       {
         "arithmetic": [
-          { "global_val": "var", "var_name": "ps_shifting_mass_fatigue", "type": "weather", "context": "ps" },
+          { "global_val": "var", "var_name": "ps_shifting_mass_fatigue" },
           "=",
-          { "global_val": "var", "var_name": "ps_str", "type": "weather", "context": "ps" },
+          { "global_val": "var", "var_name": "ps_str" },
           "+",
           { "const": 20 }
         ]
       },
       {
         "arithmetic": [
-          { "global_val": "var", "var_name": "ps_shifting_mass_stamina", "type": "weather", "context": "ps" },
+          { "global_val": "var", "var_name": "ps_shifting_mass_stamina" },
           "=",
-          { "global_val": "var", "var_name": "ps_str", "type": "weather", "context": "ps" },
+          { "global_val": "var", "var_name": "ps_str" },
           "+",
           { "const": 50 }
         ]
       },
       {
-        "arithmetic": [
-          { "u_val": "fatigue" },
-          "+=",
-          { "global_val": "var", "var_name": "ps_shifting_mass_fatigue", "type": "weather", "context": "ps" }
-        ]
+        "arithmetic": [ { "u_val": "fatigue" }, "+=", { "global_val": "var", "var_name": "ps_shifting_mass_fatigue" } ]
       },
       {
-        "arithmetic": [
-          { "u_val": "stamina" },
-          "+=",
-          { "global_val": "var", "var_name": "ps_shifting_mass_stamina", "type": "weather", "context": "ps" }
-        ]
+        "arithmetic": [ { "u_val": "stamina" }, "+=", { "global_val": "var", "var_name": "ps_shifting_mass_stamina" } ]
       },
       { "arithmetic": [ { "u_val": "sleep_deprivation" }, "+=", { "time": "1 minutes" } ] }
     ]
@@ -455,11 +447,11 @@
     "id": "EOC_absence_capture_attack",
     "condition": { "compare_int": [ { "distance": [ "u", "npc" ] }, { "const": 3 } ], "op": ">" },
     "effect": [
-      { "u_location_variable": { "value": "cage", "type": "eoc", "context": "transform", "global": true } },
+      { "u_location_variable": { "value": "portal_cage", "global": true } },
       {
         "u_transform_radius": 2,
         "ter_furn_transform": "portal_cage_transform",
-        "target_var": { "value": "cage", "type": "eoc", "context": "transform", "global": true }
+        "target_var": { "value": "portal_cage", "global": true }
       },
       {
         "set_queue_effect_on_condition": [
@@ -469,7 +461,7 @@
               {
                 "u_transform_radius": 2,
                 "ter_furn_transform": "portal_cage_revert_transform",
-                "target_var": { "value": "cage", "type": "eoc", "context": "transform", "global": true }
+                "target_var": { "value": "portal_cage", "global": true }
               }
             ]
           }