Skip to content

Commit

Permalink
Add houses for existing basements (#37902)
Browse files Browse the repository at this point in the history 
* add houses for existing basements

* Update house30.json
  • Loading branch information
@curstwist
curstwist authored Feb 11, 2020
1 parent f7a5213 commit 4ab395e
Show file tree
Hide file tree
Showing 12 changed files with 730 additions and 112 deletions.
12 changes: 6 additions & 6 deletions data/json/mapgen/basement/basement_chem.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"om_terrain": [ "basement_chem" ],
"//": "matches house_29",
"weight": 250,
"object": {
"rotation": [ 0, 3 ],
"fill_ter": "t_rock",
"rows": [
" ",
Expand All @@ -26,7 +26,7 @@
" |R________i| ",
" |||+|++||||| ",
" |W__|..| ",
" |E_R|<<| ",
" |E_R|.<| ",
" |||||||| ",
" ",
" ",
Expand Down Expand Up @@ -89,10 +89,10 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"om_terrain": "basement_chem2",
"//": "matches house_30",
"weight": 200,
"object": {
"rotation": [ 0, 3 ],
"fill_ter": "t_rock",
"rows": [
" ",
Expand All @@ -113,7 +113,7 @@
" |||||+||,,||+|||||| ",
" |i,A,F|++|U__XU| ",
" |D,,,T|..|U___c| ",
" |b,,hT|<<|U___c| ",
" |b,,hT|<.|U___c| ",
" |b,n,T||||U_U_U| ",
" ||||||| ||||||| ",
" ",
Expand Down
120 changes: 60 additions & 60 deletions data/json/mapgen/basement/basement_meth.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,34 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"om_terrain": [ "basement_meth" ],
"//": "linked to house_27.",
"weight": 20,
"object": {
"rotation": [ 0, 3 ],
"fill_ter": "t_rock",
"rows": [
" ",
" ",
" ",
" ",
" |||||||||||||| ",
" |D.YY+D|rr__d| ",
" |##YY+D|____w| ",
" |##YY|||x||||||||",
" |D...+....YYYYYY|",
" |||+||....YYYYYY|",
" |&..b|....YYYYYY|",
" |....+..|||||||||",
" |Scci|..Bx__R|pu|",
" ||||||..B|l__|_n|",
" |..<|||+|+||",
" |..<||O___0|",
" |..|||O___0|",
" |..B||A___I|",
" |+||||f___o|",
" |__F||0___0|",
" |r_W||rrrr0|",
" ||||||||||||",
" %%%%%%%%%%%%%% ",
" %D.YY+D|rr__d% ",
" %##YY+D|____w% ",
" %##YY|||x||||%%%%",
" %D...+....YYYYYY%",
" %||+||....YYYYYY%",
" %&..b|....YYYYYY%",
" %....+..||||||||%",
" %Scci|..Bx__R|pu%",
" %%%%%%..B|l__|_n%",
" %..<|||+|+|%",
" %...||O___0%",
" %..|||O___0%",
" %..B||A___I%",
" %+||||f___o%",
" %__F||0___0%",
" %r_W||rrrr0%",
" %%%%%%%%%%%%",
" ",
" "
],
Expand Down Expand Up @@ -114,34 +114,34 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"om_terrain": [ "basement_meth" ],
"//": "linked to house_27.",
"weight": 250,
"object": {
"rotation": [ 0, 3 ],
"fill_ter": "t_rock",
"rows": [
" ",
" ",
" ",
" ",
" |||||||||||||||||",
" |DYYY+D|rr__d|TT|",
" |##YY+D|____w|..|",
" |##YY|||+|||||+||",
" |D...+...YYYYYYY|",
" |||+||...YYYYYYY|",
" |&...|...YYYYYYY|",
" |....+..|||||||||",
" |Scci|..B| ",
" ||||||..B| ",
" |..<| ",
" |..<| ",
" |..|| ",
" |..B| ",
" |+||| ",
" |__F| ",
" |r_W| ",
" ||||| ",
" %%%%%%%%%%%%%%%%%",
" %DYYY+D|rr__d|TT%",
" %##YY+D|____w|..%",
" %##YY|||+|||||+|%",
" %D...+...YYYYYYY%",
" %||+||...YYYYYYY%",
" %&...|...YYYYYYY%",
" %....+..|%%%%%%%%",
" %Scci|..B% ",
" %%%%%%..B% ",
" %..<% ",
" %...% ",
" %..%% ",
" %..B% ",
" %+||% ",
" %__F% ",
" %r_W% ",
" %%%%% ",
" ",
" "
],
Expand Down Expand Up @@ -172,34 +172,34 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"om_terrain": [ "basement_meth" ],
"//": "linked to house_27.",
"weight": 250,
"object": {
"rotation": [ 0, 3 ],
"fill_ter": "t_rock",
"rows": [
" ",
" ",
" ",
" ",
" |||||||||||||||||",
" |DYYY+D|rr__d|TT|",
" |##YY+D|____w|..|",
" |##YY|||+|||||+||",
" |D...+...YYYYYYY|",
" |||+||...YYYYYYY|",
" |&...|...YYYYYYY|",
" |....+..|||||||||",
" |Scci|........T| ",
" ||||||........T| ",
" |..<|....t| ",
" |..<|....t| ",
" |..||YY.TB| ",
" |..B||||||| ",
" |+||| ",
" |__F| ",
" |r_W| ",
" ||||| ",
" %%%%%%%%%%%%%%%%%",
" %DYYY+D|rr__d|TT%",
" %##YY+D|____w|..%",
" %##YY|||+|||||+|%",
" %D...+...YYYYYYY%",
" %||+||...YYYYYYY%",
" %&...|...YYYYYYY%",
" %....+..|||||||%%",
" %Scci|........T% ",
" %%%%%%........T% ",
" %..<|....t% ",
" %...|....t% ",
" %..||YY.TB% ",
" %..B%%%%%%% ",
" %+||% ",
" %__F% ",
" %r_W% ",
" %%%%% ",
" ",
" "
],
Expand Down
83 changes: 41 additions & 42 deletions data/json/mapgen/basement/basement_survival.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"weight": 250,
"om_terrain": [ "basement_survival" ],
"//": "matches house_26",
"object": {
"fill_ter": "t_rock",
"rotation": [ 0, 3 ],
"rows": [
" ",
" ",
" -------------------- ",
" |######....ccgf...{| ",
" |#................{| ",
Expand All @@ -33,19 +34,17 @@
" |............|.......| ",
" |sssss.s|{..{|dbb.bbd| ",
" |.......|{..{|-------| ",
" |X...xXX|{..{|...| ",
" |Xx....X|{...+..t| ",
" |X...xXX|{..{|..t| ",
" |Xx....X|{...+...| ",
" |XX..xXX|{..{|k..| ",
" |XXx..X.|{..{|------ ",
" |X......|----|....<| ",
" |-|...............<| ",
" |-|................| ",
" |---..........|--| ",
" |----------| ",
" ",
" ",
" ",
" ",
" ",
" "
],
"terrain": {
Expand Down Expand Up @@ -89,56 +88,56 @@
"toilets": { "t": { } },
"place_liquids": [ { "liquid": "water", "x": [ 4, 15 ], "y": [ 14, 15 ], "repeat": 3 } ],
"place_loot": [
{ "group": "basement_survival_last_stand_casing", "x": 2, "y": 6, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 3, "y": 6, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 4, "y": 6, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 5, "y": 7, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 2, "y": 7, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 3, "y": 7, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 4, "y": 7, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 5, "y": 7, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand", "x": [ 3, 4 ], "y": 7, "chance": 100 },
{ "group": "tools_common", "x": [ 3, 7 ], "y": 1, "chance": 100 },
{ "group": "tools_entry", "x": [ 3, 7 ], "y": 1, "chance": 50 },
{ "group": "basement_survival_last_stand_casing", "x": 2, "y": 8, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 3, "y": 8, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 4, "y": 8, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 5, "y": 9, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 2, "y": 9, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 3, "y": 9, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 4, "y": 9, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand_casing", "x": 5, "y": 9, "chance": 20, "repeat": [ 1, 10 ] },
{ "group": "basement_survival_last_stand", "x": [ 3, 4 ], "y": 9, "chance": 100 },
{ "group": "tools_common", "x": [ 3, 7 ], "y": 3, "chance": 100 },
{ "group": "tools_entry", "x": [ 3, 7 ], "y": 3, "chance": 50 },
{ "item": "fire_ax", "x": 2, "y": 2, "chance": 25 },
{ "item": "2x4", "x": [ 4, 7 ], "y": [ 3, 4 ], "chance": 100, "repeat": [ 2, 4 ] },
{ "item": "log", "x": [ 4, 7 ], "y": [ 3, 4 ], "chance": 100, "repeat": [ 1, 2 ] },
{ "group": "misc_smoking", "x": 21, "y": 6, "chance": 75 },
{ "group": "kitchen", "x": [ 11, 13 ], "y": 5, "chance": 100 },
{ "group": "cannedfood", "x": 10, "y": 8, "chance": 75 },
{ "group": "cannedfood", "x": 10, "y": 9, "chance": 75 },
{ "item": "2x4", "x": [ 4, 7 ], "y": [ 5, 6 ], "chance": 100, "repeat": [ 2, 4 ] },
{ "item": "log", "x": [ 4, 7 ], "y": [ 5, 6 ], "chance": 100, "repeat": [ 1, 2 ] },
{ "group": "misc_smoking", "x": 21, "y": 8, "chance": 75 },
{ "group": "kitchen", "x": [ 11, 13 ], "y": 7, "chance": 100 },
{ "group": "cannedfood", "x": 10, "y": 10, "chance": 75 },
{ "group": "cannedfood", "x": 10, "y": 11, "chance": 75 },
{ "group": "cannedfood", "x": 10, "y": 12, "chance": 75 },
{ "group": "cannedfood", "x": 10, "y": 13, "chance": 75 },
{ "group": "fridge", "x": 15, "y": 1, "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "book_survival", "x": 15, "y": 5, "chance": 90 },
{ "group": "book_survival", "x": 15, "y": 6, "chance": 30 },
{ "group": "gear_survival", "x": 13, "y": 8, "chance": 75 },
{ "group": "gear_survival", "x": 13, "y": 9, "chance": 75 },
{ "group": "cannedfood", "x": 10, "y": 14, "chance": 75 },
{ "group": "cannedfood", "x": 10, "y": 15, "chance": 75 },
{ "group": "fridge", "x": 14, "y": 2, "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "book_survival", "x": 15, "y": 7, "chance": 90 },
{ "group": "book_survival", "x": 15, "y": 8, "chance": 30 },
{ "group": "gear_survival", "x": 13, "y": 10, "chance": 75 },
{ "group": "gear_survival", "x": 13, "y": 11, "chance": 75 },
{ "group": "gear_survival", "x": 13, "y": 12, "chance": 75 },
{ "group": "gear_survival", "x": 13, "y": 13, "chance": 75 },
{ "group": "gear_survival", "x": 13, "y": 14, "chance": 75 },
{ "group": "gear_survival", "x": 13, "y": 15, "chance": 75 },
{
"group": "guns_survival",
"x": 19,
"y": [ 1, 2 ],
"y": [ 3, 4 ],
"chance": 100,
"repeat": [ 1, 2 ],
"ammo": 75,
"magazine": 100
},
{ "group": "ammo_reloaded", "x": 19, "y": 3, "chance": 100, "repeat": [ 1, 3 ], "magazine": 100 },
{ "group": "guns_pistol_common", "x": 15, "y": 8, "chance": 30, "ammo": 75, "magazine": 100 },
{ "group": "guns_pistol_common", "x": 21, "y": 8, "chance": 30, "ammo": 75, "magazine": 100 },
{ "group": "clothing_outdoor_set", "x": 15, "y": 8, "chance": 30 },
{ "group": "clothing_outdoor_set", "x": 21, "y": 8, "chance": 30 },
{ "item": "blanket", "x": 16, "y": 8, "chance": 30 },
{ "item": "blanket", "x": 20, "y": 8, "chance": 30 },
{ "item": "pillow", "x": 16, "y": 8, "chance": 30 },
{ "item": "pillow", "x": 20, "y": 8, "chance": 30 }
{ "group": "ammo_reloaded", "x": 19, "y": 5, "chance": 100, "repeat": [ 1, 3 ], "magazine": 100 },
{ "group": "guns_pistol_common", "x": 15, "y": 10, "chance": 30, "ammo": 75, "magazine": 100 },
{ "group": "guns_pistol_common", "x": 21, "y": 10, "chance": 30, "ammo": 75, "magazine": 100 },
{ "group": "clothing_outdoor_set", "x": 15, "y": 10, "chance": 30 },
{ "group": "clothing_outdoor_set", "x": 21, "y": 10, "chance": 30 },
{ "item": "blanket", "x": 16, "y": 10, "chance": 30 },
{ "item": "blanket", "x": 20, "y": 10, "chance": 30 },
{ "item": "pillow", "x": 16, "y": 10, "chance": 30 },
{ "item": "pillow", "x": 20, "y": 10, "chance": 30 }
],
"place_monsters": [ { "monster": "GROUP_PREPPER_HOUSE", "x": [ 2, 10 ], "y": [ 4, 7 ], "chance": 2 } ]
"place_monsters": [ { "monster": "GROUP_PREPPER_HOUSE", "x": [ 2, 10 ], "y": [ 6, 9 ], "chance": 2 } ]
}
}
]
7 changes: 3 additions & 4 deletions data/json/mapgen/basement/basement_weed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"weight": 250,
"om_terrain": [ "basement_weed" ],
"//": "matches house_28",
"object": {
"rotation": [ 0, 3 ],
"fill_ter": "t_rock",
"rows": [
" ",
Expand All @@ -36,7 +35,7 @@
" ||||||||__|||| ",
" |++| ",
" |..| ",
" |<<| ",
" |.<| ",
" |||| ",
" ",
" ",
Expand Down
Loading

0 comments on commit 4ab395e

Please sign in to comment.