Merge branch 'CleverRaven:master' into atm

CleverRaven · Aug 31, 2024 · 3f4849c · 3f4849c
2 parents fcc619f + 3b69d6f
commit 3f4849c
Show file tree

Hide file tree

Showing 289 changed files with 152,275 additions and 116,298 deletions.
diff --git a/data/json/effects_on_condition/computer_eocs.json b/data/json/effects_on_condition/computer_eocs.json
@@ -50,19 +50,19 @@
     "//": "todo: make it not reveal fungal towers and such? would require edits in reveal_map code, to accept blacklist of locations?",
     "condition": {
       "or": [
-        { "npc_has_var": "map_cache", "value": "has" },
-        { "npc_has_var": "map_cache", "value": "lack" },
-        { "npc_has_var": "map_cache", "value": "read" }
+        { "compare_string": [ "has", { "npc_val": "map_cache" } ] },
+        { "compare_string": [ "lack", { "npc_val": "map_cache" } ] },
+        { "compare_string": [ "read", { "npc_val": "map_cache" } ] }
       ]
     },
     "false_effect": [ { "npc_add_var": "map_cache", "possible_values": [ "has", "lack" ] }, { "run_eocs": "EOC_CHECK_MAP_CACHE" } ],
     "effect": [
       {
-        "if": { "npc_has_var": "map_cache", "value": "read" },
+        "if": { "compare_string": [ "read", { "npc_val": "map_cache" } ] },
         "then": [ { "u_message": "You already noted everything map application on this phone can offer." } ]
       },
       {
-        "if": { "npc_has_var": "map_cache", "value": "has" },
+        "if": { "compare_string": [ "has", { "npc_val": "map_cache" } ] },
         "then": [
           { "location_variable_adjust": { "npc_val": "spawn_location_omt" }, "z_adjust": 0, "z_override": true },
           { "reveal_map": { "npc_val": "spawn_location_omt" }, "radius": { "math": [ "rng(11, 36)" ] } },
@@ -71,7 +71,7 @@
         ]
       },
       {
-        "if": { "npc_has_var": "map_cache", "value": "lack" },
+        "if": { "compare_string": [ "lack", { "npc_val": "map_cache" } ] },
         "then": [ { "u_message": "Whoever used this phone didn't ever open their map application.  Worthless." } ]
       }
     ]

