From 4672972fd7e3ff69c9b86fa91c8081b503d5b235 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Tue, 30 Apr 2019 01:26:56 +0200 Subject: [PATCH] Lint json --- .../factory/factory_mid_12.json | 80 +++++++++--------- .../factory/factory_mid_13.json | 76 +++++++++-------- .../factory/factory_mid_15.json | 80 +++++++++--------- .../factory/factory_mid_16.json | 76 +++++++++-------- .../factory/factory_mid_17.json | 76 +++++++++-------- .../More_Locations/factory/factory_re_01.json | 74 ++++++++--------- .../More_Locations/factory/factory_re_02.json | 82 +++++++++---------- .../More_Locations/factory/factory_re_03.json | 78 +++++++++--------- .../More_Locations/factory/factory_re_04.json | 74 ++++++++--------- .../More_Locations/factory/factory_re_05.json | 74 ++++++++--------- .../More_Locations/factory/factory_re_06.json | 78 +++++++++--------- .../More_Locations/factory/factory_te_01.json | 74 ++++++++--------- .../More_Locations/factory/factory_te_02.json | 74 ++++++++--------- .../More_Locations/factory/factory_te_03.json | 74 ++++++++--------- .../More_Locations/factory/factory_te_04.json | 78 +++++++++--------- .../More_Locations/factory/factory_te_05.json | 74 ++++++++--------- .../More_Locations/factory/factory_te_06.json | 78 +++++++++--------- .../factory/factory_tlc_01.json | 78 +++++++++--------- .../factory/factory_tlc_02.json | 74 ++++++++--------- .../factory/factory_tlc_04.json | 74 ++++++++--------- .../factory/factory_tlc_05.json | 74 ++++++++--------- .../factory/factory_trc_01.json | 80 +++++++++--------- .../factory/factory_trc_02.json | 78 +++++++++--------- .../factory/factory_trc_03.json | 74 ++++++++--------- .../factory/factory_trc_04.json | 74 ++++++++--------- .../factory/factory_trc_05.json | 74 ++++++++--------- json_blacklist | 26 ------ 27 files changed, 952 insertions(+), 1054 deletions(-) diff --git a/data/mods/More_Locations/factory/factory_mid_12.json b/data/mods/More_Locations/factory/factory_mid_12.json index 4afdec06c3605..a526bfc5a0e24 100644 --- a/data/mods/More_Locations/factory/factory_mid_12.json +++ b/data/mods/More_Locations/factory/factory_mid_12.json @@ -1,45 +1,41 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_mid"], - "comment" : "middle", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "......|-.........|......", - ".......|-6.......|......", - "........|-6......!......", - ".........|-6.....!......", - "..........|-6...ggg.....", - "...........|-6..g4g.....", - "-...........|-6------=--", - "|-...........|-|========", - ".|-.............=.......", - "..|-............=.......", - "...|-.....5======.......", - "....|-....=4%4u4u.......", - ".....|-...=4u4%4Z.......", - "......|...5======.......", - "......g.........=.......", - "......g.........=.......", - "......|.........=.......", - "-!-----.........=.....--", - "..|66NN.........=....-|.", - "..|6.c..........=...-|8.", - "..|66DD.........=..-|8T.", - "..-----.........=.-|8T..", - ".....2|.........=-|8T...", - ".....=|.........=|......" - ], - "rotation": [ 0, 3 ], - "palettes": [ - "factory" - ], - "monster": { - "Z": { "monster": "mon_secubot" } - } - } + { + "type": "mapgen", + "om_terrain": [ "factory_mid" ], + "comment": "middle", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "......|-.........|......", + ".......|-6.......|......", + "........|-6......!......", + ".........|-6.....!......", + "..........|-6...ggg.....", + "...........|-6..g4g.....", + "-...........|-6------=--", + "|-...........|-|========", + ".|-.............=.......", + "..|-............=.......", + "...|-.....5======.......", + "....|-....=4%4u4u.......", + ".....|-...=4u4%4Z.......", + "......|...5======.......", + "......g.........=.......", + "......g.........=.......", + "......|.........=.......", + "-!-----.........=.....--", + "..|66NN.........=....-|.", + "..|6.c..........=...-|8.", + "..|66DD.........=..-|8T.", + "..-----.........=.-|8T..", + ".....2|.........=-|8T...", + ".....=|.........=|......" + ], + "rotation": [ 0, 3 ], + "palettes": [ "factory" ], + "monster": { "Z": { "monster": "mon_secubot" } } } + } ] diff --git a/data/mods/More_Locations/factory/factory_mid_13.json b/data/mods/More_Locations/factory/factory_mid_13.json index a272abd8505d8..7a3cafe2b3174 100644 --- a/data/mods/More_Locations/factory/factory_mid_13.json +++ b/data/mods/More_Locations/factory/factory_mid_13.json @@ -1,42 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_mid"], - "comment" : "middle", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "......|.........=|......", - "......|.........=|..nn..", - "......|.........=|......", - "......1.........=-g--.n.", - "................====g.n.", - "...................=|...", - "----|..............=----", - "====-|.............=====", - "..2==-|.................", - "....==--------..........", - ".....=====333|..........", - "..........733|..........", - "..........353|..........", - "...........=.|..........", - "..--gg---....|..........", - "..|.....|....|..........", - "..|.....|....|.......===", - "---..4..g....-|------=--", - ".....6..g.....-|4....=..", - ".....4..|......-|....=..", - "........|.......-|====..", - "......---........|=.....", - "......|.........===.....", - "......|.........=|......" - ], - "rotation": [ 0, 3 ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_mid" ], + "comment": "middle", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "......|.........=|......", + "......|.........=|..nn..", + "......|.........=|......", + "......1.........=-g--.n.", + "................====g.n.", + "...................=|...", + "----|..............=----", + "====-|.............=====", + "..2==-|.................", + "....==--------..........", + ".....=====333|..........", + "..........733|..........", + "..........353|..........", + "...........=.|..........", + "..--gg---....|..........", + "..|.....|....|..........", + "..|.....|....|.......===", + "---..4..g....-|------=--", + ".....6..g.....-|4....=..", + ".....4..|......-|....=..", + "........|.......-|====..", + "......---........|=.....", + "......|.........===.....", + "......|.........=|......" + ], + "rotation": [ 0, 3 ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_mid_15.json b/data/mods/More_Locations/factory/factory_mid_15.json index 26367f6cf7407..82d1b22615804 100644 --- a/data/mods/More_Locations/factory/factory_mid_15.json +++ b/data/mods/More_Locations/factory/factory_mid_15.json @@ -1,45 +1,41 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_mid"], - "comment" : "middle", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "......|=........=|......", - "......|==========|......", - "......----3=3-----......", - "..........3=3...........", - "........................", - "........................", - "-------..........-------", - "======|..........|======", - ".....=|..........|=.....", - ".....=33........33=.....", - ".....===........===.....", - ".....733........33=.....", - "......|----!!----|=.....", - "......|l........l|=.26..", - "......|l........l|=.22..", - "......|l........l|=.....", - "......|l........l|=====.", - "----!--..........-----=-", - "......................==", - "........................", - "........................", - "......--gggggggg--......", - "......|t........t|......", - "......|..........|......" - ], - "rotation": [ 0, 3 ], - "palettes": [ - "factory" - ], - "monster": { - "t": { "monster": "mon_turret" } - } - } + { + "type": "mapgen", + "om_terrain": [ "factory_mid" ], + "comment": "middle", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "......|=........=|......", + "......|==========|......", + "......----3=3-----......", + "..........3=3...........", + "........................", + "........................", + "-------..........-------", + "======|..........|======", + ".....=|..........|=.....", + ".....=33........33=.....", + ".....===........===.....", + ".....733........33=.....", + "......|----!!----|=.....", + "......|l........l|=.26..", + "......|l........l|=.22..", + "......|l........l|=.....", + "......|l........l|=====.", + "----!--..........-----=-", + "......................==", + "........................", + "........................", + "......--gggggggg--......", + "......|t........t|......", + "......|..........|......" + ], + "rotation": [ 0, 3 ], + "palettes": [ "factory" ], + "monster": { "t": { "monster": "mon_turret" } } } + } ] diff --git a/data/mods/More_Locations/factory/factory_mid_16.json b/data/mods/More_Locations/factory/factory_mid_16.json index f29aec2630550..0f79f548935b2 100644 --- a/data/mods/More_Locations/factory/factory_mid_16.json +++ b/data/mods/More_Locations/factory/factory_mid_16.json @@ -1,42 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_mid"], - "comment" : "middle", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "......|=........=|......", - "......|=........=|......", - "......|===3373===|......", - "......-----*------......", - "........................", - "........................", - "-----------..-----------", - "...|lllll.|..|...=======", - "...!.....L|..|...=......", - "...|.....L|..|..9=9.....", - "...|lllll.|..|..........", - "...--------..--------...", - "...|,,,,,,,,,,,,,,,,|...", - "..8|,,,,,,,,,,,,,,,,|...", - "..T|,,,,,,,,,,,,,,,,|...", - "..8|,,,,,,,,,,,,,,,,|...", - "===|,,,,,,,,,,,,,,,,|2==", - "--=|,,,,,,,,,,,,,,,,|---", - "..=|,,,,,,,,,,,,,,,,|.x.", - "..=|,,,,,,,,,,,,,,,,|...", - "..=-----1......1-----...", - "..====|..........|x..x..", - "..333===.........|..x...", - "......|=.........|......" - ], - "rotation": [ 0, 3 ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_mid" ], + "comment": "middle", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "......|=........=|......", + "......|=........=|......", + "......|===3373===|......", + "......-----*------......", + "........................", + "........................", + "-----------..-----------", + "...|lllll.|..|...=======", + "...!.....L|..|...=......", + "...|.....L|..|..9=9.....", + "...|lllll.|..|..........", + "...--------..--------...", + "...|,,,,,,,,,,,,,,,,|...", + "..8|,,,,,,,,,,,,,,,,|...", + "..T|,,,,,,,,,,,,,,,,|...", + "..8|,,,,,,,,,,,,,,,,|...", + "===|,,,,,,,,,,,,,,,,|2==", + "--=|,,,,,,,,,,,,,,,,|---", + "..=|,,,,,,,,,,,,,,,,|.x.", + "..=|,,,,,,,,,,,,,,,,|...", + "..=-----1......1-----...", + "..====|..........|x..x..", + "..333===.........|..x...", + "......|=.........|......" + ], + "rotation": [ 0, 3 ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_mid_17.json b/data/mods/More_Locations/factory/factory_mid_17.json index 2e54e3de108aa..0d3fedee40f0e 100644 --- a/data/mods/More_Locations/factory/factory_mid_17.json +++ b/data/mods/More_Locations/factory/factory_mid_17.json @@ -1,42 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_mid"], - "comment" : "middle", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "......|........==--.....", - "....0.*.......==--......", - ".0.0.0|.....2==--.......", - "..0---|.....==--........", - ".0.|L......==--.........", - "..0|......==--..........", - "-*--....2==--.........--", - "........==--.........-|=", - ".......==--.........-|==", - "......==--.........-|==.", - ".....==--.........-|==..", - "...2==--.........-|==2..", - "...==--.........-|==....", - "..==--.........-|==.....", - ".==--.........-|==......", - "==--.........-|==2......", - "=--.........-|==........", - "--.........-|==.......-|", - "..........-|==.......-|.", - ".........-|==2......-|4.", - "........-|==.......-|6..", - ".......-|==.......-|4...", - "......-|==.......-|.....", - "......|==........|......" - ], - "rotation": [ 0, 3 ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_mid" ], + "comment": "middle", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "......|........==--.....", + "....0.*.......==--......", + ".0.0.0|.....2==--.......", + "..0---|.....==--........", + ".0.|L......==--.........", + "..0|......==--..........", + "-*--....2==--.........--", + "........==--.........-|=", + ".......==--.........-|==", + "......==--.........-|==.", + ".....==--.........-|==..", + "...2==--.........-|==2..", + "...==--.........-|==....", + "..==--.........-|==.....", + ".==--.........-|==......", + "==--.........-|==2......", + "=--.........-|==........", + "--.........-|==.......-|", + "..........-|==.......-|.", + ".........-|==2......-|4.", + "........-|==.......-|6..", + ".......-|==.......-|4...", + "......-|==.......-|.....", + "......|==........|......" + ], + "rotation": [ 0, 3 ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_re_01.json b/data/mods/More_Locations/factory/factory_re_01.json index 756af7fe5381b..86bd6917228e9 100644 --- a/data/mods/More_Locations/factory/factory_re_01.json +++ b/data/mods/More_Locations/factory/factory_re_01.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_re"], - "comment" : "right edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ".....|.....=||,,,,,,,F,,", - ".....|.....=||,,,,,,,F,,", - ".....------=||,,,,,,,F,,", - "...........2||,,,,,,,F,,", - "............||,,,,,,,F,,", - "............||,,,,,,,F,,", - "------....--||,,,,,,,F,,", - "....L|....|---,,,,,,,F,,", - "...ggg....||,,,,,,,,,F,,", - "...g4g....||,,,,,,,,,F,,", - "...ggg....||,,,,,,,,,F,,", - "...g4g....||,,,,,,,,,F,,", - "...ggg....||,,,,,,,,,F,,", - "...g4g....||,,,,,,,,,F,,", - "...ggg....||,,,,,,,,,F,,", - "....6|....||,,,,,,,,,F,,", - "....c|....|----,,,,,,F,,", - "-!----....--|||,,,,,,F,,", - "..| .... M||,,,,,,F,,", - "..| 3 .... 3M||,,,,,,F,,", - "..| .... M||,,,,,,F,,", - "..----......|||,,,,,,F,,", - "....0|......||,,,,,,,F,,", - ".....|......||,,,,,,,F,," - ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_re" ], + "comment": "right edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ".....|.....=||,,,,,,,F,,", + ".....|.....=||,,,,,,,F,,", + ".....------=||,,,,,,,F,,", + "...........2||,,,,,,,F,,", + "............||,,,,,,,F,,", + "............||,,,,,,,F,,", + "------....--||,,,,,,,F,,", + "....L|....|---,,,,,,,F,,", + "...ggg....||,,,,,,,,,F,,", + "...g4g....||,,,,,,,,,F,,", + "...ggg....||,,,,,,,,,F,,", + "...g4g....||,,,,,,,,,F,,", + "...ggg....||,,,,,,,,,F,,", + "...g4g....||,,,,,,,,,F,,", + "...ggg....||,,,,,,,,,F,,", + "....6|....||,,,,,,,,,F,,", + "....c|....|----,,,,,,F,,", + "-!----....--|||,,,,,,F,,", + "..| .... M||,,,,,,F,,", + "..| 3 .... 3M||,,,,,,F,,", + "..| .... M||,,,,,,F,,", + "..----......|||,,,,,,F,,", + "....0|......||,,,,,,,F,,", + ".....|......||,,,,,,,F,," + ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_re_02.json b/data/mods/More_Locations/factory/factory_re_02.json index 7d500b8eee918..91f785347f16a 100644 --- a/data/mods/More_Locations/factory/factory_re_02.json +++ b/data/mods/More_Locations/factory/factory_re_02.json @@ -1,47 +1,41 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_re"], - "comment" : "right edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ".....|......||,,,,,,,F,,", - ".ggggggggggg||,,,,,,,F,,", - ".gz.zg.z..4-|-,,,,,,,F,,", - ".g.4.gu..4-|-,,,,,,,,F,,", - ".g.4.gz.4-|-,,,,,,,,,F,,", - ".g.z.g44-|-,,,,,,,,,,F,,", - "-ggg------,,,,,,,,,,,F,,", - "...6||---,,,,,,,,,,,,F,,", - "....||,,,,,,,,,,,,,,,F,,", - "....||,,,,,,,,,,,,,,,F,,", - "...6||,,,,,,,,,,,,,,,F,,", - "....||,,,,,,,,,,,,,,,F,,", - "....||,,,,,,,,,,,,,,,F,,", - "....||,,,,,,,,,,,,,,,F,,", - ".333||,,,,,,,,,,,,,,,F,,", - ".353||,,,,,,,,,,,,,,,F,,", - "====||,,,,,,,,,,,,,,,F,,", - "---=--|---,,,,,,,,,,,F,,", - "..%==|----,,,,,,,,,,,F,,", - "....====-|-,,,,,,,,,,F,,", - ".....|.==-|-,,,,,,,,,F,,", - ".....|.%==-|-,,,,,,,,F,,", - ".....|...==-|-,,,,,,,F,,", - ".....|....==||,,,,,,,F,," - ], - "palettes": [ - "factory" - ], - "toilets": { - "&": { "amount": [ 0, 50 ] } - }, - "monster": { - "z": { "monster": "mon_skitterbot" } - } - } + { + "type": "mapgen", + "om_terrain": [ "factory_re" ], + "comment": "right edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ".....|......||,,,,,,,F,,", + ".ggggggggggg||,,,,,,,F,,", + ".gz.zg.z..4-|-,,,,,,,F,,", + ".g.4.gu..4-|-,,,,,,,,F,,", + ".g.4.gz.4-|-,,,,,,,,,F,,", + ".g.z.g44-|-,,,,,,,,,,F,,", + "-ggg------,,,,,,,,,,,F,,", + "...6||---,,,,,,,,,,,,F,,", + "....||,,,,,,,,,,,,,,,F,,", + "....||,,,,,,,,,,,,,,,F,,", + "...6||,,,,,,,,,,,,,,,F,,", + "....||,,,,,,,,,,,,,,,F,,", + "....||,,,,,,,,,,,,,,,F,,", + "....||,,,,,,,,,,,,,,,F,,", + ".333||,,,,,,,,,,,,,,,F,,", + ".353||,,,,,,,,,,,,,,,F,,", + "====||,,,,,,,,,,,,,,,F,,", + "---=--|---,,,,,,,,,,,F,,", + "..%==|----,,,,,,,,,,,F,,", + "....====-|-,,,,,,,,,,F,,", + ".....|.==-|-,,,,,,,,,F,,", + ".....|.%==-|-,,,,,,,,F,,", + ".....|...==-|-,,,,,,,F,,", + ".....|....==||,,,,,,,F,," + ], + "palettes": [ "factory" ], + "toilets": { "&": { "amount": [ 0, 50 ] } }, + "monster": { "z": { "monster": "mon_skitterbot" } } } + } ] diff --git a/data/mods/More_Locations/factory/factory_re_03.json b/data/mods/More_Locations/factory/factory_re_03.json index 96e9b1f3ec6ba..a562406dc6ce6 100644 --- a/data/mods/More_Locations/factory/factory_re_03.json +++ b/data/mods/More_Locations/factory/factory_re_03.json @@ -1,44 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_re"], - "comment" : "right edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ".....|.....=||,,,,,,,F,,", - ".....|.....=||,,,,,,,F,,", - ".323.|......||,,,,,,,F,,", - ".236.|......||,,,,,,,F,,", - ".323.|......||,,,,,,,F,,", - ".....|......||,,,,,,,F,,", - "---!--......-||,,,,,,F,,", - "............TP|,,,,,,F,,", - ".............P|,,,,,,F,,", - ".....ffffffffP|,,,,,,F,,", - ".....F~~~~~~~P|,,,,,,F,,", - ".....F~~~~~~~P|,,,,,,F,,", - ".....F~~~~~~~P|,,,,,,F,,", - ".....F~~~~~~~P|,,,,,,F,,", - ".....ffffffffP|,,,,,,F,,", - ".............P|,,,,,,F,,", - "===......Z..TP|,,,,,,F,,", - "--=---......-||,,,,,,F,,", - "..==3|......||,,,,,,,F,,", - "....=|......||,,,,,,,F,,", - "....=|......||,,,,,,,F,,", - "....========||,,,,,,,F,,", - ".....|.....=||,,,,,,,F,,", - ".....|.....=||,,,,,,,F,," - ], - "palettes": [ - "factory" - ], - "monster": { - "Z": { "monster": "mon_secubot" } - } - } + { + "type": "mapgen", + "om_terrain": [ "factory_re" ], + "comment": "right edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ".....|.....=||,,,,,,,F,,", + ".....|.....=||,,,,,,,F,,", + ".323.|......||,,,,,,,F,,", + ".236.|......||,,,,,,,F,,", + ".323.|......||,,,,,,,F,,", + ".....|......||,,,,,,,F,,", + "---!--......-||,,,,,,F,,", + "............TP|,,,,,,F,,", + ".............P|,,,,,,F,,", + ".....ffffffffP|,,,,,,F,,", + ".....F~~~~~~~P|,,,,,,F,,", + ".....F~~~~~~~P|,,,,,,F,,", + ".....F~~~~~~~P|,,,,,,F,,", + ".....F~~~~~~~P|,,,,,,F,,", + ".....ffffffffP|,,,,,,F,,", + ".............P|,,,,,,F,,", + "===......Z..TP|,,,,,,F,,", + "--=---......-||,,,,,,F,,", + "..==3|......||,,,,,,,F,,", + "....=|......||,,,,,,,F,,", + "....=|......||,,,,,,,F,,", + "....========||,,,,,,,F,,", + ".....|.....=||,,,,,,,F,,", + ".....|.....=||,,,,,,,F,," + ], + "palettes": [ "factory" ], + "monster": { "Z": { "monster": "mon_secubot" } } } + } ] diff --git a/data/mods/More_Locations/factory/factory_re_04.json b/data/mods/More_Locations/factory/factory_re_04.json index 694abdb755d32..967985257f242 100644 --- a/data/mods/More_Locations/factory/factory_re_04.json +++ b/data/mods/More_Locations/factory/factory_re_04.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_re"], - "comment" : "right edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ".....|.....=||,,,,,,,F,,", - ".....|.....=||,,,,,,,F,,", - ".....|.....=|-----,,,F,,", - ".....1-----=-----|,,,F,,", - "...........===.u||,,,F,,", - "............333.||,,,F,,", - "----........333.||,,,F,,", - "==============.u||,,,F,,", - "..=|........-----|,,,F,,", - "..=|........|-----,,,F,,", - "..3PP00..00PP|,,,,,,,F,,", - "..=|.00..00.||,,,,,,,F,,", - "..=|........||,,,,,,,F,,", - "..2PP00..00.||,,,,,,,F,,", - "..=|.00..00PP|,,,,,,,F,,", - "..=|......---|,,,,,,,F,,", - "===|.x....|---,,,,,,,F,,", - "----..x...||,,,,,,,,,F,,", - ".x........||,,,,,,,,,F,,", - "....x.x..=|---,,,,,,,F,,", - ".....----=--||,,,,,,,F,,", - "....x|...===||,,,,,,,F,,", - "...x.|.....=||,,,,,,,F,,", - ".....|.....=||,,,,,,,F,," - ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_re" ], + "comment": "right edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ".....|.....=||,,,,,,,F,,", + ".....|.....=||,,,,,,,F,,", + ".....|.....=|-----,,,F,,", + ".....1-----=-----|,,,F,,", + "...........===.u||,,,F,,", + "............333.||,,,F,,", + "----........333.||,,,F,,", + "==============.u||,,,F,,", + "..=|........-----|,,,F,,", + "..=|........|-----,,,F,,", + "..3PP00..00PP|,,,,,,,F,,", + "..=|.00..00.||,,,,,,,F,,", + "..=|........||,,,,,,,F,,", + "..2PP00..00.||,,,,,,,F,,", + "..=|.00..00PP|,,,,,,,F,,", + "..=|......---|,,,,,,,F,,", + "===|.x....|---,,,,,,,F,,", + "----..x...||,,,,,,,,,F,,", + ".x........||,,,,,,,,,F,,", + "....x.x..=|---,,,,,,,F,,", + ".....----=--||,,,,,,,F,,", + "....x|...===||,,,,,,,F,,", + "...x.|.....=||,,,,,,,F,,", + ".....|.....=||,,,,,,,F,," + ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_re_05.json b/data/mods/More_Locations/factory/factory_re_05.json index a9224c57b1a23..041278b7c03c1 100644 --- a/data/mods/More_Locations/factory/factory_re_05.json +++ b/data/mods/More_Locations/factory/factory_re_05.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_re"], - "comment" : "right edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ".....|......||,,,,,,,F,,", - ".....g.... ||,,,,,,,F,,", - ".....g.... TM|,,,,,,,F,,", - ".....|----MMM|,,,,,,,F,,", - ".....||-------,,,,,,,F,,", - ".....||,,,,,,,,,,,,,,F,,", - "--!!-||,,,,,,,,,,,,,,F,,", - ".....||,,,,,,,,,,,,,,F,,", - ".....||,,,,,,,,,,,,,,F,,", - "... MMMMM,,,,,,,,,,,F,,", - "... u...uM,,,,,,,,,,,F,,", - "... .%33.M,,,,,,,,,,,F,,", - "... .336.M,,,,,,,,,,,F,,", - "... u...uM,,,,,,,,,,,F,,", - "... MMMMM,,,,,,,,,,,F,,", - ".....||,,,,,,,,,,,,,,F,,", - "=====||,,,,,,,,,,,,,,F,,", - "----=||,,,,,,,,,,,,,,F,,", - "....=||,,,,,,,,,,,,,,F,,", - "...33||-------,,,,,,,F,,", - "....=|-------|,,,,,,,F,,", - "....======33||,,,,,,,F,,", - ".....|.....=||,,,,,,,F,,", - ".....|.....=||,,,,,,,F,," - ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_re" ], + "comment": "right edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ".....|......||,,,,,,,F,,", + ".....g.... ||,,,,,,,F,,", + ".....g.... TM|,,,,,,,F,,", + ".....|----MMM|,,,,,,,F,,", + ".....||-------,,,,,,,F,,", + ".....||,,,,,,,,,,,,,,F,,", + "--!!-||,,,,,,,,,,,,,,F,,", + ".....||,,,,,,,,,,,,,,F,,", + ".....||,,,,,,,,,,,,,,F,,", + "... MMMMM,,,,,,,,,,,F,,", + "... u...uM,,,,,,,,,,,F,,", + "... .%33.M,,,,,,,,,,,F,,", + "... .336.M,,,,,,,,,,,F,,", + "... u...uM,,,,,,,,,,,F,,", + "... MMMMM,,,,,,,,,,,F,,", + ".....||,,,,,,,,,,,,,,F,,", + "=====||,,,,,,,,,,,,,,F,,", + "----=||,,,,,,,,,,,,,,F,,", + "....=||,,,,,,,,,,,,,,F,,", + "...33||-------,,,,,,,F,,", + "....=|-------|,,,,,,,F,,", + "....======33||,,,,,,,F,,", + ".....|.....=||,,,,,,,F,,", + ".....|.....=||,,,,,,,F,," + ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_re_06.json b/data/mods/More_Locations/factory/factory_re_06.json index e9847fc613b97..4f31e74ed9b0e 100644 --- a/data/mods/More_Locations/factory/factory_re_06.json +++ b/data/mods/More_Locations/factory/factory_re_06.json @@ -1,44 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_re"], - "comment" : "right edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ".....|.....=||,,,,,,,F,,", - "...=========||,,,,,,,F,,", - "...=2-------||----,,,F,,", - "...=.......t----||,,,F,,", - "...=.......u.u.u[],,,F,,", - "...=.......t----||6,,F,,", - "---=-----!--||----,,,F,,", - "..3=3|6....6||,,,,,,,F,,", - "...=.|......||,,,,,,,F,,", - "...=.|..D...||,,,,,,,F,,", - "...=9|..Dc..||,,,,,,,F,,", - "...=.|..D6Z.||,,,,,,,F,,", - "...=9|......||,,,,,,,F,,", - "...=.|p..NNN||,,,,,,,F,,", - "...=9|-+----||,,,,,,,F,,", - "====.|..ss..||,,,,,,,F,,", - "....9|c....&||,,,,,,,F,,", - "-----|-------|6,,,,,,F,,", - ".....||t------,,,,,,,F,,", - ".....[],,,,,,,,,,,,,,F,,", - "..00.||t------,,,,,,,F,,", - "..00.|-------|,,,,,,,F,,", - "..00.!..LLL.||,,,,,,,F,,", - ".....|......||,,,,,,,F,," - ], - "palettes": [ - "factory" - ], - "monster": { - "t": { "monster": "mon_turret" } - } - } + { + "type": "mapgen", + "om_terrain": [ "factory_re" ], + "comment": "right edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ".....|.....=||,,,,,,,F,,", + "...=========||,,,,,,,F,,", + "...=2-------||----,,,F,,", + "...=.......t----||,,,F,,", + "...=.......u.u.u[],,,F,,", + "...=.......t----||6,,F,,", + "---=-----!--||----,,,F,,", + "..3=3|6....6||,,,,,,,F,,", + "...=.|......||,,,,,,,F,,", + "...=.|..D...||,,,,,,,F,,", + "...=9|..Dc..||,,,,,,,F,,", + "...=.|..D6Z.||,,,,,,,F,,", + "...=9|......||,,,,,,,F,,", + "...=.|p..NNN||,,,,,,,F,,", + "...=9|-+----||,,,,,,,F,,", + "====.|..ss..||,,,,,,,F,,", + "....9|c....&||,,,,,,,F,,", + "-----|-------|6,,,,,,F,,", + ".....||t------,,,,,,,F,,", + ".....[],,,,,,,,,,,,,,F,,", + "..00.||t------,,,,,,,F,,", + "..00.|-------|,,,,,,,F,,", + "..00.!..LLL.||,,,,,,,F,,", + ".....|......||,,,,,,,F,," + ], + "palettes": [ "factory" ], + "monster": { "t": { "monster": "mon_turret" } } } + } ] diff --git a/data/mods/More_Locations/factory/factory_te_01.json b/data/mods/More_Locations/factory/factory_te_01.json index 2e422f317e1d1..bf0c7537f884b 100644 --- a/data/mods/More_Locations/factory/factory_te_01.json +++ b/data/mods/More_Locations/factory/factory_te_01.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_te"], - "comment" : "top edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - "ffffffffffffffffffffffff", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,--,,--,,--,,--,,--,,,", - ",,,--,,--,,--,,--,,--,,,", - "------------------------", - "------------------------", - "===9999......=5=.....3==", - "..............=.........", - "........................", - "......1ffffffffff1......", - ".....8|,,,,,,,,,,|8.....", - ".....8|,,,,,,,,,,|8.....", - "------1,,,,,,,,,,1---3--", - ".....4|,,,,,,,,,,|......", - "....u.|,,,,,,,,,,|......", - "......1ffffffffff1......", - "........................", - "......|..........|......" - ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_te" ], + "comment": "top edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + "ffffffffffffffffffffffff", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,--,,--,,--,,--,,--,,,", + ",,,--,,--,,--,,--,,--,,,", + "------------------------", + "------------------------", + "===9999......=5=.....3==", + "..............=.........", + "........................", + "......1ffffffffff1......", + ".....8|,,,,,,,,,,|8.....", + ".....8|,,,,,,,,,,|8.....", + "------1,,,,,,,,,,1---3--", + ".....4|,,,,,,,,,,|......", + "....u.|,,,,,,,,,,|......", + "......1ffffffffff1......", + "........................", + "......|..........|......" + ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_te_02.json b/data/mods/More_Locations/factory/factory_te_02.json index 1dd9e484ff818..fceeec67c90ee 100644 --- a/data/mods/More_Locations/factory/factory_te_02.json +++ b/data/mods/More_Locations/factory/factory_te_02.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_te"], - "comment" : "top edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - "ffffffffffffffffffffffff", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,M*MM*M,,,,,,,,,", - ",,,,,,,,,M~~~~M,,,,,,,,,", - ",,,,-----M~~~~M-----,,,,", - ",,,,|----M~~~~M----|,,,,", - ",,,,||,,,M~~~~M,,,||,,,,", - ",,,,||,,,M*MM*M,,,||,,,,", - "-----|,,,,,,,,,,,,||----", - "------,,,,,,,,,,,,------", - "......,,,,,,,,,,,,..====", - "......,,,,,,,,,,,,..=2..", - "......,,,,,,,,,,,,..=2..", - "......,,,,,,,,,,,,..===.", - "......,,,,,,,,,,,,....=.", - "......|,,,,,,,,,,|....=.", - "------1-,,,,,,,,-1----=-", - "......|..........|....=.", - ".2.2..|...999....|...7=.", - ".======================.", - ".2.2......999...=|......", - "......|.........=|......" - ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_te" ], + "comment": "top edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + "ffffffffffffffffffffffff", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,M*MM*M,,,,,,,,,", + ",,,,,,,,,M~~~~M,,,,,,,,,", + ",,,,-----M~~~~M-----,,,,", + ",,,,|----M~~~~M----|,,,,", + ",,,,||,,,M~~~~M,,,||,,,,", + ",,,,||,,,M*MM*M,,,||,,,,", + "-----|,,,,,,,,,,,,||----", + "------,,,,,,,,,,,,------", + "......,,,,,,,,,,,,..====", + "......,,,,,,,,,,,,..=2..", + "......,,,,,,,,,,,,..=2..", + "......,,,,,,,,,,,,..===.", + "......,,,,,,,,,,,,....=.", + "......|,,,,,,,,,,|....=.", + "------1-,,,,,,,,-1----=-", + "......|..........|....=.", + ".2.2..|...999....|...7=.", + ".======================.", + ".2.2......999...=|......", + "......|.........=|......" + ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_te_03.json b/data/mods/More_Locations/factory/factory_te_03.json index 694ff2d563eee..29b5824e992e3 100644 --- a/data/mods/More_Locations/factory/factory_te_03.json +++ b/data/mods/More_Locations/factory/factory_te_03.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_te"], - "comment" : "top edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - "ffffffffffffffffffffffff", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,--------,,,,,,,,", - ",,,,,,,--MMMMMM--,,,,,,,", - ",,,,,,,-MM....MM-,,,,,,,", - ",,,,,,,|M..66..M|,,,,,,,", - ",,,,,,,|M..nn..M|,,,,,,,", - "------,||..uu..||,------", - "-----|,||......||,|-----", - "====|---|......|---|0000", - "...=-----......-----....", - "...===..................", - ".....=====..............", - "....-----=.....-----....", - "....|...|7.....|...|0000", - "----|.4.|=%....|.4.|----", - "....g...|7.....|...g....", - "....gg---=.....---gg....", - "......|===.......|......", - "......|=.........|......", - "......|=.........|......" - ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_te" ], + "comment": "top edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + "ffffffffffffffffffffffff", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,--------,,,,,,,,", + ",,,,,,,--MMMMMM--,,,,,,,", + ",,,,,,,-MM....MM-,,,,,,,", + ",,,,,,,|M..66..M|,,,,,,,", + ",,,,,,,|M..nn..M|,,,,,,,", + "------,||..uu..||,------", + "-----|,||......||,|-----", + "====|---|......|---|0000", + "...=-----......-----....", + "...===..................", + ".....=====..............", + "....-----=.....-----....", + "....|...|7.....|...|0000", + "----|.4.|=%....|.4.|----", + "....g...|7.....|...g....", + "....gg---=.....---gg....", + "......|===.......|......", + "......|=.........|......", + "......|=.........|......" + ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_te_04.json b/data/mods/More_Locations/factory/factory_te_04.json index 51d209cf0a6f8..48f08e14a5b67 100644 --- a/data/mods/More_Locations/factory/factory_te_04.json +++ b/data/mods/More_Locations/factory/factory_te_04.json @@ -1,44 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_te"], - "comment" : "top edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - "ffffffffffffffffffffffff", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,--,,,,,,,,,,,,,,--,,,", - ",,,||,,,,,,,,,,,,,,||,,,", - ",,t||,,,,,,,,,,,,,,||t,,", - "----|,,,,,,,,,,,,,,|----", - "----|,,,,,,,,,,,,,,|----", - "===||,,,,,,,,,,,,,,||===", - "..2||,,,,,,,,,,,,,,||=..", - "...||t,,,,,,,,,,,,t||=..", - "...|----,,,,,,,,----|=..", - "...----|,,,,,,,,|----=..", - ".....6||,,,,,,,,||====..", - ".....6||,,,,,,,,||=599..", - "--22--||,,,,,,,,||=-----", - "......||t,,,,,,t||=.....", - "......|----[]----|=.....", - ".33...|----[]----|=.....", - ".33...|.........===.....", - "......|.........=|......" - ], - "palettes": [ - "factory" - ], - "monster": { - "t": { "monster": "mon_turret" } - } - } + { + "type": "mapgen", + "om_terrain": [ "factory_te" ], + "comment": "top edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + "ffffffffffffffffffffffff", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,--,,,,,,,,,,,,,,--,,,", + ",,,||,,,,,,,,,,,,,,||,,,", + ",,t||,,,,,,,,,,,,,,||t,,", + "----|,,,,,,,,,,,,,,|----", + "----|,,,,,,,,,,,,,,|----", + "===||,,,,,,,,,,,,,,||===", + "..2||,,,,,,,,,,,,,,||=..", + "...||t,,,,,,,,,,,,t||=..", + "...|----,,,,,,,,----|=..", + "...----|,,,,,,,,|----=..", + ".....6||,,,,,,,,||====..", + ".....6||,,,,,,,,||=599..", + "--22--||,,,,,,,,||=-----", + "......||t,,,,,,t||=.....", + "......|----[]----|=.....", + ".33...|----[]----|=.....", + ".33...|.........===.....", + "......|.........=|......" + ], + "palettes": [ "factory" ], + "monster": { "t": { "monster": "mon_turret" } } } + } ] diff --git a/data/mods/More_Locations/factory/factory_te_05.json b/data/mods/More_Locations/factory/factory_te_05.json index 21a40f42fc07a..007166e09e731 100644 --- a/data/mods/More_Locations/factory/factory_te_05.json +++ b/data/mods/More_Locations/factory/factory_te_05.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_te"], - "comment" : "top edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - "ffffffffffffffffffffffff", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,------------------,,,", - ",,,|PPPPPPPPPPPPPPPP|,,,", - ",,,|PT T T TP|,,,", - ",,,|P P|,,,", - "----P P----", - "----PT TP----", - "===|P P|=2=", - "..=|P P|...", - "..=|PT TP|...", - "..=|PPPP8 8PPPP|...", - "..=----P |----...", - "..=gg4|6 ||l.....", - "..=gg4|| ||l.....", - "--=---|| ||---!--", - "..=...|| ||L....2", - "..=...|---....---|L.....", - "..=...|---....---|L.....", - "..======3........|L.....", - "......|=.........|......" - ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_te" ], + "comment": "top edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + "ffffffffffffffffffffffff", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,------------------,,,", + ",,,|PPPPPPPPPPPPPPPP|,,,", + ",,,|PT T T TP|,,,", + ",,,|P P|,,,", + "----P P----", + "----PT TP----", + "===|P P|=2=", + "..=|P P|...", + "..=|PT TP|...", + "..=|PPPP8 8PPPP|...", + "..=----P |----...", + "..=gg4|6 ||l.....", + "..=gg4|| ||l.....", + "--=---|| ||---!--", + "..=...|| ||L....2", + "..=...|---....---|L.....", + "..=...|---....---|L.....", + "..======3........|L.....", + "......|=.........|......" + ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_te_06.json b/data/mods/More_Locations/factory/factory_te_06.json index 401b75c459ed4..4f93e5352c9bb 100644 --- a/data/mods/More_Locations/factory/factory_te_06.json +++ b/data/mods/More_Locations/factory/factory_te_06.json @@ -1,44 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_te"], - "comment" : "top edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - "ffffffffffffffffffffffff", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,M*MM*M,,,,P,,,,", - ",,,,,,,,,M~~~~M,,,,P,,,,", - ",,,,-----M~~~~MPPPPP,,,,", - ",,,,|PPPPM~~~~M----|,,,,", - ",,,,|P,T,M~~~~M,k,||,,,,", - ",,,,|P,,,M*MM*M,,,||,,,,", - "-----P,,,,,,,,,,,,||----", - "---PPPT,,,,,,,,,,,------", - "......,,,,,,,,,,,,.2====", - "......,,,,,,,,,,,,......", - "......,,,,,,,,,,,,......", - "......,,,,,,,,,,,,......", - "......,,,,,,,,,,,,......", - ".LLL..|,,,,,,,,,,|2.....", - "------1-,,,,,,,,-1----!-", - "223223|.....Z....|......", - "......|..........|.4.4..", - ".................|......", - ".................|.4.4..", - "......|..........|......" - ], - "palettes": [ - "factory" - ], - "monster": { - "Z": { "monster": "mon_secubot" } - } - } + { + "type": "mapgen", + "om_terrain": [ "factory_te" ], + "comment": "top edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + "ffffffffffffffffffffffff", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,M*MM*M,,,,P,,,,", + ",,,,,,,,,M~~~~M,,,,P,,,,", + ",,,,-----M~~~~MPPPPP,,,,", + ",,,,|PPPPM~~~~M----|,,,,", + ",,,,|P,T,M~~~~M,k,||,,,,", + ",,,,|P,,,M*MM*M,,,||,,,,", + "-----P,,,,,,,,,,,,||----", + "---PPPT,,,,,,,,,,,------", + "......,,,,,,,,,,,,.2====", + "......,,,,,,,,,,,,......", + "......,,,,,,,,,,,,......", + "......,,,,,,,,,,,,......", + "......,,,,,,,,,,,,......", + ".LLL..|,,,,,,,,,,|2.....", + "------1-,,,,,,,,-1----!-", + "223223|.....Z....|......", + "......|..........|.4.4..", + ".................|......", + ".................|.4.4..", + "......|..........|......" + ], + "palettes": [ "factory" ], + "monster": { "Z": { "monster": "mon_secubot" } } } + } ] diff --git a/data/mods/More_Locations/factory/factory_tlc_01.json b/data/mods/More_Locations/factory/factory_tlc_01.json index 599bfca23106b..772f5152274c8 100644 --- a/data/mods/More_Locations/factory/factory_tlc_01.json +++ b/data/mods/More_Locations/factory/factory_tlc_01.json @@ -1,44 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_tlc"], - "comment" : "top left corner", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,ffffffffffffffffffffff", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,gggggggg,,,,,,,", - ",,F,,,,,,g......g,,,,,,,", - ",,F,,,,,,g..ZZ..g,,,,,,,", - ",,F,,,,,,g...-----------", - ",,F,,,,,,gggg|----------", - ",,F,,,,,,,,,,||===7=====", - ",,F,,,,,,,,,,||9.....|..", - ",,F,,,,,------|=.....|..", - ",,F,,,,,|------=.....|6.", - ",,F,,,,,||....25.....|..", - ",,F,,,,,||.....=.....|6.", - ",,F,,,,,||....u=.....---", - ",,F,,,,,||.3====........", - ",,F,,,,,|---=------.....", - ",,F,,,,,----=.....|.....", - ",,F,,,,,,,||8.....|.....", - ",,F,,,,,,,||=.....|....." - ], - "palettes": [ - "factory" - ], - "monster": { - "Z": { "monster": "mon_secubot" } - } - } + { + "type": "mapgen", + "om_terrain": [ "factory_tlc" ], + "comment": "top left corner", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,ffffffffffffffffffffff", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,gggggggg,,,,,,,", + ",,F,,,,,,g......g,,,,,,,", + ",,F,,,,,,g..ZZ..g,,,,,,,", + ",,F,,,,,,g...-----------", + ",,F,,,,,,gggg|----------", + ",,F,,,,,,,,,,||===7=====", + ",,F,,,,,,,,,,||9.....|..", + ",,F,,,,,------|=.....|..", + ",,F,,,,,|------=.....|6.", + ",,F,,,,,||....25.....|..", + ",,F,,,,,||.....=.....|6.", + ",,F,,,,,||....u=.....---", + ",,F,,,,,||.3====........", + ",,F,,,,,|---=------.....", + ",,F,,,,,----=.....|.....", + ",,F,,,,,,,||8.....|.....", + ",,F,,,,,,,||=.....|....." + ], + "palettes": [ "factory" ], + "monster": { "Z": { "monster": "mon_secubot" } } } + } ] diff --git a/data/mods/More_Locations/factory/factory_tlc_02.json b/data/mods/More_Locations/factory/factory_tlc_02.json index 1bf97469b89cb..e5619636f573f 100644 --- a/data/mods/More_Locations/factory/factory_tlc_02.json +++ b/data/mods/More_Locations/factory/factory_tlc_02.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_tlc"], - "comment" : "top left corner", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,ffffffffffffffffffffff", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,------", - ",,F,,,,,,,,,,,,,,,|-----", - ",,F,,,,,,,,,,,,,,,||.===", - ",,F,,,,,,,,,,,,,,,||x=..", - ",,F,,,,,,,,,,,,,,,||.=..", - ",,F,,,,,,,,,,,,,,,||x=..", - ",,F,,,,,,,,,,,,,,,||.=..", - ",,F,,,,,,,,,,,,,,,||.=..", - ",,F,,,,,,,-----------2--", - ",,F,,,,,,,|---------x=.x", - ",,F,,,,,,,||4.g.4.gx.=..", - ",,F,,,,,,,||..g...g..x..", - ",,F,,,,,,,||ggggggg...x.", - ",,F,,,,,,,||......|....." - ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_tlc" ], + "comment": "top left corner", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,ffffffffffffffffffffff", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,------", + ",,F,,,,,,,,,,,,,,,|-----", + ",,F,,,,,,,,,,,,,,,||.===", + ",,F,,,,,,,,,,,,,,,||x=..", + ",,F,,,,,,,,,,,,,,,||.=..", + ",,F,,,,,,,,,,,,,,,||x=..", + ",,F,,,,,,,,,,,,,,,||.=..", + ",,F,,,,,,,,,,,,,,,||.=..", + ",,F,,,,,,,-----------2--", + ",,F,,,,,,,|---------x=.x", + ",,F,,,,,,,||4.g.4.gx.=..", + ",,F,,,,,,,||..g...g..x..", + ",,F,,,,,,,||ggggggg...x.", + ",,F,,,,,,,||......|....." + ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_tlc_04.json b/data/mods/More_Locations/factory/factory_tlc_04.json index ec9df9d46a1f8..0b9f68a39a102 100644 --- a/data/mods/More_Locations/factory/factory_tlc_04.json +++ b/data/mods/More_Locations/factory/factory_tlc_04.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_tlc"], - "comment" : "top left corner", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,ffffffffffffffffffffff", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,------", - ",,F,,,,,,,,,,,,,,,|-----", - ",,F,,,,,,,,,,,,,,,||====", - ",,F,,,,,,,,,,,,,,,||=9..", - ",,F,,,,,,,,,,,,,,,||=...", - ",,F,,,,,,,,,,,,,,,||=9..", - ",,F,,,,,,,,,,,,,,,||=...", - ",,F,,,,,,,,,,,,,,,||=9..", - ",,F,,,,,,,----------=---", - ",,F,,,,,,,|---------=...", - ",,F,,,,,,,||========33..", - ",,F,,,,,,,||=7.7.7|.33..", - ",,F,,,,,,,||=.....|.....", - ",,F,,,,,,,||=.....|....." - ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_tlc" ], + "comment": "top left corner", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,ffffffffffffffffffffff", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,------", + ",,F,,,,,,,,,,,,,,,|-----", + ",,F,,,,,,,,,,,,,,,||====", + ",,F,,,,,,,,,,,,,,,||=9..", + ",,F,,,,,,,,,,,,,,,||=...", + ",,F,,,,,,,,,,,,,,,||=9..", + ",,F,,,,,,,,,,,,,,,||=...", + ",,F,,,,,,,,,,,,,,,||=9..", + ",,F,,,,,,,----------=---", + ",,F,,,,,,,|---------=...", + ",,F,,,,,,,||========33..", + ",,F,,,,,,,||=7.7.7|.33..", + ",,F,,,,,,,||=.....|.....", + ",,F,,,,,,,||=.....|....." + ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_tlc_05.json b/data/mods/More_Locations/factory/factory_tlc_05.json index 912b6e481705a..7dcf1cdb27b36 100644 --- a/data/mods/More_Locations/factory/factory_tlc_05.json +++ b/data/mods/More_Locations/factory/factory_tlc_05.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_tlc"], - "comment" : "top left corner", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,ffffffffffffffffffffff", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,,,,,,,,,,,,,,,,,,,,", - ",,F,,fffffffffff,,,,,,,,", - ",,F,,FwwwwwwwwwF,,,,,,,,", - ",,F,,Fw~~~~~~~wF,,,,,,,,", - ",,F,,Fw~~~~~~~wF,,,,,,,,", - ",,F,,Fw~~~~~~~wF,,,,,,,,", - ",,F,,Fw~~~~~~~wF,,------", - ",,F,,Fw~~~~~~~wF,,|-----", - ",,F,,Fw~~~~~~~wF,,||xxx.", - ",,F,,Fw~~~~~~~wF,,||xxx.", - ",,F,,FwwwwwwwwwF,,||xxx.", - ",,F,,fffffffffff,,||.x..", - ",,F,,,,,,,,,,,,,,,||....", - ",,F,,,,,,,,,,,,,,|||..xx", - ",,F,,,,,,,----------!---", - ",,F,,,,,,,|--------.....", - ",,F,,,,,,,||0.0.0.|.....", - ",,F,,,,,,,||......!..TT.", - ",,F,,,,,,,||0.0.0.|..TT.", - ",,F,,,,,,,||=.....|....." - ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_tlc" ], + "comment": "top left corner", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,ffffffffffffffffffffff", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,,,,,,,,,,,,,,,,,,,,", + ",,F,,fffffffffff,,,,,,,,", + ",,F,,FwwwwwwwwwF,,,,,,,,", + ",,F,,Fw~~~~~~~wF,,,,,,,,", + ",,F,,Fw~~~~~~~wF,,,,,,,,", + ",,F,,Fw~~~~~~~wF,,,,,,,,", + ",,F,,Fw~~~~~~~wF,,------", + ",,F,,Fw~~~~~~~wF,,|-----", + ",,F,,Fw~~~~~~~wF,,||xxx.", + ",,F,,Fw~~~~~~~wF,,||xxx.", + ",,F,,FwwwwwwwwwF,,||xxx.", + ",,F,,fffffffffff,,||.x..", + ",,F,,,,,,,,,,,,,,,||....", + ",,F,,,,,,,,,,,,,,|||..xx", + ",,F,,,,,,,----------!---", + ",,F,,,,,,,|--------.....", + ",,F,,,,,,,||0.0.0.|.....", + ",,F,,,,,,,||......!..TT.", + ",,F,,,,,,,||0.0.0.|..TT.", + ",,F,,,,,,,||=.....|....." + ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_trc_01.json b/data/mods/More_Locations/factory/factory_trc_01.json index 1e5bef066aa2d..557bbb3ead2e4 100644 --- a/data/mods/More_Locations/factory/factory_trc_01.json +++ b/data/mods/More_Locations/factory/factory_trc_01.json @@ -1,46 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_trc"], - "comment" : "top right corner", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - "ffffffffffffffffffffff,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,wwwwww,,,,,,,,,F,,", - ",,,,,,,,,,,w,,,,,,,,,F,,", - "------,,,,,w,,,,,,,,,F,,", - "-----|,,,,,w,,,,,,,,,F,,", - "==33||t,,,,w,,,,,,,,,F,,", - "..33|------]-----,,,,F,,", - "....-------]----|,,,,F,,", - "...t|l.........||,,,,F,,", - "....+.........A||,,,,F,,", - "...t|V........A||,,,,F,,", - "----|V.........||,,,,F,,", - "===2|V..AAA...N||,,,,F,,", - "....------------|,,,,F,,", - "....!.......|----,,,,F,,", - "....--......||,,,,,,,F,,", - "....2|......||,,,,,,,F,," - ], - "palettes": [ - "factory" - ], - "monster": { - "t": { "monster": "mon_turret" }, - "Z": { "monster": "mon_secubot" }, - "z": { "monster": "mon_skitterbot" } - } - } + { + "type": "mapgen", + "om_terrain": [ "factory_trc" ], + "comment": "top right corner", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + "ffffffffffffffffffffff,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,wwwwww,,,,,,,,,F,,", + ",,,,,,,,,,,w,,,,,,,,,F,,", + "------,,,,,w,,,,,,,,,F,,", + "-----|,,,,,w,,,,,,,,,F,,", + "==33||t,,,,w,,,,,,,,,F,,", + "..33|------]-----,,,,F,,", + "....-------]----|,,,,F,,", + "...t|l.........||,,,,F,,", + "....+.........A||,,,,F,,", + "...t|V........A||,,,,F,,", + "----|V.........||,,,,F,,", + "===2|V..AAA...N||,,,,F,,", + "....------------|,,,,F,,", + "....!.......|----,,,,F,,", + "....--......||,,,,,,,F,,", + "....2|......||,,,,,,,F,," + ], + "palettes": [ "factory" ], + "monster": { "t": { "monster": "mon_turret" }, "Z": { "monster": "mon_secubot" }, "z": { "monster": "mon_skitterbot" } } } + } ] diff --git a/data/mods/More_Locations/factory/factory_trc_02.json b/data/mods/More_Locations/factory/factory_trc_02.json index 69724fd65057a..6ec5a42e28096 100644 --- a/data/mods/More_Locations/factory/factory_trc_02.json +++ b/data/mods/More_Locations/factory/factory_trc_02.json @@ -1,44 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_trc"], - "comment" : "top right corner", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - "ffffffffffffffffffffff,,", - ",,,,,,,,,,,,---------F,,", - ",,,,,,,,,,,,|.......|F,,", - ",,,,,,,,,,,,|.T.T.T.|F,,", - ",,,,,,,,,,,,|.......|F,,", - ",,,,,,,,,,,,|.T.T.T.|F,,", - ",,,,,,,,,,---.......|F,,", - ",,,,,,,,,,|t..T.T.T.|F,,", - "-----------.........|F,,", - "-----------....------F,,", - "=7=7=7======..t|,,,,,F,,", - ".........u.=|---,,,,,F,,", - "...........=||,,,,,,,F,,", - "...........=||,,,,,,,F,,", - "...........=||,,,,,,,F,,", - "...........9||,,,,,,,F,,", - "-***-1.....=||,,,,,,,F,,", - ".000.|.....9||,,,,,,,F,,", - "....0*.....=||,,,,,,,F,,", - ".00.0*.....9||,,,,,,,F,,", - ".00.0*.....=||,,,,,,,F,,", - ".....|.....=||,,,,,,,F,," - ], - "palettes": [ - "factory" - ], - "monster": { - "t": { "monster": "mon_turret" } - } - } + { + "type": "mapgen", + "om_terrain": [ "factory_trc" ], + "comment": "top right corner", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + "ffffffffffffffffffffff,,", + ",,,,,,,,,,,,---------F,,", + ",,,,,,,,,,,,|.......|F,,", + ",,,,,,,,,,,,|.T.T.T.|F,,", + ",,,,,,,,,,,,|.......|F,,", + ",,,,,,,,,,,,|.T.T.T.|F,,", + ",,,,,,,,,,---.......|F,,", + ",,,,,,,,,,|t..T.T.T.|F,,", + "-----------.........|F,,", + "-----------....------F,,", + "=7=7=7======..t|,,,,,F,,", + ".........u.=|---,,,,,F,,", + "...........=||,,,,,,,F,,", + "...........=||,,,,,,,F,,", + "...........=||,,,,,,,F,,", + "...........9||,,,,,,,F,,", + "-***-1.....=||,,,,,,,F,,", + ".000.|.....9||,,,,,,,F,,", + "....0*.....=||,,,,,,,F,,", + ".00.0*.....9||,,,,,,,F,,", + ".00.0*.....=||,,,,,,,F,,", + ".....|.....=||,,,,,,,F,," + ], + "palettes": [ "factory" ], + "monster": { "t": { "monster": "mon_turret" } } } + } ] diff --git a/data/mods/More_Locations/factory/factory_trc_03.json b/data/mods/More_Locations/factory/factory_trc_03.json index 5dd075b545cab..786b686f14063 100644 --- a/data/mods/More_Locations/factory/factory_trc_03.json +++ b/data/mods/More_Locations/factory/factory_trc_03.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_trc"], - "comment" : "top right corner", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - "ffffffffffffffffffffff,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - "--,,,,,,,,,,,,,,,,,,,F,,", - "---,,,,,,,,,,,,,,,,,,F,,", - "---.,,,,,,,,,,,,,,,,,F,,", - "=---,,,,,,,,,,,,,,,,,F,,", - "==---,,,,,,,,,,,,,,,,F,,", - ".==---,,,,,,,,,,,,,,,F,,", - "..==---,,,,,,,,,,,,,,F,,", - "...==---,,,,,,,,,,,,,F,,", - "----==---,,,,,,,,,,,,F,,", - "..l|3==---,,,,,,,,,,,F,,", - "...---==---,,,,,,,,,,F,,", - "....l|.==---,,,,,,,,,F,,", - ".....!..==--|,,,,,,,,F,,", - ".....|...==-||,,,,,,,F,," - ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_trc" ], + "comment": "top right corner", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + "ffffffffffffffffffffff,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + "--,,,,,,,,,,,,,,,,,,,F,,", + "---,,,,,,,,,,,,,,,,,,F,,", + "---.,,,,,,,,,,,,,,,,,F,,", + "=---,,,,,,,,,,,,,,,,,F,,", + "==---,,,,,,,,,,,,,,,,F,,", + ".==---,,,,,,,,,,,,,,,F,,", + "..==---,,,,,,,,,,,,,,F,,", + "...==---,,,,,,,,,,,,,F,,", + "----==---,,,,,,,,,,,,F,,", + "..l|3==---,,,,,,,,,,,F,,", + "...---==---,,,,,,,,,,F,,", + "....l|.==---,,,,,,,,,F,,", + ".....!..==--|,,,,,,,,F,,", + ".....|...==-||,,,,,,,F,," + ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_trc_04.json b/data/mods/More_Locations/factory/factory_trc_04.json index 9a6cb7a4f0cfa..9b4fc1329fb3a 100644 --- a/data/mods/More_Locations/factory/factory_trc_04.json +++ b/data/mods/More_Locations/factory/factory_trc_04.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_trc"], - "comment" : "top right corner", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - "ffffffffffffffffffffff,,", - ",,,,~~~~~~~~~~~,,,,,,F,,", - ",,~~~~~~~~~~~~~~~~~,,F,,", - ",,,~~~~~~~~~~~~~~~~,,F,,", - ",,,~~~~~~~~~~~~~~~,,,F,,", - ",,,~~~~~~~~~~~~~~,,,,F,,", - ",,,~~~~~~~~~~~~~~~,,,F,,", - ",,,,~~~~~~~~~~~~~~~,,F,,", - "--,,,,~~~~~~~~~~~~~,,F,,", - "---,,,,~~~~~~~~~~~,,,F,,", - "---.,,,~~~~~~~~~~~~,,F,,", - ".---,,,~~~~~~~~~~~~,,F,,", - ".|---,,,~~~~~~~~~~~,,F,,", - ".|.---,,,,~~~~~~~~,,,F,,", - "....---,,,,~~~~~~~~,,F,,", - ".....---,,,,~~~~~~~,,F,,", - "-1...----,,,,,~~~~,,,F,,", - ".......---,,,,,~~~,,,F,,", - "........---,,,,,~,,,,F,,", - ".........---,,,,,,,,,F,,", - ".....1..----|,,,,,,,,F,,", - ".....|.....-||,,,,,,,F,," - ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_trc" ], + "comment": "top right corner", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + "ffffffffffffffffffffff,,", + ",,,,~~~~~~~~~~~,,,,,,F,,", + ",,~~~~~~~~~~~~~~~~~,,F,,", + ",,,~~~~~~~~~~~~~~~~,,F,,", + ",,,~~~~~~~~~~~~~~~,,,F,,", + ",,,~~~~~~~~~~~~~~,,,,F,,", + ",,,~~~~~~~~~~~~~~~,,,F,,", + ",,,,~~~~~~~~~~~~~~~,,F,,", + "--,,,,~~~~~~~~~~~~~,,F,,", + "---,,,,~~~~~~~~~~~,,,F,,", + "---.,,,~~~~~~~~~~~~,,F,,", + ".---,,,~~~~~~~~~~~~,,F,,", + ".|---,,,~~~~~~~~~~~,,F,,", + ".|.---,,,,~~~~~~~~,,,F,,", + "....---,,,,~~~~~~~~,,F,,", + ".....---,,,,~~~~~~~,,F,,", + "-1...----,,,,,~~~~,,,F,,", + ".......---,,,,,~~~,,,F,,", + "........---,,,,,~,,,,F,,", + ".........---,,,,,,,,,F,,", + ".....1..----|,,,,,,,,F,,", + ".....|.....-||,,,,,,,F,," + ], + "palettes": [ "factory" ] } + } ] diff --git a/data/mods/More_Locations/factory/factory_trc_05.json b/data/mods/More_Locations/factory/factory_trc_05.json index 2ced3ea3331c7..3292ba1aa41ee 100644 --- a/data/mods/More_Locations/factory/factory_trc_05.json +++ b/data/mods/More_Locations/factory/factory_trc_05.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["factory_trc"], - "comment" : "top right corner", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,,", - "ffffffffffffffffffffff,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,,,,,,,,,,,,,,,,,,,F,,", - ",,,--------------,,,,F,,", - ",,,|------------|,,,,F,,", - ",,,||V V V V ||,,,,F,,", - "----| ||,,,,F,,", - "----| ||,,,,F,,", - "77..+ ||,,,,F,,", - "....+ nnn p||,,,,F,,", - "....|----------||,,,,F,,", - "....| c NN||,,,,F,,", - "....! ||,,,,F,,", - "....! D 6||,,,,F,,", - "-1..| c Dc 6||,,,,F,,", - "....| D 6||,,,,F,,", - "....---gggg-----|,,,,F,,", - "....4|......|----,,,,F,,", - "....4|......||,,,,,,,F,,", - ".....|....22||,,,,,,,F,," - ], - "palettes": [ - "factory" - ] - } + { + "type": "mapgen", + "om_terrain": [ "factory_trc" ], + "comment": "top right corner", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ",,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,,,,,,,,,,,,,,,,,,,", + "ffffffffffffffffffffff,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,,,,,,,,,,,,,,,,,,,F,,", + ",,,--------------,,,,F,,", + ",,,|------------|,,,,F,,", + ",,,||V V V V ||,,,,F,,", + "----| ||,,,,F,,", + "----| ||,,,,F,,", + "77..+ ||,,,,F,,", + "....+ nnn p||,,,,F,,", + "....|----------||,,,,F,,", + "....| c NN||,,,,F,,", + "....! ||,,,,F,,", + "....! D 6||,,,,F,,", + "-1..| c Dc 6||,,,,F,,", + "....| D 6||,,,,F,,", + "....---gggg-----|,,,,F,,", + "....4|......|----,,,,F,,", + "....4|......||,,,,,,,F,,", + ".....|....22||,,,,,,,F,," + ], + "palettes": [ "factory" ] } + } ] diff --git a/json_blacklist b/json_blacklist index a438f7bc1ec4b..85814ed9f7647 100644 --- a/json_blacklist +++ b/json_blacklist @@ -45,32 +45,6 @@ data/mods/More_Locations/factory/factory_mid_08.json data/mods/More_Locations/factory/factory_mid_09.json data/mods/More_Locations/factory/factory_mid_10.json data/mods/More_Locations/factory/factory_mid_11.json -data/mods/More_Locations/factory/factory_mid_12.json -data/mods/More_Locations/factory/factory_mid_13.json -data/mods/More_Locations/factory/factory_mid_15.json -data/mods/More_Locations/factory/factory_mid_16.json -data/mods/More_Locations/factory/factory_mid_17.json -data/mods/More_Locations/factory/factory_re_01.json -data/mods/More_Locations/factory/factory_re_02.json -data/mods/More_Locations/factory/factory_re_03.json -data/mods/More_Locations/factory/factory_re_04.json -data/mods/More_Locations/factory/factory_re_05.json -data/mods/More_Locations/factory/factory_re_06.json -data/mods/More_Locations/factory/factory_te_01.json -data/mods/More_Locations/factory/factory_te_02.json -data/mods/More_Locations/factory/factory_te_03.json -data/mods/More_Locations/factory/factory_te_04.json -data/mods/More_Locations/factory/factory_te_05.json -data/mods/More_Locations/factory/factory_te_06.json -data/mods/More_Locations/factory/factory_tlc_01.json -data/mods/More_Locations/factory/factory_tlc_02.json -data/mods/More_Locations/factory/factory_tlc_04.json -data/mods/More_Locations/factory/factory_tlc_05.json -data/mods/More_Locations/factory/factory_trc_01.json -data/mods/More_Locations/factory/factory_trc_02.json -data/mods/More_Locations/factory/factory_trc_03.json -data/mods/More_Locations/factory/factory_trc_04.json -data/mods/More_Locations/factory/factory_trc_05.json data/mods/More_Locations/military_outpost/mil_outpost_1tlc_00.json data/mods/More_Locations/military_outpost/mil_outpost_1tlc_01.json data/mods/More_Locations/military_outpost/mil_outpost_1trc_00.json