Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

houses for legacy basements #37939

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions data/json/mapgen/basement/basement_game.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"//": "used by house_31 and house_32 and house_32",
"weight": 250,
"object": {
"rotation": [ 0, 3 ],
Expand Down Expand Up @@ -54,6 +55,7 @@
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"//": "used by house_31 and house_32",
"weight": 250,
"object": {
"rotation": [ 0, 3 ],
Expand Down Expand Up @@ -105,6 +107,7 @@
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"//": "used by house_31 and house_32",
"weight": 250,
"object": {
"rotation": [ 0, 3 ],
Expand Down Expand Up @@ -154,6 +157,7 @@
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"//": "used by house_31 and house_32",
"weight": 250,
"object": {
"rotation": [ 0, 3 ],
Expand Down Expand Up @@ -203,6 +207,7 @@
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"//": "used by house_31 and house_32",
"weight": 250,
"object": {
"rotation": [ 0, 3 ],
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen/basement/basement_guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"//": "used by house_31 and house_32",
"weight": 250,
"object": {
"fill_ter": "t_rock",
Expand Down
2 changes: 2 additions & 0 deletions data/json/mapgen/basement/basement_lab_stairs.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement_hidden_lab_stairs" ],
"//": "used by house_31 and house_32",
"weight": 100,
"object": {
"fill_ter": "t_thconc_floor",
Expand Down Expand Up @@ -56,6 +57,7 @@
"method": "json",
"om_terrain": [ "basement_hidden_lab_stairs" ],
"weight": 100,
"//": "used by house_31 and house_32",
"object": {
"rotation": [ 0, 3 ],
"rows": [
Expand Down
99 changes: 99 additions & 0 deletions data/json/mapgen/house/house31.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
[
{
"method": "json",
"om_terrain": "house_31",
"//": "used by legacy basements including lab basements, no dedicated stairs added.",
"type": "mapgen",
"weight": 100,
"object": {
"fill_ter": "t_floor",
"rows": [
"######....``.....`````..",
"#Tii #..[.``..X..`````..",
"# *``````.....`````..",
"#y L#..%%%%..^..`````..",
"#)]])####))))####=====##",
"#y EsE s y#~~~~~~&#",
"#r H x#~~~~~~~#",
"#r Hl x#~~~~~~~#",
"# H x#~~~~~~~#",
") hhhh #~~~~~~~#",
") ffff +~~~~~~~#",
") hhhh #U~NN~~q#",
"# RRT #########",
"#6 Y|||||||| | I@@I #",
"#6 J|RIII + + @@ o",
"o7 J| h ||+|| b#",
"#O J|y d|--t|d yE o",
"o3 4|@@ T|B--||+|| #",
"#F152|I E d|B8S|S-t|DD#",
"###o###o##o###o#########",
"..%%%........%%%...^....",
"........[...............",
".....[......[...........",
"...................%...."
],
"palettes": [ "standard_domestic_palette" ],
"terrain": {
"%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
"[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
"!": "t_region_groundcover_urban",
"`": "t_concrete",
"$": "t_privacy_fence",
";": "t_privacy_fencegate_c",
")": "t_wall_glass",
"]": "t_door_glass_c",
"-": "t_linoleum_white",
"Q": "t_linoleum_white",
"8": "t_linoleum_white",
"B": "t_linoleum_white",
"S": "t_linoleum_white",
"9": "t_linoleum_white",
"t": "t_linoleum_white",
"=": "t_door_metal_locked",
"&": "t_gates_control_brick",
"U": "t_thconc_floor",
"q": "t_thconc_floor",
"N": "t_thconc_floor",
"~": "t_thconc_floor"
},
"furniture": { "!": "f_region_flower" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_31_roof",
"object": {
"fill_ter": "t_shingle_flat_roof",
"rows": [
"|22223 ",
"|....3 ",
"|....3 ",
"|....3 ",
"|....2222222225222222222",
"|......................3",
"|......................3",
"|......................3",
"|......................3",
"|......................3",
"|......................3",
"|....X......N..........3",
"|......................3",
"|......................3",
"|....................=.3",
"|............&.........3",
"|......................3",
"|......................3",
"|......................3",
"-------------------5----",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
99 changes: 99 additions & 0 deletions data/json/mapgen/house/house32.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
[
{
"method": "json",
"om_terrain": "house_32",
"//": "used by lab basements, no dedicated stairs added.",
"type": "mapgen",
"weight": 100,
"object": {
"fill_ter": "t_floor",
"rows": [
".................``.....",
"##======#######..``.....",
"#&~~~~~~U#yiiyo..``.....",
"#~~~~~~~~+ *````.....",
"#~~~~~~~~# o.......^.",
"#~~~~~~~U#L ###]]]]###",
"#~~~~~~~U# HHHH T#",
"#~~~~~~~q#R ll x#",
"#~~NN~~qq#R o",
"##########c HHHH #",
"#Dbd + #",
"o T| hhhh AAAA#",
"# E| ffff JJJJJ#",
"o @@ y| hhhh 1#",
"#I@@I R| 5o",
"#||||||| 2#",
"# TII + |||+||Y 7O43#",
"# h ||||E R|||+||||#",
"o @ R|R R|t----B#",
"#s@y ER|R yHHHTy|QQ8S8B#",
"###o#o#####]]]##########",
"....................[.^.",
"......[.......[.........",
"........................"
],
"palettes": [ "standard_domestic_palette" ],
"terrain": {
"%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
"[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
"!": "t_region_groundcover_urban",
"`": "t_concrete",
"$": "t_privacy_fence",
";": "t_privacy_fencegate_c",
")": "t_wall_glass",
"]": "t_door_glass_c",
"-": "t_linoleum_white",
"Q": "t_linoleum_white",
"8": "t_linoleum_white",
"B": "t_linoleum_white",
"S": "t_linoleum_white",
"9": "t_linoleum_white",
"t": "t_linoleum_white",
"=": "t_door_metal_locked",
"&": "t_gates_control_brick",
"U": "t_thconc_floor",
"q": "t_thconc_floor",
"N": "t_thconc_floor",
"~": "t_thconc_floor"
},
"furniture": { "!": "f_region_flower" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_32_roof",
"object": {
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
"|22222222222223 ",
"|.............3 ",
"|.............3 ",
"|.............3 ",
"|.............3222222252",
"|......................3",
"|......................3",
"|......................3",
"|......................3",
"|......................3",
"|........N......&......3",
"|......................3",
"|...............=......3",
"|......................3",
"|......................3",
"|............X.........3",
"|......................3",
"|......................3",
"|......................3",
"|---------------------53",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
20 changes: 20 additions & 0 deletions data/json/overmap/multitile_city_buildings.json
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,26 @@
{ "point": [ 0, 0, -1 ], "overmap": "basement_chem2_north" }
]
},
{
"type": "city_building",
"id": "house_31",
"locations": [ "land" ],
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "house_31_north" },
{ "point": [ 0, 0, 1 ], "overmap": "house_31_roof_north" },
{ "point": [ 0, 0, -1 ], "overmap": "basement" }
]
},
{
"type": "city_building",
"id": "house_32",
"locations": [ "land" ],
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "house_32_north" },
{ "point": [ 0, 0, 1 ], "overmap": "house_32_roof_north" },
{ "point": [ 0, 0, -1 ], "overmap": "basement" }
]
},
{
"type": "city_building",
"id": "house_08",
Expand Down
34 changes: 34 additions & 0 deletions data/json/overmap/overmap_terrain/overmap_terrain_residential.json
Original file line number Diff line number Diff line change
Expand Up @@ -1322,6 +1322,40 @@
"color": "light_green",
"see_cost": 2
},
{
"type": "overmap_terrain",
"id": "house_31",
"name": "house",
"copy-from": "generic_city_building",
"color": "light_green",
"see_cost": 2,
"flags": [ "SIDEWALK", "GENERIC_LOOT" ]
},
{
"type": "overmap_terrain",
"id": "house_31_roof",
"name": "house",
"copy-from": "generic_city_building",
"color": "light_green",
"see_cost": 2
},
{
"type": "overmap_terrain",
"id": "house_32",
"name": "house",
"copy-from": "generic_city_building",
"color": "light_green",
"see_cost": 2,
"flags": [ "SIDEWALK", "GENERIC_LOOT" ]
},
{
"type": "overmap_terrain",
"id": "house_32_roof",
"name": "house",
"copy-from": "generic_city_building",
"color": "light_green",
"see_cost": 2
},
{
"type": "overmap_terrain",
"id": "basement_chem2",
Expand Down
4 changes: 3 additions & 1 deletion data/json/regional_map_settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,8 @@
"house_28": 50,
"house_29": 50,
"house_30": 50,
"house_31": 50,
"house_32": 50,
"house_garage": 50,
"house_garage2": 50,
"house_garage3": 50,
Expand Down Expand Up @@ -647,7 +649,7 @@
"trailerpark_city": 15,
"railroad_city": 10
},
"basements": { "basement": 1000, "basement_hidden_lab_stairs": 25 },
"basements": { "basement": 100, "basement_hidden_lab_stairs": 25 },
"parks": {
"park": 400,
"pool": 20,
Expand Down