[Backrooms] Update to use indestructible terrain, whitelist and EXTER…

…NAL_OPTIONs (#74434) * Update backrooms * "extend" and "delete" support for map_extra s * Add "connects_to" to allow the light/non-light floors to multitile * Add Backrooms label and add the maintainer as a reviewer * Removes unnecessary world setting advice Cities being disabled by external option means this no longer does anything
CleverRaven · Jun 12, 2024 · 1fb61c1 · 1fb61c1
1 parent fedfb57
commit 1fb61c1
Show file tree

Hide file tree

Showing 9 changed files with 265 additions and 53 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -222,6 +222,9 @@
   - data/mods/Aftershock/**/*
   - data/mods/aftershock_exoplanet/**/*
 
+"Mods: Backrooms":
+  - data/mods/Backrooms/**/*
+
 "Mods: Dark Days of the Dead":
   - data/mods/classic_zombies/**/*
 

diff --git a/.github/reviewers.yml b/.github/reviewers.yml
@@ -2,6 +2,8 @@ files:
   'data/mods/Aftershock/**':
     - Maleclypse
     - John-Candlebury
+  'data/mods/Backrooms/**':
+    - onura46
   'data/mods/DinoMod/**':
     - LyleSY
   'data/mods/BombasticPerks/**':

diff --git a/data/mods/Backrooms/README.md b/data/mods/Backrooms/README.md
@@ -7,7 +7,6 @@ This is an indoor only conversion for Cataclysm. The entire worldgen is replaced
 
 ## Warning: You MUST choose the scenario "Backrooms" when creating a character!
 As the Backrooms are the only location in the entire world, characters trying to start in other locations will fail to spawn.
-Turning city size to 0 is recommended just to avoid strangeness in map labeling.
 
 # Questions
 ### What's the current state of the mod?

diff --git a/data/mods/Backrooms/furniture_terrain.json b/data/mods/Backrooms/furniture_terrain.json
@@ -1,4 +1,19 @@
 [
+  {
+    "type": "terrain",
+    "id": "t_backroom_wall_border",
+    "name": "faded wall",
+    "description": "A yellowed, numbingly monotonous wallpaper decorates these thin walls.  They smell of mildew and have a faintly damp feel.",
+    "symbol": "#",
+    "color": "yellow",
+    "looks_like": "t_wall_y",
+    "move_cost": 0,
+    "coverage": 100,
+    "roof": "t_carpet_backrooms",
+    "connect_groups": "WALL",
+    "connects_to": "WALL",
+    "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ]
+  },
   {
     "type": "terrain",
     "id": "t_backroom_wall",
@@ -59,6 +74,7 @@
     "looks_like": "t_carpet_backrooms",
     "roof": "t_flat_roof",
     "connect_groups": "INDOORFLOOR",
+    "connects_to": "INDOORFLOOR",
     "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT", "RUG" ],
     "bash": {
       "str_min": 4,
@@ -82,15 +98,8 @@
     "move_cost": 2,
     "roof": "t_flat_roof",
     "connect_groups": "INDOORFLOOR",
-    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT", "RUG" ],
-    "bash": {
-      "sound": "SMASH!",
-      "ter_set": "t_thconc_floor",
-      "str_min": 50,
-      "str_max": 400,
-      "str_min_supported": 100,
-      "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 6, 13 ] } ]
-    }
+    "connects_to": "INDOORFLOOR",
+    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT", "RUG" ]
   },
   {
     "type": "terrain",
@@ -104,6 +113,7 @@
     "looks_like": "t_tile_backrooms",
     "roof": "t_flat_roof",
     "connect_groups": "INDOORFLOOR",
+    "connects_to": "INDOORFLOOR",
     "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT" ],
     "bash": {
       "str_min": 4,
@@ -127,15 +137,8 @@
     "move_cost": 2,
     "roof": "t_flat_roof",
     "connect_groups": "INDOORFLOOR",
-    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT" ],
-    "bash": {
-      "sound": "SMASH!",
-      "ter_set": "t_thconc_floor",
-      "str_min": 50,
-      "str_max": 400,
-      "str_min_supported": 100,
-      "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 6, 13 ] } ]
-    }
+    "connects_to": "INDOORFLOOR",
+    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT" ]
   },
   {
     "type": "furniture",

diff --git a/data/mods/Backrooms/game_balance.json b/data/mods/Backrooms/game_balance.json
@@ -0,0 +1,79 @@
+[
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_CITIES",
+    "info": "Allows to place cities during overmap generation.",
+    "stype": "bool",
+    "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_ROADS",
+    "info": "Allows to place procgen roads during overmap generation.",
+    "stype": "bool",
+    "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_POPULATE_OUTSIDE_CONNECTIONS_FROM_NEIGHBORS",
+    "info": "Allows to populate outside connections from neighbors.",
+    "stype": "bool",
+    "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_RIVERS",
+    "info": "Allows to place procgen rivers during overmap generation.",
+    "stype": "bool",
+    "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_LAKES",
+    "info": "Allows to place procgen lakes during overmap generation.",
+    "stype": "bool",
+    "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_OCEANS",
+    "info": "Allows to place oceans during overmap generation.",
+    "stype": "bool",
+    "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_FORESTS",
+    "info": "Allows to place procgen forests during overmap generation.",
+    "stype": "bool",
+    "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_SWAMPS",
+    "info": "Allows to place procgen swamps during overmap generation.",
+    "stype": "bool",
+    "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_RAVINES",
+    "info": "Allows to place procgen ravines during overmap generation.",
+    "stype": "bool",
+    "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_FOREST_TRAILS",
+    "info": "Allows to place procgen forest trails during overmap generation.",
+    "stype": "bool",
+    "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_FOREST_TRAILHEADS",
+    "info": "Allows to place procgen forest trailheads during overmap generation.",
+    "stype": "bool",
+    "value": false
+  }
+]
diff --git a/data/mods/Backrooms/map_extras.json b/data/mods/Backrooms/map_extras.json
@@ -7,7 +7,8 @@
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_teleporter_node" },
     "sym": "X",
     "color": "red",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "BACKROOMS" ]
   },
   {
     "id": "mx_autodoc_room",
@@ -17,6 +18,109 @@
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_autodoc_room" },
     "sym": "A",
     "color": "pink",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "BACKROOMS" ]
