From e58c9d755223e92441c6d46533ccef8f8b4ea1a8 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Tue, 30 Apr 2019 01:52:48 +0200 Subject: [PATCH] Lint json --- .../combo_garages/combogarageA_first_00.json | 78 ++++++++--------- .../combo_garages/combogarageA_first_01.json | 82 ++++++++--------- .../combo_garages/combogarageA_first_02.json | 87 +++++++++---------- .../combo_garages/combogarageA_roof_00.json | 75 ++++++++-------- .../combo_garages/combogarageA_roof_01.json | 75 ++++++++-------- .../combo_garages/combogarageA_second_00.json | 75 ++++++++-------- .../combo_garages/combogarageA_second_01.json | 73 ++++++++-------- .../combo_garages/combogarageA_second_02.json | 75 ++++++++-------- .../combo_garages/combogarageB_first_00.json | 82 ++++++++--------- .../combo_garages/combogarageB_first_01.json | 86 ++++++++---------- .../combo_garages/combogarageB_first_02.json | 86 ++++++++---------- .../combo_garages/combogarageB_roof_00.json | 75 ++++++++-------- .../combo_garages/combogarageB_roof_01.json | 75 ++++++++-------- .../combo_garages/combogarageB_second_00.json | 75 ++++++++-------- .../combo_garages/combogarageB_second_01.json | 75 ++++++++-------- .../combo_garages/combogarageB_second_02.json | 73 ++++++++-------- .../combo_garages/combogarageC_first_00.json | 77 ++++++++-------- .../combo_garages/combogarageC_first_01.json | 77 ++++++++-------- .../combo_garages/combogarageC_first_02.json | 77 ++++++++-------- .../combo_garages/combogarageC_roof_00.json | 75 ++++++++-------- .../combo_garages/combogarageC_roof_01.json | 75 ++++++++-------- .../combo_garages/combogarageC_second_00.json | 75 ++++++++-------- .../combo_garages/combogarageC_second_01.json | 75 ++++++++-------- .../combo_garages/combogarageC_second_02.json | 75 ++++++++-------- .../combohouseA_basement_00.json | 73 ++++++++-------- json_blacklist | 25 ------ 26 files changed, 907 insertions(+), 1044 deletions(-) diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_00.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_00.json index 1c6dfb6878f3f..933525aac8ff5 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_00.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_00.json @@ -1,45 +1,39 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageA_first", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "###,,,,,,,,#############", - "###,,,,,,,,#############", - "###,,,,,,,,#############", - "###,,,,,,,,#############", - "###,,,,,,,,#############", - "=== ====#########", - " =#########", - " =#########", - " =#########", - " =#########", - " =#########", - " =#########", - " =#########", - " =#########", - "--------------=#########", - " =#########", - " =#########", - "===============#########", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ], - "terrain":{ - " ": "t_concrete_floor", - ",": "t_pavement" - } - } + { + "type": "mapgen", + "om_terrain": "combogarageA_first", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "###,,,,,,,,#############", + "###,,,,,,,,#############", + "###,,,,,,,,#############", + "###,,,,,,,,#############", + "###,,,,,,,,#############", + "=== ====#########", + " =#########", + " =#########", + " =#########", + " =#########", + " =#########", + " =#########", + " =#########", + " =#########", + "--------------=#########", + " =#########", + " =#########", + "===============#########", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ], + "terrain": { " ": "t_concrete_floor", ",": "t_pavement" } } + } ] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_01.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_01.json index d1a9f5fab68b5..571a17dbdadd9 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_01.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_01.json @@ -1,48 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageA_first", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "###,,,,,,,,#############", - "###,,,,,,,,#############", - "###,,,,,,,,#############", - "###,,,,,,,,#############", - "WWW,,,,,,,,WWWWW########", - "=== ====W########", - "L LL=W########", - " =W########", - " =W########", - " v =W########", - " =W########", - " =W########", - " =W########", - " =W########", - "-----------++-=W########", - " c a c|s l=W########", - " |& l=W########", - "=gg==gggg======W########", - "#,,,,,,,,,,,,WWW########", - "#,,,,,,,,,,,,###########", - "#,,,,,,,,,,,,###########", - "#,,,,,,,,,,,,###########", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ], - "terrain":{ - " ": "t_concrete_floor", - ",": "t_pavement" - }, - "vehicles": { - "v": { "vehicle": "car_mini", "chance": 70, "fuel": 50, "status": 1 } - } - } + { + "type": "mapgen", + "om_terrain": "combogarageA_first", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "###,,,,,,,,#############", + "###,,,,,,,,#############", + "###,,,,,,,,#############", + "###,,,,,,,,#############", + "WWW,,,,,,,,WWWWW########", + "=== ====W########", + "L LL=W########", + " =W########", + " =W########", + " v =W########", + " =W########", + " =W########", + " =W########", + " =W########", + "-----------++-=W########", + " c a c|s l=W########", + " |& l=W########", + "=gg==gggg======W########", + "#,,,,,,,,,,,,WWW########", + "#,,,,,,,,,,,,###########", + "#,,,,,,,,,,,,###########", + "#,,,,,,,,,,,,###########", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ], + "terrain": { " ": "t_concrete_floor", ",": "t_pavement" }, + "vehicles": { "v": { "vehicle": "car_mini", "chance": 70, "fuel": 50, "status": 1 } } } + } ] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_02.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_02.json index deab26a8bde98..48821fdff7124 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_02.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_02.json @@ -1,50 +1,43 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageA_first", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "###,,,,,,,,#######W#####", - "###,,,,,,,,#######W#####", - "###,,,,,,,,#######W#####", - "###,,,,,,,,#######W#####", - "###,,,,,,,,#######W#####", - "=== ====###W#####", - " bb=###W#####", - " =###W#####", - " v =###W#####", - " =###W#####", - " V =###W#####", - " v =###WW####", - " =fffeeff##", - " =######F##", - "---1 1 C=######F##", - " H| C=#^#^##F##", - " + CCCC=#^#^##F##", - "========++=====#^#^##F##", - "#######F#############F##", - "#######e##^#^#^#^#^##F##", - "#######F##^#^#^#^#^##F##", - "#######F#############F##", - "#######fffffffffffffff##", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ], - "terrain":{ - " ": "t_concrete_floor", - "^": "t_dirtmound", - ",": "t_pavement" - }, - "vehicles": { - "V": { "vehicle": "beetle", "chance": 50, "fuel": 50, "status": 1 }, - "v": { "vehicle": "bicycle", "chance": 30, "fuel": 50, "status": 1 } - } - } + { + "type": "mapgen", + "om_terrain": "combogarageA_first", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "###,,,,,,,,#######W#####", + "###,,,,,,,,#######W#####", + "###,,,,,,,,#######W#####", + "###,,,,,,,,#######W#####", + "###,,,,,,,,#######W#####", + "=== ====###W#####", + " bb=###W#####", + " =###W#####", + " v =###W#####", + " =###W#####", + " V =###W#####", + " v =###WW####", + " =fffeeff##", + " =######F##", + "---1 1 C=######F##", + " H| C=#^#^##F##", + " + CCCC=#^#^##F##", + "========++=====#^#^##F##", + "#######F#############F##", + "#######e##^#^#^#^#^##F##", + "#######F##^#^#^#^#^##F##", + "#######F#############F##", + "#######fffffffffffffff##", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ], + "terrain": { " ": "t_concrete_floor", "^": "t_dirtmound", ",": "t_pavement" }, + "vehicles": { + "V": { "vehicle": "beetle", "chance": 50, "fuel": 50, "status": 1 }, + "v": { "vehicle": "bicycle", "chance": 30, "fuel": 50, "status": 1 } + } } + } ] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_roof_00.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_roof_00.json index 4d7b3053c4178..600589d6a48d7 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_roof_00.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_roof_00.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageA_roof", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "########################", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageA_roof", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "########################", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_roof_01.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_roof_01.json index 9abc72b2ec32f..13e1d43ee5af6 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_roof_01.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_roof_01.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageA_roof", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "########################", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "rrrrrrrrrrrrrrr#########", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageA_roof", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "########################", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "rrrrrrrrrrrrrrr#########", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_00.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_00.json index 7e73643941eb1..2ce54a8329134 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_00.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_00.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageA_second", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "########################", - "===============#########", - " =#########", - " =#########", - " =#########", - " =#########", - " =#########", - "-- =#########", - " =#########", - " =#########", - " =#########", - " =#########", - " =#########", - "===============#########", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageA_second", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "########################", + "===============#########", + " =#########", + " =#########", + " =#########", + " =#########", + " =#########", + "-- =#########", + " =#########", + " =#########", + " =#########", + " =#########", + " =#########", + "===============#########", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_01.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_01.json index 230d6c9f9bff8..f690a8055e5cf 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_01.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_01.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageA_second", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "########################", - "--ww-------ww--#########", - " b|i + DDD|#########", - " b|i | c7|#########", - " ---| |#########", - " | |#########", - " + b|#########", - "--+-- | b|#########", - " | |TT b|#########", - " BB|-+-------|#########", - " BB|s S|#########", - " d|--- s|#########", - " d|& + ~~|#########", - "---------------#########", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageA_second", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "########################", + "--ww-------ww--#########", + " b|i + DDD|#########", + " b|i | c7|#########", + " ---| |#########", + " | |#########", + " + b|#########", + "--+-- | b|#########", + " | |TT b|#########", + " BB|-+-------|#########", + " BB|s S|#########", + " d|--- s|#########", + " d|& + ~~|#########", + "---------------#########", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_02.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_02.json index bd2f10c134134..10a7cb94941e0 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_02.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_02.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageA_second", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "########################", - "-ww-----w--w---#########", - " |z z|#########", - " + BB w#########", - " | BB |#########", - " --------++|#########", - " |d d|dd|#########", - "---- |++----|#########", - " | | BB|#########", - " D|L + dw#########", - " cD|L | BB|#########", - " d|L |T dw#########", - " + |T BB|#########", - "-----ww--------#########", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageA_second", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "########################", + "-ww-----w--w---#########", + " |z z|#########", + " + BB w#########", + " | BB |#########", + " --------++|#########", + " |d d|dd|#########", + "---- |++----|#########", + " | | BB|#########", + " D|L + dw#########", + " cD|L | BB|#########", + " d|L |T dw#########", + " + |T BB|#########", + "-----ww--------#########", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_00.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_00.json index 00d7a411b7e36..37f2a9264dfa3 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_00.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_00.json @@ -1,48 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageB_first", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "#,,,,,,,,,##############", - "#,,,,,,,,,##############", - "#,,,,,,,,,##############", - "#,,,,,,,,,##############", - "= ===###########", - " =###########", - " =###########", - " =###########", - " =###########", - " =###########", - " =###########", - " =###########", - " =###########", - " =###########", - "---+--=======###########", - " =#################", - " =#################", - " =#################", - " =#################", - " =#################", - "=======#################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ], - "terrain":{ - " ": "t_concrete_floor", - ",": "t_pavement" - }, - "set": [ - { "square": "terrain", "x": 0, "y": 15, "x2": 5, "y2": 19, "id": "t_floor" } - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageB_first", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "#,,,,,,,,,##############", + "#,,,,,,,,,##############", + "#,,,,,,,,,##############", + "#,,,,,,,,,##############", + "= ===###########", + " =###########", + " =###########", + " =###########", + " =###########", + " =###########", + " =###########", + " =###########", + " =###########", + " =###########", + "---+--=======###########", + " =#################", + " =#################", + " =#################", + " =#################", + " =#################", + "=======#################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ], + "terrain": { " ": "t_concrete_floor", ",": "t_pavement" }, + "set": [ { "square": "terrain", "x": 0, "y": 15, "x2": 5, "y2": 19, "id": "t_floor" } ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_01.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_01.json index e8fb822ee9f85..a9d110bb9e285 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_01.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_01.json @@ -1,51 +1,41 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageB_first", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "#,,,,,,,,,##############", - "#,,,,,,,,,##############", - "#,,,,,,,,,##############", - "#,,,,,,,,,WWWW##########", - "= ===W##########", - " x=W##########", - " x=,,,,,,,,,##", - " x=,,,,,,,,,##", - " v x=,,,,,,,,,##", - " x=7,,,,,,,,##", - " x=,,,,,,,,,##", - " =,,,,,,,,,##", - " =,,,,,,,,,##", - " llCCC=,,,,,,,,,##", - "---+--=======,,,,,,,,,##", - " =#################", - " c =#################", - " TTT w#################", - "cTTT w#################", - " =#################", - "==www==#################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ], - "terrain":{ - " ": "t_concrete_floor", - ",": "t_pavement" - }, - "set": [ - { "square": "terrain", "x": 0, "y": 15, "x2": 5, "y2": 19, "id": "t_floor" } - ], - "vehicles": { - "v": { "vehicle": "car", "chance": 70, "fuel": 50, "status": 1 } - } - } + { + "type": "mapgen", + "om_terrain": "combogarageB_first", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "#,,,,,,,,,##############", + "#,,,,,,,,,##############", + "#,,,,,,,,,##############", + "#,,,,,,,,,WWWW##########", + "= ===W##########", + " x=W##########", + " x=,,,,,,,,,##", + " x=,,,,,,,,,##", + " v x=,,,,,,,,,##", + " x=7,,,,,,,,##", + " x=,,,,,,,,,##", + " =,,,,,,,,,##", + " =,,,,,,,,,##", + " llCCC=,,,,,,,,,##", + "---+--=======,,,,,,,,,##", + " =#################", + " c =#################", + " TTT w#################", + "cTTT w#################", + " =#################", + "==www==#################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ], + "terrain": { " ": "t_concrete_floor", ",": "t_pavement" }, + "set": [ { "square": "terrain", "x": 0, "y": 15, "x2": 5, "y2": 19, "id": "t_floor" } ], + "vehicles": { "v": { "vehicle": "car", "chance": 70, "fuel": 50, "status": 1 } } } + } ] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_02.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_02.json index 7f8ad0af154b2..9982ffaa05317 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_02.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_02.json @@ -1,51 +1,41 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageB_first", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "#,,,,,,,,,#####WW#######", - "#,,,,,,,,,#####WW#######", - "#,,,,,,,,,#####WW#######", - "#,,,,,,,,,#####WW#######", - "= ===ffeeff#####", - " l=#####F#####", - " v =#####F#####", - " =#####F#####", - " =#####F#####", - " =#####F#####", - " b=#####F#####", - " cTb=#####F#####", - " TTb=#####F#####", - " bbbbb=#####F#####", - "---+--=======#####F#####", - " b=###########F#####", - " c w###########F#####", - " +###########F#####", - " w###########F#####", - " lll =###########F#####", - "=======ffffffeeffff#####", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ], - "terrain":{ - " ": "t_concrete_floor", - ",": "t_pavement" - }, - "set": [ - { "square": "terrain", "x": 0, "y": 15, "x2": 5, "y2": 19, "id": "t_floor" } - ], - "vehicles": { - "v": { "vehicle": "car_mini", "chance": 70, "fuel": 50, "status": 1 } - } - } + { + "type": "mapgen", + "om_terrain": "combogarageB_first", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "#,,,,,,,,,#####WW#######", + "#,,,,,,,,,#####WW#######", + "#,,,,,,,,,#####WW#######", + "#,,,,,,,,,#####WW#######", + "= ===ffeeff#####", + " l=#####F#####", + " v =#####F#####", + " =#####F#####", + " =#####F#####", + " =#####F#####", + " b=#####F#####", + " cTb=#####F#####", + " TTb=#####F#####", + " bbbbb=#####F#####", + "---+--=======#####F#####", + " b=###########F#####", + " c w###########F#####", + " +###########F#####", + " w###########F#####", + " lll =###########F#####", + "=======ffffffeeffff#####", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ], + "terrain": { " ": "t_concrete_floor", ",": "t_pavement" }, + "set": [ { "square": "terrain", "x": 0, "y": 15, "x2": 5, "y2": 19, "id": "t_floor" } ], + "vehicles": { "v": { "vehicle": "car_mini", "chance": 70, "fuel": 50, "status": 1 } } } + } ] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_roof_00.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_roof_00.json index c369cf899e59c..c0433a04ad93c 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_roof_00.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_roof_00.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageB_roof", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageB_roof", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_roof_01.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_roof_01.json index f125170b2fa63..d3af71ab62fb8 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_roof_01.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_roof_01.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageB_roof", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "rrrrrrr#################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageB_roof", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "rrrrrrr#################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_00.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_00.json index 87b70bb034db0..eb07e9cb3614b 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_00.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_00.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageB_second", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "-------rrrrrr###########", - " |rrrrrr###########", - " |rrrrrr###########", - " |rrrrrr###########", - " |rrrrrr###########", - " |rrrrrr###########", - " |rrrrrr###########", - " |rrrrrr###########", - "-- |rrrrrr###########", - " |rrrrrr###########", - " |rrrrrr###########", - "-- |#################", - " |#################", - " |#################", - " |#################", - " |#################", - "-------#################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageB_second", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "-------rrrrrr###########", + " |rrrrrr###########", + " |rrrrrr###########", + " |rrrrrr###########", + " |rrrrrr###########", + " |rrrrrr###########", + " |rrrrrr###########", + " |rrrrrr###########", + "-- |rrrrrr###########", + " |rrrrrr###########", + " |rrrrrr###########", + "-- |#################", + " |#################", + " |#################", + " |#################", + " |#################", + "-------#################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_01.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_01.json index f104241d4bd23..0759d73a8f0f6 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_01.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_01.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageB_second", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "--ww---rrrrrr###########", - " T|rrrrrr###########", - " z |rrrrrr###########", - " |rrrrrr###########", - " z wrrrrrr###########", - " wrrrrrr###########", - " z |rrrrrr###########", - " R|rrrrrr###########", - "---+--|rrrrrr###########", - " wrrrrrr###########", - " wrrrrrr###########", - "---+--|#################", - " d|#################", - " BB |#################", - " BB |#################", - " d|#################", - "-------#################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageB_second", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "--ww---rrrrrr###########", + " T|rrrrrr###########", + " z |rrrrrr###########", + " |rrrrrr###########", + " z wrrrrrr###########", + " wrrrrrr###########", + " z |rrrrrr###########", + " R|rrrrrr###########", + "---+--|rrrrrr###########", + " wrrrrrr###########", + " wrrrrrr###########", + "---+--|#################", + " d|#################", + " BB |#################", + " BB |#################", + " d|#################", + "-------#################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_02.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_02.json index 7e5d7f9c22d5d..c5d802909eee8 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_02.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_02.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageB_second", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "--ww---ffffff###########", - " b|rrrrrF###########", - " DDDb|rrrrrF###########", - " c b|rrrrrF###########", - " i|rrrrrF###########", - " i|rrrrrF###########", - " i|rrrrrF###########", - "ii i|rrrrrF###########", - "--+---|rrrrrF###########", - " +rrrrrF###########", - " b|ffffff###########", - "---+--|#################", - " | s|#################", - " | s|#################", - " + |#################", - "C|~~ &|#################", - "-------#################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageB_second", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "--ww---ffffff###########", + " b|rrrrrF###########", + " DDDb|rrrrrF###########", + " c b|rrrrrF###########", + " i|rrrrrF###########", + " i|rrrrrF###########", + " i|rrrrrF###########", + "ii i|rrrrrF###########", + "--+---|rrrrrF###########", + " +rrrrrF###########", + " b|ffffff###########", + "---+--|#################", + " | s|#################", + " | s|#################", + " + |#################", + "C|~~ &|#################", + "-------#################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_00.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_00.json index 7e470801b5adc..5e355c3554734 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_00.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_00.json @@ -1,44 +1,39 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageC_first", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "###########,,,,,,,######", - "###########,,,,,,,######", - "###########,,,,,,,######", - "###########,,,,,,,######", - "==========#,,,,,,,######", - " =#,,,,,,,######", - " ==,,,,,,,==####", - " | =####", - " | =####", - " | =####", - " | =####", - " + =####", - " | =####", - " <<| =####", - "-- ===========####", - " =##############", - " =##############", - " =##############", - " =##############", - " =##############", - "==========##############", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ], - "set": [ - { "square": "terrain", "x": 10, "y": 7, "x2": 18, "y2": 13, "id": "t_concrete_floor" } - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageC_first", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "###########,,,,,,,######", + "###########,,,,,,,######", + "###########,,,,,,,######", + "###########,,,,,,,######", + "==========#,,,,,,,######", + " =#,,,,,,,######", + " ==,,,,,,,==####", + " | =####", + " | =####", + " | =####", + " | =####", + " + =####", + " | =####", + " <<| =####", + "-- ===========####", + " =##############", + " =##############", + " =##############", + " =##############", + " =##############", + "==========##############", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ], + "set": [ { "square": "terrain", "x": 10, "y": 7, "x2": 18, "y2": 13, "id": "t_concrete_floor" } ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_01.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_01.json index b6cdd2e4834a6..2d6b69baec2c6 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_01.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_01.json @@ -1,44 +1,39 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageC_first", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "###########,,,,,,,######", - "###########,,,,,,,######", - "###########,,,,,,,######", - "###########,,,,,,,######", - "===w==ww==#,,,,,,,######", - "a|b DD7=#,,,,,,,######", - " |b c ==,,,,,,,==####", - " |i |L =####", - " -----+--| =####", - " n| | =####", - " n|T T| =####", - " n| + =####", - "-+-- | =####", - " <<|CCC L=####", - "------- ====+======####", - " Bd|ll| =##############", - " B | + w##############", - " |ll| =##############", - " |--| w##############", - " + d| =##############", - "=w=====++=##############", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ], - "set": [ - { "square": "terrain", "x": 10, "y": 7, "x2": 18, "y2": 13, "id": "t_concrete_floor" } - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageC_first", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "###########,,,,,,,######", + "###########,,,,,,,######", + "###########,,,,,,,######", + "###########,,,,,,,######", + "===w==ww==#,,,,,,,######", + "a|b DD7=#,,,,,,,######", + " |b c ==,,,,,,,==####", + " |i |L =####", + " -----+--| =####", + " n| | =####", + " n|T T| =####", + " n| + =####", + "-+-- | =####", + " <<|CCC L=####", + "------- ====+======####", + " Bd|ll| =##############", + " B | + w##############", + " |ll| =##############", + " |--| w##############", + " + d| =##############", + "=w=====++=##############", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ], + "set": [ { "square": "terrain", "x": 10, "y": 7, "x2": 18, "y2": 13, "id": "t_concrete_floor" } ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_02.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_02.json index 4ee7e3a6ff906..141d7c2908c7d 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_02.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_02.json @@ -1,44 +1,39 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageC_first", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "###########,,,,,,,######", - "###########,,,,,,,######", - "###########,,,,,,,######", - "WWWWWWWWWWW,,,,,,,######", - "===w==ww==W,,,,,,,######", - " C=W,,,,,,,######", - " c ---===,,,,,,,==####", - " TT |& S| =####", - " TT | | =####", - " c |s s| =####", - " |-+-| =####", - " bb| + =####", - "-+---- | =####", - " <<|l l=####", - "--+------====+======####", - " CC=###W##########", - " c g###W##########", - " TTTT +WWW,,,,,######", - " TTTT g###,,,,,######", - " =###,,,,,######", - "=gg=gg=gg=###,,,,,######", - "#############,,,,,######", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "ground_level" - ], - "set": [ - { "square": "terrain", "x": 10, "y": 7, "x2": 18, "y2": 13, "id": "t_concrete_floor" } - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageC_first", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "###########,,,,,,,######", + "###########,,,,,,,######", + "###########,,,,,,,######", + "WWWWWWWWWWW,,,,,,,######", + "===w==ww==W,,,,,,,######", + " C=W,,,,,,,######", + " c ---===,,,,,,,==####", + " TT |& S| =####", + " TT | | =####", + " c |s s| =####", + " |-+-| =####", + " bb| + =####", + "-+---- | =####", + " <<|l l=####", + "--+------====+======####", + " CC=###W##########", + " c g###W##########", + " TTTT +WWW,,,,,######", + " TTTT g###,,,,,######", + " =###,,,,,######", + "=gg=gg=gg=###,,,,,######", + "#############,,,,,######", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "ground_level" ], + "set": [ { "square": "terrain", "x": 10, "y": 7, "x2": 18, "y2": 13, "id": "t_concrete_floor" } ] } + } ] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_roof_00.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_roof_00.json index fa7bbe7969a39..026efe88929c3 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_roof_00.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_roof_00.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageC_roof", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageC_roof", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_roof_01.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_roof_01.json index a5b04e394a6e9..ca8c28c6d1a91 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_roof_01.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_roof_01.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageC_roof", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "rrrrrrrrrr##############", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageC_roof", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "rrrrrrrrrr##############", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_00.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_00.json index da0db2de87256..6d32df0ce50f9 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_00.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_00.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageC_second", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "----------##############", - " |##############", - " |rrrrrrrrrr####", - " |rrrrrrrrrr####", - " |rrrrrrrrrr####", - " |rrrrrrrrrr####", - "-- |rrrrrrrrrr####", - " |rrrrrrrrrr####", - " |rrrrrrrrrr####", - "-- >>|rrrrrrrrrr####", - " |rrrrrrrrrr####", - " |##############", - " |##############", - " |##############", - " |##############", - " |##############", - "----------##############", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageC_second", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "----------##############", + " |##############", + " |rrrrrrrrrr####", + " |rrrrrrrrrr####", + " |rrrrrrrrrr####", + " |rrrrrrrrrr####", + "-- |rrrrrrrrrr####", + " |rrrrrrrrrr####", + " |rrrrrrrrrr####", + "-- >>|rrrrrrrrrr####", + " |rrrrrrrrrr####", + " |##############", + " |##############", + " |##############", + " |##############", + " |##############", + "----------##############", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_01.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_01.json index f2620626ba98f..e542957e924c7 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_01.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_01.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageC_second", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "-w---ww---##############", - " | dd|##############", - "ZZ |TT |rrrrrrrrrr####", - "ZZ |TT wrrrrrrrrrr####", - "ZZ |--- wrrrrrrrrrr####", - " | d| |rrrrrrrrrr####", - "-+--+--+-|rrrrrrrrrr####", - " wrrrrrrrrrr####", - " wrrrrrrrrrr####", - "--- >>|rrrrrrrrrr####", - " A| |rrrrrrrrrr####", - " A| |##############", - " A| llll|##############", - " --+----|##############", - " cD|##############", - " D|##############", - "--ww------##############", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageC_second", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "-w---ww---##############", + " | dd|##############", + "ZZ |TT |rrrrrrrrrr####", + "ZZ |TT wrrrrrrrrrr####", + "ZZ |--- wrrrrrrrrrr####", + " | d| |rrrrrrrrrr####", + "-+--+--+-|rrrrrrrrrr####", + " wrrrrrrrrrr####", + " wrrrrrrrrrr####", + "--- >>|rrrrrrrrrr####", + " A| |rrrrrrrrrr####", + " A| |##############", + " A| llll|##############", + " --+----|##############", + " cD|##############", + " D|##############", + "--ww------##############", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_02.json b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_02.json index 3142bf3307669..1f2ea28cceb2c 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_02.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_02.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combogarageC_second", - "weight": 250, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "-w---ww---##############", - " | dd|##############", - "ZZ |TT |ffffffffff####", - "ZZ |TT wrrrrrrrrrF####", - "ZZ |--- wrrrrrrrrrF####", - " | d| |rrrrrrrrrF####", - "-+--+--+-|rrrrrrrrrF####", - " +rrrrrrrrrF####", - " +rrrrrrrrrF####", - "--- >>|rrrrrrrrrF####", - " A| wffffffffff####", - " A| |##############", - " A| llll|##############", - " --+----|##############", - " cD|##############", - " D|##############", - "--ww------##############", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "upper_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combogarageC_second", + "weight": 250, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "-w---ww---##############", + " | dd|##############", + "ZZ |TT |ffffffffff####", + "ZZ |TT wrrrrrrrrrF####", + "ZZ |--- wrrrrrrrrrF####", + " | d| |rrrrrrrrrF####", + "-+--+--+-|rrrrrrrrrF####", + " +rrrrrrrrrF####", + " +rrrrrrrrrF####", + "--- >>|rrrrrrrrrF####", + " A| wffffffffff####", + " A| |##############", + " A| llll|##############", + " --+----|##############", + " cD|##############", + " D|##############", + "--ww------##############", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "upper_level" ] } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/multistory_houses/combo_garages/combohouseA_basement_00.json b/data/mods/More_Locations/multistory_houses/combo_garages/combohouseA_basement_00.json index 4138b4fa29817..902ce2dab4a54 100644 --- a/data/mods/More_Locations/multistory_houses/combo_garages/combohouseA_basement_00.json +++ b/data/mods/More_Locations/multistory_houses/combo_garages/combohouseA_basement_00.json @@ -1,41 +1,38 @@ [ - { - "type": "mapgen", - "om_terrain": "combohouseA_basement", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "########################", - "#######=================", - "#######= =", - "#######= =", - "#######= =", - "#######= =", - "#######= =", - "#######= =", - "#######= =", - "#######= =", - "#######= =", - "#######= =", - "#######= <<=", - "#######=================", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "multistory_house", - "lower_level" - ] - } + { + "type": "mapgen", + "om_terrain": "combohouseA_basement", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "########################", + "#######=================", + "#######= =", + "#######= =", + "#######= =", + "#######= =", + "#######= =", + "#######= =", + "#######= =", + "#######= =", + "#######= =", + "#######= =", + "#######= <<=", + "#######=================", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "multistory_house", "lower_level" ] } + } ] diff --git a/json_blacklist b/json_blacklist index a438f7bc1ec4b..88b815939fbf9 100644 --- a/json_blacklist +++ b/json_blacklist @@ -308,31 +308,6 @@ data/mods/More_Locations/multistory_houses/3story_houses/3storyE_third_02.json data/mods/More_Locations/multistory_houses/3story_houses/3storyE_third_03.json data/mods/More_Locations/multistory_houses/3story_houses/3storyE_third_04.json data/mods/More_Locations/multistory_houses/3story_houses/3storyE_third_05.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_00.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_01.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_first_02.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_roof_00.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_roof_01.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_00.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_01.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageA_second_02.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_00.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_01.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_first_02.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_roof_00.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_roof_01.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_00.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_01.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageB_second_02.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_00.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_01.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_first_02.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_roof_00.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_roof_01.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_00.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_01.json -data/mods/More_Locations/multistory_houses/combo_garages/combogarageC_second_02.json -data/mods/More_Locations/multistory_houses/combo_garages/combohouseA_basement_00.json data/mods/More_Locations/multistory_houses/combo_garages/combohouseA_basement_01.json data/mods/More_Locations/multistory_houses/combo_garages/combohouseA_basement_02.json data/mods/More_Locations/multistory_houses/combo_garages/combohouseA_first_00.json