Skip to content

Commit

Permalink
Add brick construction to camp expansions (#74389)
Browse files Browse the repository at this point in the history 
* Canteen version 1

* Canteen version 2

* Garage version 2

* Livestock version 1

* Livestock version 2

* Saltworks version 1

* Storehouse version 1

* Storehouse version 2

* Workshop version 1

* Workshop version 2
  • Loading branch information
@XygenSS
XygenSS authored Jun 14, 2024
1 parent 47b046c commit 767b21a
Show file tree
Hide file tree
Showing 30 changed files with 562 additions and 207 deletions.
42 changes: 28 additions & 14 deletions ...on/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_construction.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down Expand Up @@ -54,7 +55,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down Expand Up @@ -101,7 +103,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down Expand Up @@ -138,7 +141,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down Expand Up @@ -185,7 +189,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down Expand Up @@ -222,7 +227,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down Expand Up @@ -269,7 +275,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down Expand Up @@ -306,7 +313,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down Expand Up @@ -353,7 +361,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down Expand Up @@ -390,7 +399,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down Expand Up @@ -438,7 +448,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down Expand Up @@ -475,7 +486,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down Expand Up @@ -522,7 +534,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down Expand Up @@ -559,7 +572,8 @@
"fbmk_rammed_earth_palette",
"fbmk_rock_palette",
"fbmk_wad_palette",
"fbmk_wood_palette"
"fbmk_wood_palette",
"fbmk_brick_palette"
]
}
}
Expand Down
6 changes: 6 additions & 0 deletions data/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_palettes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,11 @@
"id": "fbmk_wood_palette",
"terrain": { ".": "t_floor", "d": "t_door_c", "o": "t_window_no_curtains", "R": "t_wood_treated_roof", "w": "t_wall_wood" },
"furniture": { ".": "f_clear", "d": "f_clear", "o": "f_clear", "w": "f_clear" }
},
{
"type": "palette",
"id": "fbmk_brick_palette",
"terrain": { ".": "t_floor", "d": "t_rdoor_c", "o": "t_window_no_curtains", "R": "t_wood_treated_roof", "w": "t_brick_wall" },
"furniture": { ".": "f_clear", "d": "f_clear", "o": "f_clear", "w": "f_clear" }
}
]
42 changes: 28 additions & 14 deletions ...on/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_construction.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down Expand Up @@ -54,7 +55,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down Expand Up @@ -101,7 +103,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down Expand Up @@ -138,7 +141,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down Expand Up @@ -185,7 +189,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down Expand Up @@ -220,7 +225,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down Expand Up @@ -265,7 +271,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down Expand Up @@ -304,7 +311,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down Expand Up @@ -353,7 +361,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down Expand Up @@ -390,7 +399,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down Expand Up @@ -437,7 +447,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down Expand Up @@ -474,7 +485,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down Expand Up @@ -521,7 +533,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down Expand Up @@ -558,7 +571,8 @@
"fbmk_2_rammed_earth_palette",
"fbmk_2_rock_palette",
"fbmk_2_wad_palette",
"fbmk_2_wood_palette"
"fbmk_2_wood_palette",
"fbmk_2_brick_palette"
]
}
}
Expand Down
13 changes: 13 additions & 0 deletions data/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_palettes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,18 @@
"w": "t_wall_wood"
},
"furniture": { }
},
{
"type": "palette",
"id": "fbmk_2_brick_palette",
"terrain": {
",": "t_dirtfloor",
".": "t_floor",
"+": "t_rdoor_c",
"r": "t_wood_treated_roof",
"v": "t_window_no_curtains",
"w": "t_brick_wall"
},
"furniture": { }
}
]
Loading

0 comments on commit 767b21a

Please sign in to comment.