diff --git a/data/mods/More_Locations/estate/estate_1be_00.json b/data/mods/More_Locations/estate/estate_1be_00.json index ebe9fa389e77f..e7978e0bdca0e 100644 --- a/data/mods/More_Locations/estate/estate_1be_00.json +++ b/data/mods/More_Locations/estate/estate_1be_00.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1be", - "comment" : "first floor, bottom edge", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - ".....|....| |....|.....", - ".....|----- -----|.....", - ".....|>> <<|.....", - "=ww===>> <<===ww=", - "#####= =#####", - "#####= =#####", - "#####==www=++=www==#####", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1be", + "comment": "first floor, bottom edge", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + ".....|....| |....|.....", + ".....|----- -----|.....", + ".....|>> <<|.....", + "=ww===>> <<===ww=", + "#####= =#####", + "#####= =#####", + "#####==www=++=www==#####", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1be_01.json b/data/mods/More_Locations/estate/estate_1be_01.json index f60edcba84ad4..fc3434babf626 100644 --- a/data/mods/More_Locations/estate/estate_1be_01.json +++ b/data/mods/More_Locations/estate/estate_1be_01.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1be", - "comment" : "first floor, bottom edge", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - ".....+....| |d..d|.....", - "...BB|--+-- --+--|.c...", - "...BB|>> <<|DDD..", - "=ww===>> <<===ww=", - "#####= =#####", - "#####= =#####", - "#####==www=++=www==#####", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1be", + "comment": "first floor, bottom edge", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + ".....+....| |d..d|.....", + "...BB|--+-- --+--|.c...", + "...BB|>> <<|DDD..", + "=ww===>> <<===ww=", + "#####= =#####", + "#####= =#####", + "#####==www=++=www==#####", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1be_02.json b/data/mods/More_Locations/estate/estate_1be_02.json index 94bce6988ce7e..eaea330026f8d 100644 --- a/data/mods/More_Locations/estate/estate_1be_02.json +++ b/data/mods/More_Locations/estate/estate_1be_02.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1be", - "comment" : "first floor, bottom edge", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - ".....|....| |....|.....", - "...|+|--+-1 1----|L....", - "...|l|>> <<|LL...", - "=ww===>> <<===ww=", - "#####= =#####", - "#####= 1 1 =#####", - "#####==www=++=www==#####", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1be", + "comment": "first floor, bottom edge", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + ".....|....| |....|.....", + "...|+|--+-1 1----|L....", + "...|l|>> <<|LL...", + "=ww===>> <<===ww=", + "#####= =#####", + "#####= 1 1 =#####", + "#####==www=++=www==#####", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1be_03.json b/data/mods/More_Locations/estate/estate_1be_03.json index 9ed96d40cb595..29857c864ced7 100644 --- a/data/mods/More_Locations/estate/estate_1be_03.json +++ b/data/mods/More_Locations/estate/estate_1be_03.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1be", - "comment" : "first floor, bottom edge", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - ".....+....| |b..b|i....", - ".....|----- --+--|i..c.", - ".a..N|>> Y Y <<|i.DDD", - "=ww===>> <<===ww=", - "#####= =#####", - "#####=Y Y=#####", - "#####==www=++=www==#####", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1be", + "comment": "first floor, bottom edge", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + ".....+....| |b..b|i....", + ".....|----- --+--|i..c.", + ".a..N|>> Y Y <<|i.DDD", + "=ww===>> <<===ww=", + "#####= =#####", + "#####=Y Y=#####", + "#####==www=++=www==#####", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1bloc_00.json b/data/mods/More_Locations/estate/estate_1bloc_00.json index e6443cd02a1c8..9c791697bd70a 100644 --- a/data/mods/More_Locations/estate/estate_1bloc_00.json +++ b/data/mods/More_Locations/estate/estate_1bloc_00.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1bloc", - "comment" : "first floor, bottom left outer corner", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "##k#################=...", - "##k#################w...", - "##k#################=...", - "##k#################==w=", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "kkkkkkkkkkkkkkkkkkkkkkkk", - "########################", - "########################" - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1bloc", + "comment": "first floor, bottom left outer corner", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "##k#################=...", + "##k#################w...", + "##k#################=...", + "##k#################==w=", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "kkkkkkkkkkkkkkkkkkkkkkkk", + "########################", + "########################" + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1bloc_01.json b/data/mods/More_Locations/estate/estate_1bloc_01.json index e9cfc02f5ef2e..b632a9818b2dc 100644 --- a/data/mods/More_Locations/estate/estate_1bloc_01.json +++ b/data/mods/More_Locations/estate/estate_1bloc_01.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1bloc", - "comment" : "first floor, bottom left outer corner", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "##k#################=...", - "##k#################wTT.", - "##k#################=TT.", - "##k#################==w=", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "kkkkkkkkkkkkkkkkkkkkkkkk", - "########################", - "########################" - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1bloc", + "comment": "first floor, bottom left outer corner", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "##k#################=...", + "##k#################wTT.", + "##k#################=TT.", + "##k#################==w=", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "kkkkkkkkkkkkkkkkkkkkkkkk", + "########################", + "########################" + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1bloc_02.json b/data/mods/More_Locations/estate/estate_1bloc_02.json index cac130c10d1a4..43d9694277fbe 100644 --- a/data/mods/More_Locations/estate/estate_1bloc_02.json +++ b/data/mods/More_Locations/estate/estate_1bloc_02.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1bloc", - "comment" : "first floor, bottom left outer corner", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "##k#################=...", - "##k#################w...", - "##k#################=d..", - "##k#################==w=", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "kkkkkkkkkkkkkkkkkkkkkkkk", - "########################", - "########################" - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1bloc", + "comment": "first floor, bottom left outer corner", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "##k#################=...", + "##k#################w...", + "##k#################=d..", + "##k#################==w=", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "kkkkkkkkkkkkkkkkkkkkkkkk", + "########################", + "########################" + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1bloc_03.json b/data/mods/More_Locations/estate/estate_1bloc_03.json index 6641d38b2ddbc..6bf9b99f1e37c 100644 --- a/data/mods/More_Locations/estate/estate_1bloc_03.json +++ b/data/mods/More_Locations/estate/estate_1bloc_03.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1bloc", - "comment" : "first floor, bottom left outer corner", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "##k#################=.cc", - "##k#################w...", - "##k#################=...", - "##k#################==w=", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "##k#####################", - "kkkkkkkkkkkkkkkkkkkkkkkk", - "########################", - "########################" - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1bloc", + "comment": "first floor, bottom left outer corner", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "##k#################=.cc", + "##k#################w...", + "##k#################=...", + "##k#################==w=", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "##k#####################", + "kkkkkkkkkkkkkkkkkkkkkkkk", + "########################", + "########################" + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1broc_00.json b/data/mods/More_Locations/estate/estate_1broc_00.json index c5ef3ab518050..85b8c8368fc76 100644 --- a/data/mods/More_Locations/estate/estate_1broc_00.json +++ b/data/mods/More_Locations/estate/estate_1broc_00.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1broc", - "comment" : "first floor, bottom right outer corner", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "...=####################", - "...w####################", - "...=####################", - "=w==####################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1broc", + "comment": "first floor, bottom right outer corner", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "...=####################", + "...w####################", + "...=####################", + "=w==####################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1broc_01.json b/data/mods/More_Locations/estate/estate_1broc_01.json index 1fd9f63faa458..f4f7382c75087 100644 --- a/data/mods/More_Locations/estate/estate_1broc_01.json +++ b/data/mods/More_Locations/estate/estate_1broc_01.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1broc", - "comment" : "first floor, bottom right outer corner", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "...=####################", - "...w####################", - "..d=####################", - "=w==####################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1broc", + "comment": "first floor, bottom right outer corner", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "...=####################", + "...w####################", + "..d=####################", + "=w==####################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1broc_02.json b/data/mods/More_Locations/estate/estate_1broc_02.json index 7821552a7c126..264b3c241b001 100644 --- a/data/mods/More_Locations/estate/estate_1broc_02.json +++ b/data/mods/More_Locations/estate/estate_1broc_02.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1broc", - "comment" : "first floor, bottom right outer corner", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "...=####################", - "...w####################", - "..p=####################", - "=w==####################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1broc", + "comment": "first floor, bottom right outer corner", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "...=####################", + "...w####################", + "..p=####################", + "=w==####################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1broc_03.json b/data/mods/More_Locations/estate/estate_1broc_03.json index 80bd11d856149..03ff328278d01 100644 --- a/data/mods/More_Locations/estate/estate_1broc_03.json +++ b/data/mods/More_Locations/estate/estate_1broc_03.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1broc", - "comment" : "first floor, bottom right outer corner", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "..b=####################", - "...w####################", - "b..=####################", - "=w==####################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1broc", + "comment": "first floor, bottom right outer corner", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "..b=####################", + "...w####################", + "b..=####################", + "=w==####################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1by_00.json b/data/mods/More_Locations/estate/estate_1by_00.json index aaad7c97dc82b..f3851a6929730 100644 --- a/data/mods/More_Locations/estate/estate_1by_00.json +++ b/data/mods/More_Locations/estate/estate_1by_00.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1by", - "comment" : "first floor, bottom yard. ", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "kkkkkkkkkkkkkkkkkkkkkkkk", - "#####k############k#####", - "########################" - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1by", + "comment": "first floor, bottom yard. ", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "kkkkkkkkkkkkkkkkkkkkkkkk", + "#####k############k#####", + "########################" + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1ica_00.json b/data/mods/More_Locations/estate/estate_1ica_00.json index a481eed8a221b..14271e99b0d5e 100644 --- a/data/mods/More_Locations/estate/estate_1ica_00.json +++ b/data/mods/More_Locations/estate/estate_1ica_00.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1ica", - "comment" : "first floor, inner corner A. can't think of a better way to name inside angles", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "...=####################", - "...w####################", - "...w####################", - "...w####################", - "...=####################", - "---=####################", - "...=####################", - "...w####################", - "...w####################", - "...=####################", - "---=####################", - " +####################", - " +####################", - "---=####################", - "...=####################", - "...w####################", - "...w####################", - "...=####################", - "---===##################", - ".....=##################", - ".....==ww==++==ww===www=", - ".....|....| |....|.....", - ".....|....| |....|.....", - ".....|....| |....|....." - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1ica", + "comment": "first floor, inner corner A. can't think of a better way to name inside angles", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "...=####################", + "...w####################", + "...w####################", + "...w####################", + "...=####################", + "---=####################", + "...=####################", + "...w####################", + "...w####################", + "...=####################", + "---=####################", + " +####################", + " +####################", + "---=####################", + "...=####################", + "...w####################", + "...w####################", + "...=####################", + "---===##################", + ".....=##################", + ".....==ww==++==ww===www=", + ".....|....| |....|.....", + ".....|....| |....|.....", + ".....|....| |....|....." + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1ica_01.json b/data/mods/More_Locations/estate/estate_1ica_01.json index 4c2a97b2481b2..0611d6cb39eaa 100644 --- a/data/mods/More_Locations/estate/estate_1ica_01.json +++ b/data/mods/More_Locations/estate/estate_1ica_01.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1ica", - "comment" : "first floor, inner corner A. can't think of a better way to name inside angles", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "...=####################", - "...w####################", - "...w####################", - "...w####################", - ".dd=####################", - "---=####################", - ".BB=####################", - ".BBw####################", - "...w####################", - "..d=####################", - "-+-=####################", - " +####################", - " +####################", - "-+-=####################", - "...=####################", - "...w####################", - "BB.w####################", - "BBd=####################", - "---===##################", - "...bb=##################", - "...bb==ww==++==ww===www=", - ".....|....| |p..p|.....", - "bb...+.nn.| +....|.AAA.", - "bb...|....| |....|....." - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1ica", + "comment": "first floor, inner corner A. can't think of a better way to name inside angles", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "...=####################", + "...w####################", + "...w####################", + "...w####################", + ".dd=####################", + "---=####################", + ".BB=####################", + ".BBw####################", + "...w####################", + "..d=####################", + "-+-=####################", + " +####################", + " +####################", + "-+-=####################", + "...=####################", + "...w####################", + "BB.w####################", + "BBd=####################", + "---===##################", + "...bb=##################", + "...bb==ww==++==ww===www=", + ".....|....| |p..p|.....", + "bb...+.nn.| +....|.AAA.", + "bb...|....| |....|....." + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1ica_02.json b/data/mods/More_Locations/estate/estate_1ica_02.json index aba5dc6e7b5ec..433e221276982 100644 --- a/data/mods/More_Locations/estate/estate_1ica_02.json +++ b/data/mods/More_Locations/estate/estate_1ica_02.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1ica", - "comment" : "first floor, inner corner A. can't think of a better way to name inside angles", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "...=####################", - "..Tw####################", - "...w####################", - ".BBw####################", - ".BB=####################", - "---=####################", - ".dd=####################", - "...w####################", - "...w####################", - ".dd=####################", - "---=####################", - " +####################", - " +####################", - "---=####################", - "..d=####################", - "...w####################", - "...w####################", - "..d=####################", - "---===##################", - "...NN=##################", - "....N==ww==++==ww===www=", - ".TT..|d..d| |....|d....", - ".TT..|-..-| |....|.....", - ".....|....| |.BB.|....." - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1ica", + "comment": "first floor, inner corner A. can't think of a better way to name inside angles", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "...=####################", + "..Tw####################", + "...w####################", + ".BBw####################", + ".BB=####################", + "---=####################", + ".dd=####################", + "...w####################", + "...w####################", + ".dd=####################", + "---=####################", + " +####################", + " +####################", + "---=####################", + "..d=####################", + "...w####################", + "...w####################", + "..d=####################", + "---===##################", + "...NN=##################", + "....N==ww==++==ww===www=", + ".TT..|d..d| |....|d....", + ".TT..|-..-| |....|.....", + ".....|....| |.BB.|....." + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1ica_03.json b/data/mods/More_Locations/estate/estate_1ica_03.json index af55b23819341..81911ef60a4cb 100644 --- a/data/mods/More_Locations/estate/estate_1ica_03.json +++ b/data/mods/More_Locations/estate/estate_1ica_03.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1ica", - "comment" : "first floor, inner corner A. can't think of a better way to name inside angles", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "..b=####################", - "...w####################", - "...w####################", - "...w####################", - "...=####################", - "--+=####################", - ".| =####################", - ".| w####################", - ".| w####################", - ".| =####################", - "-- =####################", - " +####################", - " +####################", - "---=####################", - "...=####################", - "TTTw####################", - "TTTw####################", - "...=####################", - "---===##################", - "..TTT=##################", - ".c..T==ww==++==ww===www=", - "....T|d..d| |...d|N....", - ".....|....+ |....|.....", - ".....|....| |....|..aa." - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1ica", + "comment": "first floor, inner corner A. can't think of a better way to name inside angles", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "..b=####################", + "...w####################", + "...w####################", + "...w####################", + "...=####################", + "--+=####################", + ".| =####################", + ".| w####################", + ".| w####################", + ".| =####################", + "-- =####################", + " +####################", + " +####################", + "---=####################", + "...=####################", + "TTTw####################", + "TTTw####################", + "...=####################", + "---===##################", + "..TTT=##################", + ".c..T==ww==++==ww===www=", + "....T|d..d| |...d|N....", + ".....|....+ |....|.....", + ".....|....| |....|..aa." + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1icb_00.json b/data/mods/More_Locations/estate/estate_1icb_00.json index 37414f07a4e1f..0ddfc3fc049c1 100644 --- a/data/mods/More_Locations/estate/estate_1icb_00.json +++ b/data/mods/More_Locations/estate/estate_1icb_00.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1icb", - "comment" : "first floor, inner corner B", - "weight": 0, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "####################=...", - "####################w...", - "####################w...", - "####################w...", - "####################=...", - "####################=---", - "####################=...", - "####################w...", - "####################w...", - "####################=...", - "####################=---", - "####################+ ", - "####################+ ", - "####################=---", - "####################=...", - "####################w...", - "####################w...", - "####################=...", - "##################===---", - "##################=.....", - "=www===ww==++==ww==.....", - ".....|....| |....|.....", - ".....|....| |....|.....", - ".....|....| |....|....." - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1icb", + "comment": "first floor, inner corner B", + "weight": 0, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "####################=...", + "####################w...", + "####################w...", + "####################w...", + "####################=...", + "####################=---", + "####################=...", + "####################w...", + "####################w...", + "####################=...", + "####################=---", + "####################+ ", + "####################+ ", + "####################=---", + "####################=...", + "####################w...", + "####################w...", + "####################=...", + "##################===---", + "##################=.....", + "=www===ww==++==ww==.....", + ".....|....| |....|.....", + ".....|....| |....|.....", + ".....|....| |....|....." + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1icb_01.json b/data/mods/More_Locations/estate/estate_1icb_01.json index 27e61812c5cf2..3db6457f93abc 100644 --- a/data/mods/More_Locations/estate/estate_1icb_01.json +++ b/data/mods/More_Locations/estate/estate_1icb_01.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1icb", - "comment" : "first floor, inner corner B", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "####################=b..", - "####################w...", - "####################w...", - "####################w...", - "####################=AAA", - "####################=---", - "####################=p..", - "####################w...", - "####################w...", - "####################=d..", - "####################=---", - "####################+ ", - "####################+ ", - "####################=-+-", - "####################=...", - "####################w...", - "####################w...", - "####################=ddd", - "##################===---", - "##################=Y..j.", - "=www===ww==++==ww==.....", - ".DDD.|N..a| |a..N|j....", - "..c..+....| +....|.....", - ".....|....| |....|....." - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1icb", + "comment": "first floor, inner corner B", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "####################=b..", + "####################w...", + "####################w...", + "####################w...", + "####################=AAA", + "####################=---", + "####################=p..", + "####################w...", + "####################w...", + "####################=d..", + "####################=---", + "####################+ ", + "####################+ ", + "####################=-+-", + "####################=...", + "####################w...", + "####################w...", + "####################=ddd", + "##################===---", + "##################=Y..j.", + "=www===ww==++==ww==.....", + ".DDD.|N..a| |a..N|j....", + "..c..+....| +....|.....", + ".....|....| |....|....." + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1icb_02.json b/data/mods/More_Locations/estate/estate_1icb_02.json index 842702018069a..e56a56a2ed0a2 100644 --- a/data/mods/More_Locations/estate/estate_1icb_02.json +++ b/data/mods/More_Locations/estate/estate_1icb_02.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1icb", - "comment" : "first floor, inner corner B", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "####################=...", - "####################w...", - "####################w..a", - "####################w...", - "####################=N..", - "####################=---", - "####################=BBd", - "####################w...", - "####################w...", - "####################=...", - "####################=-+-", - "####################+ ", - "####################+ ", - "####################=-+-", - "####################=...", - "####################w...", - "####################w...", - "####################=XXX", - "##################===---", - "##################=.....", - "=www===ww==++==ww==.j.j.", - "....T|d..d| |bbbb|.....", - "...c.|....+ +...b|.j.j.", - ".....|....| |...b|....." - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1icb", + "comment": "first floor, inner corner B", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "####################=...", + "####################w...", + "####################w..a", + "####################w...", + "####################=N..", + "####################=---", + "####################=BBd", + "####################w...", + "####################w...", + "####################=...", + "####################=-+-", + "####################+ ", + "####################+ ", + "####################=-+-", + "####################=...", + "####################w...", + "####################w...", + "####################=XXX", + "##################===---", + "##################=.....", + "=www===ww==++==ww==.j.j.", + "....T|d..d| |bbbb|.....", + "...c.|....+ +...b|.j.j.", + ".....|....| |...b|....." + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/data/mods/More_Locations/estate/estate_1icb_03.json b/data/mods/More_Locations/estate/estate_1icb_03.json index 1d84e0314625b..136e35964955c 100644 --- a/data/mods/More_Locations/estate/estate_1icb_03.json +++ b/data/mods/More_Locations/estate/estate_1icb_03.json @@ -1,46 +1,40 @@ [ - { - "type": "mapgen", - "om_terrain": "estate_1icb", - "comment" : "first floor, inner corner B", - "weight": 99, - "method": "json", - "object": { - "fill_ter": "t_floor", - "rows": [ - "####################=...", - "####################w...", - "####################w...", - "####################w...", - "####################=p..", - "####################=-+-", - "####################=d..", - "####################w...", - "####################w...", - "####################=d..", - "####################=---", - "####################+ ", - "####################+ ", - "####################=-+-", - "####################=...", - "####################w...", - "####################w...", - "####################=...", - "##################===---", - "##################=.....", - "=www===ww==++==ww==.Z.Z.", - "....N|a...| |...d|.....", - ".....|a...+ +....|.Z.Z.", - "AAA..|....| |....|....." - ], - "palettes": [ - "estate", - "multistory_house", - "ground_level" - ], - "terrain":{ - "k": "t_shrub" - } - } + { + "type": "mapgen", + "om_terrain": "estate_1icb", + "comment": "first floor, inner corner B", + "weight": 99, + "method": "json", + "object": { + "fill_ter": "t_floor", + "rows": [ + "####################=...", + "####################w...", + "####################w...", + "####################w...", + "####################=p..", + "####################=-+-", + "####################=d..", + "####################w...", + "####################w...", + "####################=d..", + "####################=---", + "####################+ ", + "####################+ ", + "####################=-+-", + "####################=...", + "####################w...", + "####################w...", + "####################=...", + "##################===---", + "##################=.....", + "=www===ww==++==ww==.Z.Z.", + "....N|a...| |...d|.....", + ".....|a...+ +....|.Z.Z.", + "AAA..|....| |....|....." + ], + "palettes": [ "estate", "multistory_house", "ground_level" ], + "terrain": { "k": "t_shrub" } } -] \ No newline at end of file + } +] diff --git a/json_blacklist b/json_blacklist index 33bd84e78f6f9..c11f0633b333a 100644 --- a/json_blacklist +++ b/json_blacklist @@ -89,27 +89,6 @@ data/mods/More_Locations/bandit_tower/bandit_tower_ublc_01.json data/mods/More_Locations/bandit_tower/bandit_tower_ubrc_01.json data/mods/More_Locations/bandit_tower/bandit_tower_utlc_01.json data/mods/More_Locations/bandit_tower/bandit_tower_utrc_01.json -data/mods/More_Locations/estate/estate_1be_00.json -data/mods/More_Locations/estate/estate_1be_01.json -data/mods/More_Locations/estate/estate_1be_02.json -data/mods/More_Locations/estate/estate_1be_03.json -data/mods/More_Locations/estate/estate_1bloc_00.json -data/mods/More_Locations/estate/estate_1bloc_01.json -data/mods/More_Locations/estate/estate_1bloc_02.json -data/mods/More_Locations/estate/estate_1bloc_03.json -data/mods/More_Locations/estate/estate_1broc_00.json -data/mods/More_Locations/estate/estate_1broc_01.json -data/mods/More_Locations/estate/estate_1broc_02.json -data/mods/More_Locations/estate/estate_1broc_03.json -data/mods/More_Locations/estate/estate_1by_00.json -data/mods/More_Locations/estate/estate_1ica_00.json -data/mods/More_Locations/estate/estate_1ica_01.json -data/mods/More_Locations/estate/estate_1ica_02.json -data/mods/More_Locations/estate/estate_1ica_03.json -data/mods/More_Locations/estate/estate_1icb_00.json -data/mods/More_Locations/estate/estate_1icb_01.json -data/mods/More_Locations/estate/estate_1icb_02.json -data/mods/More_Locations/estate/estate_1icb_03.json data/mods/More_Locations/estate/estate_1icc_00.json data/mods/More_Locations/estate/estate_1icc_01.json data/mods/More_Locations/estate/estate_1icc_02.json