From 3920142bbe4b2c6315604a98efa74ecfbc5de2a8 Mon Sep 17 00:00:00 2001 From: RandDenner <73523034+RandDenner@users.noreply.github.com> Date: Fri, 3 Sep 2021 20:09:27 -0400 Subject: [PATCH] Street facing churches (#51224) * Street facing churches Reverse facing of churches so their entrance faces the street. * Update church.json Missed a comma I should have moved * Update church.json Roof edges fixed * Update church.json Test for fixing JSON validation issue * Update church.json Checking if the original even passes the JSON validation * Update church.json Reverting to the fixed version after confirming that original couldn't pass the JSON style check either. * Update church.json All fixed and everything spawns correctly. Let's see if this passes checks. * Add files via upload Seeing if uploading the json as a file solves the check failures. * Add files via upload Uploading file with unix EOL formatting * Update church.json to re-initialize the stuck checker Just extended the hedges a bit. --- data/json/mapgen/church.json | 202 +++++++++++++++++------------------ 1 file changed, 101 insertions(+), 101 deletions(-) diff --git a/data/json/mapgen/church.json b/data/json/mapgen/church.json index 3e97ca72ff59b..15a68a5d3db09 100644 --- a/data/json/mapgen/church.json +++ b/data/json/mapgen/church.json @@ -6,32 +6,32 @@ "//": "New England Church", "weight": 1000, "object": { - "fill_ter": "t_dirt", + "fill_ter": "t_region_groundcover_urban", "rows": [ - " ^^^^^^ ", - " |---|--------| ", - " ||dhy|.6ooo.ll|| ", - " |W...+.........Dsss ", - " ^^|--+-|------+--|^^s ", - " ^||yy...rrrr...yy||^s ", - " wp...b.rttr.b....w s ", - " |......rrrr......| s ", + " ^^ ss ^^ s ", + " ^^ ss ^^ s ", + " O ss O s ", + " |----++-|--| s ", + " ^|....rr.+..|^ s ", + " ^^|ll| <#..3 ", + " |22|..#____#..3223 ", + " |.....######.....3 ", " |................3 ", " |................3 ", " |................3 ", @@ -87,13 +89,11 @@ " |................3 ", " |................3 ", " |................3 ", - " |.....######.....3 ", - " |--|..#____#..3--3 ", - " |..#> <#..3 ", - " |..#____#..3 ", - " |--######--3 ", - " O O ", - " ", + " ||..............33 ", + " |..............3 ", + " |..............3 ", + " ||............33 ", + " |------------3 ", " " ], "palettes": [ "roof_palette" ], @@ -117,6 +117,11 @@ " ", " ", " ", + " ##oo## ", + " #____# ", + " o> o ", + " #____# ", + " ##oo## ", " ", " ", " ", @@ -166,11 +171,6 @@ " ", " ", " ", - " ##oo## ", - " #____# ", - " o_ >o ", - " #____# ", - " ##oo## ", " ", " ", " " @@ -189,6 +189,11 @@ " ", " ", " ", + " ...... ", + " ...... ", + " ...... ", + " ...... ", + " ...... ", " ", " ", " ", @@ -202,11 +207,6 @@ " ", " ", " ", - " ...... ", - " ...... ", - " ...... ", - " ...... ", - " ...... ", " ", " ", " " @@ -222,32 +222,32 @@ "//": "Gothic Church", "weight": 1000, "object": { - "fill_ter": "t_dirt", + "fill_ter": "t_region_groundcover_urban", "rows": [ - " $$ W W $$ ", - " $$ WWWWGVBBVGWWWW $$ ", - " W..h.cccc.h..W ", - " WWVWWR..........RWWBWW ", - "WW#.#.R.b..cc..b.R.#.#WW", - " G#.#.R..........R.#.#V ", - " V#.#.Rrrrr..rrrrR.#.#B ", - "WW#..................#WW", - " WW+WW#####..#####WW+WW ", - "ssss V............B ssss", - "s WW#####..#####WW s", + "ssssssssssssssssssssssss", + "s WWWWW ss WWWWW s", + "s WT,WW$$WWssWW$$WW6tW s", + "s W,,WWWWWW++WWWWWW,tW s", + "s W,,+,,,,,,,,,,,,+,,W s", + "s WSyWlll,y,,y,lllW,w ", + " wwwwwDwww++wwwDwwwww ", + " x___wb..bw___x ", + " xx___Bb..bB___xx ", + " xx___Gy..yG___xx ", + " x___ww++ww___x ", " x____________x ", + " xx____________xx ", + " xx____________xx ", + " x___U________x ", " xxxxx____________xxxxx ", - "xx_______U____________xx", + "xx____________________xx", " x____________________x ", " x____________________x ", "xx____________________xx", " xxxxx____________xxxxx ", " x____________x ", - " xx____________xx ", - " xx____________xx ", - " x____________x ", - " x___ww++ww___x ", - " xx___Gy..yG___xx ", - " xx___Bb..bB___xx ", - " x___wb..bw___x ", - " wwwwwDwww++wwwDwwwww ", - " wHHHHywy....ywyff<>w ", - " w...c.+......+.....w ", - " B.h...wywBBwywf..h.B ", - " wdddwwwww wwwwwdddw ", - " wGGGw wGGGw ", - " " + " xxxxxxxxxxxxxx ", + " x x " ], "palettes": [ "roof_palette" ], "terrain": { @@ -367,6 +367,16 @@ "fill_ter": "t_floor", "rows": [ " ", + " wBGBw wBGBw ", + " wjt.wwwwwGGwwwwwFecw ", + " Bj..HHwtsssstwth..SB ", + " w.....+......+....cw ", + " wK.ytmw.mttm.w.y.>.w ", + " wwwDwwwwwDDwwwwwDwww ", + " x____x ", + " x____x ", + " x____x ", + " xxxxxx ", " ", " ", " ", @@ -379,16 +389,6 @@ " ", " ", " ", - " xxxxxx ", - " x____x ", - " x____x ", - " x____x ", - " wwwDwwwwwDDwwwwwDwww ", - " wK.ytmw.mttm.w.y.>.w ", - " w.....+......+....cw ", - " Bj..HHwtsssstwth..SB ", - " wjt.wwwwwGGwwwwwFecw ", - " wBGBw wBGBw ", " " ], "palettes": [ "roof_palette" ], @@ -431,6 +431,12 @@ "fill_ter": "t_rock_floor_no_roof", "rows": [ " ", + " xxxxx xxxxx ", + " x...xxxxxxxxxxxx...x ", + " x.........:........x ", + " x..X............A..x ", + " x..................x ", + " xxxxxxxxxxxxxxxxxxxx ", " ", " ", " ", @@ -447,12 +453,6 @@ " ", " ", " ", - " xxxxxxxxxxxxxxxxxxxx ", - " x..................x ", - " x..X............A..x ", - " x.........:........x ", - " x...xxxxxxxxxxxx...x ", - " xxxxx xxxxx ", " " ], "palettes": [ "roof_palette" ],