Skip to content

Commit

Permalink
Merge pull request #30052 from ifreund/lint-json
Browse files Browse the repository at this point in the history
Lint json #1
  • Loading branch information
ZhilkinSerg authored Apr 29, 2019
2 parents 6def679 + 69581d5 commit 23bed54
Show file tree
Hide file tree
Showing 22 changed files with 798 additions and 945 deletions.
82 changes: 38 additions & 44 deletions data/mods/More_Locations/estate/estate_1be_00.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,40 @@
[
{
"type": "mapgen",
"om_terrain": "estate_1be",
"comment" : "first floor, bottom edge",
"weight": 0,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
".....|....| |....|.....",
".....|----- -----|.....",
".....|>> <<|.....",
"=ww===>> <<===ww=",
"#####= =#####",
"#####= =#####",
"#####==www=++=www==#####",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [
"estate",
"multistory_house",
"ground_level"
],
"terrain":{
"k": "t_shrub"
}
}
{
"type": "mapgen",
"om_terrain": "estate_1be",
"comment": "first floor, bottom edge",
"weight": 0,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
".....|....| |....|.....",
".....|----- -----|.....",
".....|>> <<|.....",
"=ww===>> <<===ww=",
"#####= =#####",
"#####= =#####",
"#####==www=++=www==#####",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "estate", "multistory_house", "ground_level" ],
"terrain": { "k": "t_shrub" }
}
]
}
]
82 changes: 38 additions & 44 deletions data/mods/More_Locations/estate/estate_1be_01.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,40 @@
[
{
"type": "mapgen",
"om_terrain": "estate_1be",
"comment" : "first floor, bottom edge",
"weight": 99,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
".....+....| |d..d|.....",
"...BB|--+-- --+--|.c...",
"...BB|>> <<|DDD..",
"=ww===>> <<===ww=",
"#####= =#####",
"#####= =#####",
"#####==www=++=www==#####",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [
"estate",
"multistory_house",
"ground_level"
],
"terrain":{
"k": "t_shrub"
}
}
{
"type": "mapgen",
"om_terrain": "estate_1be",
"comment": "first floor, bottom edge",
"weight": 99,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
".....+....| |d..d|.....",
"...BB|--+-- --+--|.c...",
"...BB|>> <<|DDD..",
"=ww===>> <<===ww=",
"#####= =#####",
"#####= =#####",
"#####==www=++=www==#####",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "estate", "multistory_house", "ground_level" ],
"terrain": { "k": "t_shrub" }
}
]
}
]
82 changes: 38 additions & 44 deletions data/mods/More_Locations/estate/estate_1be_02.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,40 @@
[
{
"type": "mapgen",
"om_terrain": "estate_1be",
"comment" : "first floor, bottom edge",
"weight": 99,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
".....|....| |....|.....",
"...|+|--+-1 1----|L....",
"...|l|>> <<|LL...",
"=ww===>> <<===ww=",
"#####= =#####",
"#####= 1 1 =#####",
"#####==www=++=www==#####",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [
"estate",
"multistory_house",
"ground_level"
],
"terrain":{
"k": "t_shrub"
}
}
{
"type": "mapgen",
"om_terrain": "estate_1be",
"comment": "first floor, bottom edge",
"weight": 99,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
".....|....| |....|.....",
"...|+|--+-1 1----|L....",
"...|l|>> <<|LL...",
"=ww===>> <<===ww=",
"#####= =#####",
"#####= 1 1 =#####",
"#####==www=++=www==#####",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "estate", "multistory_house", "ground_level" ],
"terrain": { "k": "t_shrub" }
}
]
}
]
82 changes: 38 additions & 44 deletions data/mods/More_Locations/estate/estate_1be_03.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,40 @@
[
{
"type": "mapgen",
"om_terrain": "estate_1be",
"comment" : "first floor, bottom edge",
"weight": 99,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
".....+....| |b..b|i....",
".....|----- --+--|i..c.",
".a..N|>> Y Y <<|i.DDD",
"=ww===>> <<===ww=",
"#####= =#####",
"#####=Y Y=#####",
"#####==www=++=www==#####",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [
"estate",
"multistory_house",
"ground_level"
],
"terrain":{
"k": "t_shrub"
}
}
{
"type": "mapgen",
"om_terrain": "estate_1be",
"comment": "first floor, bottom edge",
"weight": 99,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
".....+....| |b..b|i....",
".....|----- --+--|i..c.",
".a..N|>> Y Y <<|i.DDD",
"=ww===>> <<===ww=",
"#####= =#####",
"#####=Y Y=#####",
"#####==www=++=www==#####",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "estate", "multistory_house", "ground_level" ],
"terrain": { "k": "t_shrub" }
}
]
}
]
Loading

0 comments on commit 23bed54

Please sign in to comment.