From 391f4761f68c765eb7032f13f8d13dc6f3464830 Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Fri, 7 Feb 2020 20:00:23 -0500 Subject: [PATCH] Mapgen fixes for maps of uncertain/mixed ownership --- data/json/mapgen/abandoned01.json | 4 +++- data/json/mapgen/bandit_camp.json | 2 +- data/json/mapgen/cs_gardening_allotment.json | 2 +- data/json/mapgen/fema/FEMA_blc_03.json | 2 +- data/json/mapgen/fema/FEMA_le_03.json | 2 +- data/json/mapgen/fema/FEMA_te_03.json | 2 +- data/json/mapgen/moonshine_camp.json | 2 ++ data/json/mapgen/office_cubical.json | 2 +- data/json/mapgen/park.json | 2 +- data/json/mapgen/petstore.json | 1 + data/json/mapgen/pizza_parlor.json | 4 ++-- data/json/mapgen/post_office.json | 1 + data/json/mapgen/s_gas.json | 6 +++--- data/json/mapgen/thrift.json | 1 + 14 files changed, 20 insertions(+), 13 deletions(-) diff --git a/data/json/mapgen/abandoned01.json b/data/json/mapgen/abandoned01.json index eb5367afd7aa9..1e1074ff23668 100644 --- a/data/json/mapgen/abandoned01.json +++ b/data/json/mapgen/abandoned01.json @@ -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 ] } ] } diff --git a/data/json/mapgen/bandit_camp.json b/data/json/mapgen/bandit_camp.json index fc153dbf4821e..1c7e34a9aefab 100644 --- a/data/json/mapgen/bandit_camp.json +++ b/data/json/mapgen/bandit_camp.json @@ -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/////////////##,/,,,,,", diff --git a/data/json/mapgen/cs_gardening_allotment.json b/data/json/mapgen/cs_gardening_allotment.json index d0e614920fe63..bcbfbd0fa859b 100644 --- a/data/json/mapgen/cs_gardening_allotment.json +++ b/data/json/mapgen/cs_gardening_allotment.json @@ -43,7 +43,7 @@ "..|.s...~.wwwwwwwwwwwww.", "..|...~~~sw66666666666w.", "..|sT.~~~~d,,,,B,,,,,Aw.", - "..----=---wbCCC,,,,,BAw.", + "..----=---wBCCC,,,,,BAw.", "..........wwwwwwwwwwwww.", "........................" ], diff --git a/data/json/mapgen/fema/FEMA_blc_03.json b/data/json/mapgen/fema/FEMA_blc_03.json index 3d4759904b7f6..0bdffc1eb5ff3 100644 --- a/data/json/mapgen/fema/FEMA_blc_03.json +++ b/data/json/mapgen/fema/FEMA_blc_03.json @@ -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,,,,,,*..", diff --git a/data/json/mapgen/fema/FEMA_le_03.json b/data/json/mapgen/fema/FEMA_le_03.json index 7a7e47d8d5ead..8c56daabd3582 100644 --- a/data/json/mapgen/fema/FEMA_le_03.json +++ b/data/json/mapgen/fema/FEMA_le_03.json @@ -17,7 +17,7 @@ "..|~%%%%%%%%%%%%%%%%~|..", "..|~%~~%~Z%~~%~Z%~~%~|..", "..|~%~Z%~~%~Z%~~%Z~%~|..", - "..|~%!%%!%%!%%!%%1%%~|..", + "..|~%!%%!%%!%%!%%!%%~|..", "..|~~~~~~~~~~~~~~~~~~|..", "..|L~~~~~~~~~~~XX~~XX|..", "..|BB~~TT~~~~~~XX~~XX|..", diff --git a/data/json/mapgen/fema/FEMA_te_03.json b/data/json/mapgen/fema/FEMA_te_03.json index 6c480979b421f..09cedb69b722d 100644 --- a/data/json/mapgen/fema/FEMA_te_03.json +++ b/data/json/mapgen/fema/FEMA_te_03.json @@ -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~|..", diff --git a/data/json/mapgen/moonshine_camp.json b/data/json/mapgen/moonshine_camp.json index fcca633072381..6549096133150 100644 --- a/data/json/mapgen/moonshine_camp.json +++ b/data/json/mapgen/moonshine_camp.json @@ -49,6 +49,7 @@ "e": "t_tree_hickory", "s": "t_shrub", "t": "t_dirtfloor", + "_": "t_grass", "w": "t_grass", "|": "t_wall_wood" }, @@ -161,6 +162,7 @@ "d": "t_dirtfloor", "s": "t_shrub", "t": "t_tree_maple", + "_": "t_grass", "|": "t_wall_wood" }, "furniture": { "H": "f_wood_keg", "O": "f_fvat_empty", "^": "f_still", "a": "f_ash", "c": "f_chair" }, diff --git a/data/json/mapgen/office_cubical.json b/data/json/mapgen/office_cubical.json index 0b74ccb420795..336462507c51a 100644 --- a/data/json/mapgen/office_cubical.json +++ b/data/json/mapgen/office_cubical.json @@ -140,7 +140,7 @@ " $$$$$$##$ssss$##$$$$$$ ", " ##WWWW##$ssss$##WWWW## ", " #^....^#$ssss$#Y????^##", - " #.KttK.###++###..tta.o#", + " #.KttK.###++###..ttK.o#", " #.KttK.|Y.UU.Y|......o#", " #.KttK.+..UU..+.ceec.o#", " #.KttK.+..UU..|.----+##", diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json index 3e323d5b0b16e..b1cada928c3c3 100644 --- a/data/json/mapgen/park.json +++ b/data/json/mapgen/park.json @@ -285,7 +285,7 @@ "b": "t_dirt", "P": "t_dirt", "&": "t_dirt", - "s": "t_sidewalk", + "_": "t_sidewalk", "t": "t_region_tree_shade", "z": "t_region_shrub_decorative", "~": "t_water_pool_shallow" diff --git a/data/json/mapgen/petstore.json b/data/json/mapgen/petstore.json index 8d5d1c9ca9617..af8d6ef359933 100644 --- a/data/json/mapgen/petstore.json +++ b/data/json/mapgen/petstore.json @@ -45,6 +45,7 @@ "6": "t_wall_glass_h", "7": "t_wall_glass_v", "g": "t_door_glass_c", + "o": "t_carpet_green", "r": "t_pavement", "U": "t_pavement", "y": "t_pavement_y", diff --git a/data/json/mapgen/pizza_parlor.json b/data/json/mapgen/pizza_parlor.json index 3c7c80d211095..abf70e1547bfa 100644 --- a/data/json/mapgen/pizza_parlor.json +++ b/data/json/mapgen/pizza_parlor.json @@ -26,7 +26,7 @@ "-C.....BB..BB..gccccBccR", "-C.....TT..TT..gcccBTBcR", "---....BB..BB..gccccBccR", - "-<=............gcccccccR", + "-<+............gcccccccR", "---+-..........GccccBccR", "-sll-..BB..BB..gcccBTBcR", "-lll-..TT..TT..gccccBccR", @@ -310,7 +310,7 @@ "..... |.........||||||", "..... |.....###># ", "..... ------##### ", - ",.... " + "..... " ], "terrain": { ".": "t_tar_flat_roof", diff --git a/data/json/mapgen/post_office.json b/data/json/mapgen/post_office.json index 058bfa8cf26dd..dc74036ea6fce 100644 --- a/data/json/mapgen/post_office.json +++ b/data/json/mapgen/post_office.json @@ -197,6 +197,7 @@ "+": "t_door_glass_c", "-": "t_wall_w", ".": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt", "t_shrub" ], + "_": "t_floor", "4": "t_tree_pine", "7": "t_tree_apple", "D": "t_door_c", diff --git a/data/json/mapgen/s_gas.json b/data/json/mapgen/s_gas.json index 9c791dada4eee..5f276fe967f29 100644 --- a/data/json/mapgen/s_gas.json +++ b/data/json/mapgen/s_gas.json @@ -10,7 +10,7 @@ "........................", ".-----..................", ".|...|..........sss.....", - ".|.Q.|...........&s.....", + ".|...|...........&s.....", ".|...|...........1s.....", ".|...|P..........2s.....", ".--+--..........sss.....", @@ -32,7 +32,7 @@ "...s9s...........s9s....", "........................" ], - "place_terrain": [ { "ter": "t_gas_tank", "x": 3, "y": 5 } ], + "place_terrain": [ { "ter": "t_gas_tank", "x": 3, "y": 3 } ], "terrain": { "&": "t_atm", "+": "t_chaingate_l", @@ -45,7 +45,7 @@ "furniture": { "9": "f_aut_gas_console" }, "signs": { "P": { "signage": "Danger! Do not smoke! Risk of explosion!" } }, "vendingmachines": { "1": { "item_group": "vending_drink" }, "2": { "item_group": "vending_food" } }, - "place_liquids": [ { "liquid": "gasoline", "x": 3, "y": 5, "repeat": [ 200, 1075 ] } ] + "place_liquids": [ { "liquid": "gasoline", "x": 3, "y": 3, "repeat": [ 200, 1075 ] } ] } }, { diff --git a/data/json/mapgen/thrift.json b/data/json/mapgen/thrift.json index 38235c65869ac..baf5ae9c74daf 100644 --- a/data/json/mapgen/thrift.json +++ b/data/json/mapgen/thrift.json @@ -48,6 +48,7 @@ "E": "t_dirtfloor", "G": "t_dirtfloor", "g": "t_door_glass_c", + "o": "t_carpet_purple", "r": "t_pavement", "y": "t_pavement_y", "|": "t_wall_w",