Skip to content

Commit

Permalink
Merge branch 'main' into water-wheel-goes-sploosh
Browse files Browse the repository at this point in the history
  • Loading branch information
@chaosvolt
chaosvolt committed Jun 5, 2024
2 parents ced4a90 + f4aaffd commit 9dff952
Show file tree
Hide file tree
Showing 33 changed files with 977 additions and 400 deletions.
7 changes: 4 additions & 3 deletions data/json/furniture_and_terrain/furniture-migo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@
"symbol": "i",
"color": "magenta",
"looks_like": "t_machinery_light",
"move_cost_mod": 4,
"coverage": 10,
"move_cost_mod": -1,
"coverage": 75,
"light_emitted": 15,
"required_str": -1,
"emissions": [ "emit_shock_burst" ],
Expand All @@ -233,7 +233,8 @@
"sound_fail": "whump!",
"furn_set": "f_alien_scar",
"items": [ { "item": "fetid_goop", "count": [ 3, 5 ], "prob": 100 } ],
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" }
"//": "destroy_threshold equal to str_min instead of str_max due to delicate wetware, and a pissed-off alien bug installed inside",
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 8, "block_unaimed_chance": "75%" }
}
}
]
59 changes: 42 additions & 17 deletions data/json/furniture_and_terrain/terrain-fences-gates.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"sound": "crunch!",
"sound_fail": "whump!",
"ter_set": "t_null",
"items": [ { "item": "splinter", "count": [ 10, 20 ] } ]
"items": [ { "item": "splinter", "count": [ 10, 20 ] } ],
"ranged": { "reduction": [ 12, 24 ], "destroy_threshold": 150 }
}
},
{
Expand Down Expand Up @@ -166,7 +167,7 @@
"symbol": "+",
"color": "brown",
"move_cost": 3,
"coverage": 60,
"coverage": 35,
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "DOOR", "MOUNTABLE", "BURROWABLE" ],
"connects_to": "WOODFENCE",
"open": "t_fencegate_o",
Expand All @@ -192,7 +193,8 @@
{ "item": "nail", "charges": [ 2, 8 ] },
{ "item": "splinter", "count": [ 1, 2 ] },
{ "item": "hinge", "count": [ 1, 2 ] }
]
],
"ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 20, "block_unaimed_chance": "25%" }
}
},
{
Expand Down Expand Up @@ -370,6 +372,7 @@
"symbol": "LINE_OXOX",
"color": "brown",
"move_cost": 3,
"coverage": 25,
"flags": [
"TRANSPARENT",
"DIGGABLE",
Expand All @@ -390,7 +393,8 @@
"sound": "crack.",
"sound_fail": "wham.",
"ter_set": "t_null",
"items": [ { "item": "2x4", "count": [ 1, 3 ] }, { "item": "nail", "charges": [ 2, 6 ] }, { "item": "splinter", "count": 1 } ]
"items": [ { "item": "2x4", "count": [ 1, 3 ] }, { "item": "nail", "charges": [ 2, 6 ] }, { "item": "splinter", "count": 1 } ],
"ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 20, "block_unaimed_chance": "25%" }
}
},
{
Expand Down Expand Up @@ -632,6 +636,7 @@
"color": "brown",
"looks_like": "t_fence",
"move_cost": 0,
"coverage": 60,
"examine_action": "chainfence",
"flags": [
"TRANSPARENT",
Expand All @@ -651,7 +656,8 @@
"sound": "whump!",
"sound_fail": "whack!",
"ter_set": "t_fence_post",
"items": [ { "item": "2x4", "count": [ 1, 2 ] } ]
"items": [ { "item": "2x4", "count": [ 1, 2 ] } ],
"ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 12, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -689,7 +695,8 @@
{ "item": "nail", "charges": [ 2, 8 ] },
{ "item": "splinter", "count": [ 1, 2 ] },
{ "item": "hinge", "count": [ 1, 2 ] }
]
],
"ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 20, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -746,7 +753,8 @@
{ "item": "pipe", "count": [ 4, 8 ] },
{ "item": "sheet_metal_small", "count": [ 8, 20 ] },
{ "item": "sheet_metal", "count": [ 0, 2 ] }
]
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 18, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -785,7 +793,8 @@
{ "item": "sheet_metal_small", "count": [ 8, 20 ] },
{ "item": "sheet_metal", "count": [ 0, 2 ] },
{ "item": "hinge", "count": [ 1, 2 ] }
]
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 20, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -847,7 +856,8 @@
"sound": "whump!",
"sound_fail": "whack!",
"ter_set": "t_fence_post",
"items": [ { "item": "2x4", "count": [ 4, 10 ] } ]
"items": [ { "item": "2x4", "count": [ 4, 10 ] } ],
"ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 12 }
}
},
{
Expand Down Expand Up @@ -885,7 +895,8 @@
{ "item": "nail", "charges": [ 10, 20 ] },
{ "item": "splinter", "count": [ 4, 6 ] },
{ "item": "hinge", "count": [ 1, 2 ] }
]
],
"ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 20 }
}
},
{
Expand Down Expand Up @@ -919,6 +930,7 @@
"symbol": "LINE_OXOX",
"color": "yellow",
"move_cost": 3,
"coverage": 25,
"flags": [ "TRANSPARENT", "NOITEM", "THIN_OBSTACLE", "MOUNTABLE", "SHORT", "AUTO_WALL_SYMBOL", "BURROWABLE" ],
"connects_to": "RAILING",
"bash": {
Expand All @@ -932,7 +944,8 @@
{ "item": "nail", "charges": [ 2, 6 ] },
{ "item": "scrap", "count": [ 1, 3 ] },
{ "item": "splinter", "count": [ 1, 3 ] }
]
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 12, "block_unaimed_chance": "25%" }
}
},
{
Expand All @@ -957,7 +970,9 @@
{ "item": "glass_shard", "count": [ 5, 15 ] },
{ "item": "pipe", "charges": [ 1, 2 ] },
{ "item": "scrap", "count": [ 1, 3 ] }
]
],
"//": "reduction and destroy_threshold are lower for plain glass",
"ranged": { "reduction": [ 1, 10 ], "destroy_threshold": 10, "block_unaimed_chance": "25%" }
}
},
{
Expand All @@ -969,6 +984,7 @@
"symbol": "LINE_OXOX",
"color": "dark_gray",
"move_cost": 3,
"coverage": 25,
"flags": [ "TRANSPARENT", "NOITEM", "THIN_OBSTACLE", "MOUNTABLE", "SHORT", "AUTO_WALL_SYMBOL", "BURROWABLE" ],
"connects_to": "RAILING",
"deconstruct": { "ter_set": "t_rock_floor", "items": [ { "item": "sheet_metal", "count": 2 }, { "item": "pipe", "count": 4 } ] },
Expand All @@ -983,7 +999,8 @@
{ "item": "sheet_metal", "charges": 1 },
{ "item": "sheet_metal_small", "charges": [ 1, 4 ] },
{ "item": "scrap", "count": [ 1, 3 ] }
]
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 80, "block_unaimed_chance": "25%" }
}
},
{
Expand All @@ -1008,7 +1025,9 @@
{ "item": "rock", "count": [ 5, 10 ] },
{ "item": "scrap", "count": [ 5, 8 ] },
{ "item": "rebar", "count": [ 0, 2 ] }
]
],
"//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return",
"ranged": { "reduction": [ 100, 200 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" }
}
},
{
Expand All @@ -1020,14 +1039,16 @@
"color": "light_gray",
"looks_like": "t_guardrail_bg_dp",
"move_cost": 3,
"coverage": 25,
"flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT", "MOUNTABLE", "SHORT", "THIN_OBSTACLE", "ROAD", "BURROWABLE" ],
"bash": {
"str_min": 8,
"str_max": 150,
"sound": "crunch!",
"sound_fail": "clang!",
"ter_set": "t_pavement_hw_air",
"items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 3, 6 ] } ]
"items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 3, 6 ] } ],
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" }
}
},
{
Expand All @@ -1038,14 +1059,16 @@
"symbol": "#",
"color": "light_gray",
"move_cost": 3,
"coverage": 25,
"flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT", "MOUNTABLE", "SHORT", "THIN_OBSTACLE", "ROAD", "BURROWABLE" ],
"bash": {
"str_min": 8,
"str_max": 150,
"sound": "crunch!",
"sound_fail": "clang!",
"ter_set": "t_pavement_bg_dp",
"items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 3, 6 ] } ]
"items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 3, 6 ] } ],
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" }
}
},
{
Expand All @@ -1056,6 +1079,7 @@
"symbol": "#",
"color": "light_gray",
"move_cost": 3,
"coverage": 25,
"flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT", "MOUNTABLE", "SHORT", "THIN_OBSTACLE", "ROAD", "BURROWABLE" ],
"looks_like": "t_guardrail_bg_dp",
"bash": {
Expand All @@ -1064,7 +1088,8 @@
"sound": "crunch!",
"sound_fail": "clang!",
"ter_set": "t_pavement",
"items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 3, 6 ] } ]
"items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 3, 6 ] } ],
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" }
}
}
]
Loading

0 comments on commit 9dff952

Please sign in to comment.