feat(content): more consistent fire station mapgen (#3961)

* Create fire_station_palette.json * Fix fire station * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
cataclysmbnteam · Dec 24, 2023 · 5db456d · 5db456d
1 parent bcbf015
commit 5db456d
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 113 deletions.
diff --git a/data/json/mapgen/fire_station.json b/data/json/mapgen/fire_station.json
@@ -7,64 +7,33 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "_______________________'",
-        "--O--_,_______,_______,_",
-        "|lcx|_,_______,_______,_",
-        "| c#O_,_______,_______,_",
-        "| ##|_,_______,_______,_",
-        "|r  L_,_______,_______,_",
-        "|r  |_,_______,_______,I",
-        "|w ^|_,_______,_______,_",
-        "|-M----MMMMMMM-MMMMMMM--",
-        "|w    w               w|",
-        "|                      |",
-        "|ctc                   |",
-        "|ctc |                 |",
-        "|ctc |                 |",
-        "|    |                 |",
-        "|-+--|                 |",
-        "|F @@|                 |",
-        "|t  :|                 |",
-        "|c @@|                 |",
-        "|   :|                 |",
-        "|+|  |                 |",
-        "|T|GS|  l l l   l l l  |",
+        "ssssssppppppppppppppppp'",
+        "--O--sPpppppppPpppppppPs",
+        "|Acx|sPpppppppPpppppppPs",
+        "| cjOsPpppppppPpppppppPs",
+        "| jj|sPpppppppPpppppppPs",
+        "|r  LsPpppppppPpppppppPs",
+        "|r  |sPpppppppPpppppppPI",
+        "|  ^|sPpppppppPpppppppPs",
+        "|-D----MMMMMMM-MMMMMMM--",
+        "|    |w.......t.......w|",
+        "|    Dt.......t.......t|",
+        "|c#c |t.......t.......t|",
+        "|c#c |t.......t.......t|",
+        "|c#c |t.......t.......t|",
+        "|    |t.......t.......t|",
+        "|-+--|t.......t.......t|",
+        "|F @@|t.......t.......t|",
+        "|#  g|t.......t.......t|",
+        "|c @@|t.......t.......t|",
+        "|   g|t.......t.......t|",
+        "|+|  |ttttttttttttttttt|",
+        "|T|o&|ttltltltttltltltt|",
         "|----------------------|",
-        ".....................4.."
+        "_____________________4__"
       ],
