diff --git a/data/json/mapgen/dive_shop.json b/data/json/mapgen/dive_shop.json index d4934168edeea..6967af0d1c943 100644 --- a/data/json/mapgen/dive_shop.json +++ b/data/json/mapgen/dive_shop.json @@ -175,7 +175,7 @@ "-.....................- ", "-..............ooo..Я.- ", "-....A.........ooo..Я.- ", - "-....MM........ooo....- ", + "-....1.........ooo....- ", "-..................&..- ", "-.....................- ", "-5--------------------- ", diff --git a/data/json/mapgen/house/2storymodern01.json b/data/json/mapgen/house/2storymodern01.json index b1ba9cd20d26b..58e62cd92fc07 100644 --- a/data/json/mapgen/house/2storymodern01.json +++ b/data/json/mapgen/house/2storymodern01.json @@ -527,7 +527,7 @@ " -.................- ", " -...N.............- ", " -.................- ", - " -----.............- ", + " -----....1........- ", " -............-- ", " -............5 ", " -.......~....- ", diff --git a/data/json/mapgen/house/2storymodern02.json b/data/json/mapgen/house/2storymodern02.json index e02b7eb9bdb7d..da1e07de83ac6 100644 --- a/data/json/mapgen/house/2storymodern02.json +++ b/data/json/mapgen/house/2storymodern02.json @@ -175,7 +175,7 @@ " --....-- -.......- ", " -......-------.......- ", " -.................=..- ", - " -....................- ", + " -....1...............- ", " -...................-- ", " -............-------- ", " -............- ", diff --git a/data/json/mapgen/house/2storymodern03.json b/data/json/mapgen/house/2storymodern03.json index 083df8c79d903..98241410739d6 100644 --- a/data/json/mapgen/house/2storymodern03.json +++ b/data/json/mapgen/house/2storymodern03.json @@ -165,7 +165,7 @@ " ------------......-- ", " -...........=.....- ", " -.A...............- ", - " -.................- ", + " -........1........- ", " --.....N.......&..- ", " ------...........- ", " -----..------ ", diff --git a/data/json/mapgen/house/2storymodern04.json b/data/json/mapgen/house/2storymodern04.json index 97594f8a711e8..fa0b91b0c9f6d 100644 --- a/data/json/mapgen/house/2storymodern04.json +++ b/data/json/mapgen/house/2storymodern04.json @@ -185,9 +185,9 @@ " -......................- ", " -......................- ", " -.................X....- ", - " -...MMMM...............- ", - " -...MMMM...............- ", - " -...MMMM...............- ", + " -...2..................- ", + " -......................- ", + " -......................- ", " -......................- ", " -..............ooooo...- ", " -..............ooooo...- ", @@ -201,7 +201,12 @@ " ------------ ", " ", " " - ] + ], + "nested": { + "2": { + "chunks": [ [ "residential_3x3_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ] + } + } } } ] diff --git a/data/json/mapgen/house/bungalow01.json b/data/json/mapgen/house/bungalow01.json index 6e926283f8e1c..56a60fe80ad28 100644 --- a/data/json/mapgen/house/bungalow01.json +++ b/data/json/mapgen/house/bungalow01.json @@ -74,7 +74,7 @@ "`-.........-----------``", "`-...................-``", "`-...................-``", - "`-...................-``", + "`-.....1.............-``", "`-...................-``", "`-...................-``", "`-................X..-``", diff --git a/data/json/mapgen/house/bungalow02.json b/data/json/mapgen/house/bungalow02.json index 57bbd86d5ada2..043e350fc84ad 100644 --- a/data/json/mapgen/house/bungalow02.json +++ b/data/json/mapgen/house/bungalow02.json @@ -83,7 +83,7 @@ " -..........=.......- ", " -..................- ", " -..................- ", - " -..................- ", + " -..........1.......- ", " --------...........- ", " -...........- ", " -........X..- ", diff --git a/data/json/mapgen/house/bungalow03.json b/data/json/mapgen/house/bungalow03.json index 9f91b583bd85c..f7ecd5c064c88 100644 --- a/data/json/mapgen/house/bungalow03.json +++ b/data/json/mapgen/house/bungalow03.json @@ -66,7 +66,7 @@ " -------------------- ", " -..................- ", " -..................- ", - " -..................- ", + " -.......1..........- ", " -..................- ", " -..................- ", " -..N...............- ", diff --git a/data/json/mapgen/house/bungalow04.json b/data/json/mapgen/house/bungalow04.json index 3933d7cedcfdf..b0ccde41655cc 100644 --- a/data/json/mapgen/house/bungalow04.json +++ b/data/json/mapgen/house/bungalow04.json @@ -98,7 +98,7 @@ " -...............- ", " -------.........----- ", " 5.............- ", - " -.............- ", + " -....1........- ", " -.............- ", " -.............- ", " -.............- ", diff --git a/data/json/mapgen/house/bungalow05.json b/data/json/mapgen/house/bungalow05.json index d8502796d63e2..f47e40c28e069 100644 --- a/data/json/mapgen/house/bungalow05.json +++ b/data/json/mapgen/house/bungalow05.json @@ -69,7 +69,7 @@ " -.......- ", " -------.......- ", " -.............- ", - " -.............- ", + " -.......1.....- ", " -.............- ", " -.............- ", " -.............- ", diff --git a/data/json/mapgen/house/bungalow06.json b/data/json/mapgen/house/bungalow06.json index e5886d0866d69..374e55b488474 100644 --- a/data/json/mapgen/house/bungalow06.json +++ b/data/json/mapgen/house/bungalow06.json @@ -70,7 +70,7 @@ " ------------.......- ", " --..................- ", " -...................- ", - " -...................- ", + " -.........1.........- ", " -...................- ", " -...................- ", " --...=..............- ", diff --git a/data/json/mapgen/house/bungalow07.json b/data/json/mapgen/house/bungalow07.json index 0812feec0c221..7005eec5a48ee 100644 --- a/data/json/mapgen/house/bungalow07.json +++ b/data/json/mapgen/house/bungalow07.json @@ -59,7 +59,7 @@ " -......- ", " -------......------- ", " -..................- ", - " -..................- ", + " -...........1......- ", " -..................- ", " -...N..............- ", " -..................- ", diff --git a/data/json/mapgen/house/bungalow08.json b/data/json/mapgen/house/bungalow08.json index b4c6589870b9c..3816a43968a7e 100644 --- a/data/json/mapgen/house/bungalow08.json +++ b/data/json/mapgen/house/bungalow08.json @@ -70,7 +70,7 @@ " ------------.......- ", " -..................- ", " -..................- ", - " -..................- ", + " -......1...........- ", " -..................- ", " -..................- ", " -..................- ", diff --git a/data/json/mapgen/house/bungalow09.json b/data/json/mapgen/house/bungalow09.json index 1889a2e0b0211..f9da4c04db920 100644 --- a/data/json/mapgen/house/bungalow09.json +++ b/data/json/mapgen/house/bungalow09.json @@ -71,8 +71,8 @@ " -..................- ", " -...N..............- ", " -..................- ", - " -.............MMMM.- ", - " -.............MMMM.- ", + " -............1.....- ", + " -..................- ", " -..................- ", " -..................- ", " 5..................5 ", diff --git a/data/json/mapgen/house/bungalow10.json b/data/json/mapgen/house/bungalow10.json index 80b60c412db87..dbe982c647dcf 100644 --- a/data/json/mapgen/house/bungalow10.json +++ b/data/json/mapgen/house/bungalow10.json @@ -69,7 +69,7 @@ " -....................- ", " -....................- ", " -....................- ", - " -....................- ", + " -..........1.........- ", " -....................5 ", " -....................- ", " -...X................- ", diff --git a/data/json/mapgen/house/bungalow11.json b/data/json/mapgen/house/bungalow11.json index b1462ffbb58c9..60664abe686f8 100644 --- a/data/json/mapgen/house/bungalow11.json +++ b/data/json/mapgen/house/bungalow11.json @@ -83,7 +83,7 @@ " -.................- ", " -.................- ", " -.................5 ", - " -.................- ", + " -.......1.........- ", " -.................- ", " -.................- ", " 5.................- ", diff --git a/data/json/mapgen/house/bungalow12.json b/data/json/mapgen/house/bungalow12.json index f9878bf72c171..1b65b9ab1a07b 100644 --- a/data/json/mapgen/house/bungalow12.json +++ b/data/json/mapgen/house/bungalow12.json @@ -92,7 +92,7 @@ " -...................- ", " -...................- ", " -...................- ", - " -...................- ", + " -.......1...........- ", " -...................- ", " 5..................-- ", " -..................5 ", diff --git a/data/json/mapgen/house/bungalow13.json b/data/json/mapgen/house/bungalow13.json index df1984bf83664..df296e6ffaf3b 100644 --- a/data/json/mapgen/house/bungalow13.json +++ b/data/json/mapgen/house/bungalow13.json @@ -97,9 +97,9 @@ " -....................- ", " -....................- ", " -....................- ", + " -.............1......- ", " -....................- ", - " -....................- ", - " -.A...............M..- ", + " -.A..................- ", " -........=...........- ", " -....................- ", " 5....................- ", @@ -112,8 +112,7 @@ "=": "t_shingle_flat_roof", "A": "t_shingle_flat_roof", "~": "t_shingle_flat_roof" - }, - "furniture": { "M": "f_solar_unit" } + } } } ] diff --git a/data/json/mapgen/house/bungalow14.json b/data/json/mapgen/house/bungalow14.json index 67c6b75afc9c1..4d7c4cde7c2ab 100644 --- a/data/json/mapgen/house/bungalow14.json +++ b/data/json/mapgen/house/bungalow14.json @@ -119,7 +119,7 @@ " 5....................- ", " -.....=..............- ", " -....................- ", - " -....................- ", + " -............1.......- ", " -....................- ", " -....................- ", " -....................- ", diff --git a/data/json/mapgen/house/bungalow15.json b/data/json/mapgen/house/bungalow15.json index 9d88a870b85e1..529758c89206f 100644 --- a/data/json/mapgen/house/bungalow15.json +++ b/data/json/mapgen/house/bungalow15.json @@ -94,7 +94,7 @@ " -...............- ", " -...............5 ", " -...............- ", - " -...............- ", + " -....1..........- ", " -...............- ", " .... -...........=...- ", " .... -...............- ", diff --git a/data/json/mapgen/house/bungalow16.json b/data/json/mapgen/house/bungalow16.json index 2777199429bba..b641d225f826e 100644 --- a/data/json/mapgen/house/bungalow16.json +++ b/data/json/mapgen/house/bungalow16.json @@ -107,7 +107,7 @@ " -.X..................- ", " -....................5 ", " -....................- ", - " -....................- ", + " -............1.......- ", " -....................- ", " -....................- ", " -....=...............- ", diff --git a/data/json/mapgen/house/bungalow17.json b/data/json/mapgen/house/bungalow17.json index 23c6f8d3cfcb2..b402f624258f4 100644 --- a/data/json/mapgen/house/bungalow17.json +++ b/data/json/mapgen/house/bungalow17.json @@ -67,7 +67,7 @@ " ---------------------- ", " -....................- ", " -....................- ", - " -....................- ", + " -............1.......- ", " 5....................- ", " -....................- ", " -....................- ", diff --git a/data/json/mapgen/house/bungalow18.json b/data/json/mapgen/house/bungalow18.json index 6b476d3333205..2ce9015937c4b 100644 --- a/data/json/mapgen/house/bungalow18.json +++ b/data/json/mapgen/house/bungalow18.json @@ -62,7 +62,7 @@ " ", " ---------------------- ", " -....................- ", - " -....................- ", + " -..........1.........- ", " -....................- ", " 5....=...............- ", " -....................- ", diff --git a/data/json/mapgen/house/bungalow19.json b/data/json/mapgen/house/bungalow19.json index a035c1669abbe..ffb0b93dfc0a2 100644 --- a/data/json/mapgen/house/bungalow19.json +++ b/data/json/mapgen/house/bungalow19.json @@ -93,7 +93,7 @@ " ---...............~- ", " -..................- ", " -..................- ", - " -..................--- ", + " -.........1........--- ", " -....................- ", " -....................- ", " -....................- ", diff --git a/data/json/mapgen/house/bungalow20.json b/data/json/mapgen/house/bungalow20.json index f4819a1be25b9..16c8f108e41bd 100644 --- a/data/json/mapgen/house/bungalow20.json +++ b/data/json/mapgen/house/bungalow20.json @@ -77,7 +77,7 @@ " -....................- ", " -....X...............- ", " -....................- ", - " -...................-- ", + " -.............1.....-- ", " -...................- ", " 5...N...............- ", " -...................- ", diff --git a/data/json/mapgen/house/bungalow21.json b/data/json/mapgen/house/bungalow21.json index daa70a4cd8b5e..fcf2f6eefd12c 100644 --- a/data/json/mapgen/house/bungalow21.json +++ b/data/json/mapgen/house/bungalow21.json @@ -73,7 +73,7 @@ " --------- ", " -----------.......- ", " -.................- ", - " -.................- ", + " -....1............- ", " -.................- ", " -.................- ", " -.................- ", diff --git a/data/json/mapgen/house/bungalow22.json b/data/json/mapgen/house/bungalow22.json index 34e0bb0c7a45f..641b5120ec71a 100644 --- a/data/json/mapgen/house/bungalow22.json +++ b/data/json/mapgen/house/bungalow22.json @@ -91,7 +91,7 @@ " -......------------ ", " -.................- ", " -.................- ", - " -.................- ", + " -..........1......- ", " -~................- ", " -.................- ", " -.................- ", diff --git a/data/json/mapgen/house/bungalow23.json b/data/json/mapgen/house/bungalow23.json index 25338afdeb73f..0b1edaef9d245 100644 --- a/data/json/mapgen/house/bungalow23.json +++ b/data/json/mapgen/house/bungalow23.json @@ -85,7 +85,7 @@ " -----...............- ", " -...................- ", " -...................- ", - " -...................- ", + " -....1..............- ", " -...................- ", " -...................- ", " -...................- ", diff --git a/data/json/mapgen/house/bungalow24.json b/data/json/mapgen/house/bungalow24.json index 835c9ecfde908..48a7ec8371f94 100644 --- a/data/json/mapgen/house/bungalow24.json +++ b/data/json/mapgen/house/bungalow24.json @@ -77,10 +77,10 @@ " -...................- ", " --...................- ", " -....................- ", - " -..............YYY...- ", - " -..............YYY...- ", - " --.....X.......YYY...- ", - " -.............YYY...- ", + " -..............1.....- ", + " -....................- ", + " --.....X.............- ", + " -.............1.....- ", " -...................- ", " -...................- ", " -...................- ", @@ -93,8 +93,7 @@ " ------------ ", " " ], - "terrain": { ".": "t_shingle_flat_roof" }, - "furniture": { "Y": "f_solar_unit" } + "terrain": { ".": "t_shingle_flat_roof" } } } ] diff --git a/data/json/mapgen/house/bungalow25.json b/data/json/mapgen/house/bungalow25.json index 31036be1b7910..a7ed68aab2e87 100644 --- a/data/json/mapgen/house/bungalow25.json +++ b/data/json/mapgen/house/bungalow25.json @@ -82,7 +82,7 @@ " -...................- ", " -...................- ", " -....X..............- ", - " -...................- ", + " -.........1.........- ", " -...................- ", " -...................- ", " -...............----- ", diff --git a/data/json/mapgen/house/garden_house_1.json b/data/json/mapgen/house/garden_house_1.json index 931773f3313ec..6f8aaf99d0999 100644 --- a/data/json/mapgen/house/garden_house_1.json +++ b/data/json/mapgen/house/garden_house_1.json @@ -296,7 +296,7 @@ " -.............- ", " -.............- ", " -.............- ", - " -.............- ", + " -.....1.......- ", " -.............- ", " -.............- ", " -.............- ", diff --git a/data/json/mapgen/house/house01.json b/data/json/mapgen/house/house01.json index f12e88f0c89b3..15c81fd7c757b 100644 --- a/data/json/mapgen/house/house01.json +++ b/data/json/mapgen/house/house01.json @@ -119,7 +119,7 @@ " -.................- ", " -.................- ", " -.............N...- ", - " 5.................- ", + " 5.....1...........- ", " -.................- ", " -.................- ", " -........&........- ", diff --git a/data/json/mapgen/house/house02.json b/data/json/mapgen/house/house02.json index c1f5e06c724b6..77c728ebdbfcf 100644 --- a/data/json/mapgen/house/house02.json +++ b/data/json/mapgen/house/house02.json @@ -110,7 +110,7 @@ " -..................- ", " -....=......N......- ", " -..................- ", - " -..................- ", + " -........1.........- ", " -..................- ", " -..................- ", " -..................- ", diff --git a/data/json/mapgen/house/house03.json b/data/json/mapgen/house/house03.json index d2e8768ccda4f..fdf0d5a00cf09 100644 --- a/data/json/mapgen/house/house03.json +++ b/data/json/mapgen/house/house03.json @@ -107,7 +107,7 @@ " -..................- ", " -..................- ", " -...........&......- ", - " -..................- ", + " -...1..............- ", " -..................- ", " -..................- ", " -.....--------.....- ", diff --git a/data/json/mapgen/house/house04.json b/data/json/mapgen/house/house04.json index bc7367eb090a3..809e7c50ad50a 100644 --- a/data/json/mapgen/house/house04.json +++ b/data/json/mapgen/house/house04.json @@ -73,7 +73,7 @@ " -....................- ", " -....................- ", " -....................- ", - " -....................- ", + " -.....1..............- ", " -....................- ", " -....................- ", " -....................- ", diff --git a/data/json/mapgen/house/house08.json b/data/json/mapgen/house/house08.json index c7569de2ebabc..b8044384c7d2b 100644 --- a/data/json/mapgen/house/house08.json +++ b/data/json/mapgen/house/house08.json @@ -145,7 +145,7 @@ " 5..............:....- ", " -...................- ", " --...................- ", - " -....................- ", + " -........1...........- ", " -....................- ", " -....................- ", " -....................- ", diff --git a/data/json/mapgen/house/house09.json b/data/json/mapgen/house/house09.json index 86806d90b0bfb..e2e72e8e49484 100644 --- a/data/json/mapgen/house/house09.json +++ b/data/json/mapgen/house/house09.json @@ -61,7 +61,7 @@ " -....X...............- ", " -....................- ", " -....................- ", - " -....................- ", + " -.........1..........- ", " -....................- ", " -....................- ", " -....................- ", diff --git a/data/json/mapgen/house/house10.json b/data/json/mapgen/house/house10.json index 926c121737147..1d949b2ebdc6a 100644 --- a/data/json/mapgen/house/house10.json +++ b/data/json/mapgen/house/house10.json @@ -58,7 +58,7 @@ " -........----------5 ", " -..................- ", " -..................- ", - " -..................- ", + " -......1...........- ", " -..................- ", " -..................- ", " -..................- ", diff --git a/data/json/mapgen/house/house11.json b/data/json/mapgen/house/house11.json index 70dcbd29ce377..c65d36818d003 100644 --- a/data/json/mapgen/house/house11.json +++ b/data/json/mapgen/house/house11.json @@ -70,7 +70,7 @@ " -..................- ", " -..................- ", " -..................- ", - " -..................- ", + " -....1.............- ", " -..................- ", " -.............&....- ", " -..................- ", diff --git a/data/json/mapgen/house/house12.json b/data/json/mapgen/house/house12.json index dcbff0506b022..eef68563e19ed 100644 --- a/data/json/mapgen/house/house12.json +++ b/data/json/mapgen/house/house12.json @@ -60,7 +60,7 @@ " ---------.........- ", " -................5- ", " -................- ", - " -................- ", + " -......1.........- ", " -................- ", " -.............=..- ", " -................- ", diff --git a/data/json/mapgen/house/house13.json b/data/json/mapgen/house/house13.json index e2f0f62fb27a3..195fde0347bf6 100644 --- a/data/json/mapgen/house/house13.json +++ b/data/json/mapgen/house/house13.json @@ -66,7 +66,7 @@ " -...............- ", " -......&........- ", " -...............5 ", - " -...............- ", + " -..1............- ", " -..........=....- ", " -...............- ", " -...............- ", diff --git a/data/json/mapgen/house/house14.json b/data/json/mapgen/house/house14.json index 9877201384a37..8b0c1a1207c93 100644 --- a/data/json/mapgen/house/house14.json +++ b/data/json/mapgen/house/house14.json @@ -64,7 +64,7 @@ " -.......------------5 ", " -...................- ", " -...................- ", - " -...................- ", + " -..........1........- ", " -...................- ", " -..=................- ", " -...................- ", diff --git a/data/json/mapgen/house/house15.json b/data/json/mapgen/house/house15.json index 57fb6f5e7c86a..c8ea9a41d279c 100644 --- a/data/json/mapgen/house/house15.json +++ b/data/json/mapgen/house/house15.json @@ -60,7 +60,7 @@ " -....................- ", " -.......X............- ", " -....................- ", - " -....................- ", + " -.....1..............- ", " -.................&..- ", " -....................- ", " -.....=..............- ", diff --git a/data/json/mapgen/house/house16.json b/data/json/mapgen/house/house16.json index a0ced8e0bdafa..fbafb82fd6ff3 100644 --- a/data/json/mapgen/house/house16.json +++ b/data/json/mapgen/house/house16.json @@ -59,7 +59,7 @@ " -..................- ", " -............&.....- ", " -..................- ", - " -..................- ", + " -....1.............- ", " -..................- ", " -..................- ", " -..................- ", diff --git a/data/json/mapgen/house/house17.json b/data/json/mapgen/house/house17.json index e662aca6cd7a8..0565d743d8996 100644 --- a/data/json/mapgen/house/house17.json +++ b/data/json/mapgen/house/house17.json @@ -58,7 +58,7 @@ " -.....- -.....- ", " -.....--------.....- ", " -..................- ", - " --5................- ", + " --5........1.......- ", " -................- ", " -................- ", " -....&.=.........- ", diff --git a/data/json/mapgen/house/house18.json b/data/json/mapgen/house/house18.json index ad99b519c7bed..60070d117922b 100644 --- a/data/json/mapgen/house/house18.json +++ b/data/json/mapgen/house/house18.json @@ -55,7 +55,7 @@ " -.....X.............- ", " -...................- ", " -...................- ", - " -...................- ", + " -........1..........- ", " -...................- ", " -...................- ", " -...................- ", diff --git a/data/json/mapgen/house/house19.json b/data/json/mapgen/house/house19.json index 21aefccace24b..aabfd95085daf 100644 --- a/data/json/mapgen/house/house19.json +++ b/data/json/mapgen/house/house19.json @@ -59,7 +59,7 @@ " -.....------.....- ", " -................- ", " -................- ", - " -................- ", + " -......1.........- ", " -................- ", " -................- ", " -...=......&.....- ", diff --git a/data/json/mapgen/house/house20.json b/data/json/mapgen/house/house20.json index c3982fba34d04..b543c06154020 100644 --- a/data/json/mapgen/house/house20.json +++ b/data/json/mapgen/house/house20.json @@ -101,7 +101,7 @@ " -.................- ", " -.................- ", " -.................- ", - " -.................- ", + " -......1..........- ", " -.................- ", " -.................- ", " -.................- ", diff --git a/data/json/mapgen/house/house21.json b/data/json/mapgen/house/house21.json index 77df8edbd33d1..a961c6c76aec8 100644 --- a/data/json/mapgen/house/house21.json +++ b/data/json/mapgen/house/house21.json @@ -62,7 +62,7 @@ " -......- ", " -----------......- ", " -............X...- ", - " -................- ", + " -......1.........- ", " -................- ", " -....=.......&...- ", " -................- ", diff --git a/data/json/mapgen/house/house22.json b/data/json/mapgen/house/house22.json index b01c7debca8ad..42d7594ac5d09 100644 --- a/data/json/mapgen/house/house22.json +++ b/data/json/mapgen/house/house22.json @@ -144,7 +144,7 @@ " -...................- ", " 5...................5 ", " -...................- ", - " -...................- ", + " -.......1...........- ", " -...................- ", " -...................- ", " -...................- ", diff --git a/data/json/mapgen/house/house23.json b/data/json/mapgen/house/house23.json index aa3db15da403e..c447badd8ce43 100644 --- a/data/json/mapgen/house/house23.json +++ b/data/json/mapgen/house/house23.json @@ -73,7 +73,7 @@ " -..&...............- ", " -..............=...- ", " -..................- ", - " -..................- ", + " -.........1........- ", " -..................- ", " -..................- ", " -..................- ", diff --git a/data/json/mapgen/house/house24.json b/data/json/mapgen/house/house24.json index 5c15fd00ec84e..0ab5f3835fd5b 100644 --- a/data/json/mapgen/house/house24.json +++ b/data/json/mapgen/house/house24.json @@ -241,7 +241,7 @@ " --..........- ", " -...........- ", " -...........- ", - " -...........- ", + " -....1......- ", " -...........- ", " ---------...........- ", " -...................- ", diff --git a/data/json/mapgen/house/house25.json b/data/json/mapgen/house/house25.json index 09b3087c0758c..25928ee06c9cc 100644 --- a/data/json/mapgen/house/house25.json +++ b/data/json/mapgen/house/house25.json @@ -123,7 +123,7 @@ " -.......- -.......- ", " -.......----.......- ", " -..................- ", - " -..................- ", + " -......1...........- ", " -..................- ", " -..................- ", " -..................- ", diff --git a/data/json/mapgen/house/house26.json b/data/json/mapgen/house/house26.json index e0caa1f13cee3..99528a050907f 100644 --- a/data/json/mapgen/house/house26.json +++ b/data/json/mapgen/house/house26.json @@ -56,7 +56,7 @@ " -....................- ", " -......X.............- ", " -................5---- ", - " -................- ", + " -..1.............- ", " -................- ", " -................- ", " -.........=.&....--- ", diff --git a/data/json/mapgen/house/house27.json b/data/json/mapgen/house/house27.json index 3f1dc7bce6505..3334d8a8084a1 100644 --- a/data/json/mapgen/house/house27.json +++ b/data/json/mapgen/house/house27.json @@ -52,7 +52,7 @@ " -............- ", " -............- ", " -............5---", - " -...............-", + " -...1...........-", " -...............-", " -...............-", " -...............-", diff --git a/data/json/mapgen/house/house28.json b/data/json/mapgen/house/house28.json index 7b77fa9b0692c..391b49411d31f 100644 --- a/data/json/mapgen/house/house28.json +++ b/data/json/mapgen/house/house28.json @@ -54,7 +54,7 @@ " -...............- ", " -........&......- ", " -...............- ", - " -...............- ", + " -......1........- ", " -...N...........- ", " -.........=..5--- ", " -............- ", diff --git a/data/json/mapgen/house/house29.json b/data/json/mapgen/house/house29.json index 754b3face9c8d..06aa4e1ed9531 100644 --- a/data/json/mapgen/house/house29.json +++ b/data/json/mapgen/house/house29.json @@ -54,7 +54,7 @@ " -..........- ", " -..........- ", " -..........- ", - " -..........- ", + " -...1......- ", " -..........- ", " -..........- ", " -..........- ", diff --git a/data/json/mapgen/house/house30.json b/data/json/mapgen/house/house30.json index 83209d1409602..349dbde0810f6 100644 --- a/data/json/mapgen/house/house30.json +++ b/data/json/mapgen/house/house30.json @@ -60,7 +60,7 @@ " -.................- ", " -.................- ", " --........N.....--- ", - " -..............- ", + " -..1...........- ", " -..............- ", " -..............- ", " -.....---5.....- ", diff --git a/data/json/mapgen/house/house31.json b/data/json/mapgen/house/house31.json index 3efd27a99fc85..8416f32ab32a0 100644 --- a/data/json/mapgen/house/house31.json +++ b/data/json/mapgen/house/house31.json @@ -60,7 +60,7 @@ "-....---------5---------", "-......................-", "-......................-", - "-......................-", + "-.............1........-", "-......................-", "-......................-", "-......................-", diff --git a/data/json/mapgen/house/house32.json b/data/json/mapgen/house/house32.json index 576188503a761..9db7124bd3692 100644 --- a/data/json/mapgen/house/house32.json +++ b/data/json/mapgen/house/house32.json @@ -58,7 +58,7 @@ "-.............- ", "-.............- ", "-.............--------5-", - "-......................-", + "-...1..................-", "-......................-", "-......................-", "-......................-", diff --git a/data/json/mapgen/house/house33.json b/data/json/mapgen/house/house33.json index a9ebb01d5d6f8..e0d7447338f97 100644 --- a/data/json/mapgen/house/house33.json +++ b/data/json/mapgen/house/house33.json @@ -85,7 +85,7 @@ " -............X....- ", " -.................- ", " -.................- ", - " -.................- ", + " -.....1...........- ", " -.................- ", " -.................- ", " -.................- ", diff --git a/data/json/mapgen/house/house34.json b/data/json/mapgen/house/house34.json index 9758d0f28a394..75901692749d3 100644 --- a/data/json/mapgen/house/house34.json +++ b/data/json/mapgen/house/house34.json @@ -72,7 +72,7 @@ " ------------ ", " -------5..........- ", " -.................- ", - " -.................- ", + " -.....1...........- ", " -.................- ", " -.................- ", " -............N....- ", diff --git a/data/json/mapgen/house/house35.json b/data/json/mapgen/house/house35.json index 3fad68a8e9df7..54ce13e42a51c 100644 --- a/data/json/mapgen/house/house35.json +++ b/data/json/mapgen/house/house35.json @@ -72,7 +72,7 @@ " -............- ", " -............------ ", " -.................- ", - " -.................- ", + " -..........1......- ", " -.................---- ", " -....................- ", " -....................- ", diff --git a/data/json/mapgen/house/house36.json b/data/json/mapgen/house/house36.json index 12131f848bb1d..c11fb73fa793a 100644 --- a/data/json/mapgen/house/house36.json +++ b/data/json/mapgen/house/house36.json @@ -77,7 +77,7 @@ " -....N........- ", " -.............- ", " -.............- ", - " -.............- ", + " -......1......- ", " -.............- ", "---------.............- ", "-.....................- ", diff --git a/data/json/mapgen/house/house37.json b/data/json/mapgen/house/house37.json index 5d0f7c4c122db..1b4caf4355d2f 100644 --- a/data/json/mapgen/house/house37.json +++ b/data/json/mapgen/house/house37.json @@ -74,7 +74,7 @@ "-...................- ", "-...................5 ", "-...................-- ", - "-....................- ", + "-...........1........- ", "-....................- ", "-.......X............- ", "-....................- ", diff --git a/data/json/mapgen/house/house38.json b/data/json/mapgen/house/house38.json index 839798d88bb26..cd406215b203a 100644 --- a/data/json/mapgen/house/house38.json +++ b/data/json/mapgen/house/house38.json @@ -85,7 +85,7 @@ " -...................- ", " -.......=.&.........- ", " -...................- ", - " -...................- ", + " -............1......- ", " -...................- ", " -----5..............- ", " -..............- ", diff --git a/data/json/mapgen/house/house39.json b/data/json/mapgen/house/house39.json index effccc4a6c1c9..2b4f017c01903 100644 --- a/data/json/mapgen/house/house39.json +++ b/data/json/mapgen/house/house39.json @@ -78,7 +78,7 @@ "-.....................- ", "-.....................- ", "--....................- ", - " -....................- ", + " -.......1............- ", " -....................- ", " -....................- ", " -....................5 ", diff --git a/data/json/mapgen/house/house40.json b/data/json/mapgen/house/house40.json index 2dfa99fe1c863..3fcf6902f9bf5 100644 --- a/data/json/mapgen/house/house40.json +++ b/data/json/mapgen/house/house40.json @@ -66,7 +66,7 @@ "-....-----------.......-", "-......................-", "-......................-", - "-......................-", + "-.....1................-", "-......................-", "-.................&....-", "-......................-", diff --git a/data/json/mapgen/house/house42.json b/data/json/mapgen/house/house42.json index 44845288726ed..8f0809d09b7c4 100644 --- a/data/json/mapgen/house/house42.json +++ b/data/json/mapgen/house/house42.json @@ -71,7 +71,7 @@ " -.......- ", " -.......- ------5- ", " -.......------......- ", - " -..............X....- ", + " -..1...........X....- ", " -...................- ", " -...................- ", " -...................- ", diff --git a/data/json/mapgen/house/house43.json b/data/json/mapgen/house/house43.json index cde32beb8645a..aa5e67580610b 100644 --- a/data/json/mapgen/house/house43.json +++ b/data/json/mapgen/house/house43.json @@ -141,8 +141,8 @@ " ........... ", " ........... ", " ........... ", - " ....MM..... ", - " ....M...... ", + " ....1...... ", + " ........... ", " ........... ", " ........... ", " ........... ", @@ -162,8 +162,7 @@ " " ], "palettes": [ "roof_palette" ], - "terrain": { ".": "t_shingle_flat_roof" }, - "place_loot": [ { "item": "tool_belt", "x": 9, "y": 10 }, { "item": "hammer", "x": 8, "y": 10 } ] + "terrain": { ".": "t_shingle_flat_roof" } } } ] diff --git a/data/json/mapgen/house/house_2story.json b/data/json/mapgen/house/house_2story.json index 53d484b961c93..aa30cff104654 100644 --- a/data/json/mapgen/house/house_2story.json +++ b/data/json/mapgen/house/house_2story.json @@ -116,7 +116,7 @@ " -..................- ", " -..................- ", " -..................- ", - " -..................- ", + " -...........1......- ", " -..................- ", " -......:...........- ", " -..................- ", diff --git a/data/json/mapgen/house/house_detatched1.json b/data/json/mapgen/house/house_detatched1.json index 05a54af261eda..7fad1f2f95716 100644 --- a/data/json/mapgen/house/house_detatched1.json +++ b/data/json/mapgen/house/house_detatched1.json @@ -95,7 +95,7 @@ " -...........- ", " -...........- ", " -...........- ", - " -...........- ", + " -...1.......- ", " -...........- ", " -...........- ", " -...........- ", diff --git a/data/json/mapgen/house/house_detatched10.json b/data/json/mapgen/house/house_detatched10.json index 6b512e4aabc19..d0a0b7e5c4f82 100644 --- a/data/json/mapgen/house/house_detatched10.json +++ b/data/json/mapgen/house/house_detatched10.json @@ -105,7 +105,7 @@ " -......N...........- ", " -..................- ", " -..........X.......- ", - " -..................- ", + " -...1..............- ", " -..............&...- ", " -..................- ", " ----------....=....- ", diff --git a/data/json/mapgen/house/house_detatched2.json b/data/json/mapgen/house/house_detatched2.json index 06368085b4f79..263912375e655 100644 --- a/data/json/mapgen/house/house_detatched2.json +++ b/data/json/mapgen/house/house_detatched2.json @@ -85,7 +85,7 @@ " -...=..........- ", " -..............- ", " -........N.....- ", - " -..............- ", + " -.........1....- ", " -.....&........- ", " -..............- ", " -..............- ", diff --git a/data/json/mapgen/house/house_detatched3.json b/data/json/mapgen/house/house_detatched3.json index 9598d52633084..2d25959148fda 100644 --- a/data/json/mapgen/house/house_detatched3.json +++ b/data/json/mapgen/house/house_detatched3.json @@ -75,7 +75,7 @@ " ----------------- ", " -...............- ", " -...............5 ", - " -...............- ", + " -...1...........- ", " -...........=...- ", " -...............- ", " -...............- ", diff --git a/data/json/mapgen/house/house_detatched4.json b/data/json/mapgen/house/house_detatched4.json index 1dbe75640ba4c..d310d27e0f122 100644 --- a/data/json/mapgen/house/house_detatched4.json +++ b/data/json/mapgen/house/house_detatched4.json @@ -166,7 +166,7 @@ " -.................- ", " -.................5 ", " -....&............- ", - " -..........X......- ", + " -..1.......X......- ", " -.................- ", " -.................- ", " 5....=...........~- ", diff --git a/data/json/mapgen/house/house_detatched5.json b/data/json/mapgen/house/house_detatched5.json index af436a6ea837a..d5a0b20345d2c 100644 --- a/data/json/mapgen/house/house_detatched5.json +++ b/data/json/mapgen/house/house_detatched5.json @@ -90,7 +90,7 @@ " ", " ------------ ------ ", " -..........------....- ", - " -..............X.....5 ", + " -..1...........X.....5 ", " -....................- ", " -....................- ", " -.........N..........- ", diff --git a/data/json/mapgen/house/house_detatched6.json b/data/json/mapgen/house/house_detatched6.json index 888b270d74399..dc02acc2305c9 100644 --- a/data/json/mapgen/house/house_detatched6.json +++ b/data/json/mapgen/house/house_detatched6.json @@ -92,7 +92,7 @@ " -....................- ", " -..:...N.....=.......- ", " -....................- ", - " -..................&.- ", + " -..1...............&.- ", " -....................- ", " -..........5---------- ", " -......----- ", diff --git a/data/json/mapgen/house/house_detatched7.json b/data/json/mapgen/house/house_detatched7.json index 0680ced0535ad..14ed183873a03 100644 --- a/data/json/mapgen/house/house_detatched7.json +++ b/data/json/mapgen/house/house_detatched7.json @@ -85,7 +85,7 @@ " ---- ", " ---------..------- ", " 5................- ", - " -................- ", + " -......1.........- ", " -...&........N...- ", " -................- ", " -.......=........- ", diff --git a/data/json/mapgen/house/house_detatched8.json b/data/json/mapgen/house/house_detatched8.json index 34b58868b35a2..04e57ebb7c0e3 100644 --- a/data/json/mapgen/house/house_detatched8.json +++ b/data/json/mapgen/house/house_detatched8.json @@ -88,7 +88,7 @@ " -........- ", " -......N.- ", " -..&.....- ", - " -........- ", + " -...1....- ", " -........-- ", " 5.....=...5 ", " -.........- ", @@ -104,7 +104,8 @@ " " ], "palettes": [ "roof_palette" ], - "terrain": { ".": "t_shingle_flat_roof" } + "terrain": { ".": "t_shingle_flat_roof" }, + "nested": { "1": { "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 4 ], [ "null", 88 ] ] } } } }, { diff --git a/data/json/mapgen/house/house_detatched9.json b/data/json/mapgen/house/house_detatched9.json index df93fa3212a85..3dbf75f912912 100644 --- a/data/json/mapgen/house/house_detatched9.json +++ b/data/json/mapgen/house/house_detatched9.json @@ -92,7 +92,7 @@ " -...- ", " -----...-------- ", " -..............- ", - " -..............5 ", + " -........1.....5 ", " -..............- ", " -..N..=........- ", " -..............- ", diff --git a/data/json/mapgen/house/house_fence01.json b/data/json/mapgen/house/house_fence01.json index 20c487f5b13db..b57eec67f3bd3 100644 --- a/data/json/mapgen/house/house_fence01.json +++ b/data/json/mapgen/house/house_fence01.json @@ -210,7 +210,7 @@ " -..=..------------ ", " -................- ", " -................- ", - " -................- ", + " -....1...........- ", " -............N...- ", " -................- ", " -................- ", diff --git a/data/json/mapgen/house/house_fence02.json b/data/json/mapgen/house/house_fence02.json index f41b0b0803f43..fe1016ea34205 100644 --- a/data/json/mapgen/house/house_fence02.json +++ b/data/json/mapgen/house/house_fence02.json @@ -130,7 +130,7 @@ " --------------- ", " -.............- ", " -.............- ", - " -.............- ", + " -....1........- ", " -..........X..- ", " -.............- ", " -.............- ", diff --git a/data/json/mapgen/house/house_fence03.json b/data/json/mapgen/house/house_fence03.json index dd6416a6c5407..da7f0bc36d020 100644 --- a/data/json/mapgen/house/house_fence03.json +++ b/data/json/mapgen/house/house_fence03.json @@ -110,7 +110,7 @@ " ----........- ", " -...........- ", " -...........---- ", - " -..............- ", + " -...1..........- ", " -..............- ", " -..............- ", " -..............- ", diff --git a/data/json/mapgen/house/house_fence04.json b/data/json/mapgen/house/house_fence04.json index 2561ada32bafa..004c238e5a83c 100644 --- a/data/json/mapgen/house/house_fence04.json +++ b/data/json/mapgen/house/house_fence04.json @@ -208,7 +208,7 @@ " ------------------ ", " -................- ", " -................- ", - " -................- ", + " -....1...........- ", " -...............N- ", " -................- ", " -...............X- ", diff --git a/data/json/mapgen/house/house_fence05.json b/data/json/mapgen/house/house_fence05.json index b14e4d55f7f8c..6f759eea42205 100644 --- a/data/json/mapgen/house/house_fence05.json +++ b/data/json/mapgen/house/house_fence05.json @@ -158,8 +158,8 @@ " ", " --------------- ", " -.............- ", - " -.bbb........~- ", - " -.bbb.........- ", + " -.1..........~- ", + " -.............- ", " -.............- ", " -...X.........- ", " -.............5 ", @@ -172,7 +172,6 @@ " ", " " ], - "furniture": { "b": "f_solar_unit" }, "terrain": { ".": "t_shingle_flat_roof" } } } diff --git a/data/json/mapgen/house/house_garage.json b/data/json/mapgen/house/house_garage.json index 5c5a2fbacf8e1..550e681ad5adb 100644 --- a/data/json/mapgen/house/house_garage.json +++ b/data/json/mapgen/house/house_garage.json @@ -68,7 +68,7 @@ " -....................- ", " -....................- ", " -....................- ", - " -....................- ", + " -.......1............- ", " -....................- ", " -....................- ", " -....................- ", diff --git a/data/json/mapgen/house/house_garage2.json b/data/json/mapgen/house/house_garage2.json index 7115afb3b6a83..88731aed0f648 100644 --- a/data/json/mapgen/house/house_garage2.json +++ b/data/json/mapgen/house/house_garage2.json @@ -88,7 +88,7 @@ " -.......&............- ", " -.................=..- ", " -----5...............- ", - " -...............- ", + " -......1........- ", " -...............- ", " -...............- ", " -...............- ", diff --git a/data/json/mapgen/house/house_garage3.json b/data/json/mapgen/house/house_garage3.json index 7ef3b2ebb4186..fb108d1716c11 100644 --- a/data/json/mapgen/house/house_garage3.json +++ b/data/json/mapgen/house/house_garage3.json @@ -77,7 +77,7 @@ " 5--------------------- ", " -....................- ", " -....................- ", - " -....................- ", + " -..........1.........- ", " -....................- ", " -....................- ", " -....................- ", diff --git a/data/json/mapgen/house/house_garage4.json b/data/json/mapgen/house/house_garage4.json index a017ad27c39fe..ffbb35c5419e0 100644 --- a/data/json/mapgen/house/house_garage4.json +++ b/data/json/mapgen/house/house_garage4.json @@ -74,7 +74,7 @@ " -....................- ", " -....................- ", " -.................&..- ", - " 5....................- ", + " 5........1...........- ", " -.=..................- ", " -....................- ", " -....................5 ", diff --git a/data/json/mapgen/house/house_garage5.json b/data/json/mapgen/house/house_garage5.json index 9da06ded6f5b6..1782a313e667b 100644 --- a/data/json/mapgen/house/house_garage5.json +++ b/data/json/mapgen/house/house_garage5.json @@ -72,7 +72,7 @@ " -....................- ", " -....................- ", " -............&.......- ", - " --...................- ", + " --....1..............- ", " -...................- ", " -...................- ", " -...................- ", diff --git a/data/json/mapgen/house/house_garage6.json b/data/json/mapgen/house/house_garage6.json index 418675d554c1f..51e23dd83b85b 100644 --- a/data/json/mapgen/house/house_garage6.json +++ b/data/json/mapgen/house/house_garage6.json @@ -95,7 +95,7 @@ " -------- --------- ", " -......- -.......- ", " -......- -.......- ", - " -......- -.......- ", + " -......- -..1....- ", " -......- -.......- ", " 5......- -.......- ", " -......- -.......- ", diff --git a/data/json/mapgen/house/house_garage7.json b/data/json/mapgen/house/house_garage7.json index ce4ee0a8ec9a6..c0d675174869a 100644 --- a/data/json/mapgen/house/house_garage7.json +++ b/data/json/mapgen/house/house_garage7.json @@ -77,7 +77,7 @@ " -............- ", " -............- ", " -.......X....- ", - " -............- ", + " -...1........- ", " -------............- ", " -..................- ", " -.....&........=...- ", diff --git a/data/json/mapgen/house/house_garage8.json b/data/json/mapgen/house/house_garage8.json index 427069f1bffa9..4f68e93d59516 100644 --- a/data/json/mapgen/house/house_garage8.json +++ b/data/json/mapgen/house/house_garage8.json @@ -92,7 +92,7 @@ " -........- ----- ", " -........------...-- ", " -..................- ", - " -..................- ", + " -....1.............- ", " -..................- ", " -..................- ", " -..................- ", diff --git a/data/json/mapgen/house/house_garage_prepper.json b/data/json/mapgen/house/house_garage_prepper.json index 2ff84c762ffbb..f98c25cac8231 100644 --- a/data/json/mapgen/house/house_garage_prepper.json +++ b/data/json/mapgen/house/house_garage_prepper.json @@ -127,7 +127,7 @@ " -....................5 ", " -....................- ", " -......&......=......- ", - " -....................- ", + " -..........1.........- ", " -....................- ", " -....................- ", " -....................- ", diff --git a/data/json/mapgen/house/house_gardener.json b/data/json/mapgen/house/house_gardener.json index 56f7dcb343716..98b379e5d8f2c 100644 --- a/data/json/mapgen/house/house_gardener.json +++ b/data/json/mapgen/house/house_gardener.json @@ -64,7 +64,7 @@ " -.....5-------------- ", " -...................- ", " -...................- ", - " -...=...............- ", + " -...=.......1.......- ", " -...................- ", " -...................- ", " -...................- ", diff --git a/data/json/mapgen/house/house_inner_garden.json b/data/json/mapgen/house/house_inner_garden.json index efb0f71169f34..254d5419e536a 100644 --- a/data/json/mapgen/house/house_inner_garden.json +++ b/data/json/mapgen/house/house_inner_garden.json @@ -96,7 +96,7 @@ " ---------", " ---------------.......-", " -................ooo..-", - " -.....................-", + " -.....1...............-", "5-................ooo.A-", "-~.....................-", "--................ooo..-", diff --git a/data/json/mapgen/house/house_modern_lx.json b/data/json/mapgen/house/house_modern_lx.json index 17c43a11cb476..69bfeecc6e002 100644 --- a/data/json/mapgen/house/house_modern_lx.json +++ b/data/json/mapgen/house/house_modern_lx.json @@ -87,7 +87,7 @@ " -....................- ", " -....................- ", " -.................=..- ", - " -....................- ", + " -.....1..............- ", " -.................&..- ", " -....................- ", " -....................- ", diff --git a/data/json/mapgen/house/house_patio.json b/data/json/mapgen/house/house_patio.json index 8f94afcdce391..90cb3faadef99 100644 --- a/data/json/mapgen/house/house_patio.json +++ b/data/json/mapgen/house/house_patio.json @@ -93,7 +93,7 @@ " -............- ", " -............- ", " -............- ", - " -............- ", + " -....1.......- ", " -............- ", " -............- ", " -............- ", diff --git a/data/json/mapgen/house/house_porch.json b/data/json/mapgen/house/house_porch.json index fe19ccc8d7200..8d1147b1798ee 100644 --- a/data/json/mapgen/house/house_porch.json +++ b/data/json/mapgen/house/house_porch.json @@ -78,7 +78,7 @@ " ------------ ", " -..........- ", " -..........- ", - " -.........~5---------- ", + " -..1......~5---------- ", " -....................- ", " -....................- ", " -....................- ", diff --git a/data/json/mapgen/house/house_rv.json b/data/json/mapgen/house/house_rv.json index b340696d3b187..1ab148d91949d 100644 --- a/data/json/mapgen/house/house_rv.json +++ b/data/json/mapgen/house/house_rv.json @@ -64,7 +64,7 @@ " -....&.....- ", " -..........- ", " -..........- ", - " -..........- ", + " -....1.....- ", " -..........- ", " -..........- ", " ----------5..........- ", diff --git a/data/json/mapgen/house/house_suicide.json b/data/json/mapgen/house/house_suicide.json index 7b3db08c94f99..b1a0c9f8c1af9 100644 --- a/data/json/mapgen/house/house_suicide.json +++ b/data/json/mapgen/house/house_suicide.json @@ -140,7 +140,7 @@ " -..................- ", " -.....&............- ", " -..................- ", - " -..................- ", + " -.......1..........- ", " -..................- ", " -..................- ", " ---5............oo.5 ", diff --git a/data/json/mapgen/house/house_tool_shed.json b/data/json/mapgen/house/house_tool_shed.json index d83d98920533a..c5257dbac7448 100644 --- a/data/json/mapgen/house/house_tool_shed.json +++ b/data/json/mapgen/house/house_tool_shed.json @@ -71,7 +71,7 @@ " -------------------5- ", " -...................- ", " -...................- ", - " -...................- ", + " -.......1...........- ", " --.X.................- ", " -....................- ", " -....................- ", diff --git a/data/json/mapgen/house/urban_22_house_pool.json b/data/json/mapgen/house/urban_22_house_pool.json index bb32dfe076bdd..ecd136e3d2469 100644 --- a/data/json/mapgen/house/urban_22_house_pool.json +++ b/data/json/mapgen/house/urban_22_house_pool.json @@ -75,7 +75,7 @@ " -........- ", " -........- ------- ", " -........- -.....- ", - " ---------- -...M.- ", + " ---------- -.1...- ", " -.....- ", " -.....- ", " ------- ", diff --git a/data/json/mapgen/irradiator_1.json b/data/json/mapgen/irradiator_1.json index 3345889963055..0cd18e2953242 100644 --- a/data/json/mapgen/irradiator_1.json +++ b/data/json/mapgen/irradiator_1.json @@ -420,8 +420,8 @@ " -..................................................RR..........- ", " -..................................................RR..........- ", " -..............................................................- ", - " -...::.......MMMMM.MMMMM.MMMMM.MMMMM...........X........X......- ", - " -...::.......MMMMM.MMMMM.MMMMM.MMMMM...........................- ", + " -...::.......22222.22222.22222.22222...........X........X......- ", + " -...::.......22222.22222.22222.22222...........................- ", " 5..............................................................5 ", " ---------------------------------------------------------------- ", " ", diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json index 0369cead3ad43..9cc6c5b70d678 100644 --- a/data/json/mapgen/lmoe.json +++ b/data/json/mapgen/lmoe.json @@ -70,7 +70,13 @@ "vvvvvvvvvvvvvvvvvvvvvvvv" ], "palettes": [ "bunker_ext" ], - "place_nested": [ { "chunks": [ "null", "lmoe_solar" ], "x": 11, "y": 10 } ] + "place_nested": [ + { + "chunks": [ [ "residential_1x2_solar", 3 ], [ "residential_2x2_solar", 1 ], [ "residential_1x3_solar", 2 ], [ "null", 94 ] ], + "x": 11, + "y": 10 + } + ] } }, { diff --git a/data/json/mapgen/museum.json b/data/json/mapgen/museum.json index 046fc213dfa29..ac5a1abada78d 100644 --- a/data/json/mapgen/museum.json +++ b/data/json/mapgen/museum.json @@ -106,7 +106,7 @@ " R R R R R R ", " ---------------------- ", " -....................- ", - " -........U........M..- ", + " -........U........K..- ", " -....................- ", " -....ooo..oo..ooo....- ", " -....ooo..oo..ooo....- ", @@ -132,7 +132,7 @@ "terrain": { "R": "t_column" }, "nested": { "U": { "chunks": [ "roof_2x2_infrastructure" ] }, - "M": { "chunks": [ "roof_2x2_infrastructure_1" ] }, + "K": { "chunks": [ "roof_2x2_infrastructure_1" ] }, "Z": { "chunks": [ "roof_2x2_infrastructure_2" ] } }, "place_nested": [ diff --git a/data/json/mapgen/nested/lmoe_nested.json b/data/json/mapgen/nested/lmoe_nested.json index 176cf753e60ae..581ebdffbc02a 100644 --- a/data/json/mapgen/nested/lmoe_nested.json +++ b/data/json/mapgen/nested/lmoe_nested.json @@ -84,15 +84,5 @@ } ] } - }, - { - "type": "mapgen", - "method": "json", - "//": "This is done to give a chance for lmoe bunkers to spawn with solar panels on the roof", - "nested_mapgen_id": "lmoe_solar", - "object": { "mapgensize": [ 2, 2 ], "rows": [ - "MM", - "MM" - ], "palettes": [ "roof_palette" ] } } ] diff --git a/data/json/mapgen/nested/nested_chunks_roof.json b/data/json/mapgen/nested/nested_chunks_roof.json index 93c9edc8e0d2c..265c9efccd8a4 100644 --- a/data/json/mapgen/nested/nested_chunks_roof.json +++ b/data/json/mapgen/nested/nested_chunks_roof.json @@ -531,5 +531,41 @@ { "group": "any_wild_egg", "x": 0, "y": 0, "chance": 30, "repeat": [ 1, 3 ] } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "residential_2x2_solar", + "object": { "mapgensize": [ 2, 2 ], "place_furniture": [ { "furn": "f_solar_unit", "x": [ 0, 1 ], "y": [ 0, 1 ] } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "residential_1x2_solar", + "object": { "mapgensize": [ 2, 2 ], "place_furniture": [ { "furn": "f_solar_unit", "x": 0, "y": [ 0, 1 ] } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "residential_1x3_solar", + "object": { "mapgensize": [ 3, 3 ], "place_furniture": [ { "furn": "f_solar_unit", "x": 0, "y": [ 0, 2 ] } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "residential_3x3_solar", + "object": { "mapgensize": [ 3, 3 ], "place_furniture": [ { "furn": "f_solar_unit", "x": [ 0, 2 ], "y": [ 0, 2 ] } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "industrial_1x5_solar", + "object": { "mapgensize": [ 5, 5 ], "place_furniture": [ { "furn": "f_solar_unit", "x": [ 0, 4 ], "y": 0 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "industrial_1x1_solar", + "object": { "mapgensize": [ 1, 1 ], "place_furniture": [ { "furn": "f_solar_unit", "x": 0, "y": 0 } ] } } ] diff --git a/data/json/mapgen/nursing_home.json b/data/json/mapgen/nursing_home.json index 8d02dc74b0a4c..f8b33df7bdb37 100644 --- a/data/json/mapgen/nursing_home.json +++ b/data/json/mapgen/nursing_home.json @@ -445,7 +445,7 @@ "-............................................................- ", "-................................ЯЯ.........&.&..............- ", "-................................ЯЯ..........................- ", - "-..............................................MM............- ", + "-...............................................1............- ", "-....................................................&&......- ", "-............................................................- ", "-............................................................- ", @@ -473,7 +473,7 @@ "-....................- --------------#v# -........oooo........-", "-....................--------5................----5........oooo........-", "-..........................................................oooo........-", - "-......MM..................................................oooo........-", + "-......1...................................................oooo........-", "-......................................................................-", "-......................................................................-", "-..........................oooo.oooooooo.oooo.....NN...................-", diff --git a/data/json/mapgen/office_cubical.json b/data/json/mapgen/office_cubical.json index 6f15f99056dfa..e6ed01f5a12b0 100644 --- a/data/json/mapgen/office_cubical.json +++ b/data/json/mapgen/office_cubical.json @@ -87,7 +87,7 @@ " -......--------......- ", " -..U.................- ", " -........oooo........- ", - " -........oooo....M...- ", + " -........oooo....K...- ", " -..Z.....oooo........- ", " -........oooo........- ", " -....................- ", @@ -109,7 +109,7 @@ "palettes": [ "roof_palette" ], "nested": { "U": { "chunks": [ "roof_2x2_infrastructure" ] }, - "M": { "chunks": [ "roof_2x2_infrastructure_1" ] }, + "K": { "chunks": [ "roof_2x2_infrastructure_1" ] }, "Z": { "chunks": [ "roof_2x2_infrastructure_2" ] } }, "place_nested": [ @@ -230,7 +230,7 @@ " -....................- ", " -....................--", " -.....................-", - " -.................M...-", + " -.............K.......-", " -.....................-", " -....Z...............--", " -....................- ", @@ -240,7 +240,7 @@ "palettes": [ "roof_palette" ], "nested": { "U": { "chunks": [ "roof_2x2_infrastructure" ] }, - "M": { "chunks": [ "roof_2x2_infrastructure_1" ] }, + "K": { "chunks": [ "roof_2x2_infrastructure_1" ] }, "Z": { "chunks": [ "roof_2x2_infrastructure_2" ] } }, "place_nested": [ diff --git a/data/json/mapgen/office_small.json b/data/json/mapgen/office_small.json index 7da2e19b77820..4de59879a8e7e 100644 --- a/data/json/mapgen/office_small.json +++ b/data/json/mapgen/office_small.json @@ -111,7 +111,7 @@ "-......................-", "-......................-", "-......................-", - "-........M.............-", + "-........K.............-", "---..................---", " -..............%%%%- ", " -..............+*v%- ", @@ -131,7 +131,7 @@ "terrain": { "%": "t_brick_wall", "+": "t_door_c", "*": "t_concrete" }, "nested": { "U": { "chunks": [ "roof_2x2_infrastructure" ] }, - "M": { "chunks": [ "roof_2x2_infrastructure_1" ] }, + "K": { "chunks": [ "roof_2x2_infrastructure_1" ] }, "Z": { "chunks": [ "roof_2x2_infrastructure_2" ] } }, "place_nested": [ diff --git a/data/json/mapgen/parking_garage.json b/data/json/mapgen/parking_garage.json index 409ec81cc1337..a7b2312f0d38c 100644 --- a/data/json/mapgen/parking_garage.json +++ b/data/json/mapgen/parking_garage.json @@ -243,13 +243,13 @@ "-.......- ", "-.......- ", "--......... ", - " -.MM.MM... ", - " -.MM.MM... ", + " -.1....... ", " -......... ", " -......... ", " -......... ", - " -.MM.MM... ", - " -.MM.MM... ", + " -......... ", + " -....1.... ", + " -......... ", "--......... ", "-.......- ", "-.......- ", diff --git a/data/json/mapgen/s_icecream.json b/data/json/mapgen/s_icecream.json index d2b6bf7d0880d..43d62a93a4896 100644 --- a/data/json/mapgen/s_icecream.json +++ b/data/json/mapgen/s_icecream.json @@ -124,12 +124,12 @@ " ", " ", " ------- ", - " -.....- M ", - " -.....- M ", + " -.....- ", + " -.....- ", " -.....-------------- ", " -..................- ", " -..................- ", - " -.................&- ", + " -......1..........&- ", " -..................- ", " -..................- ", " -5------------.....- ", diff --git a/data/json/mapgen/shelter.json b/data/json/mapgen/shelter.json index 8a0b08c9c6007..5d00a4a620acb 100644 --- a/data/json/mapgen/shelter.json +++ b/data/json/mapgen/shelter.json @@ -82,8 +82,8 @@ " ", " ", " ---------------- ", - " -............M.- ", " -..............- ", + " -.........2....- ", " -..............- ", " -..............- ", " -..............- ", @@ -164,9 +164,9 @@ " -.........v....- ", " -..............- ", " -.......&......- ", + " -..........2...- ", " -..............- ", - " -..............- ", - " -............M.5 ", + " -..............5 ", " ---------------- " ], "palettes": [ "roof_palette" ], @@ -223,9 +223,9 @@ " ", " ---------- ", " ---------........- ", - " -v.....M.........- ", + " -v...............- ", " -................- ", - " --................-- ", + " --.....2..........-- ", " -..................- ", " -..................- ", " -..................- ", diff --git a/data/json/mapgen/station_radio.json b/data/json/mapgen/station_radio.json index b3b8dbda8d99b..bf60f8d51d4f0 100644 --- a/data/json/mapgen/station_radio.json +++ b/data/json/mapgen/station_radio.json @@ -117,15 +117,15 @@ " -...................- ", " -...................- ", " ----###-----........- ", - " #v# -.......=- ", + " #v# -..1....=- ", " -........- ", - " R,aaaR -.MHЯ.---- ", + " R,aaaR -..HЯ.---- ", " , a,≷a -.....- ", " , aaaa ------5 ", " , , ", " , , ....... ", " R,,,,R ....X.. ", - " ..M.... ", + " ....... ", " ....... ", " " ], @@ -363,8 +363,8 @@ " ------------------ ", " -............=...- ", " -.X.X............5-- ", - " -..................- ", - " -.X.X...........M..- ", + " -.............1....- ", + " -.X.X..............- ", " -.......&.......HЯ.- ", " -..................- ", " -.............------ ", @@ -379,7 +379,7 @@ " -...:...- ..... ", " -.......## ..... ", " -.......#v ..X.. ", - " -.......## ..M.. ", + " -.......## .1... ", " --------- ..... ", " ..... ", " " diff --git a/data/json/mapgen/zoo.json b/data/json/mapgen/zoo.json index b98510084f94d..751b265977106 100644 --- a/data/json/mapgen/zoo.json +++ b/data/json/mapgen/zoo.json @@ -276,7 +276,7 @@ " -...........- ", " -...........- ", " ----- -...........- ", - " -...- -......M....- ", + " -...- -......2....- ", " -...- -...........- ", " -...- -...........- ", " -..A- -......A....- ", @@ -305,7 +305,7 @@ " -..................- ", " -..................- ", " -..................- ", - " -...........M......- ", + " -...........2......- ", " -..................- ", " -..................- ", " -..................- ", @@ -350,7 +350,7 @@ " -........- ", " 5-------------..------5 ", " -...............- ", - " -.......MM......- ", + " -.......1.......- ", " -...............- ", " -....X....:.....-------5 ", " -......................- ", diff --git a/data/json/mapgen_palettes/roof_palette.json b/data/json/mapgen_palettes/roof_palette.json index a6302a035825c..718640e8de397 100644 --- a/data/json/mapgen_palettes/roof_palette.json +++ b/data/json/mapgen_palettes/roof_palette.json @@ -55,6 +55,10 @@ }, "liquids": { "Я": { "liquid": "water_clean", "amount": [ 0, 300 ] } }, "nested": { + "1": { + "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ] + }, + "2": { "chunks": [ "industrial_1x1_solar" ] }, "5": { "chunks": [ [ "null", 90 ], [ "roof_1x1_birdnest", 10 ] ] }, "-": { "chunks": [ [ "null", 1000 ], [ "roof_1x1_birdnest", 5 ] ] } },