From e25e3b44bf532917eedbe8103cb0ce3e4dd21ba2 Mon Sep 17 00:00:00 2001
From: curstwist <39442864+curstwist@users.noreply.github.com>
Date: Mon, 25 Oct 2021 20:23:21 -0400
Subject: [PATCH] TCL light trap and spawn adjustments (#52424)

---
 .../mapgen/lab/lab_modular/lab_2x2x2_RES_8_bedrooms.json  | 8 ++++----
 .../mapgen/lab/lab_modular/lab_2x2x2_RES_8_commons.json   | 8 ++++----
 .../overmap_special/lab_modular/lab_mutagen_6_floor.json  | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_bedrooms.json b/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_bedrooms.json
index 4ef5abfec4919..f7db047922130 100644
--- a/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_bedrooms.json
+++ b/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_bedrooms.json
@@ -35,7 +35,7 @@
       "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ],
       "terrain": { "¥": "t_card_science_security_magenta" },
       "place_traps": [
-        { "trap": "tr_light_on_res_8_NW", "x": [ 8, 10 ], "y": [ 1, 23 ], "repeat": [ 1, 2 ] },
+        { "trap": "tr_light_on_res_8_NW", "x": [ 8, 10 ], "y": [ 1, 23 ] },
         { "trap": "tr_concrete_wall_door_lab_res_8_NW", "x": [ 8, 10 ], "y": [ 1, 23 ], "repeat": [ 2, 3 ] }
       ],
       "place_loot": [
@@ -98,7 +98,7 @@
       "palettes": [ "lab_common_palette", "lab_residential_palette", "standard_domestic_lino_bathroom" ],
       "terrain": { "¥": "t_card_science_maintenance_yellow" },
       "place_traps": [
-        { "trap": "tr_light_on_res_8_NE", "x": [ 13, 15 ], "y": [ 1, 23 ], "repeat": [ 2, 3 ] },
+        { "trap": "tr_light_on_res_8_NE", "x": [ 13, 15 ], "y": [ 1, 23 ] },
         { "trap": "tr_concrete_wall_door_lab_res_8_NE", "x": [ 13, 15 ], "y": [ 1, 23 ], "repeat": [ 1, 2 ] }
       ],
       "place_nested": [
@@ -171,7 +171,7 @@
         { "chunks": [ [ "lab_cargo_5x5", 100 ] ], "x": 2, "y": 7 }
       ],
       "place_monsters": [ { "monster": "GROUP_LAB_MAINTENANCE", "x": [ 1, 4 ], "y": [ 1, 22 ], "density": 0.1 } ],
-      "place_traps": [ { "trap": "tr_light_on_res_8_SW", "x": [ 8, 23 ], "y": [ 10, 12 ], "repeat": [ 1, 2 ] } ]
+      "place_traps": [ { "trap": "tr_light_on_res_8_SW", "x": [ 8, 23 ], "y": [ 10, 12 ] } ]
     }
   },
   {
@@ -223,7 +223,7 @@
         { "chunks": [ [ "lab_cargo_5x5", 100 ] ], "x": 18, "y": 1 }
       ],
       "place_monsters": [ { "monster": "GROUP_LAB_MAINTENANCE", "x": [ 19, 21 ], "y": [ 1, 22 ], "density": 0.1 } ],
-      "place_traps": [ { "trap": "tr_light_on_res_8_SE", "x": [ 2, 23 ], "y": [ 10, 12 ], "repeat": [ 3, 4 ] } ]
+      "place_traps": [ { "trap": "tr_light_on_res_8_SE", "x": [ 0, 14 ], "y": [ 10, 12 ] } ]
     }
   }
 ]
diff --git a/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_commons.json b/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_commons.json
index 2dd6b134931d1..278f284cad84c 100644
--- a/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_commons.json
+++ b/data/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_commons.json
@@ -36,7 +36,7 @@
       "traps": { "(": "tr_rollmat" },
       "terrain": { "¥": "t_card_science_maintenance_yellow" },
       "furniture": { "!": "f_exercise", "}": [ "f_ergometer", "f_ergometer_mechanical" ], "{": "f_punching_bag" },
