forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 1
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#30054 from ifreund/lint-json-3
Lint json #3
- Loading branch information
Showing
18 changed files
with
645 additions
and
744 deletions.
There are no files selected for viewing
74 changes: 36 additions & 38 deletions
74
data/mods/More_Locations/military_outpost/mil_outpost_1be_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_1be"], | ||
| "comment" : "first floor bottom edge", | ||
| "method": "json", | ||
| "weight": 0, | ||
| "object": { | ||
| "fill_ter": "t_concrete_floor", | ||
| "rows": [ | ||
| ",,,,,, ,,,,,,", | ||
| ",,,,,, ,,,,,,", | ||
| ",,,,,, ,,,,,,", | ||
| "wwwwww wwwwww", | ||
| "wwwwww wwwwww", | ||
| ",,,,,, ,,,,,,", | ||
| "------............------", | ||
| "------............------", | ||
| "....||............||....", | ||
| "....||............||....", | ||
| "....||............||....", | ||
| "....||............||....", | ||
| "....||...........5||....", | ||
| "-...||PPPPPPPPPPPY||....", | ||
| "....[]............||....", | ||
| "....||............||....", | ||
| "------............------", | ||
| "------............%-----", | ||
| ",,Fww, ,wwF,,", | ||
| ",,=ww, ,ww=,,", | ||
| ",,Fww, ,wwF,,", | ||
| ",,Fww, ,wwF,,", | ||
| ",,Fww, ,wwF,,", | ||
| ",,Fww, ,wwF,," | ||
| ], | ||
| "palettes":[ | ||
| "mil_outpost_bandit" | ||
| ] | ||
| } | ||
| { | ||
| "type": "mapgen", | ||
| "om_terrain": [ "mil_outpost_1be" ], | ||
| "comment": "first floor bottom edge", | ||
| "method": "json", | ||
| "weight": 0, | ||
| "object": { | ||
| "fill_ter": "t_concrete_floor", | ||
| "rows": [ | ||
| ",,,,,, ,,,,,,", | ||
| ",,,,,, ,,,,,,", | ||
| ",,,,,, ,,,,,,", | ||
| "wwwwww wwwwww", | ||
| "wwwwww wwwwww", | ||
| ",,,,,, ,,,,,,", | ||
| "------............------", | ||
| "------............------", | ||
| "....||............||....", | ||
| "....||............||....", | ||
| "....||............||....", | ||
| "....||............||....", | ||
| "....||...........5||....", | ||
| "-...||PPPPPPPPPPPY||....", | ||
| "....[]............||....", | ||
| "....||............||....", | ||
| "------............------", | ||
| "------............%-----", | ||
| ",,Fww, ,wwF,,", | ||
| ",,=ww, ,ww=,,", | ||
| ",,Fww, ,wwF,,", | ||
| ",,Fww, ,wwF,,", | ||
| ",,Fww, ,wwF,,", | ||
| ",,Fww, ,wwF,," | ||
| ], | ||
| "palettes": [ "mil_outpost_bandit" ] | ||
| } | ||
| } | ||
| ] |
74 changes: 36 additions & 38 deletions
74
data/mods/More_Locations/military_outpost/mil_outpost_1be_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,41 +1,39 @@ | ||
| [ | ||
| { | ||
| "type" : "mapgen", | ||
| "om_terrain" : ["mil_outpost_1be"], | ||
| "comment" : "first floor bottom edge", | ||
| "method": "json", | ||
| "weight": 250, | ||
| "object": { | ||
| "fill_ter": "t_concrete_floor", | ||
| "rows": [ | ||
| ",,,,,, ,,,,,,", | ||
| ",,,,,, ,,,,,,", | ||
| ",,,,,, ,,,,,,", | ||
| "wwwwww wwwwww", | ||
| "wwwwww wwwwww", | ||
| ",,,,,, ,,,,,,", | ||
| "-!!---............---GG-", | ||
| "-..---............---..-", | ||
| "...L||............||p...", | ||
| "...C||............||7DD.", | ||
| "...L||............||.c..", | ||
| "...C||............||....", | ||
| "...L||............||D...", | ||
| "----||............||Dc..", | ||
| ".....]............||D...", | ||
| "...%||............||.N..", | ||
| "------............------", | ||
| "------5...........%-----", | ||
| ",,FwwYYPPPPPPPPPPYYwwF,,", | ||
| ",,=ww, ,ww=,,", | ||
| ",,Fww, ,wwF,,", | ||
| ",,Fww, ,wwF,,", | ||
| ",,Fww, ,wwF,,", | ||
| ",,Fww, ,wwF,," | ||
| ], | ||
| "palettes":[ | ||
| "mil_outpost_bandit" | ||
| ] | ||
| } | ||
| { | ||
| "type": "mapgen", | ||
| "om_terrain": [ "mil_outpost_1be" ], | ||
| "comment": "first floor bottom edge", | ||
| "method": "json", | ||
| "weight": 250, | ||
| "object": { | ||
| "fill_ter": "t_concrete_floor", | ||
| "rows": [ | ||
| ",,,,,, ,,,,,,", | ||
| ",,,,,, ,,,,,,", | ||
| ",,,,,, ,,,,,,", | ||
| "wwwwww wwwwww", | ||
| "wwwwww wwwwww", | ||
| ",,,,,, ,,,,,,", | ||
| "-!!---............---GG-", | ||
| "-..---............---..-", | ||
| "...L||............||p...", | ||
| "...C||............||7DD.", | ||
| "...L||............||.c..", | ||
| "...C||............||....", | ||
| "...L||............||D...", | ||
| "----||............||Dc..", | ||
| ".....]............||D...", | ||
| "...%||............||.N..", | ||
| "------............------", | ||
| "------5...........%-----", | ||
| ",,FwwYYPPPPPPPPPPYYwwF,,", | ||
| ",,=ww, ,ww=,,", | ||
| ",,Fww, ,wwF,,", | ||
| ",,Fww, ,wwF,,", | ||
| ",,Fww, ,wwF,,", | ||
| ",,Fww, ,wwF,," | ||
| ], | ||
| "palettes": [ "mil_outpost_bandit" ] | ||
| } | ||
| } | ||
| ] |
74 changes: 36 additions & 38 deletions
74
data/mods/More_Locations/military_outpost/mil_outpost_1blc_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_1blc"], | ||
| "comment" : "first floor bottom left corner", | ||
| "method": "json", | ||
| "weight": 0, | ||
| "object": { | ||
| "fill_ter": "t_concrete_floor", | ||
| "rows": [ | ||
| ",,,,,,||........||,wwwww", | ||
| ",,,,,,||........||,wwwww", | ||
| ",,,,,,||........||,,,,ww", | ||
| ",,,----|........|----,ww", | ||
| ",,,|----........----|,ww", | ||
| ",,,||............<<||,,,", | ||
| ",,,||............<<|----", | ||
| ",,,||..............-----", | ||
| ",,,||...................", | ||
| ",,,||...................", | ||
| ",,,||...................", | ||
| ",,,||...................", | ||
| ",,,||...................", | ||
| ",,,||..................-", | ||
| ",,,||...................", | ||
| ",,,||...................", | ||
| ",,,||..............-----", | ||
| ",,,||..............|----", | ||
| ",,,||..............||,,,", | ||
| ",,,|----------------|,,,", | ||
| ",,,------------------,,,", | ||
| ",,,,,,,,,,,,,,,,,,,,,,,,", | ||
| ",,,,,,,,,,,,,,,,,,,,,,,,", | ||
| ",,,,,,,,,,,,,,,,,,,,,,,," | ||
| ], | ||
| "palettes":[ | ||
| "mil_outpost_bandit" | ||
| ] | ||
| } | ||
| { | ||
| "type": "mapgen", | ||
| "om_terrain": [ "mil_outpost_1blc" ], | ||
| "comment": "first floor bottom left corner", | ||
| "method": "json", | ||
| "weight": 0, | ||
| "object": { | ||
| "fill_ter": "t_concrete_floor", | ||
| "rows": [ | ||
| ",,,,,,||........||,wwwww", | ||
| ",,,,,,||........||,wwwww", | ||
| ",,,,,,||........||,,,,ww", | ||
| ",,,----|........|----,ww", | ||
| ",,,|----........----|,ww", | ||
| ",,,||............<<||,,,", | ||
| ",,,||............<<|----", | ||
| ",,,||..............-----", | ||
| ",,,||...................", | ||
| ",,,||...................", | ||
| ",,,||...................", | ||
| ",,,||...................", | ||
| ",,,||...................", | ||
| ",,,||..................-", | ||
| ",,,||...................", | ||
| ",,,||...................", | ||
| ",,,||..............-----", | ||
| ",,,||..............|----", | ||
| ",,,||..............||,,,", | ||
| ",,,|----------------|,,,", | ||
| ",,,------------------,,,", | ||
| ",,,,,,,,,,,,,,,,,,,,,,,,", | ||
| ",,,,,,,,,,,,,,,,,,,,,,,,", | ||
| ",,,,,,,,,,,,,,,,,,,,,,,," | ||
| ], | ||
| "palettes": [ "mil_outpost_bandit" ] | ||
| } | ||
| } | ||
| ] |
86 changes: 38 additions & 48 deletions
86
data/mods/More_Locations/military_outpost/mil_outpost_1blc_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,51 +1,41 @@ | ||
| [ | ||
| { | ||
| "type" : "mapgen", | ||
| "om_terrain" : ["mil_outpost_1blc"], | ||
| "comment" : "first floor bottom left corner", | ||
| "method": "json", | ||
| "weight": 250, | ||
| "object": { | ||
| "fill_ter": "t_concrete_floor", | ||
| "rows": [ | ||
| ",,,,,,||........||,wwwww", | ||
| ",,,,,,||c.D.DD..||wwwwww", | ||
| ",,,,,,||..D...D.||ww,,ww", | ||
| ",,,----|DD.DD.D.|-!--,ww", | ||
| ",,,|-----------+-- -|,ww", | ||
| ",,,||BB...B...| <<||,,,", | ||
| ",,,||.....B...+ <<|----", | ||
| ",,,||.BB......|-+-------", | ||
| ",,,||l...d.l..|.....^^..", | ||
| ",,,||---------|...^^....", | ||
| ",,,||&.+......+.........", | ||
| ",,,||---......|.........", | ||
| ",,,||&.+..sssC|^^DD^^N..", | ||
| ",,,||-------------------", | ||
| ",,,||H.............+ ", | ||
| ",,,||..A....H......+ ", | ||
| ",,,||[email protected]", | ||
| ",,,||........nnn...|----", | ||
| ",,,||H.....a......H||,,,", | ||
| ",,,|----------------|,,,", | ||
| ",,,------------------,,,", | ||
| ",,,,,,,,,,,,,,,,,,,,,,,,", | ||
| ",,,,,,,,,,,,,,,,,,,,,,,,", | ||
| ",,,,,,,,,,,,,,,,,,,,,,,," | ||
| ], | ||
| "palettes":[ | ||
| "mil_outpost_bandit" | ||
| ], | ||
| "npcs": { | ||
| "@": { "class": "thug" } | ||
| }, | ||
| "mapping": { | ||
| "X": { | ||
| "furniture": "f_brazier", | ||
| "item": { "item": "2x4", "count": 5 }, | ||
| "fields": { "field": "fd_fire" } | ||
| } | ||
| } | ||
| } | ||
| { | ||
| "type": "mapgen", | ||
| "om_terrain": [ "mil_outpost_1blc" ], | ||
| "comment": "first floor bottom left corner", | ||
| "method": "json", | ||
| "weight": 250, | ||
| "object": { | ||
| "fill_ter": "t_concrete_floor", | ||
| "rows": [ | ||
| ",,,,,,||........||,wwwww", | ||
| ",,,,,,||c.D.DD..||wwwwww", | ||
| ",,,,,,||..D...D.||ww,,ww", | ||
| ",,,----|DD.DD.D.|-!--,ww", | ||
| ",,,|-----------+-- -|,ww", | ||
| ",,,||BB...B...| <<||,,,", | ||
| ",,,||.....B...+ <<|----", | ||
| ",,,||.BB......|-+-------", | ||
| ",,,||l...d.l..|.....^^..", | ||
| ",,,||---------|...^^....", | ||
| ",,,||&.+......+.........", | ||
| ",,,||---......|.........", | ||
| ",,,||&.+..sssC|^^DD^^N..", | ||
| ",,,||-------------------", | ||
| ",,,||H.............+ ", | ||
| ",,,||..A....H......+ ", | ||
| ",,,||[email protected]", | ||
| ",,,||........nnn...|----", | ||
| ",,,||H.....a......H||,,,", | ||
| ",,,|----------------|,,,", | ||
| ",,,------------------,,,", | ||
| ",,,,,,,,,,,,,,,,,,,,,,,,", | ||
| ",,,,,,,,,,,,,,,,,,,,,,,,", | ||
| ",,,,,,,,,,,,,,,,,,,,,,,," | ||
| ], | ||
| "palettes": [ "mil_outpost_bandit" ], | ||
| "npcs": { "@": { "class": "thug" } }, | ||
| "mapping": { "X": { "furniture": "f_brazier", "item": { "item": "2x4", "count": 5 }, "fields": { "field": "fd_fire" } } } | ||
| } | ||
| } | ||
| ] |
Oops, something went wrong.