Skip to content

Commit

Permalink
Merge pull request CleverRaven#30053 from ifreund/lint-json-2
Browse files Browse the repository at this point in the history 
Lint json #2
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored Apr 29, 2019
2 parents 23bed54 + b4442db commit 84d1f57
Show file tree
Hide file tree
Showing 19 changed files with 663 additions and 743 deletions.
74 changes: 36 additions & 38 deletions data/mods/More_Locations/factory/factory_be_01.json
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,39 @@
[
{
"type" : "mapgen",
"om_terrain" : ["factory_be"],
"comment" : "bottom edge",
"method": "json",
"weight": 250,
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"......|..........|......",
".....--..........gg.....",
"....--............gg....",
"...--..............gg...",
"..--................gg..",
"---..................gg-",
"........................",
"........................",
"........................",
"............uu..........",
"............64..........",
"=========...22..........",
"--......=...P.........--",
"--......33..PPP88.....--",
",--.....32PPP........--,",
",,--..............X.--,,",
",,,--.........xxxxx--,,,",
",,,,----------------,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
"ffffffffffffffffffffffff",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,"
],
"palettes": [
"factory"
]
}
{
"type": "mapgen",
"om_terrain": [ "factory_be" ],
"comment": "bottom edge",
"method": "json",
"weight": 250,
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"......|..........|......",
".....--..........gg.....",
"....--............gg....",
"...--..............gg...",
"..--................gg..",
"---..................gg-",
"........................",
"........................",
"........................",
"............uu..........",
"............64..........",
"=========...22..........",
"--......=...P.........--",
"--......33..PPP88.....--",
",--.....32PPP........--,",
",,--..............X.--,,",
",,,--.........xxxxx--,,,",
",,,,----------------,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
"ffffffffffffffffffffffff",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,"
],
"palettes": [ "factory" ]
}
}
]
78 changes: 37 additions & 41 deletions data/mods/More_Locations/factory/factory_be_02.json
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,40 @@
[
{
"type" : "mapgen",
"om_terrain" : ["factory_be"],
"comment" : "bottom edge",
"method": "json",
"weight": 250,
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
".....0|..........|......",
"....0.|..........|......",
".....0*..........|......",
".00..0*..........|ff....",
"....0.|..........|tF....",
"------1..........1------",
"........................",
"........................",
".........ff..ff.........",
".....=...F F.........",
"...==5...F F.........",
"====..2..F F.........",
"------2244 4422------",
"----------4774----------",
",,u------------------u,,",
",,,,,u------------u,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
"ffffffffffffffffffffffff",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,"
],
"palettes": [
"factory"
],
"monster": {
"t": { "monster": "mon_turret" }
}
}
{
"type": "mapgen",
"om_terrain": [ "factory_be" ],
"comment": "bottom edge",
"method": "json",
"weight": 250,
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
".....0|..........|......",
"....0.|..........|......",
".....0*..........|......",
".00..0*..........|ff....",
"....0.|..........|tF....",
"------1..........1------",
"........................",
"........................",
".........ff..ff.........",
".....=...F F.........",
"...==5...F F.........",
"====..2..F F.........",
"------2244 4422------",
"----------4774----------",
",,u------------------u,,",
",,,,,u------------u,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
"ffffffffffffffffffffffff",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,"
],
"palettes": [ "factory" ],
"monster": { "t": { "monster": "mon_turret" } }
}
}
]
74 changes: 36 additions & 38 deletions data/mods/More_Locations/factory/factory_be_03.json
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,39 @@
[
{
"type" : "mapgen",
"om_terrain" : ["factory_be"],
"comment" : "bottom edge",
"method": "json",
"weight": 250,
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"......|..........|7.....",
"..=======2.......|7.....",
"..=--------+--------....",
"..=|7 7 cTTc|....",
"===| |....",
"---| |--+-",
"...g 4 4 4 4 4 4 4 g.x..",
"...|---------------|xx..",
".LL|---------------|..x.",
"...||,,,,,,,,,,,,,||xx..",
".LL||,,,,,,,,,,,,,||..x.",
"...||,,,,,,,,,,,,,||x.x.",
"----|,,,,,,,,,,,,,|-----",
"-----,,,,,,,,,,,,,------",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
"ffffffffffffffffffffffff",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,"
],
"palettes": [
"factory"
]
}
{
"type": "mapgen",
"om_terrain": [ "factory_be" ],
"comment": "bottom edge",
"method": "json",
"weight": 250,
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"......|..........|7.....",
"..=======2.......|7.....",
"..=--------+--------....",
"..=|7 7 cTTc|....",
"===| |....",
"---| |--+-",
"...g 4 4 4 4 4 4 4 g.x..",
"...|---------------|xx..",
".LL|---------------|..x.",
"...||,,,,,,,,,,,,,||xx..",
".LL||,,,,,,,,,,,,,||..x.",
"...||,,,,,,,,,,,,,||x.x.",
"----|,,,,,,,,,,,,,|-----",
"-----,,,,,,,,,,,,,------",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
"ffffffffffffffffffffffff",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,"
],
"palettes": [ "factory" ]
}
}
]
74 changes: 36 additions & 38 deletions data/mods/More_Locations/factory/factory_be_04.json
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,39 @@
[
{
"type" : "mapgen",
"om_terrain" : ["factory_be"],
"comment" : "bottom edge",
"method": "json",
"weight": 250,
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"......|..........|......",
"......|..........|......",
"......1....uu....1......",
"........................",
"........................",
"----...............-----",
"...+...............+....",
"...|---------------|....",
".gg|---------------|l...",
".g4||,P,,,P,,,P,P,||l...",
".gg||,P,,,P,,,,,,,||l...",
".g4||,,,,,P,,,,,,,||7...",
"----|,,,,,P,,,,,,,|-----",
"-----,,,,,,,,,,,,,------",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
"ffffffffffffffffffffffff",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,"
],
"palettes": [
"factory"
]
}
{
"type": "mapgen",
"om_terrain": [ "factory_be" ],
"comment": "bottom edge",
"method": "json",
"weight": 250,
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"......|..........|......",
"......|..........|......",
"......1....uu....1......",
"........................",
"........................",
"----...............-----",
"...+...............+....",
"...|---------------|....",
".gg|---------------|l...",
".g4||,P,,,P,,,P,P,||l...",
".gg||,P,,,P,,,,,,,||l...",
".g4||,,,,,P,,,,,,,||7...",
"----|,,,,,P,,,,,,,|-----",
"-----,,,,,,,,,,,,,------",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
"ffffffffffffffffffffffff",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,"
],
"palettes": [ "factory" ]
}
}
]
78 changes: 37 additions & 41 deletions data/mods/More_Locations/factory/factory_be_05.json
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,40 @@
[
{
"type" : "mapgen",
"om_terrain" : ["factory_be"],
"comment" : "bottom edge",
"method": "json",
"weight": 250,
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"......|..........|......",
"......|..........|......",
"...fff---ffffff---......",
"...F....................",
"...F......X.........====",
"----......xx.......-=---",
"...+......x.x.....X|=...",
".2.M---------------|==..",
"...M---------------|7...",
".2.M|,,,,,,P,,,,,,||7...",
"...M|,,,,,,P,,,,,,||7...",
".2.M|,,,PPPP,,,,,,||6...",
"-MMM|,,,P,,,,,,,,,|-----",
"-----,,gPggggggg,,------",
",,,,,,,g~~~~~~~g,,,,,,,,",
",,,,,,tg~~~~~~~gt,,,,,,,",
",,,,,,,g~~~~~~~g,,,,,,,,",
",,,,,,,g~~~~~~~g,,,,,,,,",
",,,,,,,ggggggggg,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
"ffffffffffffffffffffffff",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,"
],
"palettes": [
"factory"
],
"monster": {
"t": { "monster": "mon_turret" }
}
}
{
"type": "mapgen",
"om_terrain": [ "factory_be" ],
"comment": "bottom edge",
"method": "json",
"weight": 250,
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"......|..........|......",
"......|..........|......",
"...fff---ffffff---......",
"...F....................",
"...F......X.........====",
"----......xx.......-=---",
"...+......x.x.....X|=...",
".2.M---------------|==..",
"...M---------------|7...",
".2.M|,,,,,,P,,,,,,||7...",
"...M|,,,,,,P,,,,,,||7...",
".2.M|,,,PPPP,,,,,,||6...",
"-MMM|,,,P,,,,,,,,,|-----",
"-----,,gPggggggg,,------",
",,,,,,,g~~~~~~~g,,,,,,,,",
",,,,,,tg~~~~~~~gt,,,,,,,",
",,,,,,,g~~~~~~~g,,,,,,,,",
",,,,,,,g~~~~~~~g,,,,,,,,",
",,,,,,,ggggggggg,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
"ffffffffffffffffffffffff",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,"
],
"palettes": [ "factory" ],
"monster": { "t": { "monster": "mon_turret" } }
}
}
]
Loading

0 comments on commit 84d1f57

Please sign in to comment.