-      "place_traps": [ { "trap": "tr_light_on_res_8_NW", "x": [ 8, 10 ], "y": [ 1, 23 ], "repeat": [ 1, 2 ] } ],
+      "place_traps": [ { "trap": "tr_light_on_res_8_NW", "x": [ 8, 10 ], "y": [ 1, 23 ] } ],
       "place_nested": [ { "chunks": [ "lab_17x17_shop" ], "x": 1, "y": 0 }, { "chunks": [ "lab_maintenance_6x6_open" ], "x": 1, "y": 18 } ],
       "place_monsters": [
         { "monster": "GROUP_LAB_RESEARCHERS", "x": [ 13, 22 ], "y": [ 8, 22 ], "density": 0.08 },
@@ -232,7 +232,7 @@
         "H": "t_carpet_concrete_yellow",
         "l": "t_carpet_concrete_yellow"
       },
-      "place_traps": [ { "trap": "tr_light_on_res_8_NE", "x": [ 13, 15 ], "y": [ 1, 23 ], "repeat": [ 2, 3 ] } ],
+      "place_traps": [ { "trap": "tr_light_on_res_8_NE", "x": [ 13, 15 ], "y": [ 1, 23 ] } ],
       "place_nested": [
         { "chunks": [ "lab_17x17_shop_2" ], "x": 17, "y": 0 },
         { "chunks": [ "lab_maintenance_6x6_open" ], "x": 17, "y": 18 }
@@ -299,7 +299,7 @@
       ],
       "place_monsters": [ { "monster": "GROUP_LAB_MAINTENANCE", "x": [ 1, 4 ], "y": [ 1, 22 ], "density": 0.1 } ],
       "place_monster": [ { "monster": "mon_lab_security_drone_YM", "x": [ 8, 20 ], "y": [ 10, 11 ], "chance": 100, "repeat": [ 1, 2 ] } ],
-      "place_traps": [ { "trap": "tr_light_on_res_8_SW", "x": [ 8, 23 ], "y": [ 10, 12 ], "repeat": [ 1, 2 ] } ]
+      "place_traps": [ { "trap": "tr_light_on_res_8_SW", "x": [ 8, 23 ], "y": [ 10, 12 ] } ]
     }
   },
   {
@@ -351,7 +351,7 @@
         { "chunks": [ [ "lab_wall_chain_5x5", 50 ], [ "lab_wall_door_5x5", 50 ], [ "null", 50 ] ], "x": 18, "y": 6 }
       ],
       "place_monsters": [ { "monster": "GROUP_LAB_MAINTENANCE", "x": [ 19, 21 ], "y": [ 1, 22 ], "density": 0.1 } ],
-      "place_traps": [ { "trap": "tr_light_on_res_8_SE", "x": [ 2, 23 ], "y": [ 10, 12 ], "repeat": [ 3, 4 ] } ]
+      "place_traps": [ { "trap": "tr_light_on_res_8_SE", "x": [ 0, 14 ], "y": [ 10, 12 ] } ]
     }
   }
 ]
diff --git a/data/json/overmap/overmap_special/lab_modular/lab_mutagen_6_floor.json b/data/json/overmap/overmap_special/lab_modular/lab_mutagen_6_floor.json
index 1b8e45e4680ab..8a8d8020f2cc1 100644
--- a/data/json/overmap/overmap_special/lab_modular/lab_mutagen_6_floor.json
+++ b/data/json/overmap/overmap_special/lab_modular/lab_mutagen_6_floor.json
@@ -130,6 +130,6 @@
     "connections": [ { "point": [ -4, 0, 0 ], "connection": "local_road", "terrain": "road", "existing": false } ],
     "city_distance": [ 3, -1 ],
     "city_sizes": [ 1, 16 ],
-    "occurrences": [ 1, 3 ]
+    "occurrences": [ 1, 1 ]
   }
 ]