forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request CleverRaven#30055 from ifreund/lint-json-4
Lint json #4
- Loading branch information
Showing
18 changed files
with
637 additions
and
722 deletions.
There are no files selected for viewing
106 changes: 48 additions & 58 deletions
106
data/mods/More_Locations/military_outpost/mil_outpost_umid_finale_01.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" } } | ||
} | ||
} | ||
] |
74 changes: 36 additions & 38 deletions
74
data/mods/More_Locations/military_outpost/mil_outpost_ure_00.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" ] | ||
} | ||
} | ||
] |
83 changes: 38 additions & 45 deletions
83
data/mods/More_Locations/military_outpost/mil_outpost_ure_01.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" } | ||
} | ||
} | ||
] |
79 changes: 37 additions & 42 deletions
79
data/mods/More_Locations/military_outpost/mil_outpost_ure_02.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" } | ||
} | ||
} | ||
] |
Oops, something went wrong.