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.

Sign up for GitHub

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

add more basements #37931

Merged
merged 2 commits into from
Feb 11, 2020
Merged

add more basements #37931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7beabf3
add more basements
curstwist Feb 11, 2020
e3ba24e
Update regional_map_settings.json
curstwist Feb 11, 2020
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
163 changes: 82 additions & 81 deletions data/json/mapgen/basement/basement_bionic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,32 @@
"fill_ter": "t_rock_floor",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" |---------- ",
" |?..i|..LL| ",
" |/...+L...| ",
" |.ccc|L...| ",
"|-------------+---------",
"|{{{{{|bbbbbb|...rrccrr|",
"|.....|s....b|ff.......|",
"|___..|s.t..b|...cccccc|",
"|.....|a....b|.........|",
"|^..!.............s.t..|",
"|.................s.t..|",
"|%..@.............s.t..|",
"|................|-----|",
"|......|+-|++|...|&...i|",
"|......|.W|..|...+....C|",
"|..}...|.F|.<|...|.cc.*|",
"------------------------",
" |----------| ",
" |...___....| ",
" |..........| ",
" |..~~~~~~..| ",
" |---------|..~~~~~~..| ",
" |...__..i|L..~~~~~~..| ",
" |?.......|...~~~~~~..| ",
" |/.......+L..........| ",
" |.ccc.ccc|LL...___...| ",
" |------------+-------| ",
" |{{{{|bbbbbb|...rrccr| ",
" |....|s....b|ff......| ",
" |__..|s.t..b|...ccccc| ",
" |....|a....b|........| ",
" |^.!.............s..t| ",
" |................s..t| ",
" |%.@.............s..t| ",
" |...............|----| ",
" |.....|+-|++|...|&..i| ",
" |.....|.W|..|...+...C| ",
" |.}...|.F|.<|...|.cc*| ",
" ---------------------- ",
" "
],
"palettes": [ "basement_game" ],
"terrain": { "~": "t_water_pool" },
"furniture": {
"}": "f_pinball_machine",
"*": "f_shower",
Expand All @@ -51,64 +52,64 @@
},
"liquids": { "W": { "liquid": "water_clean", "amount": [ 0, 100 ] } },
"place_loot": [
{ "group": "alcohol", "x": [ 14, 15 ], "y": 6, "chance": 96, "repeat": [ 1, 2 ] },
{ "group": "fridgesnacks", "x": [ 14, 15 ], "y": 6, "chance": 80, "repeat": [ 1, 2 ] },
{ "group": "homebooks", "x": [ 7, 12 ], "y": 5, "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "homebooks", "x": 12, "y": [ 6, 8 ], "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "magazines", "x": 20, "y": [ 10, 12 ], "chance": 30 },
{ "group": "magazines", "x": 9, "y": 7, "chance": 30 },
{ "group": "snacks", "x": [ 17, 22 ], "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
{ "group": "snacks", "x": [ 17, 22 ], "y": 7, "chance": 40, "repeat": [ 1, 2 ] },
{ "group": "softdrugs", "x": 22, "y": 14, "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "cleaning", "x": 11, "y": [ 2, 3 ], "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "cleaning", "x": [ 13, 14 ], "y": 1, "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "surgery", "x": [ 8, 9 ], "y": 3, "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "bionics_common", "x": 7, "y": 3 },
{ "item": "anesthetic_kit", "x": 7, "y": 3 },
{ "item": "television", "x": 22, "y": 10, "chance": 95 },
{ "item": "soap", "x": 19, "y": 15, "chance": 80 },
{ "item": "towel", "x": 20, "y": 15, "chance": 80 },
{ "item": "towel", "x": 2, "y": 7, "chance": 60 },
{ "item": "stereo", "x": 1, "y": 7, "chance": 50 }
{ "group": "alcohol", "x": [ 14, 15 ], "y": 12, "chance": 96, "repeat": [ 1, 2 ] },
{ "group": "fridgesnacks", "x": [ 14, 15 ], "y": 12, "chance": 80, "repeat": [ 1, 2 ] },
{ "group": "homebooks", "x": [ 7, 12 ], "y": 11, "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "homebooks", "x": 12, "y": [ 12, 14 ], "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "magazines", "x": 21, "y": [ 15, 17 ], "chance": 30 },
{ "group": "magazines", "x": 9, "y": 12, "chance": 30 },
{ "group": "snacks", "x": [ 16, 21 ], "y": 11, "chance": 40, "repeat": [ 1, 2 ] },
{ "group": "snacks", "x": [ 16, 21 ], "y": 13, "chance": 40, "repeat": [ 1, 2 ] },
{ "group": "softdrugs", "x": 21, "y": 20, "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "cleaning", "x": 11, "y": 5, "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "cleaning", "x": [ 11, 12 ], "y": 8, "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "surgery", "x": [ 8, 9 ], "y": 9, "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "bionics_common", "x": 7, "y": 9 },
{ "item": "anesthetic_kit", "x": 7, "y": 9 },
{ "item": "television", "x": 21, "y": 16, "chance": 95 },
{ "item": "soap", "x": 19, "y": 21, "chance": 80 },
{ "item": "towel", "x": 20, "y": 21, "chance": 80 },
{ "item": "towel", "x": 3, "y": 13, "chance": 60 },
{ "item": "stereo", "x": 2, "y": 13, "chance": 50 }
],
"place_monster": [ { "monster": "mon_broken_cyborg", "x": 14, "y": 3, "chance": 100 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"om_terrain": [ "basement_bionic_decoy" ],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you give this the same ID, basement_bionic, and just comment on it being a decoy, you won't need separate overmap entries and things. The game will just select which map to use based on weight.

Copy link
Contributor Author

@curstwist curstwist Feb 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this because bionic_basement is a scenario start location and I don't want people spawning in the wrong basement model. I don't do it to other matching basements.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yeah I didn't notice it for the others either. that makes sense.

"weight": 100,
"object": {
"rotation": [ 0, 3 ],
"fill_ter": "t_rock_floor",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ------ ",
" |..LL| ",
" |L...| ",
" |L...| ",
"|-------------+---------",
"|{{{{{|bbbbbb|...rrccrr|",
"|.....|s....b|ff.......|",
"|___..|s.t..b|...cccccc|",
"|.....|a....b|.........|",
"|^..!.............s.t..|",
"|.................s.t..|",
"|%..@.............s.t..|",
"|................|-----|",
"|......|+-|++|...|&...i|",
"|......|.W|..|...+....C|",
"|..}...|.F|<<|...|.cc.*|",
"------------------------",
" |----------| ",
" |...___....| ",
" |..........| ",
" |..~~~~~~..| ",
" |---------|..~~~~~~..| ",
" |*|*|*|cc|L..~~~~~~..| ",
" |+|+|+|..|L..~~~~~~..| ",
" |........+...........| ",
" |cc&c&c&c|LL...___...| ",
" |------------+-------| ",
" |{{{{|bbbbbb|...rrccr| ",
" |....|s....b|ff......| ",
" |__..|s.t..b|...ccccc| ",
" |....|a....b|........| ",
" |^.!.............s..t| ",
" |................s..t| ",
" |%.@.............s..t| ",
" |...............|----| ",
" |.....|+-|++|...|&..i| ",
" |.....|.W|..|...+...C| ",
" |.}...|.F|.<|...|.cc*| ",
" ---------------------- ",
" "
],
"palettes": [ "basement_game" ],
"terrain": { "~": "t_water_pool" },
"furniture": {
"}": "f_pinball_machine",
"*": "f_shower",
Expand All @@ -125,22 +126,22 @@
},
"liquids": { "W": { "liquid": "water_clean", "amount": [ 0, 100 ] } },
"place_loot": [
{ "group": "alcohol", "x": [ 14, 15 ], "y": 6, "chance": 96, "repeat": [ 1, 2 ] },
{ "group": "fridgesnacks", "x": [ 14, 15 ], "y": 6, "chance": 80, "repeat": [ 1, 2 ] },
{ "group": "homebooks", "x": [ 7, 12 ], "y": 5, "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "homebooks", "x": 12, "y": [ 6, 8 ], "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "magazines", "x": 20, "y": [ 10, 12 ], "chance": 30 },
{ "group": "magazines", "x": 9, "y": 7, "chance": 30 },
{ "group": "snacks", "x": [ 17, 22 ], "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
{ "group": "snacks", "x": [ 17, 22 ], "y": 7, "chance": 40, "repeat": [ 1, 2 ] },
{ "group": "softdrugs", "x": 22, "y": 14, "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "cleaning", "x": 11, "y": [ 2, 3 ], "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "cleaning", "x": [ 13, 14 ], "y": 1, "chance": 70, "repeat": [ 1, 2 ] },
{ "item": "television", "x": 22, "y": 10, "chance": 95 },
{ "item": "soap", "x": 19, "y": 15, "chance": 80 },
{ "item": "towel", "x": 20, "y": 15, "chance": 80 },
{ "item": "towel", "x": 2, "y": 7, "chance": 60 },
{ "item": "stereo", "x": 1, "y": 7, "chance": 50 }
{ "group": "alcohol", "x": [ 14, 15 ], "y": 12, "chance": 96, "repeat": [ 1, 2 ] },
{ "group": "fridgesnacks", "x": [ 14, 15 ], "y": 12, "chance": 80, "repeat": [ 1, 2 ] },
{ "group": "homebooks", "x": [ 7, 12 ], "y": 11, "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "homebooks", "x": 12, "y": [ 12, 14 ], "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "magazines", "x": 21, "y": [ 15, 17 ], "chance": 30 },
{ "group": "magazines", "x": 9, "y": 12, "chance": 30 },
{ "group": "snacks", "x": [ 16, 21 ], "y": 11, "chance": 40, "repeat": [ 1, 2 ] },
{ "group": "snacks", "x": [ 16, 21 ], "y": 13, "chance": 40, "repeat": [ 1, 2 ] },
{ "group": "softdrugs", "x": 21, "y": 20, "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "cleaning", "x": 11, "y": 5, "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "cleaning", "x": [ 11, 12 ], "y": 8, "chance": 70, "repeat": [ 1, 2 ] },
{ "item": "television", "x": 21, "y": 16, "chance": 95 },
{ "item": "soap", "x": 19, "y": 21, "chance": 80 },
{ "item": "towel", "x": 20, "y": 21, "chance": 80 },
{ "item": "towel", "x": 3, "y": 13, "chance": 60 },
{ "item": "stereo", "x": 2, "y": 13, "chance": 50 }
],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 5, 17 ], "y": [ 9, 11 ], "chance": 2 } ]
}
Expand Down
38 changes: 0 additions & 38 deletions data/json/mapgen/basement/basements.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,43 +142,5 @@
{ "chunks": [ [ "recroom_12x12", 5 ], [ "tvroom_12x12", 15 ], [ "workoutroom_12x12", 5 ] ], "x": 9, "y": 9 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_05ab_basement",
"//": "mostly empty basement.",
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
"^^^^^^^^^^^^^^^^^^^^^^^^",
"^######################^",
"^#||||||||||||||||||||#^",
"^#|9..|..............|#^",
"^#|...+..............|#^",
"^#|tCS|..............|#^",
"^#||||||.............|#^",
"^#| ||+|####|||||||#^",
"^#| | |#^",
"^#| + |#^",
"^#| |< |#^",
"^#|||||| ! |#^",
"^#| | |#^",
"^#| + |#^",
"^#| | ! |#^",
"^#| | |#^",
"^#|||||| ! |#^",
"^#| | |#^",
"^#| + |#^",
"^#| | |#^",
"^#| | !!!!!! |#^",
"^#||||||||||||||||||||#^",
"^######################^",
"^^^^^^^^^^^^^^^^^^^^^^^^"
],
"palettes": [ "standard_domestic_palette", "standard_domestic_basement_palette" ],
"items": { " ": { "item": "trash", "chance": 2 } },
"place_nested": [ { "chunks": [ [ "null", 15 ], [ "utility_3x3_N", 10 ], [ "utility_3x3_S", 5 ] ], "x": 7, "y": 3 } ]
}
}
]
38 changes: 38 additions & 0 deletions data/json/mapgen/house/house05_ab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,43 @@
],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_05ab_basement",
"//": "mostly empty basement.",
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
"^^^^^^^^^^^^^^^^^^^^^^^^",
"^######################^",
"^#||||||||||||||||||||#^",
"^#|9..|..............|#^",
"^#|...+..............|#^",
"^#|tCS|..............|#^",
"^#||||||.............|#^",
"^#| ||+|####|||||||#^",
"^#| | |#^",
"^#| + |#^",
"^#| | |#^",
"^#|||||| ! |#^",
"^#| | |#^",
"^#| + |#^",
"^#| | ! |#^",
"^#| | |#^",
"^#|||||| ! |#^",
"^#| | < |#^",
"^#| + |#^",
"^#| | |#^",
"^#| | !!!!!! |#^",
"^#||||||||||||||||||||#^",
"^######################^",
"^^^^^^^^^^^^^^^^^^^^^^^^"
],
"palettes": [ "standard_domestic_palette", "standard_domestic_basement_palette" ],
"items": { " ": { "item": "trash", "chance": 2 } },
"place_nested": [ { "chunks": [ [ "null", 15 ], [ "utility_3x3_N", 10 ], [ "utility_3x3_S", 5 ] ], "x": 7, "y": 3 } ]
}
}
]
37 changes: 36 additions & 1 deletion data/json/mapgen/house/house08.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
".##||||+| o.",
".o | h o.",
".#E @@ | A A #.",
".o d@@s | hfh | ||JJJ||.",
".o d@@s | hfh | ||JJJ|#.",
".#|||||+| hfh | Y 4#.",
".#g|d Oo.",
".#>+ |6 31F52#.",
Expand Down Expand Up @@ -103,5 +103,40 @@
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_08_basement",
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ||||||||||||||||||||| ",
" |zz......g.F........| ",
" |z..................| ",
" |...................| ",
" ||.........z...z.....| ",
" |....................| ",
" |......z.......z.....| ",
" |....................| ",
" |....................| ",
" |..z................z| ",
" |<..............zz...| ",
" |%%+%||||||||||||||||| ",
" |....| ",
" |JWZJ| ",
" |||||| ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "basement_empty" ]
}
}
]
1 change: 1 addition & 0 deletions data/json/mapgen/house/house09.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"type": "mapgen",
"method": "json",
"om_terrain": [ "house_09" ],
"//": "uses bionic_basement",
"weight": 300,
"object": {
"fill_ter": "t_floor",
Expand Down
35 changes: 35 additions & 0 deletions data/json/mapgen/house/house10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,40 @@
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_10_basement",
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ",
" ",
" |||||||||| ",
" |........| ",
" |........| ",
" |........| ",
" |........||||||||||| ",
" |J.................| ",
" |Z.................| ",
" |J.................| ",
" |W.................| ",
" |J.................| ",
" |.<................| ",
" ||||.............z.| ",
" |...............| ",
" |...............| ",
" |....z..........| ",
" |...............| ",
" |||||||||.......| ",
" |g.....F| ",
" ||||||||| ",
" ",
" "
],
"palettes": [ "basement_empty" ]
}
}
]
Loading