+  },
+  {
+    "id": "mx_casings",
+    "type": "map_extra",
+    "copy-from": "mx_casings",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_corpses",
+    "type": "map_extra",
+    "copy-from": "mx_corpses",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_collegekids",
+    "type": "map_extra",
+    "copy-from": "mx_collegekids",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_spider",
+    "type": "map_extra",
+    "copy-from": "mx_spider",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_nest_dermatik",
+    "type": "map_extra",
+    "copy-from": "mx_nest_dermatik",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_science",
+    "type": "map_extra",
+    "copy-from": "mx_science",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_crater",
+    "type": "map_extra",
+    "copy-from": "mx_crater",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_nest_wasp",
+    "type": "map_extra",
+    "copy-from": "mx_nest_wasp",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_house_wasp",
+    "type": "map_extra",
+    "copy-from": "mx_house_wasp",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_pond",
+    "type": "map_extra",
+    "copy-from": "mx_pond",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_military",
+    "type": "map_extra",
+    "copy-from": "mx_military",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_drugdeal",
+    "type": "map_extra",
+    "copy-from": "mx_drugdeal",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_supplydrop",
+    "type": "map_extra",
+    "copy-from": "mx_supplydrop",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_portal",
+    "type": "map_extra",
+    "copy-from": "mx_portal",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_portal_in",
+    "type": "map_extra",
+    "copy-from": "mx_portal_in",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_jabberwock",
+    "type": "map_extra",
+    "copy-from": "mx_jabberwock",
+    "extend": { "flags": [ "BACKROOMS" ] }
+  },
+  {
+    "id": "mx_helicopter",
+    "type": "map_extra",
+    "copy-from": "mx_helicopter",
+    "extend": { "flags": [ "BACKROOMS" ] }
   }
 ]
diff --git a/data/mods/Backrooms/overmap_terrain.json b/data/mods/Backrooms/overmap_terrain.json
@@ -12,7 +12,16 @@
     "color": "white",
     "see_cost": 20,
     "spawns": { "group": "GROUP_BACKROOMS", "population": [ 2, 15 ], "chance": 40 },
-    "extras": "field"
+    "extras": "backrooms"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "backroom_border",
+    "name": "",
+    "sym": ".",
+    "color": "white",
+    "see_cost": 20,
+    "flags": [ "NO_ROTATE" ]
   },
   {
     "type": "mapgen",
@@ -52,5 +61,11 @@
         }
       ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "backroom_border",
+    "object": { "fill_ter": "t_backroom_wall_border" }
   }
 ]