Skip to content

Commit

Permalink
Merge pull request CleverRaven#30057 from ifreund/lint-json-6
Browse files Browse the repository at this point in the history
Lint json #6
  • Loading branch information
ZhilkinSerg authored Apr 29, 2019
2 parents 2769e69 + a92c4d6 commit 0085cd9
Show file tree
Hide file tree
Showing 23 changed files with 784 additions and 878 deletions.
Original file line number Diff line number Diff line change
@@ -1,41 +1,38 @@
[
{
"type": "mapgen",
"om_terrain": "2storyC_basement",
"weight": 0,
"method": "json",
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"########################",
"########################",
"########################",
"#####=================##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####=< =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####=================##",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"lower_level"
]
}
{
"type": "mapgen",
"om_terrain": "2storyC_basement",
"weight": 0,
"method": "json",
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"########################",
"########################",
"########################",
"#####=================##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####=< =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####=================##",
"########################",
"########################",
"########################"
],
"palettes": [ "multistory_house", "lower_level" ]
}
]
}
]
Original file line number Diff line number Diff line change
@@ -1,41 +1,38 @@
[
{
"type": "mapgen",
"om_terrain": "2storyC_basement",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"########################",
"########################",
"########################",
"#####=================##",
"#####= x =##",
"#####= xxx x x =##",
"#####= x x =##",
"#####=xx x =##",
"#####=------++-------=##",
"#####=< l=##",
"#####= l=##",
"#####= l=##",
"#####=Q TT =##",
"#####=q TT L=##",
"#####=C TT L=##",
"#####=C =##",
"#####= --+-=##",
"#####= | =##",
"#####= | =##",
"#####= LL|h H=##",
"#####=================##",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"lower_level"
]
}
{
"type": "mapgen",
"om_terrain": "2storyC_basement",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_concrete_floor",
"rows": [
"########################",
"########################",
"########################",
"#####=================##",
"#####= x =##",
"#####= xxx x x =##",
"#####= x x =##",
"#####=xx x =##",
"#####=------++-------=##",
"#####=< l=##",
"#####= l=##",
"#####= l=##",
"#####=Q TT =##",
"#####=q TT L=##",
"#####=C TT L=##",
"#####=C =##",
"#####= --+-=##",
"#####= | =##",
"#####= | =##",
"#####= LL|h H=##",
"#####=================##",
"########################",
"########################",
"########################"
],
"palettes": [ "multistory_house", "lower_level" ]
}
]
}
]
Original file line number Diff line number Diff line change
@@ -1,45 +1,39 @@
[
{
"type": "mapgen",
"om_terrain": "2storyC_basement",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
"########################",
"########################",
"########################",
"#####=================##",
"#####=Rnnnn =##",
"#####= z =##",
"#####= =##",
"#####= z z =##",
"#####= =##",
"#####=< ZZ z =##",
"#####= ZZ z =##",
"#####= ZZ =##",
"#####= =##",
"#####= =##",
"#####= ZZ =##",
"#####= ZZ =##",
"#####= ZZ =##",
"#####= =##",
"#####= =##",
"#####=lll =##",
"#####=================##",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"lower_level"
],
"furniture":{
"z": "f_exercise",
"Z": "f_pool_table"
}
}
{
"type": "mapgen",
"om_terrain": "2storyC_basement",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
"########################",
"########################",
"########################",
"#####=================##",
"#####=Rnnnn =##",
"#####= z =##",
"#####= =##",
"#####= z z =##",
"#####= =##",
"#####=< ZZ z =##",
"#####= ZZ z =##",
"#####= ZZ =##",
"#####= =##",
"#####= =##",
"#####= ZZ =##",
"#####= ZZ =##",
"#####= ZZ =##",
"#####= =##",
"#####= =##",
"#####=lll =##",
"#####=================##",
"########################",
"########################",
"########################"
],
"palettes": [ "multistory_house", "lower_level" ],
"furniture": { "z": "f_exercise", "Z": "f_pool_table" }
}
]
}
]
Original file line number Diff line number Diff line change
@@ -1,41 +1,38 @@
[
{
"type": "mapgen",
"om_terrain": "2storyC_first",
"weight": 0,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
"########################",
"########################",
"########################",
"#####=================##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####=<< =##",
"#####= =##",
"#####=> =##",
"#####= =##",
"#####= =##",
"####88 =##",
"####88 =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####=================##",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"ground_level"
]
}
{
"type": "mapgen",
"om_terrain": "2storyC_first",
"weight": 0,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
"########################",
"########################",
"########################",
"#####=================##",
"#####= =##",
"#####= =##",
"#####= =##",
"#####=<< =##",
"#####= =##",
"#####=> =##",
"#####= =##",
"#####= =##",
"####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": "2storyC_first",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
"########W###############",
"########W###############",
"########W###############",
"#####===+==ww==ww==ww=##",
"#####=b b=##",
"#####= c w##",
"#####w bbbTTT =##",
"#####=<< -------++--=##",
"#####=-- + S|T C=##",
"#####w>+ |s |Tc s=##",
"#####=-- |s &|T o=##",
"#####w ----| C=##",
"####88 Ab| U=##",
"####8N A |--++--=##",
"####88 A | g##",
"#####w a T| TT g##",
"#####=-+------| TT g##",
"#####= |d| TT g##",
"#####wBB c + | TT g##",
"#####=BB DD7|d| pg##",
"#####==ww======ggg*gg=##",
"########################",
"########################",
"########################"
],
"palettes": [
"multistory_house",
"ground_level"
]
}
{
"type": "mapgen",
"om_terrain": "2storyC_first",
"weight": 250,
"method": "json",
"object": {
"fill_ter": "t_floor",
"rows": [
"########W###############",
"########W###############",
"########W###############",
"#####===+==ww==ww==ww=##",
"#####=b b=##",
"#####= c w##",
"#####w bbbTTT =##",
"#####=<< -------++--=##",
"#####=-- + S|T C=##",
"#####w>+ |s |Tc s=##",
"#####=-- |s &|T o=##",
"#####w ----| C=##",
"####88 Ab| U=##",
"####8N A |--++--=##",
"####88 A | g##",
"#####w a T| TT g##",
"#####=-+------| TT g##",
"#####= |d| TT g##",
"#####wBB c + | TT g##",
"#####=BB DD7|d| pg##",
"#####==ww======ggg*gg=##",
"########################",
"########################",
"########################"
],
"palettes": [ "multistory_house", "ground_level" ]
}
}
]
Loading

0 comments on commit 0085cd9

Please sign in to comment.