Skip to content

Commit

Permalink
Merge pull request #30093 from ifreund/lint-json-24
Browse files Browse the repository at this point in the history
Lint json #24
  • Loading branch information
kevingranade authored Apr 30, 2019
2 parents 5ff9873 + 4f97806 commit ff456a7
Show file tree
Hide file tree
Showing 26 changed files with 914 additions and 1,014 deletions.
Original file line number Diff line number Diff line change
@@ -1,41 +1,38 @@
[
{
"type": "mapgen",
"om_terrain": "2storyF_first",
"weight": 0,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
"########################",
"########################",
"########################",
"######1##########1######",
"########################",
"########################",
"##====================##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= 88#",
"##=< 88#",
"##=< =##",
"##=> =##",
"##= =##",
"##= =##",
"##= =##",
"##====================##",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"ground_level"
]
}
{
"type": "mapgen",
"om_terrain": "2storyF_first",
"weight": 0,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
"########################",
"########################",
"########################",
"######1##########1######",
"########################",
"########################",
"##====================##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= 88#",
"##=< 88#",
"##=< =##",
"##=> =##",
"##= =##",
"##= =##",
"##= =##",
"##====================##",
"########################",
"########################",
"########################"
],
"palettes": [ "multistory_house", "ground_level" ]
}
}
]
Original file line number Diff line number Diff line change
@@ -1,41 +1,38 @@
[
{
"type": "mapgen",
"om_terrain": "2storyF_first",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
"#########WW#############",
"#########WW#############",
"#########WW#############",
"######1WWWWWWWWWW1######",
"#######WWWWWWWWWW#######",
"#######WWWWWWWWWW#######",
"##==ww===w===++====w==##",
"##=p n|ss &=##",
"##= + w##",
"##w --------+-|l S=##",
"##= |DD BB|n n-----=##",
"##= | c Bb| |d=##",
"##w | |BB + =##",
"##= |T |BB bb |-88#",
"##=< --+--+-------|L88#",
"##w< | d|CCCCC-+=##",
"##=> TT ---| c c =##",
"##w TT + +##",
"##= TTc | =##",
"##=bb nn|CUCosCC=##",
"##====w==w=======ww===##",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"ground_level"
]
}
{
"type": "mapgen",
"om_terrain": "2storyF_first",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
"#########WW#############",
"#########WW#############",
"#########WW#############",
"######1WWWWWWWWWW1######",
"#######WWWWWWWWWW#######",
"#######WWWWWWWWWW#######",
"##==ww===w===++====w==##",
"##=p n|ss &=##",
"##= + w##",
"##w --------+-|l S=##",
"##= |DD BB|n n-----=##",
"##= | c Bb| |d=##",
"##w | |BB + =##",
"##= |T |BB bb |-88#",
"##=< --+--+-------|L88#",
"##w< | d|CCCCC-+=##",
"##=> TT ---| c c =##",
"##w TT + +##",
"##= TTc | =##",
"##=bb nn|CUCosCC=##",
"##====w==w=======ww===##",
"########################",
"########################",
"########################"
],
"palettes": [ "multistory_house", "ground_level" ]
}
}
]
Original file line number Diff line number Diff line change
@@ -1,41 +1,38 @@
[
{
"type": "mapgen",
"om_terrain": "2storyF_first",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
"########WW##############",
"########WW##############",
"########WW##############",
"######1WWWWWWWWWW1######",
"######WWWWWWWWWWWW######",
"######WWWWWWWWWWWW######",
"##==w==w==++==w===ww==##",
"##=bBB n| |S &|bDDD=##",
"##= BB n| | | c w##",
"##w n| + s| w##",
"##w + |l s| i=##",
"##=c --| -----+---=##",
"##=TT +d| a b=##",
"##=------- A 88#",
"##=< A N8#",
"##=< ----------88#",
"##=> TT |TTc UUURR=##",
"##w cTT * =##",
"##= TT * C=##",
"##=bb |UU CosCCU=##",
"##=====ww=====+=======##",
"##################HH####",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"ground_level"
]
}
{
"type": "mapgen",
"om_terrain": "2storyF_first",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
"########WW##############",
"########WW##############",
"########WW##############",
"######1WWWWWWWWWW1######",
"######WWWWWWWWWWWW######",
"######WWWWWWWWWWWW######",
"##==w==w==++==w===ww==##",
"##=bBB n| |S &|bDDD=##",
"##= BB n| | | c w##",
"##w n| + s| w##",
"##w + |l s| i=##",
"##=c --| -----+---=##",
"##=TT +d| a b=##",
"##=------- A 88#",
"##=< A N8#",
"##=< ----------88#",
"##=> TT |TTc UUURR=##",
"##w cTT * =##",
"##= TT * C=##",
"##=bb |UU CosCCU=##",
"##=====ww=====+=======##",
"##################HH####",
"########################",
"########################"
],
"palettes": [ "multistory_house", "ground_level" ]
}
}
]
Original file line number Diff line number Diff line change
@@ -1,41 +1,38 @@
[
{
"type": "mapgen",
"om_terrain": "2storyF_roof",
"weight": 0,
"method": "json",
"object": {
"fill_ter": "t_flat_roof",
"rows": [
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrr88#",
"##rrrrrrrrrrrrrrrrrrr88#",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"upper_level"
]
}
{
"type": "mapgen",
"om_terrain": "2storyF_roof",
"weight": 0,
"method": "json",
"object": {
"fill_ter": "t_flat_roof",
"rows": [
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrr88#",
"##rrrrrrrrrrrrrrrrrrr88#",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "multistory_house", "upper_level" ]
}
]
}
]
Original file line number Diff line number Diff line change
@@ -1,41 +1,38 @@
[
{
"type": "mapgen",
"om_terrain": "2storyF_roof",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_flat_roof",
"rows": [
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrr88#",
"##rrrrrrrrrrrrrrrrrrr88#",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"upper_level"
]
}
{
"type": "mapgen",
"om_terrain": "2storyF_roof",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_flat_roof",
"rows": [
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrr88#",
"##rrrrrrrrrrrrrrrrrrr88#",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"##rrrrrrrrrrrrrrrrrrrr##",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "multistory_house", "upper_level" ]
}
]
}
]
Loading

0 comments on commit ff456a7

Please sign in to comment.