Skip to content

Commit

Permalink
fix: isherwood mapgen and others (#3802)
Browse files Browse the repository at this point in the history 
* Fix farm_horse and farm mapgen

* Fix farm_horse palette

* Fix farm_horse_isherwood and farm_isherwood mapgen

* Fix dairy_farm_isherwood mapgen

* Fix dairy_farm_isherwood mapgen

Fix waterless toilet.

* style(autofix.ci): automated formatting

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
@0Monet @autofix-ci
0Monet and autofix-ci[bot] authored Dec 2, 2023
1 parent 86a06d3 commit 216dd02
Show file tree
Hide file tree
Showing 6 changed files with 113 additions and 88 deletions.
17 changes: 9 additions & 8 deletions data/json/mapgen/farm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
" Wyyy______________W F F ",
" #_____________1___W & F DDDDDDDDDDDDDDDD F ",
" #333___________233W F F ",
" #__2___________2__# $$$ $$$ F DDDDDDDDDDDDDDDD F ",
" #__2___________2__# 9$$$ $$$ F DDDDDDDDDDDDDDDD F ",
" #__2___________2__# ###++### --w---+-----w-- F Q F ",
" W__g___________g__W #EE____# -u5e4u...Y....- F DDDDDDDDDDDDDDDD F ",
" W__g___________g__W #E_____# -o............- F F ",
Expand All @@ -28,7 +28,7 @@
" W_________________W #______# -b..+......BB.- F DDDDDDDDDDDDDDDD F ",
" W_________________W #____ll# -.ST-.....dBBd- F F ",
" #lll__________O___# ###++### --w------w----- F DDDDDDDDDDDDDDDD F ",
"FF##W##MMMMMMMMM##W##FF F F ",
"FF##W##MMMMMMMMM##W##FF 9 F F ",
"F O F F DDDDDDDDDDDDDDDD F ",
"F FFFFFFFFFFFFFFFFFFFFFFFFFFFF F ",
"F ,,,,,,,,,,,,,,,,,,,,,,, F ",
Expand Down Expand Up @@ -80,6 +80,7 @@
"F F ",
"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF "
],
"terrain": { "9": "t_gutter_downspout" },
"place_item": [
{ "item": "straw_pile", "x": [ 3, 5 ], "y": [ 5, 7 ], "amount": [ 0, 8 ] },
{ "item": "cattlefodder", "x": [ 3, 5 ], "y": [ 5, 7 ], "amount": [ 0, 4 ] },
Expand Down Expand Up @@ -114,7 +115,7 @@
" ",
" & ",
" ",
" $$$ $$$ ",
" 9$$$ $$$ ",
"###++### --w---+-----w--",
"#EE____# -u5e4u.mm.....-",
"#E_____# -o...........m-",
Expand All @@ -125,11 +126,11 @@
"#______# -b..+......BB.-",
"#____ll# -.ST-mm...dBBd-",
"###++### --w------w-----",
" ",
" 9",
" ",
"FFFFFFFFFFFFFFFFFFFFFFFF"
],
"terrain": { "Q": "t_dirtfloor" },
"terrain": { "Q": "t_dirtfloor", "9": "t_gutter_downspout" },
"items": {
".": { "item": "trash", "chance": 20 },
"B": [
Expand Down Expand Up @@ -334,8 +335,8 @@
" ,,,,,,,,,,,,,,,,,,, ",
" ,,,,,,,,,,,,,,,,,,, ",
" ,,,,,,,,,,,,,,,,,,, ",
" ,,,,,,,,,,,,,,,,,,, ... ",
" ,,,,,,,,,,,,,,,,,,, ,,,,,,,, 22222...2222222",
" ,,,,,,,,,,,,,,,,,,, ",
" ,,,,,,,,,,,,,,,,,,, ,,,,,,,, 5--------------",
" ,,,,,,,,,,,,,,,,,,, ,,,,,,,, ...............",
" ,,,,,,,,,,,,,,,,,,, ,,,,,,,, ...............",
" ,,,,,,,,,,,,,,,,,,, ,,,,,,,, ..&..........:.",
Expand All @@ -344,7 +345,7 @@
" ,,,,,,,,,,,,,,,,,,, ,,,,,,,, ...............",
" ,,,,,,,,,,,,,,,,,,, ,,,,,,,, .=.............",
" ,,,,,,,,,,,,,,,,,,, ,,,,,,,, ...............",
" ,,,,,,,,,,,,,,,,,,, ,,,,,,,, ---------------",
" ,,,,,,,,,,,,,,,,,,, ,,,,,,,, --------------5",
" ,,,,,,,,,,,,,,,,,,, ",
" ",
" "
Expand Down
43 changes: 22 additions & 21 deletions data/json/mapgen/farm_horse.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"..%..........................................................................................%..",
"..%..........................................................................................%..",
"..%.....................................6.................................WW+WWWW+WW.........%..",
"..%...................................6...6...............................W^;;LWL;LW.........%..",
"..%...................................6...6...............................Wu;;lWl;lW.........%..",
"..%................9......................................................WWWWWWWWWW.........%..",
"..%........9...9..........................................................W;;7777;;W.........%..",
"..%.....9............................................................/////G;;;;;;;;W.........%..",
Expand Down Expand Up @@ -110,7 +110,7 @@
"..%.........................,,..,,...........................................................%.."
],
"palettes": [ "farm_horse" ],
"terrain": { "p": "t_grass", "0": "t_grass", "6": "t_grass" },
"terrain": { "p": "t_grass", "0": "t_grass", "6": "t_grass", "Q": "t_dirtfloor" },
"sealed_item": { "Q": { "item": { "item": "seed_rose" }, "furniture": "f_planter_mature" } },
"items": {
"k": { "item": "office", "chance": 30 },
Expand All @@ -121,7 +121,8 @@
"c": { "item": "kitchen_counters", "chance": 30 },
"D": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] },
"7": { "item": "horse_gear", "chance": 30 },
"^": { "item": "horse_gear", "chance": 30 }
"^": { "item": "horse_gear", "chance": 30 },
"u": { "item": "horse_gear", "chance": 30 }
},
"place_loot": [
{ "item": "television", "x": 17, "y": 88, "chance": 100 },
Expand Down Expand Up @@ -360,7 +361,7 @@
" |@@****d|_________ ",
" v@@****yv_________ ",
" |n*****d|_________ ",
" |--1n1---_________ ",
" 4|--1n1---_________ ",
" -vvv- ",
" ",
" ",
Expand Down Expand Up @@ -389,23 +390,23 @@
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" |22222222223 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |.......---3 ",
" |.......3 ",
" |.......3 ",
" |.......3 ",
" |--...--- ",
" ------------ ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -.......---- ",
" -....N..- ",
" -.......- ",
" -.......- ",
" 5--...--- ",
" ----- ",
" ",
" ",
Expand Down
34 changes: 17 additions & 17 deletions data/json/mapgen/isherwood_farms/dairy_farm_isherwood.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
"X": "f_crate_c",
"Y": "f_rack_coat",
"a": "f_dumpster",
"b": "f_toilet",
"c": "f_cupboard",
"d": "f_desk",
"g": "f_gunsafe_ml",
Expand All @@ -84,6 +83,7 @@
"{": "f_bookcase",
"y": [ "f_indoor_plant_y", "f_indoor_plant" ]
},
"toilets": { "b": { } },
"items": {
"Y": { "item": "coat_rack", "chance": 35, "repeat": [ 1, 4 ] },
"d": { "item": "office", "chance": 30 },
Expand Down Expand Up @@ -117,7 +117,7 @@
],
"place_vehicles": [
{ "vehicle": "quad_bike", "x": 17, "y": 2, "chance": 30, "fuel": 200, "status": -1, "rotation": 0 },
{ "vehicle": "bicycle", "x": 17, "y": 2, "chance": 80, "fuel": 0, "status": 0, "rotation": 0 }
{ "vehicle": "bicycle", "x": 10, "y": 3, "chance": 80, "fuel": 0, "status": 0, "rotation": 0 }
],
"place_npcs": [ { "class": "isherwood_eddie", "x": 8, "y": 17 } ]
}
Expand Down Expand Up @@ -193,21 +193,21 @@
" ....... ....... ",
" ....... ....... ",
" ...&... ...&... ",
" |22222222222223 ....... ....... ",
" |.............3 ....... ....... ",
" |.............3 ....... ....... ",
" |.............3 ....... ....... ",
" |.........N...3 ...&... ...&... ",
" |.............3 ....... ....... ",
" |.............5 ....... ....... ",
" ||.............3 ....... ....... ",
" |..............3 ....... ....... ",
" |.....&........3 ...&... ...&... ",
" |..............3 ....... ....... ",
" |......R...=...3 ....... ....... ",
" ||.............3 ....... ....... ",
" --------......3 ",
" |------3 ",
" --------------- ....... ....... ",
" -.............- ....... ....... ",
" -.............- ....... ....... ",
" -.............- ....... ....... ",
" -.........N...- ...&... ...&... ",
" -.............- ....... ....... ",
" -.............5 ....... ....... ",
" --.............- ....... ....... ",
" -..............- ....... ....... ",
" -.....&........- ...&... ...&... ",
" -..............- ....... ....... ",
" -......R...=...- ....... ....... ",
" --.............- ....... ....... ",
" --------......- ",
" -------- ",
" ",
" "
],
Expand Down
44 changes: 25 additions & 19 deletions data/json/mapgen/isherwood_farms/farm_horse_isherwood.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,13 @@
"F": "t_dirtfloor",
"M": "t_dirtfloor",
"J": "t_dirtfloor",
"2": "t_dirtfloor"
"2": "t_dirtfloor",
"Q": "t_dirtfloor",
"e": "t_dirtfloor",
"I": "t_dirtfloor",
"j": "t_dirtfloor",
"m": "t_dirtfloor",
"u": "t_dirtfloor"
},
"furniture": { "J": "f_kiln_empty", "F": "f_forge_rock", "M": "f_workbench", "2": "f_locker" },
"sealed_item": {
Expand Down Expand Up @@ -401,7 +407,7 @@
" |@@****d|_________ ",
" v@@****yv_________ ",
" |n*****d|_________ ",
" |--1n1---_________ ",
" 4|--1n1---_________ ",
" -vvv- ",
" ",
" ",
Expand Down Expand Up @@ -430,23 +436,23 @@
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" |22222222223 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |.......---3 ",
" |.......3 ",
" |.......3 ",
" |.......3 ",
" |--...--- ",
" ------------ ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -..........- ",
" -.......---- ",
" -....N..- ",
" -.......- ",
" -.......- ",
" 5--...--- ",
" ----- ",
" ",
" ",
Expand Down
55 changes: 34 additions & 21 deletions data/json/mapgen/isherwood_farms/farm_isherwood.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
" ",
" ",
" GGGGGGGGGGGGGGGGGG ",
" G888899999999$$$$G ",
" G8888999999992222G ",
" G0_______________G ",
" G0__1111100000__rG ",
" ~_______________rG ",
Expand All @@ -239,18 +239,31 @@
" F DDDDDDDDDDDDDDDD F ",
"FF F "
],
"terrain": { "G": "t_reinforced_glass", "~": "t_reinforced_door_glass_c" },
"terrain": {
"G": "t_reinforced_glass",
"~": "t_reinforced_door_glass_c",
"0": "t_dirtfloor",
"1": "t_dirtfloor",
"2": "t_dirtfloor",
"^": "t_dirtfloor",
"4": "t_dirtfloor",
"5": "t_dirtfloor",
"6": "t_dirtfloor",
"7": "t_dirtfloor",
"8": "t_dirtfloor",
"9": "t_dirtfloor"
},
"sealed_item": {
"1": { "item": { "item": "seed_chamomile" }, "furniture": "f_planter_harvest" },
"0": { "item": { "item": "seed_thyme" }, "furniture": "f_planter_harvest" },
"1": { "item": { "item": "seed_chamomile" }, "furniture": "f_planter_harvest" },
"2": { "item": { "item": "seed_tobacco" }, "furniture": "f_planter_harvest" },
"^": { "item": { "item": "seed_bee_balm" }, "furniture": "f_planter_harvest" },
"4": { "item": { "item": "seed_mugwort" }, "furniture": "f_planter_harvest" },
"5": { "item": { "item": "seed_wild_herbs" }, "furniture": "f_planter_harvest" },
"6": { "item": { "item": "seed_raw_dandelion" }, "furniture": "f_planter_harvest" },
"7": { "item": { "item": "seed_cattail" }, "furniture": "f_planter_harvest" },
"8": { "item": { "item": "datura_seed" }, "furniture": "f_planter_harvest" },
"9": { "item": { "item": "seed_weed" }, "furniture": "f_planter_harvest" },
"$": { "item": { "item": "seed_tobacco" }, "furniture": "f_planter_harvest" }
"9": { "item": { "item": "seed_weed" }, "furniture": "f_planter_harvest" }
},
"items": { "r": { "item": "tools_earthworking", "chance": 20 } },
"palettes": [ "farm" ]
Expand Down Expand Up @@ -325,22 +338,22 @@
" ",
" ",
" ",
" #######_____####### 22222222",
" #666____________66# |......3",
" #666_666______666_# |......3",
" #66_____________66# |......3",
" #_____*******___6_# 2222222|......3",
" #_66__*******____6# |.............3",
" #66___*******____6# |..........:..3",
" #_____*******___66# ,,,,,,,, |.............3",
" #66___*******_____# ,,,,,,,, |.............3",
" #_66__*******__6__# ,,,,,,,, |.............3",
" #_____*******_____# ,,,,,,,, |.&...........3",
" #_66__*******___6_# ,,,,,,,, |.........X...3",
" #66___*******___66# ,,,,,,,, |.............3",
" #66___*******__666# ,,,,,,,, |.............3",
" #6________________# ,,,,,,,, |..=..........3",
" #666____666__666__# ,,,,,,,, |.............3",
" #######_____####### --------",
" #666____________66# -......-",
" #666_666______666_# -......-",
" #66_____________66# -......-",
" #_____*******___6_# --------......-",
" #_66__*******____6# -.............-",
" #66___*******____6# -..........:..-",
" #_____*******___66# ,,,,,,,, -.............-",
" #66___*******_____# ,,,,,,,, -.............-",
" #_66__*******__6__# ,,,,,,,, -.............-",
" #_____*******_____# ,,,,,,,, -.&...........-",
" #_66__*******___6_# ,,,,,,,, -.........X...-",
" #66___*******___66# ,,,,,,,, -.............-",
" #66___*******__666# ,,,,,,,, -.............-",
" #6________________# ,,,,,,,, -..=..........-",
" #666____666__666__# ,,,,,,,, -.............-",
" #666_____________># ,,,,,,,, -------------5-",
" #######_____####### ",
" ",
Expand Down
8 changes: 6 additions & 2 deletions data/json/mapgen_palettes/farm_horse.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"k": "f_desk",
"n": "f_table",
"r": "f_rack",
"t": "f_toilet",
"1": "f_armchair",
"8": "f_bookcase",
"7": "f_bench",
Expand All @@ -64,6 +63,11 @@
"y": [ "f_indoor_plant_y", "f_indoor_plant" ],
"b": "f_rotary_clothesline",
"p": [ "f_region_flower", "f_region_weed" ]
}
},
"mapping": {
"l": { "terrain": "t_dirtfloor", "furniture": "f_locker" },
"u": { "terrain": "t_dirtfloor", "furniture": "f_counter" }
},
"toilets": { "t": { } }
}
]

0 comments on commit 216dd02

Please sign in to comment.