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

Fix missing mapgen keys #37839

Merged
merged 13 commits into from
Feb 16, 2020
Merged

Fix missing mapgen keys #37839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a194ace
Mapgen fixes for Night Pryanik maps
jbytheway Feb 8, 2020
dccd420
Mapgen fixes for nexusmrsep maps
jbytheway Feb 8, 2020
4c9f8f0
Mapgen fixes for Mark Langsdorf maps
jbytheway Feb 8, 2020
223b35a
Mapgen fixes for LovamKicsiGazsii maps
jbytheway Feb 8, 2020
4111abb
Mapgen fixes for John Candlebury maps
jbytheway Feb 8, 2020
d09342d
Mapgen fixes for Erk maps
jbytheway Feb 8, 2020
3828cf1
Mapgen fixes for curstwist maps
jbytheway Feb 8, 2020
86b5959
Mapgen fixes for CountAlex maps
jbytheway Feb 8, 2020
38ab973
Mapgen fixes for chaisawlajatang maps
jbytheway Feb 8, 2020
b62193f
Mapgen fixes for maps of uncertain/mixed ownership
jbytheway Feb 8, 2020
7f25a94
Night-Pryanik review
jbytheway Feb 8, 2020
6b053e0
CountAlex review
jbytheway Feb 8, 2020
dec0932
Style json
jbytheway Feb 8, 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
4 changes: 3 additions & 1 deletion data/json/mapgen/abandoned01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,9 @@
"s": "t_underbrush",
"w": "t_water_sh",
"z": "t_shrub_strawberry",
"~": "t_fence_h"
"^": "t_dirt",
"~": "t_fence_h",
"T": "t_dirt"
},
"place_items": [ { "item": "forest", "x": [ 2, 21 ], "y": [ 5, 19 ], "chance": 80, "repeat": [ 0, 20 ] } ]
}
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/animalshelter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |.......X..........3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen/apartment_con_new.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
" ssss "
],
"palettes": [ "apartment_palette" ],
"terrain": { ".": "t_floor" },
"place_monsters": [
{ "monster": "GROUP_ZOMBIE", "x": [ 4, 23 ], "y": [ 2, 23 ], "repeat": [ 1, 2 ] },
{ "monster": "GROUP_ZOMBIE", "x": [ 24, 43 ], "y": [ 2, 23 ], "repeat": [ 1, 2 ] },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/bandit_camp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
",$,,///#####/zz//////zzz#####/////W/WW/##///,%,,",
",//,/////P////////////z////////////////##/////,$",
",,,///,//P//WWWWW////////////////////////,,/,/,,",
",%,4//,//P//WwwwW////WWWWW//////////////////,,,,",
",%,$//,//P//WwwwW////WWWWW//////////////////,,,,",
",,$/,///,P//Wwww/////WwwwW//////////////////,/,%",
"%,/,,///,P//WwwwW/////wwwW/////////////##,//$,,,",
",,,,,/,//P//WWWWW////WwwwW/////////////##,/,,,,,",
Expand Down
10 changes: 5 additions & 5 deletions data/json/mapgen/basement/basements.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"^^^^^^^^^^^^^^^^^^^^^^^^",
"^######################^",
"^#||||||||||||||||||||#^",
"^#|9..|.?..CCCNNNUUUU|#^",
"^#|???+.....?.......U|#^",
"^#|tCS|........?....U|#^",
"^#|9..|....CCCNNNUUUU|#^",
"^#|...+.............U|#^",
"^#|tCS|.............U|#^",
"^#||||||...CCCCCCUUUU|#^",
"^#| ||+|####|||||||#^",
"^#| | << !! |#^",
Expand Down Expand Up @@ -83,8 +83,8 @@
"^######################^",
"^#||||||||||||||||||||#^",
"^#|9..|....CCCNNNUUUU|#^",
"^#|???+...?...?.....U|#^",
"^#|tCS|....?...?....U|#^",
"^#|...+.............U|#^",
"^#|tCS|.............U|#^",
"^#||||||...CCCCCCUUUU|#^",
"^#| ||+|####|||||||#^",
"^#| | |#^",
Expand Down
8 changes: 4 additions & 4 deletions data/json/mapgen/bus_station.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@
"| A & 3.....................................",
"| 3.....................................",
"| 3.....................................",
"| ooooo 3..........''''''''''''''''...........",
"| ooooo 3..........''''''''''''''''...........",
"| ooooo 3.......... ...........",
"| ooooo 3.......... ...........",
"| 3.....................................",
"| 3.....................................",
"| 3.....................................",
Expand All @@ -130,8 +130,8 @@
"| 3.....................................",
"| 3.....................................",
"22222! 3.....................................",
"....5222222..........''''''''''''''''...........",
".....................''''''''''''''''...........",
"....5222222.......... ...........",
"..................... ...........",
"................................................"
],
"terrain": {
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/collapsed_tower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
"#####|xppppppppppppp|| |#|||||| ##|##########~~#|##~~|###|# # ##|####",
"#####|xppCCppppppppp|| |## ##| |#########~~~~~####||||||||||###|####",
"#####||||||||||#pppp|| #| # 66|# #|#~~~~~~~~~~~~~~~~#|########### |####",
"##############|#2{{2|| + B|| ||######~~t~~~| ######## |####",
"##############|#2{{2|| + B|| ||######~~~~~~| ######## |####",
"################ppppr|# | | ##~~~~~~| |# #### |####",
"#################pppr|33| ####|###|| ##### ~~~||33||## #|####",
"###############pppppp|##||||###| ########~~~~~~~|# # 6#####|####",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/cs_gardening_allotment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"..|.s...~.wwwwwwwwwwwww.",
"..|...~~~sw66666666666w.",
"..|sT.~~~~d,,,,B,,,,,Aw.",
"..----=---wbCCC,,,,,BAw.",
"..----=---wBCCC,,,,,BAw.",
"..........wwwwwwwwwwwww.",
"........................"
],
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/dispensary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,13 +467,13 @@
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |.....x............3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" 5..................3 ",
" |.....x............3 ",
" |..................3 ",
" |................&.3 ",
" |..................3 ",
" |2222222222...222223 ",
Expand Down
3 changes: 2 additions & 1 deletion data/json/mapgen/dollar_store.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@
"U": "f_dumpster",
"L": "f_locker",
"h": "f_chair",
"y": "f_indoor_plant",
"p": [ "f_datura", "f_bluebell", "f_mutpoppy", "f_dahlia", "f_flower_tulip", "f_chamomile", "f_flower_spurge", "f_lily" ]
},
"toilets": { "T": { } },
Expand Down Expand Up @@ -284,7 +285,7 @@
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..........x.......3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
Expand Down
8 changes: 5 additions & 3 deletions data/json/mapgen/farm_dairy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,9 @@
"................................................................................................",
"................................................................................................",
"...........................................................|-ll-|---|l--|--|--------|...........",
"...........................................................|[bb[|^^_|,,,|[[|-|&%~~~(|...........",
"...........................................................l~bb~|~~~|,,,|~~+*|~````(|...........",
"...........................................................l~~~~|~~~|,,,|~~|-|~```~_|...........",
"...........................................................|[bb[|^^_|...|[[|-|&%~~~(|...........",
"...........................................................l~bb~|~~~|...|~~+*|~````(|...........",
"...........................................................l~~~~|~~~|...|~~|-|~```~_|...........",
Night-Pryanik marked this conversation as resolved.
Show resolved Hide resolved
"...........................................................|~~~~|&~%|<|-|~~|---+----|...........",
"...........................................................|~~~~|-+-|<|3~~~|~~!!!~~[|...........",
"...........................................................|~~~~~~~!|~~~~~~+~~~`~~~bl...........",
Expand Down Expand Up @@ -572,6 +572,8 @@
"b": "t_floor",
"d": "t_floor",
"D": "t_floor",
"K": "t_open_air",
"L": "t_open_air",
"3": "t_floor",
"4": "t_floor",
"-": "t_wall_wood",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/farm_horse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
" wwwwwww.....wwwwwww ",
" w..6..>.........6.w ",
" w...6.........6...w ",
" w......*****`.....w ",
" w......*****......w ",
" wwww...*****...wwww ",
" w......*****....66w ",
" w.6.6..*****....66w ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/fema/FEMA_blc_03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
".f..=,,ffffffff,,TT,,=..",
".f..=,,f,,,,,,f,,TT,,=..",
".f..=,,f,,ll,,f,,,,,,=..",
".f..=,,f,,ll,,e,,,,,,=..",
".f..=,,f,,ll,,F,,,,,,=..",
".f..=,,f,,ll,,f,,,,,,=..",
".f..*,,f,,,,,,f,,,,,,*..",
".f..*,,ffffffff,,,,,,*..",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/fema/FEMA_le_03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"..|~%%%%%%%%%%%%%%%%~|..",
"..|~%~~%~Z%~~%~Z%~~%~|..",
"..|~%~Z%~~%~Z%~~%Z~%~|..",
"..|~%!%%!%%!%%!%%1%%~|..",
"..|~%!%%!%%!%%!%%!%%~|..",
"..|~~~~~~~~~~~~~~~~~~|..",
"..|L~~~~~~~~~~~XX~~XX|..",
"..|BB~~TT~~~~~~XX~~XX|..",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/fema/FEMA_te_03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
".N|~xxx~f~~~~~~~~~~~~|N.",
"..|~xxx~f~XX~~XX~~XX~|N.",
"..|~z~~~f~~~~~~~~~~~~|N.",
".N|~~~~~ffffffffeefff|N.",
".N|~~~~~ffffffffFFfff|N.",
".N|~~~~~~~~~~~~~~~~~~|N.",
".N|TTc~~~z~~~~~~~~D~~|..",
".N|TT~~z~~~~~~~~z~Dc~|..",
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen/helipad.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
"H": { "item": "SUS_spice_collection", "chance": 75 },
"&": { "item": "SUS_toilet", "chance": 50 }
},
"vendingmachines": { "1": { "item_group": "vending_drink" }, "2": { "item_group": "vending_food" } },
"place_monsters": [ { "monster": "GROUP_MIL_STRONG", "x": 36, "y": 15 }, { "monster": "GROUP_MIL_WEAK", "x": 24, "y": 30, "density": 2 } ],
"monster": { "T": { "monster": "mon_turret_rifle" } },
"place_vehicles": [
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen/house/house03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
"|": "t_brick_wall"
},
"furniture": {
"&": "f_sink",
"#": "f_counter",
"C": "f_cupboard",
"F": "f_fridge",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house_detatched4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
" |..........X......3 ",
" |.................3 ",
" |.................3 ",
" 6....=...........~3 ",
" 5....=...........~3 ",
" |..........N......3 ",
" |.................3 ",
" |.................3 ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house_duplex4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"..o@@ | hfh||hfh | @@o..",
"..o | T| | @@o..",
"..# + HH |x H + #..",
".^#Ddb| E x|x H |Db{#^.",
".^#Ddb| E x|x H |Dbd#^.",
"..#|||| s x|x H ||||#..",
"..#d + E R|R + II#..",
"..o@@ | RR| | ho..",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house_w_6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
" |..............3 ",
" |..............3 ",
" |..............3 ",
" |.............Z3 ",
" |..............3 ",
" ||..............3 ",
" |...............3 ",
" |...............3 ",
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/irradiator_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"'f**|------------NN4-| |4NN---------------|**f'",
"'f**|MMMMMMMM4 4ZZPPPZZPPP|**f'",
"'f**|M PP N PPPXXXXXXX4NXXXXXXXXPPP N xP|**f'",
"'f**|MP pPPPP|----==-------XXXXXXXXNXXXXXXXX-----==-----|PPZPPPZPPP|**f'",
"'f**|MP PPPPP|----==-------XXXXXXXXNXXXXXXXX-----==-----|PPZPPPZPPP|**f'",
"'f**|TTTTTTTT| C K KXXXXXXX!Q!!!!!Q!XXXXXX J |TTTTTTTTTT|**f'",
"'f**|--------4 C K KKKXCCMMCX!!UUUUU!!XMMCCX J J C 4----------|**f'",
"'f**|( N C K KXCXXXCX!!UUUUU!!XCXXCX J J C N (|**f'",
Expand Down Expand Up @@ -161,7 +161,7 @@
"'f**L____________________Ls##ssss##ss##ssss##sL____________________L**f'",
"'f**L___________________Lss--w=w---DD---w=w--ssL___________________L**f'",
"'fsss__________________Lssswdh ^hx xhA hdwsssL__________________sssf'",
"'fs(s__________________Ls(swxh hd dh lhxws(sL__________________s(sf'",
"'fs(s__________________Ls(swxh hd dh hxws(sL__________________s(sf'",
"'fsss__________________Lsss--w-w---DD---w-w--sssL__________________sssf'",
"'ffffGGGGGGGGGGGGGGGGGGffffffffffffGGffffffffffffGGGGGGGGGGGGGGGGGGffff'",
"[[[[L__________________LssssssssssssssssssssssssL__________________L[[[[",
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/isherwood_farms/farm_horse_isherwood.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"..%....-vvv-...p.p..........,,..,,.......................9...9..9..////...9...///..9....9..9.%..",
"..%..9................9...9.,,..,,.9..9..9...9..99...9..9....9...9..9///9...///.......9......%..",
"..%.9...0.....9...9..9.9...9,,..,,...9..99...9..9..........9...9..9....//////...9....9..9....%..",
"..%...9....9.......9...9..9.,,..,,.9..9...9..99...9..9.9...9..9.9...9..9..9..x.9..99...9..9...%..",
"..%...9....9.......9...9..9.,,..,,.9..9...9..99...9..9.9...9..9.9...9..9..9...9..99...9..9...%..",
"..%%%%%%%%%%%%%%%%%%%%%%%%%%,,..,,%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%..",
"..%.........................,,..,,...........................................................%.."
],
Expand Down Expand Up @@ -242,7 +242,7 @@
" wwwwwww.....wwwwwww ",
" w..6..>.........6.w ",
" w...6.........6...w ",
" w......*****`.....w ",
" w......*****......w ",
" wwww...*****...wwww ",
" w......*****....66w ",
" w.6.6..*****....66w ",
Expand Down
4 changes: 3 additions & 1 deletion data/json/mapgen/lab/lab_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@
"h": "f_chair",
"f": "f_fridge",
"t": "f_table",
"i": "f_filing_cabinet",
"c": "f_counter",
"S": "f_sink",
"T": "f_toilet",
"#": "f_null",
"]": "f_bookcase"
"]": "f_bookcase",
"^": "f_rubble_rock"
},
"terrain": {
"6": "t_console",
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/lab/lab_surface/lab_surface_nested.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@
"rotation": [ 0, 3 ],
"rows": [
"bb dd",
"bs cX",
"bs cx",
" ",
"bs f",
"bbSDC"
Expand Down Expand Up @@ -1137,7 +1137,7 @@
"mapgensize": [ 11, 11 ],
"rotation": [ 0, 3 ],
"rows": [
"AACttt6c ",
"AACtttUc ",
"t ",
"AACtttU U",
"t U",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/library.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
" |....................3 ",
" |....................3 ",
" |....................3 ",
" |.....x..............3 ",
" |....................3 ",
" |....................3 ",
" |....................3 ",
" |....................3 ",
Expand Down
5 changes: 3 additions & 2 deletions data/json/mapgen/mall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4052,6 +4052,7 @@
">": "t_stairs_down",
"|": "t_wall_w",
"E": "t_elevator",
"=": "t_door_c",
"_": "t_thconc_floor"
},
"place_items": [ { "item": "roof_trash", "x": [ 0, 8 ], "y": [ 0, 23 ], "chance": 50, "repeat": [ 1, 3 ] } ]
Expand Down Expand Up @@ -6511,7 +6512,7 @@
"..........3 ",
"..........3 "
],
"terrain": { ".": "t_flat_roof", " ": "t_open_air", "3": "t_gutter_east" },
"terrain": { ".": "t_flat_roof", " ": "t_open_air", "3": "t_gutter_east", "o": "t_glass_roof" },
"place_items": [ { "item": "roof_trash", "x": [ 0, 8 ], "y": [ 0, 23 ], "chance": 50, "repeat": [ 1, 3 ] } ]
}
},
Expand Down Expand Up @@ -7350,7 +7351,7 @@
"........................",
"........................",
"........................",
".......................-",
"........................",
"........................",
"........................",
"........................",
Expand Down
3 changes: 2 additions & 1 deletion data/json/mapgen/mansion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,8 @@
"m": { "item": "tool_common_stack", "chance": 100 },
"n": { "item": "cannedfood", "chance": 30 },
"r": { "item": "mansion_ammo", "chance": 40 },
"v": { "item": "a_television", "chance": 100 }
"v": { "item": "a_television", "chance": 100 },
"{": { "item": "suit_of_armor", "chance": 100 }
},
"place_monsters": [ { "monster": "GROUP_MANSION", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
}
Expand Down
Loading