Skip to content

Commit

Permalink
neverending fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maleclypse
Maleclypse committed Aug 14, 2021
1 parent a5de8be commit bc23ca8
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 70 deletions.
2 changes: 1 addition & 1 deletion data/mods/Aftershock/maps/nested/arcology/arcology_chunks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"| VVV "
],
"terrain": { " ": "t_floor", "|": "t_wall_p" },
"nested": { "1": { "chunks": [ [ "arcology_2x2_gate" ] ] } },
"nested": { "1": { "chunks": [ "arcology_2x2_gate" ] } },
"furniture": {
"?": "f_console_broken",
"L": "f_table",
Expand Down
130 changes: 61 additions & 69 deletions data/mods/Aftershock/maps/nested/arcology/arcology_gate_chunks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,12 @@
",,,,,,..",
",,,,%,||"
],
"palettes": [ "arcology_exterior" ]
},
"terrain": { "P": "t_metal_floor", "C": "t_metal_floor", "W": "t_metal_floor" },
"items": {
"W": [ { "item": "building_rubble", "chance": 80, "repeat": [ 1, 3 ] } ],
"C": [ { "item": "wreckage", "chance": 100, "repeat": [ 1, 2 ] } ],
"P": [ { "item": "ash", "chance": 80, "repeat": [ 1, 3 ] } ]
"terrain": { "P": "t_metal_floor", "C": "t_metal_floor", "W": "t_metal_floor" },
"items": {
"W": [ { "item": "building_rubble", "chance": 80, "repeat": [ 1, 3 ] } ],
"C": [ { "item": "wreckage", "chance": 100, "repeat": [ 1, 2 ] } ],
"P": [ { "item": "ash", "chance": 80, "repeat": [ 1, 3 ] } ]
}
}
},
{
Expand Down Expand Up @@ -188,15 +187,13 @@
",,,,,,,,"
],
"palettes": [ "arcology_exterior" ],
"nested": {
"6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] },
"computers": {
"5": {
"name": "South Entrance Gate Controls",
"security": 0,
"options": [ { "name": "EMERGENCY OVERRIDE - OPEN GATES", "action": "open", "security": 3 } ],
"failures": [ { "action": "damage" }, { "action": "shutdown" } ]
}
"nested": { "6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] } },
"computers": {
"5": {
"name": "South Entrance Gate Controls",
"security": 0,
"options": [ { "name": "EMERGENCY OVERRIDE - OPEN GATES", "action": "open", "security": 3 } ],
"failures": [ { "action": "damage" }, { "action": "shutdown" } ]
}
}
}
Expand Down Expand Up @@ -268,7 +265,8 @@
],
"palettes": [ "arcology_exterior" ],
"nested": {
"6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] },
"6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] }
},
"computers": {
"5": {
"name": "South Entrance Gate Controls",
Expand All @@ -278,7 +276,6 @@
}
}
}
}
},
{
"type": "mapgen",
Expand All @@ -299,15 +296,15 @@
",,,,,,,,",
",,,,,,,,"
],
"palettes": [ "arcology_exterior" ]
},
"nested": {
"6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] },
"terrain": { "P": "t_metal_floor", "C": "t_metal_floor", "W": "t_metal_floor" },
"items": {
"W": [ { "item": "building_rubble", "chance": 80, "repeat": [ 1, 3 ] } ],
"C": [ { "item": "wreckage", "chance": 100, "repeat": [ 1, 2 ] } ],
"P": [ { "item": "ash", "chance": 80, "repeat": [ 1, 3 ] } ]
"palettes": [ "arcology_exterior" ],
"nested": {
"6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] },
"terrain": { "P": "t_metal_floor", "C": "t_metal_floor", "W": "t_metal_floor" },
"items": {
"W": [ { "item": "building_rubble", "chance": 80, "repeat": [ 1, 3 ] } ],
"C": [ { "item": "wreckage", "chance": 100, "repeat": [ 1, 2 ] } ],
"P": [ { "item": "ash", "chance": 80, "repeat": [ 1, 3 ] } ]
}
}
}
},
Expand Down Expand Up @@ -371,15 +368,13 @@
"_6||,,,,"
],
"palettes": [ "arcology_exterior" ],
"nested": {
"6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] },
"computers": {
"5": {
"name": "East Entrance Gate Controls",
"security": 0,
"options": [ { "name": "EMERGENCY OVERRIDE - OPEN GATES", "action": "open", "security": 3 } ],
"failures": [ { "action": "damage" }, { "action": "shutdown" } ]
}
"nested": { "6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] } },
"computers": {
"5": {
"name": "East Entrance Gate Controls",
"security": 0,
"options": [ { "name": "EMERGENCY OVERRIDE - OPEN GATES", "action": "open", "security": 3 } ],
"failures": [ { "action": "damage" }, { "action": "shutdown" } ]
}
}
}
Expand Down Expand Up @@ -450,15 +445,13 @@
"_6||,,,,"
],
"palettes": [ "arcology_exterior" ],
"nested": {
"6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] },
"computers": {
"5": {
"name": "East Entrance Gate Controls",
"security": 0,
"options": [ { "name": "EMERGENCY OVERRIDE - OPEN GATES", "action": "open", "security": 3 } ],
"failures": [ { "action": "damage" }, { "action": "shutdown" } ]
}
"nested": { "6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] } },
"computers": {
"5": {
"name": "East Entrance Gate Controls",
"security": 0,
"options": [ { "name": "EMERGENCY OVERRIDE - OPEN GATES", "action": "open", "security": 3 } ],
"failures": [ { "action": "damage" }, { "action": "shutdown" } ]
}
}
}
Expand Down Expand Up @@ -657,14 +650,14 @@
"________",
"________"
],
"palettes": [ "arcology_exterior" ]
},
"nested": { "6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] } },
"terrain": { "P": "t_metal_floor", "C": "t_metal_floor", "W": "t_metal_floor" },
"items": {
"W": [ { "item": "building_rubble", "chance": 80, "repeat": [ 1, 3 ] } ],
"C": [ { "item": "wreckage", "chance": 100, "repeat": [ 1, 2 ] } ],
"P": [ { "item": "ash", "chance": 80, "repeat": [ 1, 3 ] } ]
"palettes": [ "arcology_exterior" ],
"nested": { "6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] } },
"terrain": { "P": "t_metal_floor", "C": "t_metal_floor", "W": "t_metal_floor" },
"items": {
"W": [ { "item": "building_rubble", "chance": 80, "repeat": [ 1, 3 ] } ],
"C": [ { "item": "wreckage", "chance": 100, "repeat": [ 1, 2 ] } ],
"P": [ { "item": "ash", "chance": 80, "repeat": [ 1, 3 ] } ]
}
}
},
{
Expand All @@ -673,7 +666,6 @@
"nested_mapgen_id": "arcology_8x8_gate_n_6",
"//": "Working Console, broken gate",
"object": {
"fill_ter": "t_thconc_floor",
"mapgensize": [ 8, 8 ],
"rotation": [ 0, 3 ],
"rows": [
Expand All @@ -686,21 +678,21 @@
"________",
"________"
],
"palettes": [ "arcology_exterior" ]
},
"nested": { "6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] } },
"terrain": { "P": "t_metal_floor", "C": "t_metal_floor", "W": "t_metal_floor" },
"items": {
"W": [ { "item": "building_rubble", "chance": 80, "repeat": [ 1, 3 ] } ],
"C": [ { "item": "wreckage", "chance": 100, "repeat": [ 1, 2 ] } ],
"P": [ { "item": "ash", "chance": 80, "repeat": [ 1, 3 ] } ]
},
"computers": {
"5": {
"name": "North Entrance Gate Controls",
"security": 0,
"options": [ { "name": "EMERGENCY OVERRIDE - OPEN GATES", "action": "open", "security": 3 } ],
"failures": [ { "action": "damage" }, { "action": "shutdown" } ]
"palettes": [ "arcology_exterior" ],
"nested": { "6": { "chunks": [ [ "arcology_1x1_gate", 50 ], [ "arcology_1x1_gate_broken", 50 ] ] } },
"terrain": { "P": "t_metal_floor", "C": "t_metal_floor", "W": "t_metal_floor" },
"items": {
"W": [ { "item": "building_rubble", "chance": 80, "repeat": [ 1, 3 ] } ],
"C": [ { "item": "wreckage", "chance": 100, "repeat": [ 1, 2 ] } ],
"P": [ { "item": "ash", "chance": 80, "repeat": [ 1, 3 ] } ]
},
"computers": {
"5": {
"name": "North Entrance Gate Controls",
"security": 0,
"options": [ { "name": "EMERGENCY OVERRIDE - OPEN GATES", "action": "open", "security": 3 } ],
"failures": [ { "action": "damage" }, { "action": "shutdown" } ]
}
}
}
},
Expand Down

0 comments on commit bc23ca8

Please sign in to comment.