Merge pull request #56921 from Ilysen/camspy-memes

Fixes Hub 01 having extremely enthusiastic camspy operators
CleverRaven · Apr 21, 2022 · 445fc89 · 445fc89
2 parents 8abcb3f + adecbd7
commit 445fc89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/data/json/effect_on_condition.json b/data/json/effect_on_condition.json
@@ -168,12 +168,12 @@
   },
   {
     "type": "effect_on_condition",
-    "id": "eoc_robofac_surveillance",
+    "id": "robofac_surveillance",
+    "recurrence": [ "1 days", "7 days" ],
+    "global": true,
     "condition": { "or": [ { "u_has_trait": "PROF_HUB01_ANCILLIARY" }, { "u_has_effect": "robofac_surveillance" } ] },
-    "deactivate_condition": { "not": { "or": [ { "u_has_trait": "PROF_HUB01_ANCILLIARY" }, { "u_has_effect": "robofac_surveillance" } ] } },
     "effect": [
-      { "u_spawn_monster": "mon_robofac_camspy", "real_count": 1, "min_radius": 15, "max_radius": 40, "outdoor_only": true },
-      { "queue_eocs": "eoc_robofac_surveillance", "time_in_future": [ "1 days", "7 days" ] }
+      { "u_spawn_monster": "mon_robofac_camspy", "real_count": 1, "min_radius": 15, "max_radius": 40, "outdoor_only": true }
     ]
   },
   {

diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json
@@ -324,7 +324,7 @@
         "text": "[Identify yourself before the intercom.]",
         "condition": { "npc_has_var": "npc_intercom_trade", "type": "dialogue", "context": "intercom", "value": "yes" },
         "topic": "TALK_ROBOFAC_INTERCOM_SERVICES",
-        "effect": [ { "run_eocs": "eoc_robofac_surveillance" }, { "u_add_effect": "robofac_surveillance", "duration": "14 days" } ]
+        "effect": { "u_add_effect": "robofac_surveillance", "duration": "14 days" }
       },
       {
         "text": "[Press the button.]",