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

Update Radio Tower Mapgen #33355

Merged
merged 2 commits into from
Aug 20, 2019
Merged

Update Radio Tower Mapgen #33355

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
24762d6
Update Radio Tower
John-Candlebury Aug 19, 2019
e9a00d6
Remove roofs
John-Candlebury Aug 19, 2019
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
23 changes: 23 additions & 0 deletions data/json/furniture_and_terrain/terrain-floors-outdoors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,29 @@
"items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 5, 10 ] } ]
}
},
{
"type": "terrain",
"id": "t_metal_floor_no_roof",
"name": "metal floor",
"looks_like": "t_metal_floor",
"description": "High-quality and tough checkered flooring to reduce risk of slips and falls.",
"symbol": ".",
"color": "light_cyan",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
"bash": {
"sound": "thump",
"ter_set": "t_null",
"str_min": 200,
"str_max": 500,
"str_min_supported": 200,
"items": [
{ "item": "steel_lump", "count": [ 1, 4 ] },
{ "item": "steel_chunk", "count": [ 3, 12 ] },
{ "item": "scrap", "count": [ 9, 36 ] }
]
}
},
{
"type": "terrain",
"id": "t_linoleum_white_no_roof",
Expand Down
250 changes: 216 additions & 34 deletions data/json/mapgen/radio_tower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@
"object": {
"fill_ter": "t_floor",
"rows": [
" ---------------------- ",
" | | ",
" | | ",
" | R____R | ",
" |_______ ______ | ",
" |_______ ______ | ",
" |_______ ______ | ",
" |_______ _<____ | ",
" |_______ R____R | ",
" |_______ 6 | ",
" |_______ | ",
" ------22-------------- ",
" ",
" ",
" ",
Expand All @@ -18,12 +30,46 @@
" ",
" ",
" ",
" &&&& ",
" &&&& ",
" &&&& ",
" &&&& ",
" 6 ",
" ",
" "
],
"terrain": {
" ": [ "t_dirt", "t_dirt", "t_grass" ],
"#": "t_concrete_wall",
"R": "t_radio_tower",
"2": "t_chaingate_c",
"-": "t_chainfence_h",
"|": "t_chainfence_v",
"6": "t_radio_controls",
"_": "t_pavement",
"<": "t_stairs_up"
}
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "radio_tower_1" ],
"weight": 250,
"object": {
"fill_ter": "t_floor",
"rows": [
" -2222222-------------- ",
" |_______ | ",
" |_______ | ",
" |_______ R____R | ",
" |_______ ______ | ",
" |_______ ______ | ",
" |_______ ______ | ",
" |_______ _<____ | ",
" |_______ R____R | ",
" |___________ | ",
" |___________ | ",
" --------##+########--- ",
" #..ll#rrrC#4 ",
" w....+..h6# ",
" ##+#w#...C# ",
" |R wCCCCw ",
" |----##ww## ",
" ",
" ",
" ",
Expand All @@ -32,32 +78,86 @@
" ",
" "
],
"terrain": { " ": [ "t_dirt", "t_dirt", "t_grass" ], "&": "t_radio_tower", "6": "t_radio_controls" }
"terrain": {
" ": [ "t_dirt", "t_dirt", "t_grass" ],
"#": "t_concrete_wall",
"R": "t_radio_tower",
"2": "t_chaingate_c",
"-": "t_chainfence_h",
"|": "t_chainfence_v",
"6": "t_radio_controls",
"_": "t_pavement",
"+": "t_door_c",
"4": "t_gutter_downspout",
"<": "t_stairs_up",
"w": "t_window"
},
"furniture": { "C": "f_counter", "r": "f_rack", "h": "f_chair", "l": "f_locker" },
"items": {
"C": { "item": "radio", "chance": 80, "repeat": [ 1, 2 ] },
"r": { "item": "recycle_electronic", "chance": 80, "repeat": [ 1, 2 ] },
"l": { "item": "clothing_work_set", "chance": 80 }
}
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "radio_tower_1" ],
"weight": 250,
"om_terrain": "radio_tower_roof_1",
"object": {
"fill_ter": "t_floor",
"fill_ter": "t_metal_floor_no_roof",
"rows": [
" ",
" ",
" ",
" R,,,,R ",
" , , ",
" , , ",
" aaaa , ",
" a><a , ",
" Raaa,R ",
" ",
" ",
" ...........3 ",
" ...........5 ",
" ...........3 ",
" .......&...3 ",
" R ......3 ",
" ......3 ",
" ",
" ",
" ",
" ",
" ",
" ",
" &&&& ######### ",
" &&&& #.6CCCC.# ",
" &&&& #.......# ",
" &&&& ##+#w#w## ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", "<": "t_stairs_up", ">": "t_stairs_down" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "radio_tower_even",
"object": {
"fill_ter": "t_metal_floor_no_roof",
"rows": [
" ",
" :: ",
" aaaaaaaa ",
" aR,,,,Ra ",
" :a,,,,,,aX ",
" a,,::,,a ",
" a,,::,,a ",
" :a,<>,,,aX ",
" aR,,,,Ra ",
" aaaaaaaa ",
" : ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
Expand All @@ -68,43 +168,68 @@
" ",
" "
],
"terrain": {
" ": [ "t_dirt", "t_dirt", "t_grass" ],
"#": "t_wall",
"&": "t_radio_tower",
"+": "t_door_c",
".": "t_floor",
"6": "t_radio_controls",
"C": "t_floor",
"w": "t_window"
},
"furniture": { "C": "f_counter" },
"place_loot": [ { "item": "television", "x": 12, "y": 12, "chance": 100 }, { "item": "stepladder", "x": 10, "y": 12, "chance": 100 } ],
"place_items": [ { "item": "radio", "x": [ 13, 15 ], "y": 12, "chance": 60, "repeat": [ 1, 3 ] } ]
"palettes": [ "roof_palette" ],
"terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", "<": "t_stairs_up", ">": "t_stairs_down" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "radio_tower_roof_1",
"om_terrain": "radio_tower_odd",
"object": {
"fill_ter": "t_tar_flat_roof",
"fill_ter": "t_metal_floor_no_roof",
"rows": [
" ",
" ",
" ",
" :R,,,,R ",
" , , ",
" , , ",
" Xaaaa , ",
" Xa><a ,: ",
" XRaaa,R ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", "<": "t_stairs_up", ">": "t_stairs_down" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "radio_tower_top",
"object": {
"fill_ter": "t_metal_floor_no_roof",
"rows": [
" ",
" ",
" ",
" aaaaaa ",
" a,,,,a ",
" a,RR,a ",
" a,RR,a ",
" a>,,,a ",
" aaaaaa ",
" ",
" ",
" ",
" ",
" ",
" ",
" ......... ",
" ..:...... ",
" ......X.. ",
" ......... ",
" ",
" ",
" ",
Expand All @@ -116,7 +241,64 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_tar_flat_roof" }
"terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", ">": "t_stairs_down" },
"place_nested": [
{
"chunks": [ [ "null", 40 ], [ "radio_tower_2x2_map", 40 ], [ "radio_tower_2x2_holdout", 10 ], [ "radio_tower_2x2_sniper", 10 ] ],
"x": 10,
"y": 5
}
]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "radio_tower_2x2_holdout",
"object": {
"mapgensize": [ 2, 2 ],
"place_furniture": [
{ "furn": "f_camp_chair", "x": 1, "y": 0, "chance": 50 },
{ "furn": "f_makeshift_bed", "x": 1, "y": 1, "chance": 50 }
],
"place_loot": [
{ "group": "camping", "x": 1, "y": [ 0, 1 ], "chance": 50, "repeat": [ 2, 3 ] },
{ "item": "blanket", "x": 1, "y": [ 0, 1 ], "chance": 50, "repeat": [ 1, 2 ] },
{ "item": "can_drink_unsealed", "x": 1, "y": [ 0, 1 ], "chance": 30, "repeat": [ 2, 3 ] },
{ "item": "can_food_unsealed", "x": 1, "y": [ 0, 1 ], "chance": 40, "repeat": [ 2, 3 ] },
{ "item": "can_food_unsealed", "x": 1, "y": [ 0, 1 ], "chance": 40, "repeat": [ 2, 3 ] },
{ "item": "sleeping_bag", "x": 1, "y": 1, "chance": 40 }
]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "radio_tower_2x2_sniper",
"object": {
"mapgensize": [ 2, 2 ],
"place_furniture": [ { "furn": "f_camp_chair", "x": 1, "y": 0, "chance": 50 } ],
"place_loot": [
{ "item": "corpse", "x": 1, "y": 0 },
{ "group": "mon_zombie_soldier_death_drops", "x": 1, "y": 0 },
{ "item": "survivor_scope", "x": 1, "y": 0, "chance": 70 },
{ "item": "can_drink_unsealed", "x": 1, "y": [ 0, 1 ], "chance": 70, "repeat": [ 2, 3 ] },
{ "item": "3006", "x": 1, "y": 0, "chance": 40 },
{ "item": "survivor_special_700", "x": 1, "y": 0, "chance": 80, "ammo": 100 }
]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "radio_tower_2x2_map",
"object": {
"mapgensize": [ 2, 2 ],
"place_loot": [
{ "item": "survivor_scope", "x": 1, "y": 0 },
{ "item": "survivormap", "x": 1, "y": 0 },
{ "item": "3006", "x": 1, "y": 0, "chance": 40 }
]
}
}
]
Loading