Skip to content

Commit

Permalink
Mapgen fixes for maps of uncertain/mixed ownership
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbytheway
jbytheway committed Feb 8, 2020
1 parent 582bdd8 commit 391f476
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 13 deletions.
4 changes: 3 additions & 1 deletion data/json/mapgen/abandoned01.json
View file
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/bandit_camp.json
View file
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
2 changes: 1 addition & 1 deletion data/json/mapgen/cs_gardening_allotment.json
View file
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
2 changes: 1 addition & 1 deletion data/json/mapgen/fema/FEMA_blc_03.json
View file
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
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
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
2 changes: 2 additions & 0 deletions data/json/mapgen/moonshine_camp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"e": "t_tree_hickory",
"s": "t_shrub",
"t": "t_dirtfloor",
"_": "t_grass",
"w": "t_grass",
"|": "t_wall_wood"
},
Expand Down Expand Up @@ -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" },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/office_cubical.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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..|.----+##",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/park.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen/petstore.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/pizza_parlor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -310,7 +310,7 @@
"..... |.........||||||",
"..... |.....###># ",
"..... ------##### ",
",.... "
"..... "
],
"terrain": {
".": "t_tar_flat_roof",
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen/post_office.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions data/json/mapgen/s_gas.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"........................",
".-----..................",
".|...|..........sss.....",
".|.Q.|...........&s.....",
".|...|...........&s.....",
".|...|...........1s.....",
".|...|P..........2s.....",
".--+--..........sss.....",
Expand All @@ -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",
Expand All @@ -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 ] } ]
}
},
{
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen/thrift.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 391f476

Please sign in to comment.