Skip to content

Commit

Permalink
Mapgen fixes for curstwist maps
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbytheway
jbytheway committed Feb 8, 2020
1 parent dcf4d47 commit 07f7a18
Show file tree
Hide file tree
Showing 20 changed files with 32 additions and 25 deletions.
2 changes: 1 addition & 1 deletion data/json/mapgen/animalshelter.json
View file
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
4 changes: 2 additions & 2 deletions data/json/mapgen/dispensary.json
View file
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
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
2 changes: 1 addition & 1 deletion data/json/mapgen/farm_horse.json
View file
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
1 change: 1 addition & 0 deletions data/json/mapgen/house/house03.json
View file
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
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
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
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/isherwood_farms/farm_horse_isherwood.json
View file
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
2 changes: 1 addition & 1 deletion data/json/mapgen/library.json
View file
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
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
2 changes: 1 addition & 1 deletion data/json/mapgen/nested/city_npc_nested_spawns.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"_L.7____________________",
"_L.7____________________",
"_L.7____________________",
"_L.2mtb.________________",
"_L..mtb.________________",
"_L....._________________",
"_LLLLLL.________________"
],
Expand Down
16 changes: 8 additions & 8 deletions data/json/mapgen/nested/house_nested.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
" O",
"66EE",
"66EE",
" 0"
" O"
],
"palettes": [ "house_w_nest_palette" ],
"items": {
Expand All @@ -241,7 +241,7 @@
" O",
"I EE",
"h EE",
" 0"
" O"
],
"palettes": [ "house_w_nest_palette" ],
"items": {
Expand All @@ -264,7 +264,7 @@
" O",
"b EE",
"H EE",
" 0"
" O"
],
"palettes": [ "house_w_nest_palette" ],
"items": {
Expand Down Expand Up @@ -306,7 +306,7 @@
"mapgensize": [ 4, 4 ],
"rotation": [ 0, 3 ],
"rows": [
"0 ",
"O ",
"EE66",
"EE66",
"O "
Expand All @@ -329,7 +329,7 @@
"mapgensize": [ 4, 4 ],
"rotation": [ 0, 3 ],
"rows": [
"0 ",
"O ",
"EE h",
"EE I",
"O "
Expand All @@ -352,7 +352,7 @@
"mapgensize": [ 4, 4 ],
"rotation": [ 0, 3 ],
"rows": [
"0 ",
"O ",
"EE H",
"EE b",
"O "
Expand Down Expand Up @@ -1332,8 +1332,8 @@
"mapgensize": [ 3, 3 ],
"rotation": [ 0, 3 ],
"rows": [
"T @",
"T @",
"L @",
"L @",
"C @"
],
"palettes": [ "house_w_nest_palette" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/roadstop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"...... .. ......",
"...... .. ......",
".A.... ...A..",
".+.&.. .. ...=..",
".=.&.. .. ...=..",
"...... .. ......",
"...... .. ...&..",
"...... .. ......",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/s_coffee.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@
"__|..................3__",
"__|..................3__",
"__|..................3__",
"__|......>.........:.3__",
"__|......>...........3__",
"__|.......311111151113__",
"__|.......3_____________",
"__|.......3_____________",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/s_liquor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
" |................3 ",
" |................3 ",
" |.&..............3 ",
" |.+..............3 ",
" |.=..............3 ",
" -5----...........3 ",
" |......>....3 ",
" |...........3 ",
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen_palettes/hotel_tower_palette.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"d": "f_dresser",
"o": "f_counter",
"D": "f_dryer",
"Y": "f_rack_coat",
"^": [ "f_indoor_plant_y", "f_indoor_plant" ],
"h": "f_chair",
"r": "f_rack",
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen_palettes/house_w_palette.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
"X": "f_birdbath",
"Y": "f_trashcan",
"Z": "f_dryer",
"a": [ "f_floor_lamp", "f_rack_coat" ],
"d": "f_shower",
"g": "f_water_heater",
"h": "f_fireplace",
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen_palettes/junkyard_palette.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"D": "t_door_c",
"S": "t_sidewalk",
"q": "t_door_metal_locked",
"f": "t_floor",
"c": "t_carpet_red",
"n": "t_carpet_red",
"r": "t_reinforced_door_glass_c",
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen_palettes/movie_theater_palette.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"f": "t_carpet_purple",
"e": "t_carpet_purple",
".": "t_thconc_floor",
"_": "t_floor",
"!": "t_brick_wall",
"|": "t_wall_b",
"%": "t_wall_glass",
Expand Down

0 comments on commit 07f7a18

Please sign in to comment.