From 84b47d201fea3551aa47649174f203118c928f17 Mon Sep 17 00:00:00 2001
From: curstwist <39442864+curstwist@users.noreply.github.com>
Date: Sat, 4 Sep 2021 16:06:20 -0400
Subject: [PATCH] Update lab_parking_lot.json (#51364)

* and nerf turret type
---
 .../lab_nested_security.json                  |  2 +
 .../lab/lab_modular/lab_parking_lot.json      | 72 +++++++++----------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_security.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_security.json
index c4746ecae5a8d..b4c2f3a243999 100644
--- a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_security.json
+++ b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_security.json
@@ -689,6 +689,7 @@
         "||    |       "
       ],
       "palettes": [ "lab_common_palette", "lab_security_palette" ],
+      "monster": { "ɜ": { "monster": "mon_turret_riot" } },
       "place_nested": [
         {
           "chunks": [ [ "null", 30 ], [ "lab_security_sandbag_EW_1", 50 ], [ "lab_security_sandbag_EW_2", 50 ] ],
@@ -730,6 +731,7 @@
         "    ||        "
       ],
       "palettes": [ "lab_common_palette", "lab_security_palette" ],
+      "monster": { "ɜ": { "monster": "mon_turret_riot" } },
       "place_nested": [
         {
           "chunks": [ [ "null", 30 ], [ "lab_security_sandbag_EW_1", 50 ], [ "lab_security_sandbag_EW_2", 50 ] ],
diff --git a/data/json/mapgen/lab/lab_modular/lab_parking_lot.json b/data/json/mapgen/lab/lab_modular/lab_parking_lot.json
index a82aa4040938f..df00484282c58 100644
--- a/data/json/mapgen/lab/lab_modular/lab_parking_lot.json
+++ b/data/json/mapgen/lab/lab_modular/lab_parking_lot.json
@@ -73,42 +73,42 @@
       "palettes": [ "lab_surface_palette" ],
       "terrain": { "#": "t_concrete_wall" },
       "place_vehicles": [
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 270, "status": 0, "x": 73, "y": 5 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 270, "status": 0, "x": 79, "y": 5 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 270, "status": 0, "x": 86, "y": 5 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 30, "rotation": 270, "status": 0, "x": 92, "y": 5 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 270, "status": 0, "x": 99, "y": 5 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 270, "status": 0, "x": 105, "y": 5 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 30, "rotation": 90, "status": 0, "x": 74, "y": 18 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "status": 0, "x": 80, "y": 18 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 90, "status": 0, "x": 87, "y": 18 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "status": 0, "x": 93, "y": 18 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 40, "rotation": 90, "status": 0, "x": 100, "y": 18 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "status": 0, "x": 106, "y": 18 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 30, "rotation": 90, "status": 0, "x": 74, "y": 25 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "status": 0, "x": 80, "y": 25 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 90, "status": 0, "x": 87, "y": 25 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "status": 0, "x": 93, "y": 25 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 40, "rotation": 90, "status": 0, "x": 100, "y": 25 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "status": 0, "x": 106, "y": 25 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 270, "status": 0, "x": 14, "y": 5 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 270, "status": 0, "x": 20, "y": 5 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 270, "status": 0, "x": 28, "y": 5 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 30, "rotation": 270, "status": 0, "x": 34, "y": 5 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 270, "status": 0, "x": 40, "y": 5 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 270, "status": 0, "x": 47, "y": 5 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 30, "rotation": 90, "status": 0, "x": 14, "y": 18 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "status": 0, "x": 20, "y": 18 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 90, "status": 0, "x": 28, "y": 18 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "status": 0, "x": 34, "y": 18 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 40, "rotation": 90, "status": 0, "x": 40, "y": 18 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "status": 0, "x": 47, "y": 18 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 30, "rotation": 90, "status": 0, "x": 14, "y": 25 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "status": 0, "x": 20, "y": 25 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 90, "status": 0, "x": 28, "y": 25 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "status": 0, "x": 34, "y": 25 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 40, "rotation": 90, "status": 0, "x": 40, "y": 25 },
-        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "status": 0, "x": 47, "y": 25 }
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 270, "x": 73, "y": 5 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 270, "x": 79, "y": 5 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 270, "x": 86, "y": 5 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 30, "rotation": 270, "x": 92, "y": 5 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 270, "x": 99, "y": 5 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 270, "x": 105, "y": 5 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 30, "rotation": 90, "x": 74, "y": 18 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "x": 80, "y": 18 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 90, "x": 87, "y": 18 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "x": 93, "y": 18 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 40, "rotation": 90, "x": 100, "y": 18 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "x": 106, "y": 18 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 30, "rotation": 90, "x": 74, "y": 25 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "x": 80, "y": 25 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 90, "x": 87, "y": 25 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "x": 93, "y": 25 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 40, "rotation": 90, "x": 100, "y": 25 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "x": 106, "y": 25 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 270, "x": 14, "y": 5 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 270, "x": 20, "y": 5 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 270, "x": 28, "y": 5 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 30, "rotation": 270, "x": 34, "y": 5 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 270, "x": 40, "y": 5 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 270, "x": 47, "y": 5 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 30, "rotation": 90, "x": 14, "y": 18 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "x": 20, "y": 18 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 90, "x": 28, "y": 18 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "x": 34, "y": 18 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 40, "rotation": 90, "x": 40, "y": 18 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "x": 47, "y": 18 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 30, "rotation": 90, "x": 14, "y": 25 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "x": 20, "y": 25 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 20, "rotation": 90, "x": 28, "y": 25 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "x": 34, "y": 25 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": 40, "rotation": 90, "x": 40, "y": 25 },
+        { "vehicle": "parkinglotbasic", "chance": 20, "fuel": -1, "rotation": 90, "x": 47, "y": 25 }
       ]
     }
   },