Skip to content

Commit

Permalink
Add basements 3 (#37873)
Browse files Browse the repository at this point in the history 
* crack house basements

* basements for preppers, fortified

* stair removals

one is a duplex and one has abandoned variant, needs further planning on basements for these types.

* lint
  • Loading branch information
@curstwist
curstwist authored Feb 10, 2020
1 parent b7876ca commit 1b61a64
Show file tree
Hide file tree
Showing 9 changed files with 189 additions and 28 deletions.
28 changes: 14 additions & 14 deletions data/json/mapgen/basement/basement_messed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"om_terrain": "basement_messed",
"//": "used for house_crack1, house_crack2",
"weight": 250,
"object": {
"rotation": [ 0, 3 ],
"fill_ter": "t_rock",
"rows": [
" ",
" ",
" ",
" |||||||||||| ",
" |a.aaHHbbbr| ",
" |a.......ar| ",
" |a..a||||||| ",
" |a..aaaarrr| ",
" |a.a.aaaaaa| ",
" |aa....arrr| ",
" |||..|++|||| ",
" |E..a|.<| ",
" |W..r|||| ",
" |||||| ",
" ",
" ",
" ",
" ",
" ",
" ",
" |||||||||||| ",
" |a.aaHHbbbr| ",
" |a.......ar| ",
" |a..a||||||| ",
" |a..aaaarrr| ",
" |a.a.aaaaaa| ",
" |aa....arrr| ",
" |||..|++|||| ",
" |E..a|..| ",
" |W..r|<<| ",
" ||||||||| ",
" ",
" ",
" ",
Expand Down Expand Up @@ -84,7 +84,7 @@
],
"b": [ { "item": "home_hw", "chance": 60 }, { "item": "mechanics", "chance": 30 } ]
},
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 9, 16 ], "y": [ 12, 16 ] } ]
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 4, 13 ], "y": [ 4, 9 ] } ]
}
}
]
35 changes: 35 additions & 0 deletions data/json/mapgen/house/crack_house.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,5 +315,40 @@
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_crack3_basement",
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ",
" |||||||||||||| ",
" |............| ",
" |............| ",
" ||||............| ",
" |F.g............| ",
" |...............| ",
" |...............| ",
" |...............| ",
" |...............| ",
" |J..............| ",
" |W.A.......z....| ",
" |JZJ..<...zz...z| ",
" ||||||||||||||||| ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "basement_empty" ]
}
}
]
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house18.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
".#312FY |+|+| 6612#..",
".#|||||| | ||||||#..",
".#TRIR | ||||| |RRb #..",
".#E + +>|>+ + d#..",
".#E + +U|U+ + d#..",
".oy E|+|||||+| @@o..",
".od b|S$B|B$S|E @@o..",
".# s|t$B|B$t|T d#..",
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/house/house23.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"`.# E| |J no..",
"`.#yxxx 7#..",
"`.#|||| hhh Y#..",
"`.#S--+ fff y 6#..",
"`.#98t| hhh|>| RR Y6#..",
"`.#S--+ fff 6#..",
"`.#98t| hhh Ty RR Y6#..",
"`.#####*###|||+||+|||#..",
"`......``^#db T| dD#^.",
"`````````!o I| o..",
Expand Down
35 changes: 35 additions & 0 deletions data/json/mapgen/house/house_fortified.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,40 @@
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_fortified_basement",
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" |||||||||||||| ",
" |............| ",
" |............| ",
" |............| ",
" |............| ",
" |............| ",
" |............| ",
" |............| ",
" |............| ",
" |............| ",
" |||||||||............| ",
" |....................| ",
" |....................| ",
" |...................<| ",
" |....................| ",
" |...................W| ",
" |...................Z| ",
" |||||||||||..........| ",
" |..........| ",
" |..........| ",
" |........gF| ",
" |||||||||||| ",
" "
],
"palettes": [ "basement_empty" ]
}
}
]
35 changes: 35 additions & 0 deletions data/json/mapgen/house/house_garage_prepper.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,5 +154,40 @@
}
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_prepper2_basement",
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" |||||||||||||||||||||| ",
" |....................| ",
" |....................| ",
" |..............zz...g| ",
" |..............z.....| ",
" |................z..F| ",
" |....................| ",
" |....................| ",
" |...................Z| ",
" |...................J| ",
" |...................W| ",
" |....................| ",
" |...................<| ",
" |....................| ",
" |....................| ",
" |....................| ",
" ||||||...............| ",
" |...............| ",
" |...............| ",
" |...............| ",
" |...............| ",
" ||||||||||||||||| ",
" "
],
"palettes": [ "basement_empty" ]
}
}
]
35 changes: 35 additions & 0 deletions data/json/mapgen/house/house_prepper.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,40 @@
{ "monster": "GROUP_PEST", "x": [ 2, 21 ], "y": [ 13, 21 ], "chance": 3 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_prepper_basement",
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" |||||||||||||||||||||| ",
" |...............g.F..| ",
" |....................| ",
" |....................| ",
" |....................| ",
" |....................| ",
" |....................| ",
" |....................| ",
" |....................| ",
" |.........%.<...WJJZU| ",
" |.........%%%%%%%%%%%| ",
" |....................| ",
" |....................| ",
" |....................| ",
" |....................| ",
" |....................| ",
" |....................| ",
" |....................| ",
" |....................| ",
" |....................| ",
" |....................| ",
" |||||||||||||||||||||| ",
" "
],
"palettes": [ "basement_empty" ]
}
}
]
18 changes: 7 additions & 11 deletions data/json/overmap/multitile_city_buildings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,7 @@
"type": "city_building",
"id": "house_18",
"locations": [ "land" ],
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "house_18_north" },
{ "point": [ 0, 0, 1 ], "overmap": "house_18_roof_north" },
{ "point": [ 0, 0, -1 ], "overmap": "basement" }
]
"overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_18_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_18_roof_north" } ]
},
{
"type": "city_building",
Expand Down Expand Up @@ -3194,7 +3190,7 @@
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "house_prepper_north" },
{ "point": [ 0, 0, 1 ], "overmap": "house_04_roof_north" },
{ "point": [ 0, 0, -1 ], "overmap": "basement" }
{ "point": [ 0, 0, -1 ], "overmap": "house_prepper_basement_north" }
]
},
{
Expand All @@ -3204,7 +3200,7 @@
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "house_prepper2_north" },
{ "point": [ 0, 0, 1 ], "overmap": "house_prepper2_roof_north" },
{ "point": [ 0, 0, -1 ], "overmap": "basement" }
{ "point": [ 0, 0, -1 ], "overmap": "house_prepper2_basement_north" }
]
},
{
Expand All @@ -3214,7 +3210,7 @@
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "house_fortified_north" },
{ "point": [ 0, 0, 1 ], "overmap": "house_fortified_roof_north" },
{ "point": [ 0, 0, -1 ], "overmap": "basement" }
{ "point": [ 0, 0, -1 ], "overmap": "house_fortified_basement_north" }
]
},
{
Expand All @@ -3224,7 +3220,7 @@
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "house_crack1_north" },
{ "point": [ 0, 0, 1 ], "overmap": "house_crack1_roof_north" },
{ "point": [ 0, 0, -1 ], "overmap": "basement" }
{ "point": [ 0, 0, -1 ], "overmap": "basement_messed_north" }
]
},
{
Expand All @@ -3234,7 +3230,7 @@
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "house_crack2_north" },
{ "point": [ 0, 0, 1 ], "overmap": "house_crack1_roof_north" },
{ "point": [ 0, 0, -1 ], "overmap": "basement" }
{ "point": [ 0, 0, -1 ], "overmap": "basement_messed_north" }
]
},
{
Expand All @@ -3244,7 +3240,7 @@
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "house_crack3_north" },
{ "point": [ 0, 0, 1 ], "overmap": "house_crack3_roof_north" },
{ "point": [ 0, 0, -1 ], "overmap": "basement" }
{ "point": [ 0, 0, -1 ], "overmap": "house_crack3_basement_north" }
]
}
]
25 changes: 25 additions & 0 deletions data/json/overmap/overmap_terrain/overmap_terrain_residential.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@
"see_cost": 2,
"flags": [ "SIDEWALK", "GENERIC_LOOT" ]
},
{
"type": "overmap_terrain",
"id": "house_prepper_basement",
"copy-from": "generic_city_house_basement"
},
{
"type": "overmap_terrain",
"id": "house_prepper2",
Expand All @@ -80,6 +85,11 @@
"color": "light_green",
"see_cost": 2
},
{
"type": "overmap_terrain",
"id": "house_prepper2_basement",
"copy-from": "generic_city_house_basement"
},
{
"type": "overmap_terrain",
"id": "house_fortified",
Expand All @@ -97,6 +107,11 @@
"color": "light_green",
"see_cost": 2
},
{
"type": "overmap_terrain",
"id": "house_fortified_basement",
"copy-from": "generic_city_house_basement"
},
{
"type": "overmap_terrain",
"id": "duplex",
Expand Down Expand Up @@ -1789,6 +1804,11 @@
"see_cost": 2,
"flags": [ "SIDEWALK", "GENERIC_LOOT" ]
},
{
"type": "overmap_terrain",
"id": "basement_messed",
"copy-from": "generic_city_house_basement"
},
{
"type": "overmap_terrain",
"id": "house_crack1_roof",
Expand All @@ -1815,6 +1835,11 @@
"see_cost": 2,
"flags": [ "SIDEWALK", "GENERIC_LOOT" ]
},
{
"type": "overmap_terrain",
"id": "house_crack3_basement",
"copy-from": "generic_city_house_basement"
},
{
"type": "overmap_terrain",
"id": "house_crack3_roof",
Expand Down

0 comments on commit 1b61a64

Please sign in to comment.