diff --git a/data/json/effects_on_condition/example_eocs.json b/data/json/effects_on_condition/example_eocs.json
@@ -76,7 +76,7 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_item_transporter_test_2",
-    "condition": { "u_has_var": "eoc_sample_item_transporter_set_coordinates", "value": "yes" },
+    "condition": { "compare_string": [ "yes", { "u_val": "eoc_sample_item_transporter_set_coordinates" } ] },
     "effect": [
       {
         "u_run_inv_eocs": "manual_mult",
@@ -128,12 +128,12 @@
     "id": "EOC_if_else_test",
     "effect": [
       {
-        "if": { "u_has_var": "eoc_sample_if_else_test", "value": "yes" },
+        "if": { "compare_string": [ "yes", { "u_val": "eoc_sample_if_else_test" } ] },
         "then": { "u_message": "You have variable." },
         "else": [
           { "u_message": "You don't have variable." },
           {
-            "if": { "not": { "u_has_var": "eoc_sample_if_else_test", "value": "yes" } },
+            "if": { "not": { "compare_string": [ "yes", { "u_val": "eoc_sample_if_else_test" } ] } },
             "then": [ { "u_add_var": "eoc_sample_if_else_test", "value": "yes" }, { "u_message": "Variable added." } ]
           }
         ]

diff --git a/data/json/effects_on_condition/mapgen_eocs/lab_mapgen_eocs.json b/data/json/effects_on_condition/mapgen_eocs/lab_mapgen_eocs.json
@@ -46,7 +46,7 @@
       "and": [
         { "u_at_om_location": "lab_security_z-1" },
         { "u_has_item": "id_science_security_yellow" },
-        { "not": { "u_has_var": "check_trap_trigger_valid_security_employee", "value": "yes" } }
+        { "not": { "compare_string": [ "yes", { "u_val": "check_trap_trigger_valid_security_employee" } ] } }
       ]
     },
     "effect": [

diff --git a/data/json/effects_on_condition/misc_effect_on_condition.json b/data/json/effects_on_condition/misc_effect_on_condition.json
@@ -14,23 +14,23 @@
     "id": "ambient_subway",
     "recurrence": [ "1 hours", "2 hours" ],
     "global": true,
-    "condition": { "or": [ { "u_at_om_location": "subway_ns" }, { "u_at_om_location": "subway_ew" } ] },
+    "condition": { "u_at_om_location": "subway" },
     "effect": [ { "u_message": "<AMBIENT_SUBWAY>", "snippet": true, "sound": true } ]
   },
   {
     "type": "effect_on_condition",
     "id": "ambient_lab_subway",
     "recurrence": [ "1 hours", "2 hours" ],
     "global": true,
-    "condition": { "or": [ { "u_at_om_location": "lab_subway_ns" }, { "u_at_om_location": "lab_subway_ew" } ] },
+    "condition": { "u_at_om_location": "lab_subway" },
     "effect": [ { "u_message": "<AMBIENT_LAB_SUBWAY>", "snippet": true, "sound": true } ]
   },
   {
     "type": "effect_on_condition",
     "id": "ambient_sewer",
     "recurrence": [ "1 hours", "2 hours" ],
     "global": true,
-    "condition": { "or": [ { "u_at_om_location": "sewer_ns" }, { "u_at_om_location": "sewer_ew" } ] },
+    "condition": { "u_at_om_location": "sewer" },
     "effect": [ { "u_message": "<AMBIENT_SEWER>", "snippet": true, "sound": true } ]
   },
   {
@@ -133,7 +133,7 @@
     "id": "sewer_morale_debuff",
     "global": false,
     "recurrence": [ "20 minutes", "1 hour" ],
-    "condition": { "or": [ { "u_at_om_location": "sewer_ns" }, { "u_at_om_location": "sewer_ew" } ] },
+    "condition": { "u_at_om_location": "sewer" },
     "effect": [
       { "u_message": "<SEWER_MORALE_DEBUFF>", "snippet": true },
       {

diff --git a/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json
@@ -657,7 +657,9 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_PORTAL_YRAX_ATTENTION",
-    "condition": { "and": [ "u_is_outside", { "u_has_var": "u_met_apeirohedra", "value": "yes" }, { "one_in_chance": 400 } ] },
+    "condition": {
+      "and": [ "u_is_outside", { "compare_string": [ "yes", { "u_val": "u_met_apeirohedra" } ] }, { "one_in_chance": 400 } ]
+    },
     "effect": [
       { "u_message": "An alien construct emerges from the storm.", "type": "neutral" },
       { "u_spawn_monster": "mon_yrax_quadraphract", "real_count": 1, "min_radius": 10, "max_radius": 15 }

diff --git a/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json
@@ -15,7 +15,8 @@
         "type": "neutral",
         "popup": true
       },
-      { "math": [ "u_vitri_glass_entered", "=", "1" ] }
+      { "math": [ "u_vitri_glass_entered", "=", "1" ] },
+      { "math": [ "u_back_from_vitri_glass", "=", "0" ] }
     ]
   },
   {
@@ -364,7 +365,11 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_queue_unvitrified_return",
-    "effect": { "queue_eocs": "EOC_unvitrified_return", "time_in_future": "1 seconds" }
+    "condition": { "math": [ "u_back_from_vitri_glass", "<", "1" ] },
+    "effect": [
+      { "queue_eocs": "EOC_unvitrified_return", "time_in_future": "1 seconds" },
+      { "math": [ "u_back_from_vitri_glass", "=", "1" ] }
+    ]
   },
   {
     "type": "effect_on_condition",

diff --git a/data/json/effects_on_condition/npc_eocs/appearance_eocs.json b/data/json/effects_on_condition/npc_eocs/appearance_eocs.json
@@ -232,22 +232,22 @@
     "effect": [
       { "run_eocs": "assign_random_natural_hair_color" },
       {
-        "if": { "u_has_var": "mutation_hair_color_natural_hair_color_black", "value": "yes" },
+        "if": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_natural_hair_color_black" } ] },
         "then": [ { "u_add_trait": { "context_val": "trait_id" }, "variant": "black" } ],
         "else": {
-          "if": { "u_has_var": "mutation_hair_color_natural_hair_color_blond", "value": "yes" },
+          "if": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_natural_hair_color_blond" } ] },
           "then": [ { "u_add_trait": { "context_val": "trait_id" }, "variant": "blond" } ],
           "else": {
-            "if": { "u_has_var": "mutation_hair_color_natural_hair_color_brown", "value": "yes" },
+            "if": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_natural_hair_color_brown" } ] },
             "then": [ { "u_add_trait": { "context_val": "trait_id" }, "variant": "brown" } ],
             "else": {
-              "if": { "u_has_var": "mutation_hair_color_natural_hair_color_gray", "value": "yes" },
+              "if": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_natural_hair_color_gray" } ] },
               "then": [ { "u_add_trait": { "context_val": "trait_id" }, "variant": "gray" } ],
               "else": {
-                "if": { "u_has_var": "mutation_hair_color_natural_hair_color_red", "value": "yes" },
+                "if": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_natural_hair_color_red" } ] },
                 "then": [ { "u_add_trait": { "context_val": "trait_id" }, "variant": "red" } ],
                 "else": {
-                  "if": { "u_has_var": "mutation_hair_color_natural_hair_color_white", "value": "yes" },
+                  "if": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_natural_hair_color_white" } ] },
                   "then": [ { "u_add_trait": { "context_val": "trait_id" }, "variant": "white" } ]
                 }
               }
@@ -393,12 +393,12 @@
     "id": "assign_random_natural_hair_color",
     "condition": {
       "and": [
-        { "not": { "u_has_var": "mutation_hair_color_natural_hair_color_black", "value": "yes" } },
-        { "not": { "u_has_var": "mutation_hair_color_natural_hair_color_blond", "value": "yes" } },
-        { "not": { "u_has_var": "mutation_hair_color_natural_hair_color_brown", "value": "yes" } },
-        { "not": { "u_has_var": "mutation_hair_color_natural_hair_color_gray", "value": "yes" } },
-        { "not": { "u_has_var": "mutation_hair_color_natural_hair_color_red", "value": "yes" } },
-        { "not": { "u_has_var": "mutation_hair_color_natural_hair_color_white", "value": "yes" } }
+        { "not": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_natural_hair_color_black" } ] } },
+        { "not": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_natural_hair_color_blond" } ] } },
+        { "not": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_natural_hair_color_brown" } ] } },
+        { "not": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_natural_hair_color_gray" } ] } },
+        { "not": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_natural_hair_color_red" } ] } },
+        { "not": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_natural_hair_color_white" } ] } }
       ]
     },
     "effect": [
@@ -417,7 +417,7 @@
   {
     "type": "effect_on_condition",
     "id": "natural_hair_color_black",
-    "condition": { "not": { "u_has_var": "mutation_hair_color_picked_hair_color", "value": "yes" } },
+    "condition": { "not": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_picked_hair_color" } ] } },
     "effect": [
       { "u_add_var": "mutation_hair_color_natural_hair_color_black", "value": "yes" },
       { "u_add_var": "mutation_hair_color_picked_hair_color", "value": "yes" }
@@ -426,7 +426,7 @@
   {
     "type": "effect_on_condition",
     "id": "natural_hair_color_blond",
-    "condition": { "not": { "u_has_var": "mutation_hair_color_picked_hair_color", "value": "yes" } },
+    "condition": { "not": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_picked_hair_color" } ] } },
     "effect": [
       { "u_add_var": "mutation_hair_color_natural_hair_color_blond", "value": "yes" },
       { "u_add_var": "mutation_hair_color_picked_hair_color", "value": "yes" }
@@ -435,7 +435,7 @@
   {
     "type": "effect_on_condition",
     "id": "natural_hair_color_brown",
-    "condition": { "not": { "u_has_var": "mutation_hair_color_picked_hair_color", "value": "yes" } },
+    "condition": { "not": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_picked_hair_color" } ] } },
     "effect": [
       { "u_add_var": "mutation_hair_color_natural_hair_color_brown", "value": "yes" },
       { "u_add_var": "mutation_hair_color_picked_hair_color", "value": "yes" }
@@ -444,7 +444,7 @@
   {
     "type": "effect_on_condition",
     "id": "natural_hair_color_gray",
-    "condition": { "not": { "u_has_var": "mutation_hair_color_picked_hair_color", "value": "yes" } },
+    "condition": { "not": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_picked_hair_color" } ] } },
     "effect": [
       { "u_add_var": "mutation_hair_color_natural_hair_color_gray", "value": "yes" },
       { "u_add_var": "mutation_hair_color_picked_hair_color", "value": "yes" }
@@ -453,7 +453,7 @@
   {
     "type": "effect_on_condition",
     "id": "natural_hair_color_white",
-    "condition": { "not": { "u_has_var": "mutation_hair_color_picked_hair_color", "value": "yes" } },
+    "condition": { "not": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_picked_hair_color" } ] } },
     "effect": [
       { "u_add_var": "mutation_hair_color_natural_hair_color_white", "value": "yes" },
       { "u_add_var": "mutation_hair_color_picked_hair_color", "value": "yes" }
@@ -462,7 +462,7 @@
   {
     "type": "effect_on_condition",
     "id": "natural_hair_color_red",
-    "condition": { "not": { "u_has_var": "mutation_hair_color_picked_hair_color", "value": "yes" } },
+    "condition": { "not": { "compare_string": [ "yes", { "u_val": "mutation_hair_color_picked_hair_color" } ] } },
     "effect": [
       { "u_add_var": "mutation_hair_color_natural_hair_color_red", "value": "yes" },
       { "u_add_var": "mutation_hair_color_picked_hair_color", "value": "yes" }

diff --git a/data/json/effects_on_condition/npc_eocs/godco_npc_eocs.json b/data/json/effects_on_condition/npc_eocs/godco_npc_eocs.json
@@ -37,7 +37,7 @@
         }
       ]
     },
-    "deactivate_condition": { "u_has_var": "dialogue_godco_godco_notalk_to_u", "value": "yes" },
+    "deactivate_condition": { "compare_string": [ "yes", { "u_val": "dialogue_godco_godco_notalk_to_u" } ] },
     "effect": [ { "u_add_var": "dialogue_godco_godco_notalk_to_u", "value": "yes" } ]
   },
   {
@@ -47,11 +47,11 @@
     "global": true,
     "condition": {
       "and": [
-        { "u_has_var": "general_completed_theresa_going_away", "value": "yes" },
+        { "compare_string": [ "yes", { "u_val": "general_completed_theresa_going_away" } ] },
         { "u_near_om_location": "godco_3", "range": 12 }
       ]
     },
-    "deactivate_condition": { "u_has_var": "general_completed_theresa_gone", "value": "yes" },
+    "deactivate_condition": { "compare_string": [ "yes", { "u_val": "general_completed_theresa_gone" } ] },
     "effect": [
       { "mapgen_update": "theresa_remove", "om_terrain": "godco_3" },
       { "u_lose_var": "general_completed_theresa_going_away" },
@@ -111,10 +111,10 @@
     "condition": {
       "and": [
         { "math": [ "godco_has_canningpots", "==", "1" ] },
-        { "not": { "npc_has_var": "dialogue_missions_got_mission", "value": "yes" } }
+        { "not": { "compare_string": [ "yes", { "npc_val": "dialogue_missions_got_mission" } ] } }
       ]
     },
-    "deactivate_condition": { "npc_has_var": "dialogue_missions_got_mission", "value": "yes" },
+    "deactivate_condition": { "compare_string": [ "yes", { "npc_val": "dialogue_missions_got_mission" } ] },
     "effect": [
       { "offer_mission": "MISSION_GODCO_FOOD_GUARD_CANNING_STARTUP" },
       { "npc_add_var": "dialogue_missions_got_mission", "value": "yes" }

diff --git a/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json b/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json
@@ -148,7 +148,7 @@
       "and": [
         { "math": [ "isherwood_barry_rescued", "!=", "1" ] },
         { "math": [ "isherwood_family_coming", "!=", "1" ] },
-        { "u_has_var": "barry_following", "type": "general", "context": "meeting", "value": "yes" },
+        { "compare_string": [ "yes", { "u_val": "general_meeting_barry_following" } ] },
         { "u_near_om_location": "horse_farm_isherwood_13", "range": 30 }
       ]
     },
@@ -307,7 +307,7 @@
     "condition": {
       "and": [
         { "u_has_mission": "MISSION_ISHERWOOD_CHRIS_1" },
-        { "not": { "u_has_var": "barry_following", "type": "general", "context": "meeting", "value": "yes" } },
+        { "not": { "compare_string": [ "yes", { "u_val": "general_meeting_barry_following" } ] } },
         {
           "and": [
             { "not": { "u_near_om_location": "barry_mi-go_scout_tower_1", "range": 2 } },
@@ -494,7 +494,7 @@
         { "u_near_om_location": "barry_mi-go_scout_tower_4", "range": 3 }
       ]
     },
-    "deactivate_condition": { "u_has_var": "u_been_to_migos", "value": "yes" },
+    "deactivate_condition": { "compare_string": [ "yes", { "u_val": "u_been_to_migos" } ] },
     "effect": [ { "u_add_var": "u_been_to_migos", "value": "yes" } ]
   }
 ]
diff --git a/data/json/encounters/randec_independent_travelers.json b/data/json/encounters/randec_independent_travelers.json
@@ -22,7 +22,7 @@
     "type": "effect_on_condition",
     "id": "EOC_traveler_random_destination_direction",
     "//": "Picks a random direction for the NPC in question to be going in.  Used for dialogue checks.",
-    "condition": { "not": { "u_has_var": "dialogue_travel_direction_picked_direction", "value": "yes" } },
+    "condition": { "not": { "compare_string": [ "yes", { "u_val": "dialogue_travel_direction_picked_direction" } ] } },
     "effect": [
       {
         "weighted_list_eocs": [

diff --git a/data/json/encounters/randenc_refugee_center.json b/data/json/encounters/randenc_refugee_center.json
@@ -11,7 +11,7 @@
         { "not": { "u_near_om_location": "evac_center_13", "range": 2 } },
         "is_day",
         { "one_in_chance": 10 },
-        { "u_has_var": "mission_flag_FMShopkeep_Mission1", "value": "yes" },
+        { "compare_string": [ "yes", { "u_val": "mission_flag_FMShopkeep_Mission1" } ] },
         { "math": [ "time_since(u_timer_RC_Shoppers_RandEnc)", ">=", "time('1 d')" ] }
       ]
     },
@@ -58,7 +58,7 @@
         { "not": { "u_near_om_location": "evac_center_13", "range": 2 } },
         "is_day",
         { "one_in_chance": 15 },
-        { "u_has_var": "mission_flag_FMShopkeep_Mission1", "value": "yes" },
+        { "compare_string": [ "yes", { "u_val": "mission_flag_FMShopkeep_Mission1" } ] },
         { "math": [ "time_since(u_timer_JohnBailey_RandEnc)", ">=", "time('3 d')" ] }
       ]
     },

diff --git a/data/json/itemgroups/electronics.json b/data/json/itemgroups/electronics.json
@@ -159,7 +159,7 @@
       { "item": "light_battery_cell", "charges": 1000, "prob": 160, "count": [ 0, 8 ] },
       { "item": "light_battery_cell", "charges": 1000, "prob": 16, "count": [ 0, 16 ] },
       { "item": "light_cell_rechargeable", "charges": 1000, "prob": 16, "count": [ 0, 8 ] },
-      { "item": "light_cell_rechargeable", "charges": 1000, "prob": 1, "count": [ 0, 16 ] },
+      { "item": "light_cell_rechargeable", "charges": 1000, "prob": 1, "count": [ 0, 12 ] },
       { "item": "medium_battery_cell", "charges": 1000, "prob": 15, "count": [ 0, 4 ] }
     ]
   }

diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json
@@ -1372,15 +1372,15 @@
         },
         {
           "id": "EOC_MIGO_BIO_TECH_SETUP",
-          "condition": { "not": { "npc_has_var": "mbt_f_function_set", "value": "yes" } },
+          "condition": { "not": { "compare_string": [ "yes", { "npc_val": "mbt_f_function_set" } ] } },
           "effect": [
             { "npc_add_var": "mbt_f_function_set", "value": "yes" },
             { "npc_add_var": "mbt_f_function", "possible_values": [ "morale", "focus", "pain", "sleepiness" ] }
           ]
         },
         {
           "id": "EOC_MIGO_BIO_TECH_MORALE",
-          "condition": { "npc_has_var": "mbt_f_function", "value": "morale" },
+          "condition": { "compare_string": [ "morale", { "npc_val": "mbt_f_function" } ] },
           "effect": [
             { "u_message": "You feel amazing!" },
             {
@@ -1394,20 +1394,20 @@
         },
         {
           "id": "EOC_MIGO_BIO_TECH_FOCUS",
-          "condition": { "npc_has_var": "mbt_f_function", "value": "focus" },
+          "condition": { "compare_string": [ "focus", { "npc_val": "mbt_f_function" } ] },
           "effect": [
             { "u_message": "You feel incredibly focused!" },
             { "math": [ "u_val('focus')", "+=", "min( u_val('focus') + 30, 130)" ] }
           ]
         },
         {
           "id": "EOC_MIGO_BIO_TECH_PAIN",
-          "condition": { "npc_has_var": "mbt_f_function", "value": "pain" },
+          "condition": { "compare_string": [ "pain", { "npc_val": "mbt_f_function" } ] },
           "effect": [ { "u_message": "You feel your aches and pains fade away!" }, { "math": [ "u_pain()", "-=", "30" ] } ]
         },
         {
           "id": "EOC_MIGO_BIO_TECH_SLEEPINESS",
-          "condition": { "npc_has_var": "mbt_f_function", "value": "sleepiness" },
+          "condition": { "compare_string": [ "sleepiness", { "npc_val": "mbt_f_function" } ] },
           "effect": [ { "u_message": "You instantly feel more awake!" }, { "math": [ "u_val('sleepiness')", "-=", "30" ] } ]
         }
       ]

diff --git a/data/json/mapgen/fema/FEMA_tlc_01.json b/data/json/mapgen/fema/FEMA_tlc_01.json
@@ -45,7 +45,7 @@
       "fill_ter": "t_dirt",
       "rows": [
         "........................",
-        ".Fffffffffffffffffffffff",
+        ".fffffffffffffffffffffff",
         ".f......................",
         ".f......................",
         ".f..========**========..",

diff --git a/data/json/mapgen/fema/FEMA_trc_01.json b/data/json/mapgen/fema/FEMA_trc_01.json
@@ -45,7 +45,7 @@
       "fill_ter": "t_dirt",
       "rows": [
         "........................",
-        ".Fffffffffffffffffffffff",
+        ".fffffffffffffffffffffff",
         ".f......................",
         ".f......................",
         ".f..========**========..",