Merge pull request CleverRaven#75499 from GuardianDll/google_maps

Google Maps
casswedson · Aug 10, 2024 · e5033d9 · e5033d9
2 parents e240f7c + 5338029
commit e5033d9
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 6 deletions.
diff --git a/data/json/effects_on_condition/computer_eocs.json b/data/json/effects_on_condition/computer_eocs.json
@@ -1,4 +1,32 @@
 [
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_SMARTPHONE_EOCS",
+    "//": "should be removed if any of #74335, #71814, #50277 and #28975 would be resolved",
+    "effect": [
+      {
+        "run_eoc_selector": [ "EOC_READ_LOCAL_FILES_pseudo", "EOC_CHECK_MAP_CACHE_pseudo" ],
+        "names": [ "Dig into local files and logs", "Check map application" ],
+        "title": "Pick the action",
+        "descriptions": [
+          "You can take a look at the local files stored on this phone.",
+          "You can check is there any map cache on this smartphone."
+        ]
+      }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_READ_LOCAL_FILES_pseudo",
+    "//": "for selector cannot pick EoCs that are failing",
+    "effect": [ { "run_eocs": "EOC_READ_LOCAL_FILES" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_CHECK_MAP_CACHE_pseudo",
+    "//": "for selector cannot pick EoCs that are failing",
+    "effect": [ { "run_eocs": "EOC_CHECK_MAP_CACHE" } ]
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_READ_LOCAL_FILES",
@@ -14,5 +42,35 @@
         }
       ]
     }
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_CHECK_MAP_CACHE",
+    "condition": {
+      "or": [
+        { "npc_has_var": "map_cache", "value": "has" },
+        { "npc_has_var": "map_cache", "value": "lack" },
+        { "npc_has_var": "map_cache", "value": "read" }
+      ]
+    },
+    "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" },
+        "then": [ { "u_message": "You already noted everything map application on this phone can offer." } ]
+      },
+      {
+        "if": { "npc_has_var": "map_cache", "value": "has" },
+        "then": [
+          { "reveal_map": { "npc_val": "spawn_location_omt" }, "radius": { "math": [ "rng(11, 36)" ] } },
+          { "npc_add_var": "map_cache", "value": "read" },
+          { "u_message": "You found some cached map in the map application, and noted it.", "type": "good" }
+        ]
+      },
+      {
+        "if": { "npc_has_var": "map_cache", "value": "lack" },
+        "then": [ { "u_message": "Whoever used this phone didn't ever open their map application.  Worthless." } ]
+      }
+    ]
   }
 ]
diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json
@@ -388,8 +388,8 @@
       {
         "type": "effect_on_conditions",
         "menu_text": "Dig into local files and logs",
-        "description": "You can take a look at the local files stored on this laptop.",
-        "//need_charges_msg": "The laptop's batteries need more charge.",
+        "description": "You can take a look at the local files stored on this smartphone.",
+        "//need_charges_msg": "The smartphone's charge is too low.",
         "effect_on_conditions": [ "EOC_READ_LOCAL_FILES" ]
       },
       {
@@ -653,10 +653,9 @@
       "EBOOKREAD",
       {
         "type": "effect_on_conditions",
-        "menu_text": "Dig into local files and logs",
-        "description": "You can take a look at the local files stored on this smartphone.",
-        "//need_charges_msg": "The smartphone's charge is too low.",
-        "effect_on_conditions": [ "EOC_READ_LOCAL_FILES" ]
+        "menu_text": "Check the system",
+        "description": "Check another applications and files.",
+        "effect_on_conditions": [ "EOC_SMARTPHONE_EOCS" ]
       },
       {
         "target": "smart_phone_flashlight",