Skip to content

Commit

Permalink
Fix a few mistakes from #71850 (#71962)
Browse files Browse the repository at this point in the history
* Do the fix

* The bathroom as well

* Go throug hall
  • Loading branch information
Milopetilo authored Feb 26, 2024
1 parent 4d936d1 commit ddc0ef4
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 30 deletions.
10 changes: 6 additions & 4 deletions data/json/mapgen/farm.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
"!_!__!~!.#1 6| hfh #",
"!______!.#2 6|||||||+||#",
"!______!.#|+||rrr T d#",
"!_!__!_!.#B~t| h @@o",
"!______!.#B~~+ @@#",
"!_!__!_!.#B't| h @@o",
"!______!.#B''+ @@#",
"!qq__qq!.#8S8|RRR E d#",
"!!!**!!!.##o########oo##",
",,,,,...................",
Expand All @@ -133,6 +133,7 @@
",": "t_region_soil",
"0": "t_water_pump",
"$": "t_region_shrub_decorative",
"'": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
"q": "t_dirtfloor",
"_": "t_dirtfloor",
"~": "t_dirtmoundfloor"
Expand Down Expand Up @@ -174,8 +175,8 @@
"!_!__!~!.#1 6| hfh #",
"!______!.#2 6|||||||+||#",
"!______!.#|+||rrr T d#",
"!_!__!_!.#B~t| h @@o",
"!______!.#B~~+ @@#",
"!_!__!_!.#B't| h @@o",
"!______!.#B''+ @@#",
"!qq__qq!.#8S8|RRR E d#",
"!!!**!!!.##o########oo##",
",,,,,...................",
Expand All @@ -189,6 +190,7 @@
",": "t_region_soil",
"0": "t_water_pump",
"$": "t_region_shrub_decorative",
"'": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
"q": "t_dirtfloor",
"_": "t_dirtfloor",
"~": "t_dirtmoundfloor"
Expand Down
5 changes: 3 additions & 2 deletions data/json/mapgen/farm_2side.json
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,8 @@
".......,,,..,,,....$.....oO fff x#.$",
".......,,,..,,,....$..u..o5 666| hhh E||||#.$",
".......,,,..,,,....$.....##||||| y|S8t#.$",
".......,,,..,,,....$&....^#d E|RRR| +~~~o.$",
".......,,,..,,,....$``````o@@ ||||| VV y|~BB#.$",
".......,,,..,,,....$&....^#d E|RRR| +___o.$",
".......,,,..,,,....$``````o@@ ||||| VV y|_BB#.$",
".......,,,..,,,,...$`~~~~`o@@ + ||+|||||#.$",
".......,,,,..,,,...$`~~~~`#d RRR| | @@#.$",
"........,,,..,,,...$`~~~~`####oo####*#d h d#.$",
Expand All @@ -450,6 +450,7 @@
"]": "t_region_groundcover",
"&": "t_water_pump",
"~": "t_water_pool_outdoors",
"_": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
",": "t_region_soil",
"Ŧ": "t_splitrail_fence"
},
Expand Down
25 changes: 16 additions & 9 deletions data/json/mapgen/farm_stills.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
" Ʌ …,,,,,,,,,,,, j ? oi...............|...Ero ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,, j ? #y...............|PP..T# ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,, j ? #||+|||..;;hffh;;||||+|# ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,, ? #J====1..;;hffh;;.....<# ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,, [? #5====3A.;;hffh;;.E||+|# ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,, ? oO====JA.;;hffh;;.y|t~~# ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,, [ ? #J====2A.;;hffh;;.E|~~~# ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,, ? #66==47...........T|8S8# ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,, ? #J````1..;;hffh;;.....<# ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,, [? #5````3A.;;hffh;;.E||+|# ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,, ? oO````JA.;;hffh;;.y|t~~# ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,, [ ? #J````2A.;;hffh;;.E|~~~# ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,, ? #66``47...........T|8S8# ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,,… ? ###*####oo####oo#####o## ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ …,,,,,,,,,,,,…… ? ,#♣# ?… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
" Ʌ ……,,,,,,,,,,,,…… ?????,,,????????????????????… $ $ $ $ $ $ $ $ $ $ $ $ $ $ …Ʌ ",
Expand Down Expand Up @@ -88,6 +88,7 @@
"terrain": {
" ": "t_region_groundcover",
"…": [ [ "t_region_soil", 25 ], [ "t_region_groundcover", 3 ] ],
"`": { "param": "linoleum_color_kitchen", "fallback": "t_linoleum_gray" },
"?": "t_region_groundcover",
"#": "t_wall_wood",
"$": "t_shrub_grape",
Expand Down Expand Up @@ -159,9 +160,9 @@
"#0........J.}#~~~~~~~~~~",
"#??.......J.}#~~~####^~~",
"#|||.....||||#####HH####",
"#qq|.....|8~~t~B|r...@@#",
"#w.|.....|S~~~~B|rE..@@#",
"#w.+.....|8~~~~w|T....I#",
"#qq|.....|8__t_B|r...@@#",
"#w.|.....|S____B|rE..@@#",
"#w.+.....|8____w|T....I#",
"#U.|.....|||+||||||+|||#",
"#U.|..................>#",
"#||||||+|||+|||+||||+||#",
Expand Down Expand Up @@ -197,7 +198,13 @@
"~~~~~~~~~~~~~~~~~~~~~~~~"
],
"palettes": [ "standard_domestic_palette", "standard_domestic_lino_bathroom" ],
"terrain": { "~": "t_open_air", ".": "t_floor", "#": "t_wall_wood", "!": "t_shingle_flat_roof" },
"terrain": {
"~": "t_open_air",
".": "t_floor",
"_": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
"#": "t_wall_wood",
"!": "t_shingle_flat_roof"
},
"furniture": { "}": "f_glass_fridge" },
"items": {
"}": { "item": "wines_worthy", "chance": 70, "repeat": [ 1, 2 ] },
Expand Down
7 changes: 4 additions & 3 deletions data/json/mapgen/house/2storymodern04.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@
"00~~~~~~~~~~~~~~#d ¤@@¤ | y:~~~~~~00",
"00~~~~~~~~~~~~~~#|||||||||+||V :00000000",
"0000000000000000#88|v|¤@@¤ d|V HHHHHTy:00000000",
"000///////////00#8~|+| @@ d|r H ?#00000000",
"000///////////00#S~+ |rh H ll s##^0000000",
"000///////////00#t~|D h |r x##00000000",
"000///////////00#8'|+| @@ d|r H ?#00000000",
"000///////////00#S'+ |rh H ll s##^0000000",
"000///////////00#t'|D h |r x##00000000",
"000///////////00#BB|D IIIR|y y?sxxx##00000000",
"000///////////00####:::¶::###::::#######00000000",
"000///////////00#`₸``₸`````#000000^0000000000000",
Expand All @@ -156,6 +156,7 @@
"/": "t_shingle_flat_roof",
"0": "t_open_air",
"~": "t_flat_roof",
"'": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
")": "t_glass_railing",
"`": "t_concrete",
"K": "t_concrete"
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow24.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"........................"
],
"terrain": {
"_": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
"_": { "param": "linoleum_color_kitchen", "fallback": "t_linoleum_gray" },
"?": "t_railing_v",
"=": "t_floor_noroof",
",": "t_carpet_red",
Expand Down
11 changes: 6 additions & 5 deletions data/json/mapgen/house/house33.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"#~~~~~~~# | |D d#...",
"#~~~~~~~# hh |D d#...",
"#N~~~~~~# ff |||+|#...",
"#NA~~~~~# ff |t~~B#...",
"######*## hh |||~B#...",
".^#III T| | +>|~So...",
"..o E || || |U|~t#..[",
"#NA~~~~~# ff |t''B#...",
"######*## hh |||'B#...",
".^#III T| | +>|'So...",
"..o E || || |U|'t#..[",
"..#R RR |||+|#...",
"..#|||||| |RR D#...",
"..#6_|t~+ + o...",
"..#6_|t'+ + o...",
"..#6_|8S| | #...",
"..#|+||||Y xx s|b I#...",
"..#1__FJJ H| @@#...",
Expand All @@ -46,6 +46,7 @@
"K": "t_thconc_floor",
"G": "t_thconc_floor",
"/": "t_railing",
"'": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
"_": { "param": "linoleum_color_kitchen", "fallback": "t_linoleum_gray" }
},
"place_loot": [
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house_fence02.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"}.-(((#@ d|y x V#-.}",
"}.-(((#|||||| so-.}",
"}.-/((oZ~~` E#..}",
"}.--<-#W_<|RRRlHHHly#^.}",
"}.--<-#W~<|RRRlHHHly#^.}",
"}.----##o#######o####..}",
"}...........^..........}",
"}}}}}}}}}}}}}}}}}}}}}}}}"
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/urban_12_house.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"standard_domestic_landscaping_palette"
],
"terrain": {
",": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
",": { "param": "linoleum_color_kitchen", "fallback": "t_linoleum_gray" },
"h": "t_carpet_purple",
"f": "t_carpet_purple",
"'": "t_thconc_floor",
Expand Down
9 changes: 5 additions & 4 deletions data/json/mapgen/mansion.json
Original file line number Diff line number Diff line change
Expand Up @@ -1190,10 +1190,10 @@
" i|I DDbDDD | ",
" y| y|||||||| TRRRRv",
"|||||+|||s@@@@s|++||||||",
"t|8S8~| @@@@ |8S8|t",
"~~~~~~+ --))))-- +~~~~~",
"~~~~~~| --))))-- |~~~~~",
"9|~~~~|x-------- d|BBB|9",
"t|8S8'| @@@@ |8S8|t",
"''''''+ --))))-- +'''''",
"''''''| --))))-- |'''''",
"9|''''|x-------- d|BBB|9",
"###BBB|x-------- I|BBB##",
"%%oBBB| -------- d#ooo#%",
"%%oBBB| -HH--HH- #%%%%%",
Expand All @@ -1209,6 +1209,7 @@
"palettes": [ "standard_domestic_palette", "standard_domestic_lino_bathroom", "standard_domestic_landscaping_palette" ],
"terrain": {
"~": "t_carpet_green",
"'": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
"-": "t_carpet_yellow",
"H": "t_carpet_yellow",
")": "t_carpet_yellow",
Expand Down

0 comments on commit ddc0ef4

Please sign in to comment.