diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_umid_finale_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_umid_finale_01.json index a9cb08e1dbbb1..a737e8500d578 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_umid_finale_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_umid_finale_01.json @@ -1,61 +1,51 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_umid_finale"], - "comment" : "underground middle", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########| |............", - "########| ------.......", - "########| |.......", - "########| |.......", - "####MMMMMM[][]MMMMMM--+-", - "####M 77 M....", - "####M 7M....", - "####M c TTT 7M....", - "----M 47 TTTc 7M....", - "...|M 47 TTT M....", - "...|M 47 TTT M----", - "...|M 47 [ ", - "...|M 47 zz c ] ", - "...|M zz M --", - "...|M zz M |.", - "...|M M |.", - "...|M M |.", - "----M M |.", - " M yYH M |-", - " MMMMMMMMMMMMMMMM |.", - "-- |.", - ".| |.", - ".----------------------.", - "....|##########|........" - ], - "palettes":[ - "mil_outpost_underground" - ], - "terrain": { - "Y":"t_utility_light" - }, - "furniture": { - "Y":"f_displaycase", - "y":"f_displaycase", - "H":"f_displaycase" - }, - "item": { - "Y": [ - { "item": "power_armor_basic", "chance": 20 }, - { "item": "power_armor_helmet_basic", "chance": 20 }, - { "item": "power_armor_frame", "chance": 20 } - ], - "y": { "item": "adv_UPS_off", "count": [0 , 1] }, - "H": { "item": "laser_rifle", "count": [0 , 1] } - }, - "monster": { - "z": { "monster": "mon_zombie_armored" } - } - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_umid_finale" ], + "comment": "underground middle", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########| |............", + "########| ------.......", + "########| |.......", + "########| |.......", + "####MMMMMM[][]MMMMMM--+-", + "####M 77 M....", + "####M 7M....", + "####M c TTT 7M....", + "----M 47 TTTc 7M....", + "...|M 47 TTT M....", + "...|M 47 TTT M----", + "...|M 47 [ ", + "...|M 47 zz c ] ", + "...|M zz M --", + "...|M zz M |.", + "...|M M |.", + "...|M M |.", + "----M M |.", + " M yYH M |-", + " MMMMMMMMMMMMMMMM |.", + "-- |.", + ".| |.", + ".----------------------.", + "....|##########|........" + ], + "palettes": [ "mil_outpost_underground" ], + "terrain": { "Y": "t_utility_light" }, + "furniture": { "Y": "f_displaycase", "y": "f_displaycase", "H": "f_displaycase" }, + "item": { + "Y": [ + { "item": "power_armor_basic", "chance": 20 }, + { "item": "power_armor_helmet_basic", "chance": 20 }, + { "item": "power_armor_frame", "chance": 20 } + ], + "y": { "item": "adv_UPS_off", "count": [ 0, 1 ] }, + "H": { "item": "laser_rifle", "count": [ 0, 1 ] } + }, + "monster": { "z": { "monster": "mon_zombie_armored" } } } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ure_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_ure_00.json index 7fc1abda3955f..4ed64124ee753 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ure_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ure_00.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_ure"], - "comment" : "underground right edge", - "method": "json", - "weight": 0, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "....|###|.........|#####", - "........................", - "........................", - "........................", - "-.......................", - "........................", - "........................", - "........................", - "........................", - "........................", - "-.......................", - "........................", - "........................", - "-.......................", - "........................", - "........................", - "........................", - "........................", - "-.......................", - "........................", - "........................", - "........................", - "........................", - "......|......|..|#######" - ], - "palettes":[ - "mil_outpost_underground" - ] - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_ure" ], + "comment": "underground right edge", + "method": "json", + "weight": 0, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "....|###|.........|#####", + "........................", + "........................", + "........................", + "-.......................", + "........................", + "........................", + "........................", + "........................", + "........................", + "-.......................", + "........................", + "........................", + "-.......................", + "........................", + "........................", + "........................", + "........................", + "-.......................", + "........................", + "........................", + "........................", + "........................", + "......|......|..|#######" + ], + "palettes": [ "mil_outpost_underground" ] } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ure_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_ure_01.json index bdbb5623b7a17..c84250d220c83 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ure_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ure_01.json @@ -1,48 +1,41 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_ure"], - "comment" : "underground right edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "....|###|.........|#####", - "....|###|5.......5|#####", - "....|###|.........|#####", - "....|###|5..0.0..5|#####", - "--------|---------|#####", - "..CCssCC|.........|#####", - "........|.Y..Y..Y.|#####", - "..CCssCC|.........|#####", - "........|.Y..Y..Y.|#####", - "....ssCC|.........|#####", - "--+--------1...1---#####", - " |#######", - ". |#######", - "-------------- |#######", - ".U.UUUU.gLLLL| |#######", - "........g....| |#######", - "........gg.gg| |#######", - "..cDD........+ |#######", - "-------------| |#######", - "......|CssssC| |#######", - "......|C....C| |#######", - "......|C.....+ |#######", - "......|C....C| |#######", - "......|C....C| |#######" - ], - "palettes":[ - "mil_outpost_underground" - ], - "terrain":{ - "5": "t_ind_press", - "0": "t_ind_furnace" - }, - "furniture":{ - "Y": "f_exercise" - } - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_ure" ], + "comment": "underground right edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "....|###|.........|#####", + "....|###|5.......5|#####", + "....|###|.........|#####", + "....|###|5..0.0..5|#####", + "--------|---------|#####", + "..CCssCC|.........|#####", + "........|.Y..Y..Y.|#####", + "..CCssCC|.........|#####", + "........|.Y..Y..Y.|#####", + "....ssCC|.........|#####", + "--+--------1...1---#####", + " |#######", + ". |#######", + "-------------- |#######", + ".U.UUUU.gLLLL| |#######", + "........g....| |#######", + "........gg.gg| |#######", + "..cDD........+ |#######", + "-------------| |#######", + "......|CssssC| |#######", + "......|C....C| |#######", + "......|C.....+ |#######", + "......|C....C| |#######", + "......|C....C| |#######" + ], + "palettes": [ "mil_outpost_underground" ], + "terrain": { "5": "t_ind_press", "0": "t_ind_furnace" }, + "furniture": { "Y": "f_exercise" } } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ure_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_ure_02.json index 38b6063f9312b..e02ea42523ae7 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ure_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ure_02.json @@ -1,45 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_ure"], - "comment" : "underground right edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "....|###|....=....|#####", - "...3-----.c.c=..5.|#####", - ".30===========.5gg|#####", - "...3..c.c.c.c.5.g4|#####", - "-------------------#####", - "CCCC..U|################", - "......R|################", - "CCCC..U|################", - "......R|################", - "......U|################", - "--+-----################", - " |################", - " |################", - "----- |################", - "....| |################", - "....+ |################", - "....| |################", - "....| |################", - "----| ----------#######", - "...C| |#######", - "...C| |#######", - "...C-----!!--- |#######", - "...CCC|......| |#######", - ".....C|......| |#######" - ], - "palettes":[ - "mil_outpost_underground" - ], - "terrain":{ - "=": "t_conveyor", - "0": "t_ind_assembler" - } - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_ure" ], + "comment": "underground right edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "....|###|....=....|#####", + "...3-----.c.c=..5.|#####", + ".30===========.5gg|#####", + "...3..c.c.c.c.5.g4|#####", + "-------------------#####", + "CCCC..U|################", + "......R|################", + "CCCC..U|################", + "......R|################", + "......U|################", + "--+-----################", + " |################", + " |################", + "----- |################", + "....| |################", + "....+ |################", + "....| |################", + "....| |################", + "----| ----------#######", + "...C| |#######", + "...C| |#######", + "...C-----!!--- |#######", + "...CCC|......| |#######", + ".....C|......| |#######" + ], + "palettes": [ "mil_outpost_underground" ], + "terrain": { "=": "t_conveyor", "0": "t_ind_assembler" } } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ure_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_ure_03.json index cc9d177d88ca5..bd474a6b781fc 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ure_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ure_03.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_ure"], - "comment" : "underground right edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "....|###|.........|#####", - "....|----.........|#####", - "....|74...........|#####", - "....|.............|#####", - "--!--.....33......|#####", - ".........3##3.....|#####", - ".........3##3.....|#####", - "..........33....74|#####", - "..................|#####", - ".....nnn........74|#####", - "--+----------------#####", - " |#######", - " |##...##", - "---------+---- |##...##", - ".............| |##...##", - ".............| |##...##", - ".............| +.....##", - "CCCCCCCC.....| |##...##", - "-------C.....| |##...##", - ".N.N.N|C.....| |#######", - ".N.N.N|C.....| |#######", - ".N N.N|C.....| |#######", - ".N.N.N|C.....| |#######", - "......|C.....| |#######" - ], - "palettes":[ - "mil_outpost_underground" - ] - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_ure" ], + "comment": "underground right edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "....|###|.........|#####", + "....|----.........|#####", + "....|74...........|#####", + "....|.............|#####", + "--!--.....33......|#####", + ".........3##3.....|#####", + ".........3##3.....|#####", + "..........33....74|#####", + "..................|#####", + ".....nnn........74|#####", + "--+----------------#####", + " |#######", + " |##...##", + "---------+---- |##...##", + ".............| |##...##", + ".............| |##...##", + ".............| +.....##", + "CCCCCCCC.....| |##...##", + "-------C.....| |##...##", + ".N.N.N|C.....| |#######", + ".N.N.N|C.....| |#######", + ".N N.N|C.....| |#######", + ".N.N.N|C.....| |#######", + "......|C.....| |#######" + ], + "palettes": [ "mil_outpost_underground" ] } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_ure_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_ure_04.json index 0ffc00e102a8e..afb63fa8beafc 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_ure_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_ure_04.json @@ -1,49 +1,41 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_ure"], - "comment" : "underground right edge", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "....|###|.......33|#####", - "...C|###|...====33|#####", - "...C|###|...=.....|#####", - "...C|###|2===.....|#####", - "-+------|------+--|#####", - "....|XXX|B..B|....|#####", - "....|x.x|B..B|L..L|#####", - "....+..x|....|....|#####", - "....|x.x|....|L..L|#####", - ".sss|XXX|l..l|....|#####", - "----------+----+-------#", - " |l..BB|#", - " |.....|#", - "-------------- |l..BB|#", - ".B.B..|UUU..L| +.....|#", - ".B.B..+.....L| |l..BB|#", - "......|UUU..L| |-----|#", - "....BB|------| |l..BB|#", - "--+---|DDc.DD| +.....|#", - "......|N.....+ |l..BB|#", - "......|DD.cDD| |------#", - "......|------| |#######", - "......|......| |#######", - "......|......| |#######" - ], - "palettes":[ - "mil_outpost_underground" - ], - "terrain":{ - "=": "t_conveyor", - "0": "t_ind_assembler" - }, - "items": { - "x": { "item": "cannedfood", "chance": 35 }, - "X": { "item": "cannedfood", "chance": 65 } - } - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_ure" ], + "comment": "underground right edge", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "....|###|.......33|#####", + "...C|###|...====33|#####", + "...C|###|...=.....|#####", + "...C|###|2===.....|#####", + "-+------|------+--|#####", + "....|XXX|B..B|....|#####", + "....|x.x|B..B|L..L|#####", + "....+..x|....|....|#####", + "....|x.x|....|L..L|#####", + ".sss|XXX|l..l|....|#####", + "----------+----+-------#", + " |l..BB|#", + " |.....|#", + "-------------- |l..BB|#", + ".B.B..|UUU..L| +.....|#", + ".B.B..+.....L| |l..BB|#", + "......|UUU..L| |-----|#", + "....BB|------| |l..BB|#", + "--+---|DDc.DD| +.....|#", + "......|N.....+ |l..BB|#", + "......|DD.cDD| |------#", + "......|------| |#######", + "......|......| |#######", + "......|......| |#######" + ], + "palettes": [ "mil_outpost_underground" ], + "terrain": { "=": "t_conveyor", "0": "t_ind_assembler" }, + "items": { "x": { "item": "cannedfood", "chance": 35 }, "X": { "item": "cannedfood", "chance": 65 } } } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utea_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_utea_00.json index b96ae63236403..84b530c05bd13 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utea_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utea_00.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_utea"], - "comment" : "underground top edge. A stair", - "method": "json", - "weight": 0, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "#......................#", - "#......................#", - "#......................#", - "-......................#", - ".......................#", - ".......................-", - "-.......................", - "........................", - "........................", - "........................", - "........................", - "...........<<..........-", - "...........<<...........", - "........................", - ".......................-", - ".......................#", - "-......................#", - ".......................#", - ".......................#", - "-......................-", - "#.......................", - "#.......................", - "#.......................", - "########|..|............" - ], - "palettes":[ - "mil_outpost_underground" - ] - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_utea" ], + "comment": "underground top edge. A stair", + "method": "json", + "weight": 0, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "#......................#", + "#......................#", + "#......................#", + "-......................#", + ".......................#", + ".......................-", + "-.......................", + "........................", + "........................", + "........................", + "........................", + "...........<<..........-", + "...........<<...........", + "........................", + ".......................-", + ".......................#", + "-......................#", + ".......................#", + ".......................#", + "-......................-", + "#.......................", + "#.......................", + "#.......................", + "########|..|............" + ], + "palettes": [ "mil_outpost_underground" ] } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utea_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_utea_01.json index b91307c13a8c5..3b13a2da42c89 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utea_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utea_01.json @@ -1,44 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_utea"], - "comment" : "underground top edge. A stair", - "method": "json", - "weight": 100, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "########################", - "########################", - "-------------###########", - " |###########", - " |######-----", - "---------- --------....", - ".llll....| |D.....", - ".........+ |6c....", - ".........--!!-- |D.....", - ".........| | |D.....", - "...1.....| << | -------", - "fffffffff| << | ", - "..Z......| | ", - ".....Z..|------ -------", - "...Z..Z.| |######", - "--------- |######", - " -------######", - " |############", - "--------- -------------", - "########| !....gDc.....", - "########| !....gD......", - "########| --!!--.......", - "########| |............" - ], - "palettes":[ - "mil_outpost_underground" - ], - "monster": { - "Z": { "monster": "mon_zombie_dog" } - } - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_utea" ], + "comment": "underground top edge. A stair", + "method": "json", + "weight": 100, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "########################", + "########################", + "-------------###########", + " |###########", + " |######-----", + "---------- --------....", + ".llll....| |D.....", + ".........+ |6c....", + ".........--!!-- |D.....", + ".........| | |D.....", + "...1.....| << | -------", + "fffffffff| << | ", + "..Z......| | ", + ".....Z..|------ -------", + "...Z..Z.| |######", + "--------- |######", + " -------######", + " |############", + "--------- -------------", + "########| !....gDc.....", + "########| !....gD......", + "########| --!!--.......", + "########| |............" + ], + "palettes": [ "mil_outpost_underground" ], + "monster": { "Z": { "monster": "mon_zombie_dog" } } } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utea_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_utea_02.json index 53f1473cc2af7..e4aab6d5fdc72 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utea_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utea_02.json @@ -1,41 +1,39 @@ - [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_utea"], - "comment" : "underground top edge. A stair", - "method": "json", - "weight": 100, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "########################", - "########################", - "----------------########", - " +...|########", - " +...---------", - "-----------|...bbbbbbbbb", - "...F.......|............", - "...=.......|T...........", - "...=.....------.........", - "...F.....| |T..b.bbbb", - "..-----!!- << ----------", - "f=| << ", - "..| ", - ".Z| -------------------", - "..| |##################", - "--- -------############", - " |############", - " |############", - "--------- |------------", - "########| |............", - "########| +...c.....c..", - "########| +...TTTTTTT..", - "########| |......c....." - ], - "palettes":[ - "mil_outpost_underground" - ] - } +[ + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_utea" ], + "comment": "underground top edge. A stair", + "method": "json", + "weight": 100, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "########################", + "########################", + "----------------########", + " +...|########", + " +...---------", + "-----------|...bbbbbbbbb", + "...F.......|............", + "...=.......|T...........", + "...=.....------.........", + "...F.....| |T..b.bbbb", + "..-----!!- << ----------", + "f=| << ", + "..| ", + ".Z| -------------------", + "..| |##################", + "--- -------############", + " |############", + " |############", + "--------- |------------", + "########| |............", + "########| +...c.....c..", + "########| +...TTTTTTT..", + "########| |......c....." + ], + "palettes": [ "mil_outpost_underground" ] } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utea_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_utea_03.json index 4ab6843297f8e..fba8d04cb2003 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utea_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utea_03.json @@ -1,44 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_utea"], - "comment" : "underground top edge. A stairs", - "method": "json", - "weight": 100, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "########################", - "########################", - "----------------########", - " |########", - " ---------", - "--+--------- |.....", - ".....x|####| +.....", - ".....x|####----- |.....", - ".....x|########| |.....", - "......|####----- |nnn..", - "......|####|<< ------", - "ffffff|####|<< ", - "......|####| ", - "..Z.Z.|####-------------", - "......|#################", - "--G-G----------#########", - " |#########", - " |#########", - "--------- |---------", - "########| |7g7g7g7g.", - "########| ----.g.g.g.g.", - "########| +............", - "########| |............" - ], - "palettes":[ - "mil_outpost_underground" - ], - "monster": { - "Z": { "monster": "mon_zombie_dog" } - } - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_utea" ], + "comment": "underground top edge. A stairs", + "method": "json", + "weight": 100, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "########################", + "########################", + "----------------########", + " |########", + " ---------", + "--+--------- |.....", + ".....x|####| +.....", + ".....x|####----- |.....", + ".....x|########| |.....", + "......|####----- |nnn..", + "......|####|<< ------", + "ffffff|####|<< ", + "......|####| ", + "..Z.Z.|####-------------", + "......|#################", + "--G-G----------#########", + " |#########", + " |#########", + "--------- |---------", + "########| |7g7g7g7g.", + "########| ----.g.g.g.g.", + "########| +............", + "########| |............" + ], + "palettes": [ "mil_outpost_underground" ], + "monster": { "Z": { "monster": "mon_zombie_dog" } } } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utea_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_utea_04.json index 6884827a3bc65..a534a0f826d71 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utea_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utea_04.json @@ -1,44 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_utea"], - "comment" : "underground top edge. A stair", - "method": "json", - "weight": 100, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "###---------############", - "###|..bbb..|############", - "----.......|############", - " !.......|############", - " !.......|------------", - "-------+---|S.&|B..l|bbb", - "...|p.....p|-.-|B..B|b..", - "...|......n|s..|l..B|Dc.", - "...+....-+---+-|...l|b..", - "...|....| |..BB|bbb", - "...|----- << --+------", - "fff|l..l| << ", - "...|....+ ", - ".Z.|....| ----", - "...|l..l| |###", - "--------- |###", - " |###", - " |###", - "------- ----+--------", - "######| |............", - "######--- |bb..bb..bb..", - "########| |bb..bb..bb..", - "########| |............" - ], - "palettes":[ - "mil_outpost_underground" - ], - "monster": { - "Z": { "monster": "mon_zombie_dog" } - } - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_utea" ], + "comment": "underground top edge. A stair", + "method": "json", + "weight": 100, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "###---------############", + "###|..bbb..|############", + "----.......|############", + " !.......|############", + " !.......|------------", + "-------+---|S.&|B..l|bbb", + "...|p.....p|-.-|B..B|b..", + "...|......n|s..|l..B|Dc.", + "...+....-+---+-|...l|b..", + "...|....| |..BB|bbb", + "...|----- << --+------", + "fff|l..l| << ", + "...|....+ ", + ".Z.|....| ----", + "...|l..l| |###", + "--------- |###", + " |###", + " |###", + "------- ----+--------", + "######| |............", + "######--- |bb..bb..bb..", + "########| |bb..bb..bb..", + "########| |............" + ], + "palettes": [ "mil_outpost_underground" ], + "monster": { "Z": { "monster": "mon_zombie_dog" } } } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_00.json index 24e544c6391da..b4b812879412c 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_00.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_utea"], - "comment" : "underground top edge. B stair", - "method": "json", - "weight": 0, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "#......................#", - "#......................#", - "#......................#", - "-......................#", - ".......................#", - ".......................-", - "-.......................", - "........................", - "........................", - "........................", - "........................", - "...........>>..........-", - "f..........>>...........", - "........................", - ".......................-", - ".......................#", - "-......................#", - ".......................#", - ".......................#", - "-......................-", - "#.......................", - "#.......................", - "#.......................", - "########|..|............" - ], - "palettes":[ - "mil_outpost_underground" - ] - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_utea" ], + "comment": "underground top edge. B stair", + "method": "json", + "weight": 0, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "#......................#", + "#......................#", + "#......................#", + "-......................#", + ".......................#", + ".......................-", + "-.......................", + "........................", + "........................", + "........................", + "........................", + "...........>>..........-", + "f..........>>...........", + "........................", + ".......................-", + ".......................#", + "-......................#", + ".......................#", + ".......................#", + "-......................-", + "#.......................", + "#.......................", + "#.......................", + "########|..|............" + ], + "palettes": [ "mil_outpost_underground" ] } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_01.json b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_01.json index 91ea892bbdbb1..9323cfebcd495 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_01.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_01.json @@ -1,44 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_uteb"], - "comment" : "underground top edge. B stair", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "########################", - "########################", - "------------############", - " |############", - " |------------", - "---1-++-1 |.cTTTTc.bbbb", - "........| +............", - ".....>>.+ +............", - ".....>>.+ -------......", - "........| |c..Nbb", - "...1....1 >> -------", - "ffffffff| >> ", - "..Z.....| ", - ".....Z..| -------------", - "...Z..Z.| |############", - "--------- |###----#####", - " |###|44|#####", - " |###|44|#####", - "--------- |----44------", - "########| |...6666DDD6.", - "########| |........c...", - "########| +............", - "########| |............" - ], - "palettes":[ - "mil_outpost_underground" - ], - "monster": { - "Z": { "monster": "mon_zombie_dog" } - } - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_uteb" ], + "comment": "underground top edge. B stair", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "########################", + "########################", + "------------############", + " |############", + " |------------", + "---1-++-1 |.cTTTTc.bbbb", + "........| +............", + ".....>>.+ +............", + ".....>>.+ -------......", + "........| |c..Nbb", + "...1....1 >> -------", + "ffffffff| >> ", + "..Z.....| ", + ".....Z..| -------------", + "...Z..Z.| |############", + "--------- |###----#####", + " |###|44|#####", + " |###|44|#####", + "--------- |----44------", + "########| |...6666DDD6.", + "########| |........c...", + "########| +............", + "########| |............" + ], + "palettes": [ "mil_outpost_underground" ], + "monster": { "Z": { "monster": "mon_zombie_dog" } } } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_02.json b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_02.json index da8680cc33692..24694308fdfb1 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_02.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_02.json @@ -1,41 +1,39 @@ - [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_uteb"], - "comment" : "underground top edge. B stair", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "##----##################", - "##|>>|##################", - "##|>>|##################", - "--- -----------########", - " +...|########", - " +...---------", - "-----------|....D6D|44..", - "..F........|D....c.|....", - "..=...Z....|6c.....+....", - "..=...Z....|D..c...|....", - "..F.......----D6D.p|44..", - "..F...Z...|>>|----------", - "f=F...Z...|>>| ", - "..|-FF=FF--++- ", - ".Z| --------", - "..| |#######", - "--- ------------#######", - " |##################", - " |##################", - "------##----------------", - "########| |.CCCCCCCCsCC", - "########| +............", - "########| +............", - "########| |............" - ], - "palettes":[ - "mil_outpost_underground" - ] - } +[ + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_uteb" ], + "comment": "underground top edge. B stair", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "##----##################", + "##|>>|##################", + "##|>>|##################", + "--- -----------########", + " +...|########", + " +...---------", + "-----------|....D6D|44..", + "..F........|D....c.|....", + "..=...Z....|6c.....+....", + "..=...Z....|D..c...|....", + "..F.......----D6D.p|44..", + "..F...Z...|>>|----------", + "f=F...Z...|>>| ", + "..|-FF=FF--++- ", + ".Z| --------", + "..| |#######", + "--- ------------#######", + " |##################", + " |##################", + "------##----------------", + "########| |.CCCCCCCCsCC", + "########| +............", + "########| +............", + "########| |............" + ], + "palettes": [ "mil_outpost_underground" ] } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_03.json b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_03.json index 998064ae5a19a..4623af844ec5b 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_03.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_03.json @@ -1,44 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_uteb"], - "comment" : "underground top edge. B stair", - "method": "json", - "weight": 250, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "########################", - "########################", - "----------------########", - " |########", - " |--------", - "------++----- |TTTc....", - "...........l| |TTT.....", - "...........l| |....c...", - "...........l| |........", - "......------- -+---.ss.", - "......|###|>> -----", - "ffffff|###|>> ", - "......|###------- ", - "..Z.Z.|#########|-------", - "......|#################", - "--G-G----------#########", - " |SS|#########", - " |..|#########", - "--------- -++----------", - "########| |..7g7g4g7g7g", - "########| |...g.g.g.g.g", - "########| |............", - "########| |............" - ], - "palettes":[ - "mil_outpost_underground" - ], - "monster": { - "Z": { "monster": "mon_zombie_dog" } - } - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_uteb" ], + "comment": "underground top edge. B stair", + "method": "json", + "weight": 250, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "########################", + "########################", + "----------------########", + " |########", + " |--------", + "------++----- |TTTc....", + "...........l| |TTT.....", + "...........l| |....c...", + "...........l| |........", + "......------- -+---.ss.", + "......|###|>> -----", + "ffffff|###|>> ", + "......|###------- ", + "..Z.Z.|#########|-------", + "......|#################", + "--G-G----------#########", + " |SS|#########", + " |..|#########", + "--------- -++----------", + "########| |..7g7g4g7g7g", + "########| |...g.g.g.g.g", + "########| |............", + "########| |............" + ], + "palettes": [ "mil_outpost_underground" ], + "monster": { "Z": { "monster": "mon_zombie_dog" } } } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_04.json b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_04.json index c767db8a9e46f..f9a056cd62836 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_uteb_04.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_uteb_04.json @@ -1,44 +1,40 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_ute"], - "comment" : "underground top edge. B stair", - "method": "json", - "weight": 100, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - "########################", - "###---------############", - "###|..bbb..|############", - "----.......|############", - " !.......|############", - " |.......|########----", - "--------------------|bbb", - ".....| |b..", - ".....| |Dc.", - ".....+ |b..", - ".....+ gggg |bbb", - ".....| g>> ----", - "fffff| g>> ", - ".....| gggg ", - ".Z...| ----", - ".....| |###", - "------ |###", - " |###", - " |###", - "--------- ----+--------", - "########| |............", - "########| |bb..bb..bb..", - "########| |bb..bb..bb..", - "########| |............" - ], - "palettes":[ - "mil_outpost_underground" - ], - "monster": { - "Z": { "monster": "mon_zombie_dog" } - } - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_ute" ], + "comment": "underground top edge. B stair", + "method": "json", + "weight": 100, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + "########################", + "###---------############", + "###|..bbb..|############", + "----.......|############", + " !.......|############", + " |.......|########----", + "--------------------|bbb", + ".....| |b..", + ".....| |Dc.", + ".....+ |b..", + ".....+ gggg |bbb", + ".....| g>> ----", + "fffff| g>> ", + ".....| gggg ", + ".Z...| ----", + ".....| |###", + "------ |###", + " |###", + " |###", + "--------- ----+--------", + "########| |............", + "########| |bb..bb..bb..", + "########| |bb..bb..bb..", + "########| |............" + ], + "palettes": [ "mil_outpost_underground" ], + "monster": { "Z": { "monster": "mon_zombie_dog" } } } + } ] diff --git a/data/mods/More_Locations/military_outpost/mil_outpost_utlc_00.json b/data/mods/More_Locations/military_outpost/mil_outpost_utlc_00.json index 76c618575e756..f7c2aedb7108a 100644 --- a/data/mods/More_Locations/military_outpost/mil_outpost_utlc_00.json +++ b/data/mods/More_Locations/military_outpost/mil_outpost_utlc_00.json @@ -1,41 +1,39 @@ [ - { - "type" : "mapgen", - "om_terrain" : ["mil_outpost_utlc"], - "comment" : "underground top left corner", - "method": "json", - "weight": 0, - "object": { - "fill_ter": "t_concrete_floor", - "rows": [ - ".......................#", - ".......................#", - ".......................#", - ".......................-", - "........................", - "........................", - ".......................-", - "........................", - "........................", - "........................", - "........................", - "........................", - ".....................fff", - "........................", - "........................", - "........................", - ".......................-", - "........................", - "........................", - ".......................-", - ".......................#", - ".......................#", - ".......................#", - "#######|..|##|..|#######" - ], - "palettes":[ - "mil_outpost_underground" - ] - } + { + "type": "mapgen", + "om_terrain": [ "mil_outpost_utlc" ], + "comment": "underground top left corner", + "method": "json", + "weight": 0, + "object": { + "fill_ter": "t_concrete_floor", + "rows": [ + ".......................#", + ".......................#", + ".......................#", + ".......................-", + "........................", + "........................", + ".......................-", + "........................", + "........................", + "........................", + "........................", + "........................", + ".....................fff", + "........................", + "........................", + "........................", + ".......................-", + "........................", + "........................", + ".......................-", + ".......................#", + ".......................#", + ".......................#", + "#######|..|##|..|#######" + ], + "palettes": [ "mil_outpost_underground" ] } + } ] diff --git a/json_blacklist b/json_blacklist index 24a4c0417d798..51f9bca87eaeb 100644 --- a/json_blacklist +++ b/json_blacklist @@ -295,23 +295,6 @@ data/mods/More_Locations/military_outpost/mil_outpost_umid_01.json data/mods/More_Locations/military_outpost/mil_outpost_umid_02.json data/mods/More_Locations/military_outpost/mil_outpost_umid_03.json data/mods/More_Locations/military_outpost/mil_outpost_umid_04.json -data/mods/More_Locations/military_outpost/mil_outpost_umid_finale_01.json -data/mods/More_Locations/military_outpost/mil_outpost_ure_00.json -data/mods/More_Locations/military_outpost/mil_outpost_ure_01.json -data/mods/More_Locations/military_outpost/mil_outpost_ure_02.json -data/mods/More_Locations/military_outpost/mil_outpost_ure_03.json -data/mods/More_Locations/military_outpost/mil_outpost_ure_04.json -data/mods/More_Locations/military_outpost/mil_outpost_utea_00.json -data/mods/More_Locations/military_outpost/mil_outpost_utea_01.json -data/mods/More_Locations/military_outpost/mil_outpost_utea_02.json -data/mods/More_Locations/military_outpost/mil_outpost_utea_03.json -data/mods/More_Locations/military_outpost/mil_outpost_utea_04.json -data/mods/More_Locations/military_outpost/mil_outpost_uteb_00.json -data/mods/More_Locations/military_outpost/mil_outpost_uteb_01.json -data/mods/More_Locations/military_outpost/mil_outpost_uteb_02.json -data/mods/More_Locations/military_outpost/mil_outpost_uteb_03.json -data/mods/More_Locations/military_outpost/mil_outpost_uteb_04.json -data/mods/More_Locations/military_outpost/mil_outpost_utlc_00.json data/mods/More_Locations/military_outpost/mil_outpost_utlc_01.json data/mods/More_Locations/military_outpost/mil_outpost_utlc_02.json data/mods/More_Locations/military_outpost/mil_outpost_utlc_03.json