Mansion Escape balance update (#72787)

* Mansion Update * Lint * Implement suggestions Co-Authored-By: NetSysFire <[email protected]> * Adjust mansion monster spawns * Json Lint --------- Co-authored-by: NetSysFire <[email protected]>
CleverRaven · May 2, 2024 · 5ead8e7 · 5ead8e7
1 parent e14a732
commit 5ead8e7
Show file tree

Hide file tree

Showing 8 changed files with 389 additions and 126 deletions.
diff --git a/data/json/effects_on_condition/scenario_specific_eocs.json b/data/json/effects_on_condition/scenario_specific_eocs.json
@@ -50,6 +50,7 @@
     "type": "effect_on_condition",
     "id": "scenario_mansion_pursuit",
     "eoc_type": "SCENARIO_SPECIFIC",
+    "//": "EOC_BANISH_MANSION_MONSTERS is not triggering/working at the moment.",
     "effect": [
       {
         "u_location_variable": { "u_val": "mansion_centre" },
@@ -68,8 +69,9 @@
       { "run_eocs": "EOC_SPAWN_MANSION_MONSTERS" },
       {
         "u_run_monster_eocs": [ { "id": "EOC_BANISH_MONSTERS_AROUND_PLAYER", "effect": { "run_eocs": "EOC_BANISH_SELF" } } ],
-        "monster_range": 6
-      }
+        "monster_range": 12
+      },
+      { "run_eocs": "EOC_SPAWN_MANSION_MONSTERS_NEAR_PLAYER" }
     ]
   },
   {
@@ -91,6 +93,17 @@
           }
         ],
         "monster_range": 36
+      },
+      {
+        "npc_run_monster_eocs": [ { "id": "EOC_BANISH_MANSION_CIVILIANS", "effect": { "run_eocs": "EOC_BANISH_SELF" } } ],
+        "mtype_ids": [
+          "mon_civilian_panic",
+          "mon_civilian_parent",
+          "mon_civilian_police",
+          "mon_civilian_stationary",
+          "mon_civilian_zombiefighter"
+        ],
+        "monster_range": 50
       }
     ]
   },
@@ -104,21 +117,66 @@
         "group": true,
         "real_count": 1,
         "min_radius": 0,
-        "max_radius": 36,
+        "max_radius": 18,
         "target_var": { "u_val": "mansion_centre" },
         "indoor_only": true
       },
       {
         "u_spawn_monster": "GROUP_MANSION_START",
         "group": true,
-        "real_count": 20,
+        "real_count": 15,
         "min_radius": 0,
         "max_radius": 36,
         "target_var": { "u_val": "mansion_centre" },
         "indoor_only": true
       }
     ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_SPAWN_MANSION_MONSTERS_NEAR_PLAYER",
+    "//": "Spawn mansion monsters near the player, either for lore or as weak obstacles.",
+    "effect": [
+      {
+        "run_eocs": {
+          "id": "EOC_SEX_LAIR_SPAWNS",
+          "condition": { "and": [ { "u_near_om_location": "mansion_boarded_t2d_start" }, { "math": [ "rand(2)", "==", "0" ] } ] },
+          "effect": [
+            {
+              "u_spawn_monster": "mon_zombie_resort_dancer",
+              "real_count": { "math": [ "1 + rand(1)" ] },
+              "min_radius": 3,
+              "max_radius": 5
+            },
+            { "u_message": "What was that sound?", "type": "warning", "popup": true }
+          ]
+        }
+      },
+      {
+        "run_eocs": {
+          "id": "EOC_PANICROOM_SPAWNS",
+          "condition": { "and": [ { "u_near_om_location": "mansion_boarded_t2_start" }, { "math": [ "rand(1)", "==", "0" ] } ] },
+          "effect": [
+            {
+              "u_spawn_monster": "GROUP_SCENARIO_PANICROOM",
+              "group": true,
+              "real_count": { "math": [ "1 + rand(1)" ] },
+              "max_radius": 2
+            },
+            { "u_message": "Is there someone else in here?", "type": "warning", "popup": true }
+          ]
+        }
+      },
+      {
+        "u_spawn_monster": "GROUP_MANSION_PURSUERS",
+        "group": true,
+        "real_count": 5,
+        "min_radius": 10,
+        "max_radius": 16,
+        "indoor_only": true
+      }
+    ]
+  },
   {
     "type": "effect_on_condition",
     "id": "scenario_assassin_convict",