Skip to content

Commit

Permalink
Merge pull request CleverRaven#30058 from ifreund/lint-json-7
Browse files Browse the repository at this point in the history
Lint json #7
  • Loading branch information
ZhilkinSerg authored Apr 29, 2019
2 parents 0085cd9 + fcdf85a commit e19a054
Show file tree
Hide file tree
Showing 27 changed files with 925 additions and 1,040 deletions.
Original file line number Diff line number Diff line change
@@ -1,41 +1,38 @@
[
{
"type": "mapgen",
"om_terrain": "3storyF_basement",
"weight": 0,
"method": "json",
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"########################",
"########################",
"########################",
"##====================##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= 88 =##",
"##=<<88 =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##====================##",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"lower_level"
]
}
{
"type": "mapgen",
"om_terrain": "3storyF_basement",
"weight": 0,
"method": "json",
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"########################",
"########################",
"########################",
"##====================##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= 88 =##",
"##=<<88 =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##====================##",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "multistory_house", "lower_level" ]
}
}
]
Original file line number Diff line number Diff line change
@@ -1,45 +1,39 @@
[
{
"type": "mapgen",
"om_terrain": "3storyF_basement",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"########################",
"########################",
"########################",
"##====================##",
"##=& | xxxxxx=##",
"##=s + xxxx=##",
"##=---------+--------=##",
"##= | h| | X X =##",
"##= 88 + | + x =##",
"##=<<88 | H| | x X =##",
"##=---- ---- |-------=##",
"##=q + + U=##",
"##=Q ----+--| U=##",
"##=T | n| Tc C=##",
"##=---- n| c C=##",
"##= | n| C=##",
"#$$% + n|CCCCCCC=##",
"##====================##",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"lower_level"
],
"terrain":{
"%": "t_sewage_pump",
"$": "t_sewage_pipe"
}
}
{
"type": "mapgen",
"om_terrain": "3storyF_basement",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"########################",
"########################",
"########################",
"##====================##",
"##=& | xxxxxx=##",
"##=s + xxxx=##",
"##=---------+--------=##",
"##= | h| | X X =##",
"##= 88 + | + x =##",
"##=<<88 | H| | x X =##",
"##=---- ---- |-------=##",
"##=q + + U=##",
"##=Q ----+--| U=##",
"##=T | n| Tc C=##",
"##=---- n| c C=##",
"##= | n| C=##",
"#$$% + n|CCCCCCC=##",
"##====================##",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "multistory_house", "lower_level" ],
"terrain": { "%": "t_sewage_pump", "$": "t_sewage_pipe" }
}
}
]
Original file line number Diff line number Diff line change
@@ -1,44 +1,39 @@
[
{
"type": "mapgen",
"om_terrain": "3storyF_basement",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_water_sh",
"rows": [
"########################",
"########################",
"########################",
"##====================##",
"##=h =##",
"##=H =##",
"##= =##",
"##= =##",
"##= 88 =##",
"##=<<88 =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##====================##",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"lower_level"
],
"set": [
{ "square": "terrain", "x": 3, "y": 4, "x2": 20, "y2": 19, "id": "t_water_sh", "chance": 30 }
]
}
{
"type": "mapgen",
"om_terrain": "3storyF_basement",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_water_sh",
"rows": [
"########################",
"########################",
"########################",
"##====================##",
"##=h =##",
"##=H =##",
"##= =##",
"##= =##",
"##= 88 =##",
"##=<<88 =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##= =##",
"##====================##",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "multistory_house", "lower_level" ],
"set": [ { "square": "terrain", "x": 3, "y": 4, "x2": 20, "y2": 19, "id": "t_water_sh", "chance": 30 } ]
}
}
]
Original file line number Diff line number Diff line change
@@ -1,41 +1,38 @@
[
{
"type": "mapgen",
"om_terrain": "3storyF_basement",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"########################",
"########################",
"########################",
"##====================##",
"##=CqCQC | cTT=##",
"##= -+- TT=##",
"##= | |LLLLL =##",
"##=TTT | |--------=##",
"##=--88 | |xx xx x =##",
"##=<<88-+-- |x xxx xx=##",
"##= + x x =##",
"##=-+--- ------------=##",
"##= C| |l C| X =##",
"##= C| + C| X X =##",
"##=h | |l C| X =##",
"##= | ------| X =##",
"##= H| + =##",
"##====================##",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"lower_level"
]
}
{
"type": "mapgen",
"om_terrain": "3storyF_basement",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"########################",
"########################",
"########################",
"##====================##",
"##=CqCQC | cTT=##",
"##= -+- TT=##",
"##= | |LLLLL =##",
"##=TTT | |--------=##",
"##=--88 | |xx xx x =##",
"##=<<88-+-- |x xxx xx=##",
"##= + x x =##",
"##=-+--- ------------=##",
"##= C| |l C| X =##",
"##= C| + C| X X =##",
"##=h | |l C| X =##",
"##= | ------| X =##",
"##= H| + =##",
"##====================##",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "multistory_house", "lower_level" ]
}
}
]
Original file line number Diff line number Diff line change
@@ -1,45 +1,39 @@
[
{
"type": "mapgen",
"om_terrain": "3storyF_basement",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"########################",
"######$#################",
"######$#################",
"##====$===============##",
"#$$$$$$| | =##",
"##= % | | =##",
"##=h | | =##",
"##=H | =##",
"##=--88 =##",
"##=<<88 =##",
"##= =##",
"##= =##",
"##= =##",
"##= | | =##",
"##= C| | =##",
"##= C| | xx=##",
"##=CQqC| | xxx=##",
"##====================##",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"lower_level"
],
"terrain":{
"%": "t_sewage_pump",
"$": "t_sewage_pipe"
}
}
{
"type": "mapgen",
"om_terrain": "3storyF_basement",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"########################",
"######$#################",
"######$#################",
"##====$===============##",
"#$$$$$$| | =##",
"##= % | | =##",
"##=h | | =##",
"##=H | =##",
"##=--88 =##",
"##=<<88 =##",
"##= =##",
"##= =##",
"##= =##",
"##= | | =##",
"##= C| | =##",
"##= C| | xx=##",
"##=CQqC| | xxx=##",
"##====================##",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "multistory_house", "lower_level" ],
"terrain": { "%": "t_sewage_pump", "$": "t_sewage_pipe" }
}
}
]
Loading

0 comments on commit e19a054

Please sign in to comment.