From df987e1da6af868aaa7dad3fcf7df15635122f29 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Mon, 29 Apr 2019 11:59:52 +0200 Subject: [PATCH 1/2] Lint json --- .../2story_houses/2storyA_basement_00.json | 73 +++++++++--------- .../2story_houses/2storyA_basement_01.json | 73 +++++++++--------- .../2story_houses/2storyA_basement_02.json | 73 +++++++++--------- .../2story_houses/2storyA_basement_03.json | 73 +++++++++--------- .../2story_houses/2storyA_basement_04.json | 73 +++++++++--------- .../2story_houses/2storyA_basement_05.json | 73 +++++++++--------- .../2story_houses/2storyA_first_00.json | 73 +++++++++--------- .../2story_houses/2storyA_first_01.json | 73 +++++++++--------- .../2story_houses/2storyA_first_02.json | 73 +++++++++--------- .../2story_houses/2storyA_first_03.json | 73 +++++++++--------- .../2story_houses/2storyA_first_04.json | 73 +++++++++--------- .../2story_houses/2storyA_first_05.json | 73 +++++++++--------- .../2story_houses/2storyA_roof_00.json | 75 +++++++++---------- .../2story_houses/2storyA_roof_01.json | 75 +++++++++---------- .../2story_houses/2storyA_second_00.json | 75 +++++++++---------- .../2story_houses/2storyA_second_01.json | 73 +++++++++--------- .../2story_houses/2storyA_second_02.json | 73 +++++++++--------- .../2story_houses/2storyA_second_03.json | 73 +++++++++--------- .../2story_houses/2storyA_second_04.json | 73 +++++++++--------- .../2story_houses/2storyA_second_05.json | 75 +++++++++---------- 20 files changed, 704 insertions(+), 764 deletions(-) diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_00.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_00.json index e663c3f7c4ac5..029583e427f0d 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_00.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_00.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_basement", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "########################", - "########################", - "##====================##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= << =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##====================##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "lower_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_basement", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "########################", + "########################", + "##====================##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= << =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##====================##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "lower_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_01.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_01.json index d2d857b0f9486..fc3eb72a29b7e 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_01.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_01.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_basement", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "########################", - "########################", - "##====================##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= << =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##====================##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "lower_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_basement", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "########################", + "########################", + "##====================##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= << =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##====================##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "lower_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_02.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_02.json index d2d857b0f9486..fc3eb72a29b7e 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_02.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_02.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_basement", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "########################", - "########################", - "##====================##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= << =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##====================##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "lower_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_basement", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "########################", + "########################", + "##====================##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= << =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##====================##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "lower_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_03.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_03.json index d2d857b0f9486..fc3eb72a29b7e 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_03.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_03.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_basement", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "########################", - "########################", - "##====================##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= << =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##====================##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "lower_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_basement", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "########################", + "########################", + "##====================##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= << =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##====================##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "lower_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_04.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_04.json index d2d857b0f9486..fc3eb72a29b7e 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_04.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_04.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_basement", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "########################", - "########################", - "##====================##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= << =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##====================##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "lower_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_basement", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "########################", + "########################", + "##====================##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= << =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##====================##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "lower_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_05.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_05.json index d2d857b0f9486..fc3eb72a29b7e 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_05.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_05.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_basement", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "########################", - "########################", - "##====================##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= << =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##====================##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "lower_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_basement", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "########################", + "########################", + "##====================##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= << =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##====================##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "lower_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_00.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_00.json index 34a6c1cfef4c8..cbbf354db8e47 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_00.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_00.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_first", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "##====================##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##=<< =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= >> =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##====================##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_first", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "##====================##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##=<< =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= >> =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##====================##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_01.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_01.json index 70ad229d4cf2c..d8902ce2b338c 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_01.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_01.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_first", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "#######Ww###############", - "#######WW###############", - "######WWWW##############", - "##===w=++=w=======w===##", - "##=b b|l ~~=##", - "##w + w##", - "##w -------- |ss &=##", - "##= |d b| ------=##", - "##=<<| BB | AAAb=##", - "##=--| Bb | =##", - "##=dd| |a =##", - "##w + + A=##", - "##=--| TT | A=##", - "##=L | cTTc |>> A=##", - "##=-+---------- =##", - "##=U R|p g##", - "##=o C TTTTTTc g##", - "##=s C TTTTTT *##", - "##=C c g##", - "##=CCCC|p =##", - "##=========gggggg*gg==##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_first", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "#######Ww###############", + "#######WW###############", + "######WWWW##############", + "##===w=++=w=======w===##", + "##=b b|l ~~=##", + "##w + w##", + "##w -------- |ss &=##", + "##= |d b| ------=##", + "##=<<| BB | AAAb=##", + "##=--| Bb | =##", + "##=dd| |a =##", + "##w + + A=##", + "##=--| TT | A=##", + "##=L | cTTc |>> A=##", + "##=-+---------- =##", + "##=U R|p g##", + "##=o C TTTTTTc g##", + "##=s C TTTTTT *##", + "##=C c g##", + "##=CCCC|p =##", + "##=========gggggg*gg==##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_02.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_02.json index 9d5a3da6f2ddc..a3f618f797e1b 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_02.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_02.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_first", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "################W#######", - "################W#######", - "################W#######", - "##==============+=ww==##", - "##=CCCoCsCUU L| b=##", - "##=C L| w##", - "##=R L| =##", - "##=--- ------ w##", - "##=<<| A =##", - "##= | TTTc A w##", - "##= | TTT A =##", - "##= a b=##", - "##=------- ------+--=##", - "##=p BBd| |>>|b =##", - "##wD + | |b c w##", - "##=Dc d| | |b DD=##", - "##=------| ------=##", - "##= B + + B=##", - "##w B |-----|T Bw##", - "##=b + d|d + d=##", - "##===ww===========ww==##", - "###########II###########", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_first", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "################W#######", + "################W#######", + "################W#######", + "##==============+=ww==##", + "##=CCCoCsCUU L| b=##", + "##=C L| w##", + "##=R L| =##", + "##=--- ------ w##", + "##=<<| A =##", + "##= | TTTc A w##", + "##= | TTT A =##", + "##= a b=##", + "##=------- ------+--=##", + "##=p BBd| |>>|b =##", + "##wD + | |b c w##", + "##=Dc d| | |b DD=##", + "##=------| ------=##", + "##= B + + B=##", + "##w B |-----|T Bw##", + "##=b + d|d + d=##", + "##===ww===========ww==##", + "###########II###########", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_03.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_03.json index 75747f78abc6e..dc4802578d8c0 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_03.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_03.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_first", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "####W###################", - "####WWWWWWW#############", - "##########W#############", - "##========+===========##", - "##=& l| b| BB=##", - "##= + + BB=##", - "##=S ss| |T =##", - "##=----- ------+-=##", - "##=<< |d d=##", - "##=---------- ----=##", - "HH=b TTTT b=##", - "HH= a nw##", - "##w ---- nw##", - "##w A|>> b=##", - "##= A|----++--=##", - "##=b AAA p| =##", - "##=---------| c =##", - "##=L|CosCUUR| TTTT w##", - "##= + + c =##", - "##=L| T| p=##", - "##===w=w=w=w====ww====##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_first", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "####W###################", + "####WWWWWWW#############", + "##########W#############", + "##========+===========##", + "##=& l| b| BB=##", + "##= + + BB=##", + "##=S ss| |T =##", + "##=----- ------+-=##", + "##=<< |d d=##", + "##=---------- ----=##", + "HH=b TTTT b=##", + "HH= a nw##", + "##w ---- nw##", + "##w A|>> b=##", + "##= A|----++--=##", + "##=b AAA p| =##", + "##=---------| c =##", + "##=L|CosCUUR| TTTT w##", + "##= + + c =##", + "##=L| T| p=##", + "##===w=w=w=w====ww====##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_04.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_04.json index 16c356bd22310..dd7aa05a6c465 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_04.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_04.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_first", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "##====ww====++===ww===##", - "##=a TT b| |i cD=##", - "##w Dw##", - "##= AAA b| |bbbbbb=##", - "##=--------- -------=##", - "##w<< |RCCCU=##", - "##=-------- | =##", - "##=M BB d| C=##", - "##w z BB | o=##", - "##w + | s=##", - "##= llll| >>|UUU C=##", - "##=-+------ |-----=##", - "##= | |dd b=##", - "##=dd| + =##", - "##=---+--- ---| BB =##", - "##=S s| |dd| BB =##", - "##=& s| | + d=##", - "##========++==========##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_first", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "##====ww====++===ww===##", + "##=a TT b| |i cD=##", + "##w Dw##", + "##= AAA b| |bbbbbb=##", + "##=--------- -------=##", + "##w<< |RCCCU=##", + "##=-------- | =##", + "##=M BB d| C=##", + "##w z BB | o=##", + "##w + | s=##", + "##= llll| >>|UUU C=##", + "##=-+------ |-----=##", + "##= | |dd b=##", + "##=dd| + =##", + "##=---+--- ---| BB =##", + "##=S s| |dd| BB =##", + "##=& s| | + d=##", + "##========++==========##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_05.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_05.json index 89485acb09f23..626b60b52b548 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_05.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_05.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_first", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "#####WW#################", - "#####WW#################", - "#####WW#################", - "##===++===============##", - "##=p |b BB|DDD=##", - "##= b|d BB| c =##", - "##= b| | i=##", - "##= b| c =##", - "##=<< + TTT =##", - "##=-- a---------+-=##", - "##=A bbbb|l|d d=##", - "##=A |+----=##", - "##=A + ~~w##", - "##= AAA >>|ss &=##", - "##=-------- --------=##", - "##=C R| p=##", - "##=s C | TTT g##", - "##=o C TTT c c g##", - "##=C C | g##", - "##=U cT|C c p=##", - "##==========gggggggg==##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_first", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "#####WW#################", + "#####WW#################", + "#####WW#################", + "##===++===============##", + "##=p |b BB|DDD=##", + "##= b|d BB| c =##", + "##= b| | i=##", + "##= b| c =##", + "##=<< + TTT =##", + "##=-- a---------+-=##", + "##=A bbbb|l|d d=##", + "##=A |+----=##", + "##=A + ~~w##", + "##= AAA >>|ss &=##", + "##=-------- --------=##", + "##=C R| p=##", + "##=s C | TTT g##", + "##=o C TTT c c g##", + "##=C C | g##", + "##=U cT|C c p=##", + "##==========gggggggg==##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_roof_00.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_roof_00.json index 08e345dc8dee1..7fa350559234f 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_roof_00.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_roof_00.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_roof", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - "########################", - "########################", - "########################", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_roof", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + "########################", + "########################", + "########################", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_roof_01.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_roof_01.json index 4945fdb7d4170..455d81d886c63 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_roof_01.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_roof_01.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_roof", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - "########################", - "########################", - "########################", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_roof", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + "########################", + "########################", + "########################", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_00.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_00.json index a08705053426e..d7f6a46a56ee2 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_00.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_00.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_second", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "##====================##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##=>> =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##= =##", - "##====================##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_second", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "##====================##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##=>> =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##= =##", + "##====================##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_01.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_01.json index 7351e4d56a5b9..91d1524974712 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_01.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_01.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_second", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "##====================##", - "##=dBdB +d|Tc cD=##", - "##= B B |-| BB D=##", - "##= |d+ ------=##", - "##=----------+-|S ~~=##", - "##w>> + =##", - "##= |ss &=##", - "##=--+------ -------=##", - "##= +d| | d=##", - "##wD +d| | BB =##", - "##=D BB |--++- BB =##", - "##wc BB |d+ =##", - "##= |d+ TTT c7=##", - "##=++=ww==============##", - "##FrrrrrrFrrrrrrrrrrrr##", - "##FrrrrrrFrrrrrrrrrrrr##", - "##FrrrrrrFrrrrrrrrrrrr##", - "##ffffffffrrrrrrrrrrrr##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_second", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "##====================##", + "##=dBdB +d|Tc cD=##", + "##= B B |-| BB D=##", + "##= |d+ ------=##", + "##=----------+-|S ~~=##", + "##w>> + =##", + "##= |ss &=##", + "##=--+------ -------=##", + "##= +d| | d=##", + "##wD +d| | BB =##", + "##=D BB |--++- BB =##", + "##wc BB |d+ =##", + "##= |d+ TTT c7=##", + "##=++=ww==============##", + "##FrrrrrrFrrrrrrrrrrrr##", + "##FrrrrrrFrrrrrrrrrrrr##", + "##FrrrrrrFrrrrrrrrrrrr##", + "##ffffffffrrrrrrrrrrrr##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_02.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_02.json index 3b2ecf50efca1..f0fa3d882d7cc 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_02.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_02.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_second", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "##==w=w=w=w=w===wwww==##", - "##=p p=##", - "##= =##", - "##w --+--------+-- =##", - "##w |s |d d| | w##", - "##=>>| s|-+-|T B| =##", - "##=--| | b| B| w##", - "##=dd|S &|B | | =##", - "##=++-----B |--+-| =##", - "##= b| |d d| w##", - "##w BB |-+------- =##", - "##w BB + w##", - "##=p | =##", - "##==www=====w===w==++=##", - "##FrrrrrrrrrrrrrrrrrrF##", - "##FrrrcrcrrrrrrrrrrrrF##", - "##FrcrrrrcrrrrrrrrrrrF##", - "##ffffffffffffffffffff##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_second", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "##==w=w=w=w=w===wwww==##", + "##=p p=##", + "##= =##", + "##w --+--------+-- =##", + "##w |s |d d| | w##", + "##=>>| s|-+-|T B| =##", + "##=--| | b| B| w##", + "##=dd|S &|B | | =##", + "##=++-----B |--+-| =##", + "##= b| |d d| w##", + "##w BB |-+------- =##", + "##w BB + w##", + "##=p | =##", + "##==www=====w===w==++=##", + "##FrrrrrrrrrrrrrrrrrrF##", + "##FrrrcrcrrrrrrrrrrrrF##", + "##FrcrrrrcrrrrrrrrrrrF##", + "##ffffffffffffffffffff##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_03.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_03.json index 1733d985cfffa..91bd6614a1ffb 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_03.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_03.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_second", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "##===ww====ww====ww===##", - "##= s| |D BB =##", - "##=*|~~ + |D BB w##", - "##=&|~~ M| | =##", - "##=-------- --+----+=##", - "##w>> |d| =##", - "##w | |d=##", - "##=----+--- -----+--=##", - "##w d | |DD b=##", - "##=BB T| | b=##", - "##=BB cT| + BB b=##", - "##w T|--| BB b=##", - "##=p + d|d p=##", - "##====================##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_second", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "##===ww====ww====ww===##", + "##= s| |D BB =##", + "##=*|~~ + |D BB w##", + "##=&|~~ M| | =##", + "##=-------- --+----+=##", + "##w>> |d| =##", + "##w | |d=##", + "##=----+--- -----+--=##", + "##w d | |DD b=##", + "##=BB T| | b=##", + "##=BB cT| + BB b=##", + "##w T|--| BB b=##", + "##=p + d|d p=##", + "##====================##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_04.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_04.json index df827af86d740..38ac788956796 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_04.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_04.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_second", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "##===www==www===www===##", - "##=n L=##", - "##w ZZZ ZZZ C L=##", - "##= ZZZ ZZZ C L=##", - "##= C L=##", - "##w>> a AAA C R=##", - "##= ---------+-----=##", - "##= |T BBd|d w##", - "##w + BB |T BB=##", - "##= | | BB=##", - "##=-+----+---| -+--=##", - "##w | |d + c | s=##", - "##=S ss&|d|d |7DD|& S=##", - "##==w=========www==w==##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_second", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "##===www==www===www===##", + "##=n L=##", + "##w ZZZ ZZZ C L=##", + "##= ZZZ ZZZ C L=##", + "##= C L=##", + "##w>> a AAA C R=##", + "##= ---------+-----=##", + "##= |T BBd|d w##", + "##w + BB |T BB=##", + "##= | | BB=##", + "##=-+----+---| -+--=##", + "##w | |d + c | s=##", + "##=S ss&|d|d |7DD|& S=##", + "##==w=========www==w==##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_05.json b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_05.json index 50097c11835d9..3ecfc0e7bdc9d 100644 --- a/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_05.json +++ b/data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_05.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "2storyA_second", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "##====ww=ww===w==w====##", - "##=d| BB|b BB |d=##", - "##= + BB| + =##", - "##=d|b d| TTT|d=##", - "##=------+---+-------=##", - "##=>> |l ~~=##", - "##= + =##", - "##=---bb |ss --=##", - "##=dd|---+-- |----|d=##", - "##=++|b | + p-+=##", - "##= | | =##", - "##=D BB | |Tc BB w##", - "##=c BB d| |T BBd=##", - "##===ww=====ww===w====##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "##rrrrrrrrrrrrrrrrrrrr##", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "2storyA_second", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "##====ww=ww===w==w====##", + "##=d| BB|b BB |d=##", + "##= + BB| + =##", + "##=d|b d| TTT|d=##", + "##=------+---+-------=##", + "##=>> |l ~~=##", + "##= + =##", + "##=---bb |ss --=##", + "##=dd|---+-- |----|d=##", + "##=++|b | + p-+=##", + "##= | | =##", + "##=D BB | |Tc BB w##", + "##=c BB d| |T BBd=##", + "##===ww=====ww===w====##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "##rrrrrrrrrrrrrrrrrrrr##", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] From c815c7c304dcea30afdd9c897bec743ba543a5e5 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Mon, 29 Apr 2019 12:02:37 +0200 Subject: [PATCH 2/2] Remove from blacklist --- json_blacklist | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/json_blacklist b/json_blacklist index 33bd84e78f6f9..bcb535e433993 100644 --- a/json_blacklist +++ b/json_blacklist @@ -388,26 +388,6 @@ data/mods/More_Locations/military_outpost/mil_outpost_yre_00.json data/mods/More_Locations/military_outpost/mil_outpost_yte_00.json data/mods/More_Locations/military_outpost/mil_outpost_ytlc_00.json data/mods/More_Locations/military_outpost/mil_outpost_ytrc_00.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_00.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_01.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_02.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_03.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_04.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_basement_05.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_00.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_01.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_02.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_03.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_04.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_first_05.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_roof_00.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_roof_01.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_00.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_01.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_02.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_03.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_04.json -data/mods/More_Locations/multistory_houses/2story_houses/2storyA_second_05.json data/mods/More_Locations/multistory_houses/2story_houses/2storyB_basement_00.json data/mods/More_Locations/multistory_houses/2story_houses/2storyB_basement_01.json data/mods/More_Locations/multistory_houses/2story_houses/2storyB_basement_02.json