-      "set": [ { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": 23, "repeat": [ 5, 8 ] } ],
-      "terrain": {
-        " ": "t_floor",
-        "+": "t_door_c",
-        ",": "t_pavement_y",
-        "-": "t_brick_wall",
-        ".": "t_grass",
-        "I": "t_column",
-        "L": "t_door_locked",
-        "M": "t_door_metal_locked",
-        "O": "t_window",
-        "'": "t_pavement",
-        "_": "t_pavement",
-        "w": "t_gates_control_brick",
-        "x": "t_console_broken",
-        "|": "t_brick_wall",
-        "4": "t_gutter_downspout"
-      },
-      "furniture": {
-        "'": "f_street_light",
-        "#": "f_counter",
-        ":": "f_dresser",
-        "@": "f_bed",
-        "F": "f_fridge",
-        "G": "f_oven",
-        "S": "f_sink",
-        "^": "f_indoor_plant",
-        "c": "f_chair",
-        "l": "f_locker",
-        "r": "f_rack",
-        "t": "f_table"
-      },
-      "toilets": { "T": {  } },
+      "palettes": [ "fire_station" ],
+      "terrain": { "'": "t_sidewalk", "O": "t_window", "T": "t_thconc_floor", "L": "t_door_locked" },
       "place_items": [
         { "item": "bed", "x": [ 3, 4 ], "y": [ 16, 16 ], "chance": 80 },
         { "item": "bed", "x": [ 3, 4 ], "y": [ 18, 18 ], "chance": 80 },
@@ -85,7 +54,7 @@
       ],
       "place_loot": [ { "item": "american_flag", "x": 23, "y": 5, "chance": 75 } ],
       "place_monsters": [ { "monster": "GROUP_FIRE", "x": [ 2, 21 ], "y": [ 9, 21 ], "chance": 1 } ],
-      "place_vehicles": [ { "vehicle": "fire_engine", "x": 11, "y": 13, "chance": 30, "rotation": 270 } ]
+      "place_vehicles": [ { "vehicle": "fire_engine", "x": 10, "y": 12, "chance": 30, "rotation": 270 } ]
     }
   },
   {
@@ -146,8 +115,8 @@
       "fill_ter": "t_floor",
       "rows": [
         "__PpppppppPpppppppP__s_'",
-        "_||+++++++|+++++++||_s__",
-        "_|6.......t.......6|_s__",
+        "_||MMMMMMM|MMMMMMM||_s__",
+        "_|w.......t.......w|_s__",
         "_|t.......t.......t|_s_S",
         "_|t.......t.......t|ss__",
         "_|t.......t.......t|Is_a",
@@ -157,69 +126,34 @@
         "_|t.......t.......t|_s_a",
         "_|t.......t.......t|_s_4",
         "_|t.......t.......t||D||",
-        "_|t.......t.......t|ff^|",
-        "_|tttttttttttttttttDfff|",
-        "_|rtrtrtttTTrrTTttt|f#Cw",
-        "_||||||||D||||||D|||f#c|",
-        "_ss|ee|HHf{{{{{{fffdf#c|",
-        "_s<|tt|H#ffffffffffdfffw",
-        "_ss||d|H#ffffffff|||||||",
-        "_ss|&fffffc#cffff|bbgbb|",
-        "___||d|Fffc#cffffdfffffh",
-        "___|it|&ojc#cfE5B|bbgbb|",
-        "___|||||ww|w|ww|||||||||",
+        "_|t.......t.......t|  ^|",
+        "_|tttttttttttttttttD   |",
+        "_|rtrtrttt11rr11ttt| #xW",
+        "_||||||||D||||||D||| #c|",
+        "_ss|ee|HH AAAAAA   + #c|",
+        "_s<|tt|H#          +   W",
+        "_ss||+|H#        |||||||",
+        "_ss|&     c#c    |@@g@@|",
+        "___||+|F  c#c    +     h",
+        "___|Tt|&ojc#c E5B|@@g@@|",
+        "___|||||WW|W|WW|||||||||",
         "________________________"
       ],
-      "set": [ { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": 23, "repeat": [ 5, 8 ] } ],
+      "palettes": [ "fire_station" ],
       "terrain": {
-        "f": "t_floor",
-        "+": "t_door_metal_locked",
-        ".": "t_scrap_floor",
-        "6": "t_gates_control_brick",
-        "C": "t_console_broken",
-        "D": "t_door_metal_c",
-        "I": "t_column",
-        "P": "t_pavement_y",
         "S": "t_shrub_rose",
-        "T": "t_thconc_floor",
-        "'": "t_grass",
-        "_": "t_grass",
         "a": "t_shrub_lilac",
-        "d": "t_door_c",
+        "1": "t_thconc_floor",
         "e": "t_thconc_floor",
-        "h": "t_curtains",
         "i": "t_thconc_floor",
-        "p": "t_pavement",
         "r": "t_thconc_floor",
-        "s": "t_sidewalk",
-        "t": "t_thconc_floor",
-        "w": "t_window_domestic",
-        "|": "t_brick_wall",
-        "4": "t_gutter_downspout",
-        "<": "t_ladder_up"
-      },
-      "furniture": {
-        "'": "f_street_light",
-        "#": "f_table",
-        "&": "f_sink",
-        "5": "f_ergometer",
-        "B": "f_bookcase",
-        "E": "f_exercise",
-        "F": "f_fridge",
-        "H": "f_sofa",
-        "T": "f_table",
-        "^": "f_indoor_plant",
-        "b": "f_bed",
-        "c": "f_chair",
-        "e": "f_shower",
-        "g": "f_dresser",
-        "i": "f_toilet",
-        "j": "f_counter",
-        "o": "f_oven",
-        "r": "f_rack",
-        "{": "f_locker"
+        "'": "t_region_groundcover_urban",
+        "W": "t_window_domestic",
+        "h": "t_curtains",
+        "<": "t_ladder_up",
+        "T": "t_thconc_floor"
       },
-      "toilets": { "i": {  } },
+      "furniture": { "1": "f_table", "5": "f_ergometer", "B": "f_bookcase", "E": "f_exercise", "H": "f_sofa", "e": "f_shower" },
       "place_items": [
         { "item": "mechanics", "x": 15, "y": 14, "chance": 25 },
         { "item": "mechanics", "x": [ 10, 11 ], "y": 14, "chance": 25 },

diff --git a/data/json/mapgen_palettes/fire_station_palette.json b/data/json/mapgen_palettes/fire_station_palette.json
@@ -0,0 +1,40 @@
+[
+  {
+    "type": "palette",
+    "id": "fire_station",
+    "terrain": {
+      "-": "t_brick_wall",
+      "+": "t_door_c",
+      "I": "t_column",
+      "M": "t_door_metal_locked",
+      "x": "t_console_broken",
+      "w": "t_gates_control_brick",
+      "|": "t_brick_wall",
+      "4": "t_gutter_downspout",
+      "l": "t_thconc_floor",
+      "P": "t_pavement_y",
+      "p": "t_pavement",
+      "_": "t_region_groundcover_urban",
+      ".": "t_scrap_floor",
+      "t": "t_thconc_floor",
+      "D": "t_door_metal_c",
+      "s": "t_sidewalk"
+    },
+    "furniture": {
+      "'": "f_street_light",
+      "@": "f_bed",
+      "#": "f_table",
+      "j": "f_counter",
+      "c": "f_chair",
+      "l": "f_locker",
+      "&": "f_sink",
+      "o": "f_oven",
+      "F": "f_fridge",
+      "g": "f_dresser",
+      "^": "f_indoor_plant",
+      "A": "f_locker",
+      "r": "f_rack"
+    },
+    "toilets": { "T": {  } }
+  }
+]