Merge pull request #51247 from curstwist/more-minor-adjustments

more minor map adjustments
CleverRaven · Aug 31, 2021 · 0447a46 · 0447a46
2 parents 91ab3fc + c16998a
commit 0447a46
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 44 deletions.
diff --git a/data/json/mapgen/lab/lab_modular/lab_1x1_security.json b/data/json/mapgen/lab/lab_modular/lab_1x1_security.json
@@ -60,35 +60,34 @@
     "method": "json",
     "om_terrain": [ "lab_security_z0" ],
     "type": "mapgen",
-    "//": "TODO: trap the security hallway, fill out security area",
     "weight": 200,
     "object": {
       "fill_ter": "t_linoleum_white",
       "rows": [
-        "|||+||+||||||||||||==|||",
+        "|||+||+||||||||||||==ƶ||",
         "|34.|P.P..+..h.|;;;;;;;;",
         "X...|....h|III6:;;;;;;è;",
-        "XH..:J..II|::::|;;||||||",
-        "XH..:Jh...=;;;;;;;=;|PPT",
+        "XH..:J..II|::::|;;|#||||",
+        "XH..:Jh...=;;;;;;;|;|PPT",
         "-...:J..II|;è;;;;ɜ|;:.h.",
         "XH..|Y..h.|;;;|||||;:.rr",
         "XH..||:||||;;;|;;;|è|h.h",
         "XH..=..ɛ|.|;;;|;è;+;||+|",
         "|y..¥...|.|;è;|;;;|;;;;;",
         "|||||..||||;;;|||||||;;;",
-        "|>ë.|..122|;;;+;Z|>;ƶ;;i",
-        "|...-..-22|;;;|WW|>;=;èi",
+        "|>ë.:..122|;;;+;Z|>;ƶ;;i",
+        "|...#..-22|;;;|WW|>;=;èi",
         "|||||..||||;;;|||||||;;;",
         "|y..¥...|.|;è;|;;;|;;;;;",
         "XH..=..ɛ|.|;;;|;è;+;||+|",
         "XH..||:||||;;;|;;;|è|h.h",
         "XH..|Y...h|;;;|||||;:.rr",
         "-...:J..II|;è;;;;ɜ|;:.h.",
-        "XH..:Jh...=;;;;;;;=;|yPP;",
-        "XH..:J..II|::::|;;||||||",
+        "XH..:Jh...=;;;;;;;|;|yPP;",
+        "XH..:J..II|::::|;;|#||||",
         "X...|...h.|III6:;;;;;;è;",
         "|34.|P.P..+..h.|;;;;;;;;",
-        "|||+||+||||||||||||==|||"
+        "|||+||+||||||||||||==ƶ||"
       ],
       "palettes": [ "lab_common_palette", "lab_security_palette" ],
       "terrain": {
@@ -244,14 +243,14 @@
     "object": {
       "fill_ter": "t_thconc_floor",
       "rows": [
-        "|,,,,,,,,,ƶ`````|⁴⁴⁴⁴⁴⁴⁴",
+        "|,,,,,,,,,ƶ`````|⁴⁴⁴⁴⁴⁴é",
         "|,,,,,,,,,=``î`<|⁴⁴⁴⁴⁴⁴⁴",
-        "|,,,,,,,,,|`````|⁴⁴⁴%%%%",
+        "|,,,,,,,,,|`````|é⁴⁴%%%%",
         "|,,,,,,,,,|``|#||⁴⁴%%~~~",
         "|,,,,,,,,,|``|>|⁴⁴%%~~~~",
         "|,,,,ê,,,,|ƶ=|||⁴%%~~~~~",
         "|,,,,,,,,,|⁴⁴⁴⁴⁴%%~~~~~~",
-        "|,,,,,,,,,|⁴⁴⁴⁴%%~~~~~~~",
+        "|,,,,,,,,,|⁴é⁴⁴%%~~~~~~~",
         "|,,,,,,,,,|⁴⁴⁴%%~~~~~~~~",
         "|,,,ê,,,,,|⁴⁴⁴%~~~~~~~~~",
         "|||||,,||||⁴⁴⁴%~~~~~~~~~",
@@ -260,14 +259,14 @@
         "|||||,,||||⁴⁴⁴%~~~~~~~~~",
         "|,,,ê,,,,,|⁴⁴⁴%~~~~~~~~~",
         "|,,,,,,,,,|⁴⁴⁴%%~~~~~~~~",
-        "|,,,,,,,,,|⁴⁴⁴⁴%%~~~~~~~",
+        "|,,,,,,,,,|⁴é⁴⁴%%~~~~~~~",
         "|,,,,,,,,,|⁴⁴⁴⁴⁴%%~~~~~~",
         "|,,,,ê,,,,|ƶ=|||⁴%%~~~~~",
         "|,,,,,,,,,|``|>|⁴⁴%%~~~~",
         "|,,,,,,,,,|``|#||⁴⁴%%~~~",
-        "|,,,,,,,,,|`````|⁴⁴⁴%%%%",
+        "|,,,,,,,,,|`````|é⁴⁴%%%%",
         "|,,,,,,,,,=``î`<|⁴⁴⁴⁴⁴⁴⁴",
-        "|,,,,,,,,,ƶ`````|⁴⁴⁴⁴⁴⁴⁴"
+        "|,,,,,,,,,ƶ`````|⁴⁴⁴⁴⁴⁴é"
       ],
       "palettes": [ "lab_common_palette", "lab_security_palette" ],
       "place_monsters": [ { "monster": "GROUP_LAB_BASIC_SECURITY", "x": [ 1, 8 ], "y": [ 1, 22 ], "density": 0.1 } ],
@@ -312,7 +311,10 @@
         "|,,,,,,,|;|``````````|;|"
       ],
       "palettes": [ "lab_common_palette", "lab_security_palette" ],
-      "place_loot": [ { "item": "id_science_maintenance_green", "x": 1, "y": 8, "chance": 25 } ],
+      "place_loot": [
+        { "item": "id_science_maintenance_green", "x": 1, "y": 8, "chance": 25 },
+        { "item": "hacksaw", "x": 1, "y": [ 14, 15 ], "chance": 100 }
+      ],
       "terrain": { "¥": "t_card_science_security_yellow", "ƶ": "t_card_science_security_magenta" },
       "place_signs": [
         { "signage": "<color_white_red>Badges Mandatory Beyond This Point.</color>", "x": 10, "y": 10 },

diff --git a/data/json/mapgen/lab/lab_modular/lab_central_hallway.json b/data/json/mapgen/lab/lab_modular/lab_central_hallway.json
@@ -8,13 +8,13 @@
     "object": {
       "fill_ter": "t_linoleum_white",
       "rows": [
-        ";;;;;;;;;;;;;;;;;;X...y..y...X;;;;;;;;;;;;;;;;;;",
-        "; ;;;;;;;;;;;;;;;;XX........XX;;;;;;;;;;;;;;;; ;",
-        "%%%%%%%%%%%%%%%%;;;XX......XX;;;%%%%%%%%%%%%%%%%",
-        "~~~~~~~~~~~~~~~%%;;;XX....XX;;;%%~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~%;;;;XXXXXX;;;;%~~~~~~~~~~~~~~~~",
+        ";;;;;;;é;;;;;;;;é;:...y..y...:;é;;;;;;;;é;;;;;;;",
+        "; ;;;;;;;;;;;;;;;;::........::;;;;;;;;;;;;;;;; ;",
+        "%%%%%%%%%%%%%%%%;;;::......::;;;%%%%%%%%%%%%%%%%",
+        "~~~~~~~~~~~~~~~%%;;;::....::;;;%%~~~~~~~~~~~~~~~",
+        "~~~~~~~~~~~~~~~~%;;;;::::::;;;;%~~~~~~~~~~~~~~~~",
         "~~~~~~~~~~~~~~~~%%;;;;;;;;;;;;%%~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~%%%;;;;;;;;%%%~~~~~~~~~~~~~~~~~",
+        "~~~~~~~~~~~~~~~~~%%%;;;;é;;;%%%~~~~~~~~~~~~~~~~~",
         "~~~~~~~~~~~~~~~~~~ %%%%%%%%%% ~~~~~~~~~~~~~~~~~~",
         "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
         "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
@@ -25,15 +25,15 @@
         "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
         "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
         "~~~~~~~~~~~~~~~~~~ %%%%%%%%%% ~~~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~~%%%;;;;;;;;%%%~~~~~~~~~~~~~~~~~",
+        "~~~~~~~~~~~~~~~~~%%%;;;;é;;;%%%~~~~~~~~~~~~~~~~~",
         "~~~~~~~~~~~~~~~~%%;;;;;;;;;;;;%%~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~~%;;;;XXXXXX;;;;%~~~~~~~~~~~~~~~~",
-        "~~~~~~~~~~~~~~~%%;;;XX....XX;;;%%~~~~~~~~~~~~~~~",
-        "%%%%%%%%%%%%%%%%;;;XX......XX;;;%%%%%%%%%%%%%%%%",
-        "; ;;;;;;;;;;;;;;;;XX........XX;;;;;;;;;;;;;;;; ;",
-        ";;;;;;;;;;;;;;;;;;X...y..y...X;;;;;;;;;;;;;;;;;;"
+        "~~~~~~~~~~~~~~~~%;;;;::::::;;;;%~~~~~~~~~~~~~~~~",
+        "~~~~~~~~~~~~~~~%%;;;::....::;;;%%~~~~~~~~~~~~~~~",
+        "%%%%%%%%%%%%%%%%;;;::......::;;;%%%%%%%%%%%%%%%%",
+        "; ;;;;;;;;;;;;;;;;::........::;;;;;;;;;;;;;;;; ;",
+        ";;;;;;;é;;;;;;;;é;:...y..y...:;é;;;;;;;;é;;;;;;;"
       ],
-      "palettes": [ "lab_common_palette", "lab_residential_palette" ],
+      "palettes": [ "lab_common_palette" ],
       "terrain": { " ": "t_strconc_floor" },
       "monster": { " ": { "monster": "mon_turret_searchlight" } },
       "place_monster": [

diff --git a/data/json/mapgen/lab/lab_modular/lab_health_clinic.json b/data/json/mapgen/lab/lab_modular/lab_health_clinic.json
@@ -7,30 +7,30 @@
     "object": {
       "fill_ter": "t_linoleum_white",
       "rows": [
-        ";;;;;;;;;;;;;|||||||||||",
+        ";é;;;;;;;;;;;|||||||||||",
         ";;;;;;;;;;;;;|.........|",
-        "%%%%;;;;;;;;;|.........|",
+        "%%%%;;;;é;;;;|.........|",
         "~~~%%;;;;;;;;|.........|",
         "~~~~%%;;;;;;;|....ë....|",
         "~~~~~%%;;;;;;|.........|",
         "~~~~~~%%;;;;;|.........|",
         "~~~~~~~%%;;;;|.........|",
-        "~~~~~~~~%%;;;Xj........#",
-        "~~~~~~~~~%;;;Xj...ë....#",
+        "~~~~~~~~%%;;;:j........#",
+        "~~~~~~~~~%;;;:j...ë....#",
         "~~~~~~~~~%;;;|||||--||||",
         "~~~~~~~~~%;;;|221...|.>|",
-        "~~~~~~~~~%;;;|22-...-.>|",
+        "~~~~~~~~~%;é;|22-...-.>|",
         "~~~~~~~~~%;;;|||||--||||",
-        "~~~~~~~~~%;;;Xj...ë....#",
-        "~~~~~~~~%%;;;Xj........#",
+        "~~~~~~~~~%;;;:j...ë....#",
+        "~~~~~~~~%%;;;:j........#",
         "~~~~~~~%%;;;;|.........|",
         "~~~~~~%%;;;;;|.........|",
         "~~~~~%%;;;;;;|.........|",
         "~~~~%%;;;;;;;|....ë....|",
         "~~~%%;;;;;;;;|.........|",
-        "%%%%;;;;;;;;;|.........|",
+        "%%%%;;;;é;;;;|.........|",
         ";;;;;;;;;;;;;|.........|",
-        ";;;;;;;;;;;;;|||||||||||"
+        ";é;;;;;;;;;;;|||||||||||"
       ],
       "palettes": [ "lab_common_palette", "lab_medical_palette" ],
       "place_nested": [

diff --git a/data/json/mapgen_palettes/lab/lab_modular_palette.json b/data/json/mapgen_palettes/lab/lab_modular_palette.json
@@ -326,7 +326,11 @@
     "items": {
       "3": { "item": "vending_food", "chance": 90 },
       "4": { "item": "vending_drink", "chance": 90 },
-      "U": [ { "item": "home_hw", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "cleaning", "chance": 40, "repeat": [ 1, 2 ] } ],
+      "U": [
+        { "item": "home_hw", "chance": 10, "repeat": [ 1, 2 ] },
+        { "item": "drugs_emergency", "chance": 30, "repeat": [ 1, 2 ] },
+        { "item": "cleaning", "chance": 40, "repeat": [ 1, 2 ] }
+      ],
       "∞": [
         { "item": "clothing_soldier_set", "chance": 100 },
         { "item": "gear_soldier_sidearm", "chance": 33 },

diff --git a/data/json/monstergroups/lab.json b/data/json/monstergroups/lab.json
@@ -204,17 +204,16 @@
     "name": "GROUP_LAB_BASIC_SECURITY",
     "default": "mon_zombie_labsecurity",
     "monsters": [
-      { "monster": "mon_feral_labsecurity_9mm", "freq": 18, "cost_multiplier": 8 },
-      { "monster": "mon_feral_labsecurity_flashlight", "freq": 18, "cost_multiplier": 2 },
+      { "monster": "mon_feral_labsecurity_9mm", "freq": 18, "cost_multiplier": 12 },
+      { "monster": "mon_feral_labsecurity_flashlight", "freq": 18, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
       { "monster": "mon_zombie_labsecurity", "freq": 40, "cost_multiplier": 0, "pack_size": [ 2, 3 ] },
       { "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 1, "pack_size": [ 1, 2 ] },
       { "monster": "mon_zombie", "freq": 30, "cost_multiplier": 1, "pack_size": [ 2, 4 ] },
       { "monster": "mon_zombie_fat", "freq": 20, "cost_multiplier": 1, "pack_size": [ 1, 2 ] },
       { "monster": "mon_zombie_tough", "freq": 20, "cost_multiplier": 2 },
       { "monster": "mon_zombie_crawler", "freq": 10, "cost_multiplier": 1 },
-      { "monster": "mon_zombie_technician", "freq": 3, "cost_multiplier": 2 },
-      { "monster": "mon_zombie_necro", "freq": 1, "cost_multiplier": 15 },
-      { "monster": "mon_eyebot", "freq": 10, "cost_multiplier": 10 }
+      { "monster": "mon_zombie_technician", "freq": 3, "cost_multiplier": 5 },
+      { "monster": "mon_zombie_necro", "freq": 1, "cost_multiplier": 15 }
     ]
   },
   {