diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json index 7f5b3c1e6a06..388bbe00b06e 100644 --- a/data/json/furniture_and_terrain/furniture-appliances.json +++ b/data/json/furniture_and_terrain/furniture-appliances.json @@ -32,6 +32,7 @@ { "item": "cu_pipe", "count": [ 1, 4 ] }, { "item": "scrap_copper", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50 } } }, @@ -73,6 +74,7 @@ { "item": "e_scrap", "count": [ 5, 10 ] }, { "item": "plastic_chunk", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 50 } } }, @@ -118,6 +120,7 @@ { "item": "cu_pipe", "count": [ 1, 4 ] }, { "item": "scrap_copper", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, @@ -159,6 +162,7 @@ { "item": "element", "count": [ 1, 3 ] }, { "item": "cable", "charges": [ 1, 15 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, @@ -284,7 +288,7 @@ { "item": "sheet_metal_small", "count": [ 10, 20 ] }, { "item": "pipe", "count": [ 0, 2 ] } ], - "//2": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//2": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 20, "block_unaimed_chance": "25%" } }, "examine_action": "transform", @@ -372,6 +376,7 @@ { "item": "cable", "charges": [ 1, 4 ] }, { "item": "plastic_chunk", "count": [ 2, 4 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -448,6 +453,7 @@ { "item": "glass_shard", "count": [ 2, 4 ] }, { "item": "motor_tiny", "prob": 25 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 50 } } }, @@ -593,6 +599,7 @@ { "item": "cu_pipe", "count": [ 1, 4 ] }, { "item": "scrap_copper", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50 } } }, @@ -636,6 +643,7 @@ { "item": "cu_pipe", "count": [ 1, 4 ] }, { "item": "scrap_copper", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, @@ -668,6 +676,7 @@ { "item": "cable", "charges": [ 1, 3 ] }, { "item": "pilot_light", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } } }, @@ -703,6 +712,7 @@ { "item": "water_faucet", "count": 1 }, { "item": "pot", "count": [ 0, 1 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } } }, @@ -738,6 +748,7 @@ { "item": "scrap", "count": [ 0, 6 ] }, { "item": "wire", "count": [ 1, 3 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } } }, @@ -776,6 +787,7 @@ { "item": "scrap", "count": [ 10, 20 ] }, { "item": "pipe", "count": [ 1, 3 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } } }, @@ -855,6 +867,7 @@ { "item": "e_scrap", "count": [ 20, 50 ] }, { "item": "cable", "charges": [ 2, 8 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 40 } } }, @@ -898,6 +911,7 @@ { "item": "cable", "charges": [ 1, 15 ] }, { "item": "scrap_copper", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50 } } }, @@ -974,7 +988,7 @@ { "item": "scrap", "count": [ 4, 6 ] }, { "item": "pipe", "count": [ 0, 3 ] } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 16, "block_unaimed_chance": "25%" } } }, @@ -1014,7 +1028,7 @@ { "item": "scrap", "count": [ 4, 6 ] }, { "item": "pipe", "count": [ 0, 3 ] } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//": "Variable, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 10, "block_unaimed_chance": "25%" } } }, @@ -1051,7 +1065,7 @@ { "item": "scrap", "count": [ 4, 6 ] }, { "item": "pipe", "count": [ 0, 3 ] } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 16, "block_unaimed_chance": "50%" } } }, @@ -1170,7 +1184,7 @@ { "item": "cable", "charges": [ 2, 8 ] }, { "item": "small_storage_battery", "count": [ 4, 16 ] } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 16, "block_unaimed_chance": "50%" } } }, @@ -1212,7 +1226,7 @@ { "item": "cable", "charges": [ 2, 8 ] }, { "item": "small_storage_battery", "count": [ 20, 80 ] } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 16, "block_unaimed_chance": "75%" } } }, @@ -1253,7 +1267,7 @@ { "item": "cable", "charges": [ 2, 8 ] }, { "item": "small_storage_battery", "count": [ 40, 160 ] } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 16 } } }, @@ -1409,6 +1423,7 @@ { "item": "scrap", "count": [ 1, 4 ] }, { "item": "cable", "charges": [ 2, 8 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, @@ -1503,6 +1518,7 @@ { "item": "plastic_chunk", "count": [ 1, 2 ] }, { "item": "frame", "count": [ 0, 1 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } } }, @@ -1572,6 +1588,7 @@ { "item": "cable", "charges": [ 1, 4 ] }, { "item": "element", "count": [ 2, 6 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } } }, @@ -1750,6 +1767,7 @@ { "charges": 0, "item": "food_processor", "prob": 50 }, { "charges": 0, "item": "press", "prob": 50 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, @@ -1851,6 +1869,7 @@ { "item": "cable", "charges": [ 2, 8 ] }, { "item": "frame", "count": [ 0, 1 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } } }, @@ -1918,6 +1937,7 @@ { "item": "scrap_copper", "count": [ 1, 2 ] }, { "item": "motor_tiny", "prob": 25 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50 } } }, @@ -2045,6 +2065,7 @@ { "item": "scrap_copper", "count": [ 0, 2 ] }, { "item": "motor_tiny", "prob": 25 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } } }, @@ -2124,6 +2145,7 @@ { "item": "hose", "prob": 50 }, { "item": "motor_tiny", "prob": 25 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } } }, @@ -2215,6 +2237,7 @@ { "item": "sheet_metal", "count": [ 1, 4 ] }, { "item": "cable", "charges": [ 1, 1 ] } ], + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, @@ -2253,7 +2276,7 @@ { "item": "cu_pipe", "count": [ 1, 4 ] }, { "item": "scrap_copper", "count": [ 0, 2 ] } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 18 } } }, @@ -2498,7 +2521,7 @@ { "item": "plut_cell", "charges": [ 0, 3 ] }, { "item": "lead", "charges": [ 12, 18 ] } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } }, "deconstruct": { @@ -2613,6 +2636,7 @@ { "charges": 0, "item": "hotplate", "prob": 50 }, { "charges": 0, "item": "press", "prob": 50 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } } diff --git a/data/json/furniture_and_terrain/furniture-barriers.json b/data/json/furniture_and_terrain/furniture-barriers.json index 0e36427472a0..2f47c1b9ebeb 100644 --- a/data/json/furniture_and_terrain/furniture-barriers.json +++ b/data/json/furniture_and_terrain/furniture-barriers.json @@ -18,7 +18,7 @@ "sound": "smash!", "sound_fail": "whump.", "items": [ { "item": "2x4", "count": [ 2, 6 ] }, { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": 1 } ], - "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, { diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json index b7c876794479..d58b48b46485 100644 --- a/data/json/furniture_and_terrain/furniture-decorative.json +++ b/data/json/furniture_and_terrain/furniture-decorative.json @@ -19,7 +19,7 @@ "furn_set": "f_bigmirror_b", "items": [ { "item": "glass_shard", "count": [ 3, 6 ] } ], "//": "destroy_threshold equal to str_min as fragile glass breaks into standing mirror frame, reduction matches that of broken mirror", - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 5 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 5 } } }, { @@ -39,7 +39,7 @@ "sound": "metal screeching!", "sound_fail": "clang!", "items": [ { "item": "scrap", "count": [ 2, 4 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 30 } } }, { @@ -58,7 +58,7 @@ "sound": "metal screeching!", "sound_fail": "clang!", "items": [ { "item": "steel_chunk", "count": [ 5, 10 ] } ], - "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 50, 50 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" } }, "flags": [ "TRANSPARENT", "MOUNTABLE", "SHORT" ] }, @@ -79,7 +79,7 @@ "sound": "metal screeching!", "sound_fail": "clang!", "items": [ { "item": "steel_chunk", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 50, 50 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" } }, "flags": [ "TRANSPARENT", "SHORT" ] }, @@ -119,7 +119,7 @@ "sound_fail": "thump.", "items": [ { "item": "rock", "count": [ 1, 6 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 16, 32 ], "destroy_threshold": 32, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 32, 32 ], "destroy_threshold": 32, "block_unaimed_chance": "50%" } } }, { @@ -139,7 +139,7 @@ "sound": "smash!", "sound_fail": "whump.", "items": [ { "item": "splinter", "count": [ 9, 12 ] } ], - "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, { @@ -160,7 +160,7 @@ "sound_fail": "thump.", "items": [ { "item": "rock", "count": [ 1, 6 ] }, { "item": "rebar", "count": [ 1, 2 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 16, 32 ], "destroy_threshold": 32, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 32, 32 ], "destroy_threshold": 32, "block_unaimed_chance": "25%" } } }, { @@ -219,6 +219,7 @@ { "item": "nail", "charges": [ 5, 14 ] }, { "item": "stick", "count": [ 1, 3 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } } diff --git a/data/json/furniture_and_terrain/furniture-domestic_plants.json b/data/json/furniture_and_terrain/furniture-domestic_plants.json index 36275e83418a..38b66abf2e70 100644 --- a/data/json/furniture_and_terrain/furniture-domestic_plants.json +++ b/data/json/furniture_and_terrain/furniture-domestic_plants.json @@ -325,7 +325,7 @@ "sound": "crack.", "sound_fail": "whump.", "items": [ { "item": "2x4", "count": [ 0, 6 ] }, { "item": "nail", "charges": [ 0, 8 ] }, { "item": "rag", "count": [ 0, 12 ] } ], - "ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 15, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 5, 5 ], "destroy_threshold": 15, "block_unaimed_chance": "25%" } }, "examine_action": "dirtmound", "plant_data": { "transform": "f_rack_mushroom_seed" } diff --git a/data/json/furniture_and_terrain/furniture-fireplaces.json b/data/json/furniture_and_terrain/furniture-fireplaces.json index 29b79d3606e9..ed8c4c521b9e 100644 --- a/data/json/furniture_and_terrain/furniture-fireplaces.json +++ b/data/json/furniture_and_terrain/furniture-fireplaces.json @@ -18,7 +18,7 @@ "sound_fail": "whump!", "items": [ { "item": "rock", "count": [ 15, 30 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 50, 100 ], "destroy_threshold": 100, "block_unaimed_chance": "75%" } + "ranged": { "reduction": [ 100, 100 ], "destroy_threshold": 100, "block_unaimed_chance": "75%" } } }, { @@ -40,7 +40,7 @@ "sound": "metal screeching!", "sound_fail": "clang!", "items": [ { "item": "scrap", "count": [ 3, 6 ] }, { "item": "pipe", "prob": 50 } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } }, "deconstruct": { "items": [ { "item": "metal_tank", "count": 1 }, { "item": "pipe", "count": 1 } ] } }, @@ -67,7 +67,7 @@ { "item": "steel_chunk", "count": [ 2, 6 ] }, { "item": "sheet_metal_small", "count": [ 2, 6 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" } } }, { @@ -119,7 +119,7 @@ { "item": "sheet_metal_small", "count": [ 3, 10 ] }, { "item": "sheet_metal", "count": [ 0, 1 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } } }, { @@ -146,7 +146,7 @@ { "item": "sheet_metal_small", "count": [ 2, 5 ] }, { "item": "sheet_metal", "count": [ 0, 1 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" } } }, { diff --git a/data/json/furniture_and_terrain/furniture-fungal.json b/data/json/furniture_and_terrain/furniture-fungal.json index 4bac63f2b8cb..6fbf545b15c3 100644 --- a/data/json/furniture_and_terrain/furniture-fungal.json +++ b/data/json/furniture_and_terrain/furniture-fungal.json @@ -40,6 +40,7 @@ "str_max": 30, "sound": "poof.", "sound_fail": "poof.", + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } } }, @@ -71,6 +72,7 @@ "str_max": 50, "sound": "poof.", "sound_fail": "squelch.", + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 13, 26 ], "destroy_threshold": 50, "block_unaimed_chance": "75%" } } } diff --git a/data/json/furniture_and_terrain/furniture-graves.json b/data/json/furniture_and_terrain/furniture-graves.json index 7200a1678555..c10ddbcb14e8 100644 --- a/data/json/furniture_and_terrain/furniture-graves.json +++ b/data/json/furniture_and_terrain/furniture-graves.json @@ -18,7 +18,7 @@ "sound_fail": "thump.", "items": [ { "item": "rock", "count": [ 2, 7 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 40, 40 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, { @@ -40,7 +40,7 @@ "sound_fail": "thump!", "items": [ { "item": "rock", "count": [ 2, 4 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 50, 100 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 100, 100 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -62,7 +62,7 @@ "sound_fail": "thump!", "items": [ { "item": "rock", "count": [ 8, 14 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 60, 120 ], "destroy_threshold": 120, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 120, 120 ], "destroy_threshold": 120, "block_unaimed_chance": "50%" } } }, { @@ -83,7 +83,7 @@ "sound_fail": "thump!", "items": [ { "item": "rock", "count": [ 5, 10 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 80, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 80, "block_unaimed_chance": "25%" } } }, { @@ -104,7 +104,7 @@ "sound_fail": "thunk!", "items": [ { "item": "rock", "count": [ 18, 30 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 80, 160 ], "destroy_threshold": 160 } + "ranged": { "reduction": [ 160, 160 ], "destroy_threshold": 160 } } } ] diff --git a/data/json/furniture_and_terrain/furniture-industrial.json b/data/json/furniture_and_terrain/furniture-industrial.json index 888b433e2537..a85dd8e1451d 100644 --- a/data/json/furniture_and_terrain/furniture-industrial.json +++ b/data/json/furniture_and_terrain/furniture-industrial.json @@ -27,6 +27,7 @@ { "item": "plastic_chunk", "count": [ 10, 12 ] }, { "item": "scrap", "count": [ 6, 8 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" } }, "deconstruct": { @@ -68,6 +69,7 @@ { "item": "jerrycan", "count": [ 0, 2 ] }, { "item": "metal_tank", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" } }, "deconstruct": { @@ -123,6 +125,7 @@ { "item": "scrap", "count": [ 2, 5 ] }, { "item": "motor", "prob": 30 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 45, "block_unaimed_chance": "25%" } } }, @@ -156,6 +159,7 @@ { "item": "steel_chunk", "count": [ 120, 240 ] }, { "item": "scrap", "count": [ 120, 240 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 150, "block_unaimed_chance": "75%" } } }, @@ -208,6 +212,7 @@ { "item": "plastic_chunk", "count": [ 2, 8 ] }, { "item": "scrap", "count": [ 3, 8 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } } }, @@ -234,6 +239,7 @@ { "item": "cable", "charges": [ 20, 100 ] }, { "item": "pipe", "count": [ 1, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -265,6 +271,7 @@ { "item": "power_supply", "count": [ 0, 2 ] }, { "item": "metal_tank_little", "count": [ 0, 6 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 13, 25 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" } } }, @@ -306,7 +313,7 @@ { "item": "cable", "charges": [ 10, 15 ] }, { "item": "pipe", "count": [ 0, 3 ] } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 16, 32 ], "destroy_threshold": 32, "block_unaimed_chance": "50%" } }, "//": "Matches the power output across 5 minutes that the capacitors and conduits provided on first implementation", diff --git a/data/json/furniture_and_terrain/furniture-medical.json b/data/json/furniture_and_terrain/furniture-medical.json index 495ab46c3be2..4e06c6e95346 100644 --- a/data/json/furniture_and_terrain/furniture-medical.json +++ b/data/json/furniture_and_terrain/furniture-medical.json @@ -38,7 +38,7 @@ { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 16, "block_unaimed_chance": "25%" } } }, @@ -68,7 +68,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "rag", "count": [ 20, 30 ] } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 10, "block_unaimed_chance": "25%" } } }, @@ -109,6 +109,7 @@ { "item": "cu_pipe", "count": [ 1, 4 ] }, { "item": "scrap_copper", "count": [ 0, 2 ] } ], + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, @@ -155,6 +156,7 @@ { "item": "scrap_copper", "count": [ 1, 2 ] }, { "item": "motor_tiny", "prob": 25 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 80 } } }, @@ -195,6 +197,7 @@ { "item": "cable", "charges": [ 1, 3 ] }, { "item": "cu_pipe", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 18, 35 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } }, "examine_action": "workbench", @@ -245,6 +248,7 @@ { "item": "glass_shard", "count": [ 3, 6 ] }, { "item": "cable", "charges": [ 1, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 13, 25 ], "destroy_threshold": 60, "block_unaimed_chance": "25%" } } }, @@ -285,6 +289,7 @@ { "item": "element", "count": [ 1, 3 ] }, { "item": "cable", "charges": [ 1, 15 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 13, 25 ], "destroy_threshold": 60, "block_unaimed_chance": "25%" } } }, @@ -389,6 +394,7 @@ { "item": "e_scrap", "count": [ 5, 10 ] }, { "item": "plastic_chunk", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } } }, @@ -435,6 +441,7 @@ { "item": "e_scrap", "count": [ 5, 10 ] }, { "item": "plastic_chunk", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 11, 22 ], "destroy_threshold": 70, "block_unaimed_chance": "25%" } } }, @@ -477,6 +484,7 @@ { "item": "e_scrap", "count": [ 5, 10 ] }, { "item": "plastic_chunk", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 12, 24 ], "destroy_threshold": 70, "block_unaimed_chance": "25%" } } }, @@ -518,6 +526,7 @@ { "item": "e_scrap", "count": [ 5, 10 ] }, { "item": "plastic_chunk", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 19, 38 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } } }, @@ -559,6 +568,7 @@ { "item": "e_scrap", "count": [ 5, 10 ] }, { "item": "plastic_chunk", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 18, 35 ], "destroy_threshold": 70, "block_unaimed_chance": "75%" } } }, @@ -601,6 +611,7 @@ { "item": "e_scrap", "count": [ 5, 10 ] }, { "item": "plastic_chunk", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } } }, @@ -643,6 +654,7 @@ { "item": "e_scrap", "count": [ 5, 10 ] }, { "item": "plastic_chunk", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } } }, @@ -679,6 +691,7 @@ { "item": "sheet_metal", "count": [ 1, 2 ] }, { "item": "plastic_chunk", "count": [ 5, 10 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } } }, @@ -726,6 +739,7 @@ { "item": "e_scrap", "count": [ 5, 10 ] }, { "item": "plastic_chunk", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } } }, @@ -771,6 +785,7 @@ { "item": "e_scrap", "count": [ 5, 10 ] }, { "item": "plastic_chunk", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, @@ -816,6 +831,7 @@ { "item": "e_scrap", "count": [ 5, 10 ] }, { "item": "plastic_chunk", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } } }, @@ -921,7 +937,7 @@ { "item": "sheet_metal", "count": [ 1, 3 ] }, { "item": "cable", "charges": [ 1, 15 ] } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 12, "block_unaimed_chance": "25%" } } } diff --git a/data/json/furniture_and_terrain/furniture-migo.json b/data/json/furniture_and_terrain/furniture-migo.json index 1d2622a518c9..518c740e9030 100644 --- a/data/json/furniture_and_terrain/furniture-migo.json +++ b/data/json/furniture_and_terrain/furniture-migo.json @@ -40,6 +40,7 @@ "sound_fail": "whump!", "furn_set": "f_alien_scar_small", "items": [ { "item": "fetid_goop", "count": [ 3, 7 ], "prob": 100 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 7, 13 ], "destroy_threshold": 26, "block_unaimed_chance": "25%" } } }, @@ -63,6 +64,7 @@ "sound_fail": "whump!", "furn_set": "f_alien_scar_small", "items": [ { "item": "fetid_goop", "count": [ 15, 25 ], "prob": 100 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 60, "block_unaimed_chance": "25%" } } }, @@ -144,6 +146,7 @@ "sound": "splorch!", "sound_fail": "whump.", "items": [ { "item": "fetid_goop", "count": [ 5, 10 ], "prob": 100 }, { "group": "migo_pod_storage", "prob": 50 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, @@ -166,6 +169,7 @@ "sound": "splorch!", "sound_fail": "whump.", "items": [ { "group": "migo_pod_samples", "prob": 75, "count": [ 1, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, @@ -187,6 +191,7 @@ "sound": "splorch!", "sound_fail": "whump.", "items": [ { "item": "alien_pod_resin", "count": [ 1, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, @@ -208,6 +213,7 @@ "sound": "splorch!", "sound_fail": "whump.", "furn_set": "f_alien_scar", + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 23, 45 ], "destroy_threshold": 60, "block_unaimed_chance": "25%" } } }, @@ -233,7 +239,7 @@ "sound_fail": "whump!", "furn_set": "f_alien_scar", "items": [ { "item": "fetid_goop", "count": [ 3, 5 ], "prob": 100 } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate wetware, and a pissed-off alien bug installed inside", + "//": "Variable reduction, 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%" } } } diff --git a/data/json/furniture_and_terrain/furniture-plumbing.json b/data/json/furniture_and_terrain/furniture-plumbing.json index ad6c390245f1..c1b52d15636b 100644 --- a/data/json/furniture_and_terrain/furniture-plumbing.json +++ b/data/json/furniture_and_terrain/furniture-plumbing.json @@ -24,7 +24,7 @@ { "item": "ceramic_shard", "count": [ 6, 18 ] } ], "//": "ceramic obstacles have destroy_threshold equal to str_min since more fragile", - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 12, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 12, "block_unaimed_chance": "25%" } } }, { @@ -52,7 +52,7 @@ { "item": "glass_shard", "count": [ 1, 2 ] } ], "//": "ceramic obstacles have destroy_threshold equal to str_min since more fragile", - "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 6, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 6, "block_unaimed_chance": "25%" } } }, { @@ -77,7 +77,7 @@ { "item": "ceramic_shard", "count": [ 2, 8 ] } ], "//": "ceramic obstacles have destroy_threshold equal to str_min since more fragile", - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 8, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 8, "block_unaimed_chance": "25%" } } }, { @@ -99,7 +99,7 @@ "sound_fail": "whunk!", "items": [ { "item": "cu_pipe", "prob": 50 }, { "item": "ceramic_shard", "count": [ 2, 8 ] }, { "item": "wax", "count": 1 } ], "//": "ceramic obstacles have destroy_threshold equal to str_min since more fragile", - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 8, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 8, "block_unaimed_chance": "25%" } } }, { @@ -122,7 +122,7 @@ "sound": "reality shattering!", "sound_fail": "whunk!", "items": [ { "item": "cu_pipe", "prob": 50 }, { "item": "sheet_metal", "count": [ 2, 8 ] }, { "item": "pipe", "count": 1 } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" } } }, { @@ -169,6 +169,7 @@ { "item": "scrap_copper", "count": [ 0, 2 ] }, { "item": "water_faucet", "count": [ 0, 1 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, @@ -196,6 +197,7 @@ { "item": "hose", "count": 1 }, { "item": "water_faucet", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 8, 15 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } }, "deconstruct": { @@ -250,6 +252,7 @@ { "item": "plastic_chunk", "count": [ 0, 2 ] }, { "item": "cu_pipe", "count": [ 1, 3 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 8, 15 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } } } diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json index 3b0e351ebe5c..206240e5fec2 100644 --- a/data/json/furniture_and_terrain/furniture-recreation.json +++ b/data/json/furniture_and_terrain/furniture-recreation.json @@ -29,6 +29,7 @@ { "item": "pipe", "count": 1 }, { "item": "lead", "charges": [ 1000, 2000 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 60, "block_unaimed_chance": "25%" } } }, @@ -80,7 +81,7 @@ { "item": "splinter", "count": 1 }, { "item": "felt_patch", "count": [ 0, 2 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, { @@ -188,6 +189,7 @@ { "item": "power_supply", "prob": 50 }, { "item": "RAM", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 35, "block_unaimed_chance": "50%" } } }, @@ -236,6 +238,7 @@ { "item": "plastic_chunk", "count": [ 1, 3 ] }, { "item": "bearing", "charges": [ 0, 16 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, @@ -342,7 +345,7 @@ { "item": "leather", "count": [ 4, 12 ] }, { "item": "rag", "count": [ 4, 18 ] } ], - "ranged": { "reduction": [ 8, 15 ], "destroy_threshold": 20, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 15, 15 ], "destroy_threshold": 20, "block_unaimed_chance": "50%" } } }, { @@ -380,7 +383,7 @@ { "item": "splinter", "count": 1 }, { "item": "plastic_chunk", "count": [ 1, 5 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, { @@ -420,7 +423,7 @@ { "item": "e_scrap", "prob": 25 }, { "item": "plastic_chunk", "count": [ 0, 1 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 20, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 20, "block_unaimed_chance": "50%" } } }, { @@ -481,7 +484,7 @@ { "item": "felt_patch", "count": [ 0, 2 ] }, { "item": "scrap", "count": [ 0, 1 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, { @@ -523,7 +526,7 @@ { "item": "steel_chunk", "count": [ 1, 4 ] }, { "item": "cable", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 40 } + "ranged": { "reduction": [ 16, 16 ], "destroy_threshold": 40 } } } ] diff --git a/data/json/furniture_and_terrain/furniture-roof.json b/data/json/furniture_and_terrain/furniture-roof.json index b42bceefdc89..d4c2431bb4c6 100644 --- a/data/json/furniture_and_terrain/furniture-roof.json +++ b/data/json/furniture_and_terrain/furniture-roof.json @@ -71,7 +71,7 @@ "sound_fail": "whump!", "items": [ { "item": "brick", "count": [ 5, 30 ] }, { "item": "scrap", "count": [ 3, 6 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 30, 30 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" } } }, { @@ -117,7 +117,7 @@ "sound": "whack!", "sound_fail": "whump!", "items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 15, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 15, "block_unaimed_chance": "25%" } } }, { @@ -138,7 +138,7 @@ "sound": "whack!", "sound_fail": "clang!", "items": [ { "item": "sheet_metal_small", "count": [ 1, 5 ] }, { "item": "scrap", "count": [ 3, 6 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 12, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 12, "block_unaimed_chance": "25%" } } } ] diff --git a/data/json/furniture_and_terrain/furniture-rural.json b/data/json/furniture_and_terrain/furniture-rural.json index 277c8dbc08cb..170d3e9b6250 100644 --- a/data/json/furniture_and_terrain/furniture-rural.json +++ b/data/json/furniture_and_terrain/furniture-rural.json @@ -75,7 +75,7 @@ { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": [ 2, 6 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, { @@ -99,7 +99,7 @@ { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": [ 2, 6 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, { @@ -127,7 +127,7 @@ { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": [ 2, 6 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, { @@ -152,7 +152,7 @@ { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": [ 2, 6 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } } ] diff --git a/data/json/furniture_and_terrain/furniture-seats.json b/data/json/furniture_and_terrain/furniture-seats.json index eeccb2920b52..5fb154b9dbfb 100644 --- a/data/json/furniture_and_terrain/furniture-seats.json +++ b/data/json/furniture_and_terrain/furniture-seats.json @@ -20,7 +20,7 @@ "sound": "smash!", "sound_fail": "whump.", "items": [ { "item": "2x4", "count": [ 1, 3 ] }, { "item": "nail", "charges": [ 2, 6 ] }, { "item": "splinter", "count": 1 } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, { @@ -49,7 +49,7 @@ { "item": "splinter", "count": 1 }, { "item": "rag", "count": [ 20, 30 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, { @@ -80,7 +80,7 @@ { "item": "rag", "count": [ 20, 30 ] }, { "item": "rope_6" } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, { @@ -104,7 +104,7 @@ "sound": "smash!", "sound_fail": "whump.", "items": [ { "item": "2x4", "count": [ 1, 3 ] }, { "item": "nail", "charges": [ 2, 6 ] }, { "item": "splinter", "count": 1 } ], - "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 20, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 20, "block_unaimed_chance": "25%" } } }, { @@ -132,7 +132,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "rag", "count": [ 20, 30 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, { @@ -156,7 +156,7 @@ "sound": "smash!", "sound_fail": "whump.", "items": [ { "item": "2x4", "count": 1 }, { "item": "nail", "charges": [ 1, 5 ] }, { "item": "splinter", "count": 3 } ], - "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 20, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 20, "block_unaimed_chance": "25%" } } }, { @@ -176,7 +176,15 @@ "examine_action": "deployed_furniture", "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT" ], "max_volume": "875 L", - "deconstruct": { "items": [ { "item": "camp_chair", "count": 1 } ] } + "deconstruct": { "items": [ { "item": "camp_chair", "count": 1 } ] }, + "bash": { + "str_min": 6, + "str_max": 18, + "sound": "metal screeching!", + "sound_fail": "clang.", + "items": [ { "item": "sheet_metal_small", "count": [ 1, 2 ] }, { "item": "steel_chunk", "count": [ 0, 1 ] } ], + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 18, "block_unaimed_chance": "25%" } + } }, { "type": "furniture", @@ -200,7 +208,7 @@ "sound": "smash!", "sound_fail": "whump.", "items": [ { "item": "splinter", "count": [ 2, 6 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, { @@ -235,6 +243,7 @@ { "item": "nail", "charges": [ 1, 3 ] }, { "item": "rag", "count": [ 5, 10 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, @@ -262,7 +271,7 @@ { "item": "sheet_metal", "count": [ 0, 1 ] }, { "item": "pipe", "count": [ 0, 4 ] } ], - "ranged": { "reduction": [ 7, 15 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 15, 15 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" } }, "deconstruct": { "items": [ { "item": "scrap", "count": 3 }, { "item": "sheet_metal", "count": 1 }, { "item": "pipe", "count": 4 } ] } }, @@ -286,11 +295,13 @@ "max_volume": "750 L", "deconstruct": { "items": [ { "item": "chair_folding", "count": 1 } ] }, "bash": { - "str_min": 5, - "str_max": 15, + "str_min": 6, + "str_max": 18, "sound": "smash!", "sound_fail": "whump.", - "items": [ { "item": "plastic_chunk", "count": [ 3, 12 ] }, { "item": "scrap", "charges": [ 5, 25 ] } ] + "items": [ { "item": "plastic_chunk", "count": [ 3, 12 ] }, { "item": "scrap", "charges": [ 5, 25 ] } ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 18, "block_unaimed_chance": "25%" } } } ] diff --git a/data/json/furniture_and_terrain/furniture-signs.json b/data/json/furniture_and_terrain/furniture-signs.json index f6726939f7ac..28fb6c0486f9 100644 --- a/data/json/furniture_and_terrain/furniture-signs.json +++ b/data/json/furniture_and_terrain/furniture-signs.json @@ -21,7 +21,7 @@ { "item": "nail", "charges": [ 4, 6 ] }, { "item": "splinter", "count": [ 1, 4 ] } ], - "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "75%" } + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "75%" } } }, { @@ -43,7 +43,7 @@ "sound": "smash!", "sound_fail": "whump.", "items": [ { "item": "2x4", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 2, 4 ] }, { "item": "splinter", "count": 2 } ], - "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, { @@ -66,7 +66,7 @@ "sound": "smash!", "sound_fail": "whump.", "items": [ { "item": "2x4", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 2, 4 ] }, { "item": "splinter", "count": 2 } ], - "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } } ] diff --git a/data/json/furniture_and_terrain/furniture-sleep.json b/data/json/furniture_and_terrain/furniture-sleep.json index b5642d5ecd18..b58056016cd3 100644 --- a/data/json/furniture_and_terrain/furniture-sleep.json +++ b/data/json/furniture_and_terrain/furniture-sleep.json @@ -25,6 +25,7 @@ { "item": "rag", "count": [ 40, 55 ] }, { "item": "scrap", "count": [ 10, 20 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, @@ -55,6 +56,7 @@ { "item": "rag", "count": [ 80, 110 ] }, { "item": "scrap", "count": [ 20, 40 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, @@ -91,6 +93,7 @@ { "item": "rag", "count": [ 120, 160 ] }, { "item": "scrap", "count": [ 60, 100 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 13, 25 ], "destroy_threshold": 60, "block_unaimed_chance": "75%" } } }, @@ -116,6 +119,7 @@ { "item": "nail", "charges": [ 6, 8 ] }, { "item": "splinter", "count": [ 3, 6 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, @@ -197,6 +201,7 @@ { "item": "splinter", "count": [ 1, 4 ] }, { "item": "rag", "count": [ 20, 30 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" } } }, @@ -224,6 +229,7 @@ { "item": "straw_pile", "count": [ 7, 8 ] }, { "item": "splinter", "count": [ 1, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 20, "block_unaimed_chance": "25%" } } }, diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json index 84b6d2e8e330..464ebffd9f07 100644 --- a/data/json/furniture_and_terrain/furniture-storage.json +++ b/data/json/furniture_and_terrain/furniture-storage.json @@ -22,7 +22,7 @@ { "item": "nail", "charges": [ 4, 12 ] }, { "item": "splinter", "count": [ 5, 10 ] } ], - "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 40 } + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 40 } } }, { @@ -50,7 +50,7 @@ { "item": "splinter", "count": [ 6, 10 ] }, { "item": "wood_panel", "count": [ 0, 1 ] } ], - "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 40 } + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 40 } } }, { @@ -97,7 +97,7 @@ { "item": "nail", "charges": [ 2, 10 ] }, { "item": "rag", "count": [ 8, 12 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } }, "pry": { "success_message": "You wedge open the coffin.", @@ -139,7 +139,7 @@ { "item": "nail", "charges": [ 2, 10 ] }, { "item": "rag", "count": [ 8, 12 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } }, { @@ -171,7 +171,7 @@ "sound": "smash!", "sound_fail": "wham!", "items": [ { "item": "2x4", "count": [ 1, 5 ] }, { "item": "nail", "charges": [ 2, 10 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } }, "pry": { "success_message": "You pop open the crate.", @@ -200,7 +200,7 @@ "sound": "smash!", "sound_fail": "wham!", "items": [ { "item": "2x4", "count": [ 1, 5 ] }, { "item": "nail", "charges": [ 2, 10 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, { @@ -261,7 +261,7 @@ { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": [ 5, 10 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, { @@ -298,6 +298,7 @@ { "item": "glass_shard", "count": [ 1, 10 ] }, { "item": "scrap", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, @@ -326,7 +327,7 @@ { "item": "rock", "count": [ 1, 2 ] } ], "//": "double the expected damage reduction", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "75%" } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "75%" } } }, { @@ -354,7 +355,7 @@ { "item": "rock", "count": [ 1, 2 ] } ], "//": "double the expected damage reduction", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "75%" } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "75%" } } }, { @@ -397,7 +398,7 @@ { "item": "rock", "count": [ 1, 2 ] } ], "//": "double the expected damage reduction", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "75%" } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "75%" } } }, { @@ -425,7 +426,7 @@ { "item": "rock", "count": [ 1, 2 ] } ], "//": "double the expected damage reduction", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "75%" } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "75%" } } }, { @@ -468,7 +469,7 @@ { "item": "rock", "count": [ 1, 2 ] } ], "//": "double the expected damage reduction", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "75%" } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "75%" } } }, { @@ -495,7 +496,7 @@ { "item": "sheet_metal_small", "count": [ 4, 8 ] }, { "item": "pipe", "count": [ 0, 1 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40 } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40 } } }, { @@ -589,7 +590,7 @@ { "item": "sheet_metal_small", "count": [ 4, 8 ] }, { "item": "pipe", "count": 1 } ], - "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } } }, { @@ -612,7 +613,7 @@ "sound": "smash!", "sound_fail": "whump.", "items": [ { "item": "2x4", "count": [ 2, 6 ] }, { "item": "nail", "charges": [ 20, 40 ] }, { "item": "splinter", "count": 12 } ], - "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, { @@ -654,7 +655,7 @@ "sound": "smash!", "sound_fail": "whump.", "items": [ { "item": "plastic_chunk", "count": [ 2, 7 ] }, { "item": "pipe", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" } } }, { @@ -683,7 +684,7 @@ { "item": "rock", "count": [ 1, 2 ] } ], "//": "double the expected damage reduction", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" } } }, { @@ -722,7 +723,7 @@ { "item": "rock", "count": [ 1, 2 ] } ], "//": "double the expected damage reduction", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" } } }, { @@ -750,7 +751,7 @@ { "item": "rock", "count": [ 1, 2 ] } ], "//": "double the expected damage reduction", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" } } }, { @@ -807,7 +808,7 @@ { "item": "pipe", "count": [ 0, 1 ] }, { "item": "scrap", "count": [ 2, 5 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40 } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40 } } }, { @@ -836,7 +837,7 @@ "sound": "metal screeching!", "sound_fail": "clang!", "items": [ { "item": "scrap", "count": [ 0, 6 ] }, { "item": "sheet_metal", "count": [ 0, 4 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } } }, { @@ -870,6 +871,7 @@ { "item": "sheet_metal_small", "count": [ 1, 4 ] }, { "item": "pipe", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, @@ -899,7 +901,7 @@ { "item": "sheet_metal_small", "count": [ 4, 8 ] }, { "item": "pipe", "count": 4 } ], - "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 40 } + "ranged": { "reduction": [ 16, 16 ], "destroy_threshold": 40 } } }, { @@ -937,7 +939,7 @@ { "item": "scrap", "count": [ 10, 20 ] }, { "item": "splinter", "count": 1 } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, { @@ -980,7 +982,7 @@ "furn_set": "f_displaycase_b", "items": [ { "item": "glass_shard", "count": [ 1, 5 ] } ], "//": "reduction matches that of the underlying broken case, destroy_threshold matches str_min since glass might shatter", - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 6, "block_unaimed_chance": "75%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 6, "block_unaimed_chance": "75%" } } }, { @@ -1006,7 +1008,7 @@ { "item": "splinter", "count": [ 2, 4 ] }, { "item": "nail", "charges": [ 0, 8 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" } } }, { @@ -1029,7 +1031,7 @@ "furn_set": "f_displaycase_b", "items": [ { "item": "glass_shard", "count": [ 1, 5 ] } ], "//": "reduction matches that of the underlying broken case, destroy_threshold matches str_min since glass might shatter", - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 6, "block_unaimed_chance": "75%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 6, "block_unaimed_chance": "75%" } } }, { @@ -1052,7 +1054,7 @@ "sound": "metal screeching!", "sound_fail": "clang!", "items": [ { "item": "scrap", "count": [ 8, 32 ] }, { "item": "water_faucet", "prob": 50 } ], - "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 20, "block_unaimed_chance": "75%" } + "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 20, "block_unaimed_chance": "75%" } } }, { @@ -1076,7 +1078,7 @@ { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "pipe", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 45, "block_unaimed_chance": "75%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 45, "block_unaimed_chance": "75%" } } }, { @@ -1107,7 +1109,7 @@ { "item": "scrap", "count": [ 10, 20 ] }, { "item": "splinter", "count": [ 1, 20 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } } }, { @@ -1136,7 +1138,7 @@ { "item": "scrap", "count": [ 2, 6 ] }, { "item": "hinge", "charges": 2 } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" } } } ] diff --git a/data/json/furniture_and_terrain/furniture-surfaces.json b/data/json/furniture_and_terrain/furniture-surfaces.json index 1f50e6d47ab7..6275c43de1ea 100644 --- a/data/json/furniture_and_terrain/furniture-surfaces.json +++ b/data/json/furniture_and_terrain/furniture-surfaces.json @@ -21,7 +21,7 @@ { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": [ 5, 10 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } }, "examine_action": "workbench", "workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75L" } @@ -49,7 +49,7 @@ { "item": "nail", "charges": [ 2, 6 ] }, { "item": "splinter", "count": [ 5, 10 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" } }, "examine_action": "workbench", "workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75L" } @@ -80,7 +80,7 @@ { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": [ 5, 10 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, { @@ -132,7 +132,7 @@ { "item": "nail", "charges": [ 10, 16 ] }, { "item": "splinter", "count": [ 4, 12 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } }, "examine_action": "workbench", "workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75L" } @@ -162,7 +162,7 @@ { "item": "steel_chunk", "count": [ 4, 8 ] }, { "item": "scrap", "count": [ 12, 24 ] } ], - "ranged": { "reduction": [ 18, 35 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 35, 35 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } }, "examine_action": "workbench", "workbench": { "multiplier": 1.2, "mass": "500 kg", "volume": "200L" } @@ -257,7 +257,7 @@ { "item": "pipe", "count": [ 1, 3 ] }, { "item": "sheet_metal_small", "count": [ 4, 8 ] } ], - "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 16, 16 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } }, "examine_action": "workbench", "workbench": { "multiplier": 1.05, "mass": "100 kg", "volume": "35L" } @@ -285,7 +285,7 @@ { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": 1 } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } }, "examine_action": "workbench", "workbench": { "multiplier": 1.1, "mass": "200 kg", "volume": "75L" } @@ -314,7 +314,7 @@ { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": 1 } ], - "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } }, "examine_action": "workbench", "workbench": { "multiplier": 0.85, "mass": "200 kg", "volume": "75L" } diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index 3e9a8b4ddf3c..af24469e7dfc 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -135,6 +135,7 @@ { "item": "plastic_chunk", "count": [ 5, 20 ] }, { "item": "plastic_sheet", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 20 } } }, @@ -276,6 +277,7 @@ { "item": "plastic_chunk", "count": [ 5, 20 ] }, { "item": "plastic_sheet", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 13 } } }, @@ -829,7 +831,7 @@ { "group": "rock_mining_extra", "prob": 8 } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 16, 32 ], "destroy_threshold": 32, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 32, 32 ], "destroy_threshold": 32, "block_unaimed_chance": "25%" } } }, { @@ -855,7 +857,7 @@ { "item": "material_limestone", "charges": [ 5, 15 ], "prob": 80 }, { "group": "rock_mining_extra", "prob": 15 } ], - "ranged": { "reduction": [ 32, 64 ], "destroy_threshold": 64, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 64, 64 ], "destroy_threshold": 64, "block_unaimed_chance": "50%" } } }, { @@ -880,7 +882,7 @@ { "item": "material_limestone", "charges": [ 8, 20 ], "prob": 80 }, { "group": "rock_mining_extra", "prob": 20 } ], - "ranged": { "reduction": [ 64, 128 ], "destroy_threshold": 128 } + "ranged": { "reduction": [ 128, 128 ], "destroy_threshold": 128 } } }, { @@ -918,6 +920,7 @@ { "item": "cable", "charges": [ 1, 2 ] }, { "item": "plastic_chunk", "count": [ 2, 4 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -946,6 +949,7 @@ { "item": "cable", "charges": [ 1, 3 ] }, { "item": "scrap", "count": [ 3, 12 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -972,7 +976,7 @@ { "item": "cable", "charges": [ 0, 1 ] }, { "item": "scrap", "count": [ 3, 5 ] } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -995,7 +999,7 @@ "sound_fail": "thump.", "items": [ { "item": "rock", "count": [ 35, 50 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 32, 64 ], "destroy_threshold": 64, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 64, 64 ], "destroy_threshold": 64, "block_unaimed_chance": "50%" } } }, { @@ -1023,6 +1027,7 @@ { "item": "scrap", "count": [ 3, 12 ] }, { "item": "rope_6", "count": [ 1, 3 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -1048,6 +1053,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "american_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -1074,7 +1080,7 @@ { "item": "splinter", "count": [ 10, 20 ] }, { "item": "rope_makeshift_6", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -1099,7 +1105,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "american_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -1123,6 +1129,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "pirate_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -1147,7 +1154,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "pirate_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -1172,7 +1179,9 @@ { "item": "pipe", "count": [ 0, 2 ] }, { "item": "scrap", "count": [ 1, 3 ] }, { "item": "plastic_chunk", "count": [ 1, 6 ] } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "75%" } } } ] diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json index 65053a738d21..58cb0a0bbec2 100644 --- a/data/json/furniture_and_terrain/furniture-tools.json +++ b/data/json/furniture_and_terrain/furniture-tools.json @@ -44,6 +44,7 @@ { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 150, "block_unaimed_chance": "50%" } } }, @@ -117,7 +118,7 @@ "sound": "crunch!", "sound_fail": "whump.", "items": [ { "item": "char_forge", "count": 1 } ], - "ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 8, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 4, 4 ], "destroy_threshold": 8, "block_unaimed_chance": "25%" } } }, { @@ -163,7 +164,7 @@ "sound": "crunch!", "sound_fail": "whump.", "items": [ { "item": "still", "count": 1 } ], - "ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 8, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 4, 4 ], "destroy_threshold": 8, "block_unaimed_chance": "25%" } } }, { @@ -188,7 +189,7 @@ "sound_fail": "whump!", "items": [ { "item": "rock", "count": [ 15, 30 ] }, { "item": "material_soil", "count": [ 0, 1 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 50 } + "ranged": { "reduction": [ 50, 50 ], "destroy_threshold": 50 } } }, { @@ -212,7 +213,7 @@ "sound_fail": "whump!", "items": [ { "item": "rock", "count": [ 15, 30 ] }, { "item": "material_soil", "count": [ 0, 1 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 50 } + "ranged": { "reduction": [ 50, 50 ], "destroy_threshold": 50 } } }, { @@ -240,7 +241,7 @@ { "item": "steel_chunk", "count": [ 0, 3 ] }, { "item": "pipe", "count": [ 0, 4 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40 } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40 } } }, { @@ -267,7 +268,7 @@ { "item": "steel_chunk", "count": [ 0, 3 ] }, { "item": "pipe", "count": [ 0, 4 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40 } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 40 } } }, { @@ -316,6 +317,7 @@ { "item": "steel_chunk", "count": [ 5, 20 ] }, { "item": "scrap", "count": [ 10, 50 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 40 } } }, @@ -363,6 +365,7 @@ { "item": "steel_chunk", "count": [ 5, 20 ] }, { "item": "scrap", "count": [ 10, 50 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 40 } } }, @@ -475,7 +478,7 @@ "sound_fail": "whump.", "items": [ { "item": "rock", "count": [ 20, 30 ] }, { "item": "material_soil", "count": [ 0, 2 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 18, 36 ], "destroy_threshold": 36, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 36, 36 ], "destroy_threshold": 36, "block_unaimed_chance": "25%" } } }, { @@ -499,7 +502,7 @@ "sound_fail": "whump.", "items": [ { "item": "rock", "count": [ 20, 30 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 18, 36 ], "destroy_threshold": 36, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 36, 36 ], "destroy_threshold": 36, "block_unaimed_chance": "25%" } } }, { @@ -549,6 +552,7 @@ { "item": "steel_chunk", "count": [ 2, 4 ] }, { "item": "steel_plate", "count": [ 1, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150 } }, "deconstruct": { @@ -585,6 +589,7 @@ { "item": "plastic_chunk", "count": [ 4, 10 ] }, { "item": "steel_plate", "count": [ 2, 4 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150, "block_unaimed_chance": "75%" } }, "deconstruct": { @@ -624,6 +629,7 @@ { "item": "plastic_chunk", "count": [ 4, 10 ] }, { "item": "steel_plate", "count": [ 2, 4 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150, "block_unaimed_chance": "50%" } }, "deconstruct": { @@ -663,6 +669,7 @@ { "item": "plastic_chunk", "count": [ 4, 10 ] }, { "item": "steel_plate", "count": [ 2, 4 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" } }, "deconstruct": { @@ -701,6 +708,7 @@ { "item": "plastic_chunk", "count": [ 4, 10 ] }, { "item": "steel_plate", "count": [ 2, 4 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150, "block_unaimed_chance": "50%" } }, "deconstruct": { @@ -739,6 +747,7 @@ { "item": "plastic_chunk", "count": [ 4, 10 ] }, { "item": "steel_plate", "count": [ 2, 4 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150, "block_unaimed_chance": "50%" } }, "deconstruct": { @@ -777,6 +786,7 @@ { "item": "plastic_chunk", "count": [ 4, 10 ] }, { "item": "steel_plate", "count": [ 2, 4 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" } }, "deconstruct": { @@ -815,6 +825,7 @@ { "item": "plastic_chunk", "count": [ 4, 10 ] }, { "item": "steel_plate", "count": [ 2, 4 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150, "block_unaimed_chance": "50%" } }, "deconstruct": { @@ -853,6 +864,7 @@ { "item": "steel_lump", "count": [ 1, 2 ] }, { "item": "steel_plate", "count": [ 1, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150, "block_unaimed_chance": "75%" } }, "deconstruct": { @@ -890,6 +902,7 @@ { "item": "steel_chunk", "count": [ 2, 4 ] }, { "item": "steel_lump", "count": [ 1, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150, "block_unaimed_chance": "75%" } }, "deconstruct": { @@ -943,6 +956,7 @@ { "item": "e_scrap", "count": [ 5, 10 ] }, { "item": "plastic_chunk", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "75%" } } }, @@ -967,8 +981,8 @@ ] }, "bash": { - "str_min": 3, - "str_max": 45, + "str_min": 12, + "str_max": 50, "sound": "smash!", "sound_fail": "whump.", "items": [ @@ -979,7 +993,7 @@ { "item": "scrap", "count": [ 5, 10 ] }, { "item": "splinter", "count": 1 } ], - "ranged": { "reduction": [ 2, 3 ], "destroy_threshold": 45, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, { @@ -1016,7 +1030,7 @@ { "item": "scrap", "count": [ 5, 10 ] }, { "item": "splinter", "count": 1 } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, { @@ -1104,6 +1118,7 @@ { "item": "sheet_metal_small", "count": [ 4, 8 ] }, { "item": "rock", "count": [ 8, 15 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } } }, @@ -1131,6 +1146,7 @@ { "item": "sheet_metal_small", "count": [ 4, 8 ] }, { "item": "rock", "count": [ 8, 15 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } } }, @@ -1160,6 +1176,7 @@ { "item": "scrap", "count": [ 3, 5 ] }, { "item": "rock", "count": [ 8, 15 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, @@ -1189,6 +1206,7 @@ { "item": "scrap", "count": [ 3, 5 ] }, { "item": "rock", "count": [ 8, 15 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, @@ -1239,6 +1257,7 @@ { "item": "cu_pipe", "count": [ 1, 4 ] }, { "item": "scrap_copper", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 45, "block_unaimed_chance": "25%", "flammable": true } } }, @@ -1275,6 +1294,7 @@ { "item": "sheet_metal", "count": [ 0, 2 ] }, { "item": "steel_chunk", "count": [ 1, 5 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 75, 150 ], "destroy_threshold": 520 } } }, @@ -1328,6 +1348,7 @@ { "item": "cu_pipe", "count": [ 1, 4 ] }, { "item": "scrap_copper", "count": [ 0, 2 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 50 } } }, diff --git a/data/json/furniture_and_terrain/furniture-triffid.json b/data/json/furniture_and_terrain/furniture-triffid.json index fa6b8273bbb8..6966997c40ee 100644 --- a/data/json/furniture_and_terrain/furniture-triffid.json +++ b/data/json/furniture_and_terrain/furniture-triffid.json @@ -35,6 +35,7 @@ "sound": "smash", "sound_fail": "whump.", "items": [ { "item": "splinter", "count": [ 10, 15 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 60, "block_unaimed_chance": "50%" } } }, diff --git a/data/json/furniture_and_terrain/terrain-doors.json b/data/json/furniture_and_terrain/terrain-doors.json index fb0d818da509..b571395ba483 100644 --- a/data/json/furniture_and_terrain/terrain-doors.json +++ b/data/json/furniture_and_terrain/terrain-doors.json @@ -226,7 +226,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 0, 2 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 } } }, { @@ -265,7 +265,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 0, 2 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 } } }, { @@ -304,7 +304,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 0, 2 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 } } }, { @@ -343,7 +343,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 0, 2 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 } } }, { @@ -382,7 +382,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 0, 2 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 } } }, { @@ -421,7 +421,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 0, 2 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 } } }, { @@ -606,7 +606,7 @@ { "item": "splinter", "count": [ 1, 4 ] }, { "item": "hinge", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 5, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } } }, { @@ -643,7 +643,7 @@ { "item": "splinter", "count": [ 1, 4 ] }, { "item": "hinge", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 5, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } } }, { @@ -680,7 +680,7 @@ { "item": "splinter", "count": [ 1, 4 ] }, { "item": "hinge", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 5, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } } }, { @@ -717,7 +717,7 @@ { "item": "splinter", "count": [ 1, 4 ] }, { "item": "hinge", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 5, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } } }, { @@ -1055,7 +1055,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 0, 2 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 } } }, { @@ -1092,7 +1092,7 @@ { "item": "splinter", "count": [ 1, 4 ] }, { "item": "hinge", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 5, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } } }, { @@ -1129,7 +1129,7 @@ { "item": "splinter", "count": [ 1, 4 ] }, { "item": "hinge", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 5, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } } }, { @@ -1168,7 +1168,7 @@ { "item": "splinter", "count": [ 1, 4 ] }, { "item": "hinge", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 5, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } } }, { @@ -1312,7 +1312,7 @@ { "item": "splinter", "count": [ 2, 4 ] }, { "item": "nail", "charges": [ 4, 12 ] } ], - "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 100 } + "ranged": { "reduction": [ 18, 18 ], "destroy_threshold": 100 } } }, { @@ -1349,7 +1349,7 @@ { "item": "splinter", "count": [ 2, 4 ] }, { "item": "hinge", "count": [ 0, 1 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 90, "block_unaimed_chance": "75%" } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 90, "block_unaimed_chance": "75%" } } }, { @@ -1413,7 +1413,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 0, 2 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 } }, "pry": { "success_message": "You pry open the door.", @@ -1474,7 +1474,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 0, 2 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 } }, "pry": { "success_message": "You pry open the door.", @@ -1535,7 +1535,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 0, 2 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 } }, "pry": { "success_message": "You pry open the door.", @@ -1586,7 +1586,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 0, 2 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 80 } }, "pry": { "success_message": "You pry open the door.", @@ -1639,7 +1639,9 @@ { "item": "rag", "count": [ 2, 5 ] }, { "item": "stick", "count": 1 }, { "item": "withered", "count": [ 2, 12 ] } - ] + ], + "//": "Go straight through without taking any damage.", + "ranged": { "block_unaimed_chance": "0%" } } }, { @@ -1670,7 +1672,7 @@ { "item": "withered", "count": [ 2, 12 ] }, { "item": "splinter", "count": [ 5, 10 ] } ], - "ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 20 } + "ranged": { "reduction": [ 4, 4 ], "destroy_threshold": 20 } } }, { @@ -1870,7 +1872,7 @@ { "item": "nail", "charges": [ 2, 10 ] }, { "item": "splinter", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 8, 15 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 15, 15 ], "destroy_threshold": 80 } } }, { @@ -1899,7 +1901,7 @@ { "item": "splinter", "count": 1 }, { "item": "hinge", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 40 } + "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 40 } } }, { @@ -1928,7 +1930,7 @@ { "item": "nail", "charges": [ 2, 10 ] }, { "item": "splinter", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 8, 15 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 15, 15 ], "destroy_threshold": 80 } } }, { @@ -1957,7 +1959,7 @@ { "item": "nail", "charges": [ 1, 8 ] }, { "item": "splinter", "count": 1 } ], - "ranged": { "reduction": [ 13, 25 ], "destroy_threshold": 60 } + "ranged": { "reduction": [ 25, 25 ], "destroy_threshold": 60 } } }, { @@ -1986,7 +1988,7 @@ { "item": "splinter", "count": 1 }, { "item": "hinge", "count": [ 0, 1 ] } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 50 } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 50 } } }, { @@ -2017,7 +2019,7 @@ { "item": "splinter", "count": 1 }, { "item": "hinge", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 40 } + "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 40 } } }, { @@ -2039,7 +2041,7 @@ "byproducts": [ { "item": "steel_plate", "count": [ 0, 1 ] }, { "item": "steel_chunk", "count": [ 3, 8 ] } ] }, "bash": { - "str_min": 80, + "str_min": 90, "str_max": 250, "sound": "metal screeching!", "sound_fail": "clang!", @@ -2049,7 +2051,7 @@ { "item": "steel_plate", "prob": 75 }, { "item": "hinge", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 } + "ranged": { "reduction": [ 90, 90 ], "destroy_threshold": 250 } } }, { @@ -2065,13 +2067,13 @@ "flags": [ "NOITEM", "DOOR", "CONNECT_TO_WALL", "AUTO_WALL_SYMBOL", "MINEABLE" ], "open": "t_secretdoor_metal_o", "bash": { - "str_min": 80, + "str_min": 90, "str_max": 250, "sound": "metal screeching!", "sound_fail": "clang!", "ter_set": "t_mdoor_frame", "items": [ { "item": "scrap", "count": [ 12, 24 ] }, { "item": "steel_plate", "prob": 75 } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 } + "ranged": { "reduction": [ 90, 90 ], "destroy_threshold": 250 } } }, { @@ -2102,7 +2104,7 @@ "flags": [ "NOITEM", "DOOR", "CONNECT_TO_WALL", "MINEABLE" ], "open": "t_door_metal_lab_o", "bash": { - "str_min": 80, + "str_min": 90, "str_max": 250, "sound": "metal screeching!", "sound_fail": "clang!", @@ -2112,7 +2114,7 @@ { "item": "steel_plate", "prob": 75 }, { "item": "hinge", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 } + "ranged": { "reduction": [ 90, 90 ], "destroy_threshold": 250 } } }, { @@ -2128,7 +2130,7 @@ "flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ], "close": "t_door_metal_c", "bash": { - "str_min": 80, + "str_min": 90, "str_max": 250, "sound": "metal screeching!", "sound_fail": "clang!", @@ -2153,7 +2155,7 @@ "flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ], "close": "t_door_metal_lab_c", "bash": { - "str_min": 80, + "str_min": 90, "str_max": 250, "sound": "metal screeching!", "sound_fail": "clang!", @@ -2180,7 +2182,7 @@ "open": "t_door_metal_o_peep", "examine_action": "door_peephole", "bash": { - "str_min": 80, + "str_min": 90, "str_max": 250, "sound": "metal screeching!", "sound_fail": "clang!", @@ -2191,7 +2193,7 @@ { "item": "steel_plate", "prob": 75 }, { "item": "hinge", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 } + "ranged": { "reduction": [ 90, 90 ], "destroy_threshold": 250 } } }, { @@ -2207,7 +2209,7 @@ "flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ], "close": "t_door_metal_c_peep", "bash": { - "str_min": 80, + "str_min": 90, "str_max": 250, "sound": "metal screeching!", "sound_fail": "clang!", @@ -2239,7 +2241,7 @@ }, "flags": [ "NOITEM", "REDUCE_SCENT", "CONNECT_TO_WALL", "LOCKED", "MINEABLE", "BLOCK_WIND" ], "bash": { - "str_min": 80, + "str_min": 90, "str_max": 250, "sound": "metal screeching!", "sound_fail": "clang!", @@ -2249,7 +2251,7 @@ { "item": "steel_plate", "prob": 75 }, { "item": "hinge", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 } + "ranged": { "reduction": [ 90, 90 ], "destroy_threshold": 250 } } }, { @@ -2264,7 +2266,7 @@ "roof": "t_flat_roof", "flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "SUPPORTS_ROOF", "ROAD", "INDOORS", "BURROWABLE" ], "bash": { - "str_min": 80, + "str_min": 90, "str_max": 250, "sound": "metal screeching!", "sound_fail": "clang!", @@ -2326,7 +2328,7 @@ "byproducts": [ { "item": "steel_plate", "count": [ 0, 1 ] }, { "item": "steel_chunk", "count": [ 3, 8 ] } ] }, "bash": { - "str_min": 80, + "str_min": 90, "str_max": 250, "sound": "metal screeching!", "sound_fail": "clang!", @@ -2336,7 +2338,7 @@ { "item": "steel_plate", "prob": 75 }, { "item": "hinge", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 } + "ranged": { "reduction": [ 90, 90 ], "destroy_threshold": 250 } }, "pry": { "success_message": "You pry open the door.", @@ -2618,13 +2620,13 @@ "flags": [ "NOITEM", "DOOR", "CONNECT_TO_WALL", "MINEABLE", "BLOCK_WIND" ], "open": "t_door_metal_bulkhead_o", "bash": { - "str_min": 80, + "str_min": 90, "str_max": 250, "sound": "metal screeching!", "sound_fail": "clang!", "ter_set": "t_mdoor_frame", "items": [ { "item": "scrap", "count": [ 12, 24 ] }, { "item": "steel_plate", "prob": 75 } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 } + "ranged": { "reduction": [ 90, 90 ], "destroy_threshold": 250 } } }, { @@ -2641,7 +2643,7 @@ "flags": [ "TRANSPARENT", "INDOORS", "FLAT", "ROAD" ], "close": "t_door_metal_bulkhead_c", "bash": { - "str_min": 80, + "str_min": 90, "str_max": 250, "sound": "metal screeching!", "sound_fail": "clang!", diff --git a/data/json/furniture_and_terrain/terrain-fences-gates.json b/data/json/furniture_and_terrain/terrain-fences-gates.json index a12a7f4c37a3..6a73fa07e493 100644 --- a/data/json/furniture_and_terrain/terrain-fences-gates.json +++ b/data/json/furniture_and_terrain/terrain-fences-gates.json @@ -16,7 +16,7 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": [ { "item": "splinter", "count": [ 10, 20 ] } ], - "ranged": { "reduction": [ 12, 24 ], "destroy_threshold": 150 } + "ranged": { "reduction": [ 24, 24 ], "destroy_threshold": 150 } } }, { @@ -194,7 +194,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "hinge", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 20, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 4, 4 ], "destroy_threshold": 20, "block_unaimed_chance": "25%" } } }, { @@ -394,7 +394,7 @@ "sound_fail": "wham.", "ter_set": "t_null", "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%" } + "ranged": { "reduction": [ 4, 4 ], "destroy_threshold": 20, "block_unaimed_chance": "25%" } } }, { @@ -657,7 +657,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "log", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 12, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 5, 5 ], "destroy_threshold": 12, "block_unaimed_chance": "50%" } } }, { @@ -696,7 +696,7 @@ { "item": "splinter", "count": [ 1, 2 ] }, { "item": "hinge", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 20, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 4, 4 ], "destroy_threshold": 20, "block_unaimed_chance": "50%" } } }, { @@ -754,7 +754,7 @@ { "item": "sheet_metal_small", "count": [ 8, 20 ] }, { "item": "sheet_metal", "count": [ 0, 2 ] } ], - "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 18, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 18, "block_unaimed_chance": "50%" } } }, { @@ -794,7 +794,7 @@ { "item": "sheet_metal", "count": [ 0, 2 ] }, { "item": "hinge", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 20, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 20, "block_unaimed_chance": "50%" } } }, { @@ -857,7 +857,7 @@ "sound_fail": "whack!", "ter_set": "t_fence_post", "items": [ { "item": "2x4", "count": [ 4, 10 ] } ], - "ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 12 } + "ranged": { "reduction": [ 5, 5 ], "destroy_threshold": 12 } } }, { @@ -896,7 +896,7 @@ { "item": "splinter", "count": [ 4, 6 ] }, { "item": "hinge", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 20 } + "ranged": { "reduction": [ 4, 4 ], "destroy_threshold": 20 } } }, { @@ -945,7 +945,7 @@ { "item": "scrap", "count": [ 1, 3 ] }, { "item": "splinter", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 12, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 12, "block_unaimed_chance": "25%" } } }, { @@ -1000,7 +1000,7 @@ { "item": "sheet_metal_small", "charges": [ 1, 4 ] }, { "item": "scrap", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 80, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 80, "block_unaimed_chance": "25%" } } }, { @@ -1016,8 +1016,8 @@ "flags": [ "TRANSPARENT", "NOITEM", "THIN_OBSTACLE", "MOUNTABLE", "SHORT", "AUTO_WALL_SYMBOL", "MINEABLE", "BURROWABLE" ], "connects_to": "RAILING", "bash": { - "str_min": 100, - "str_max": 400, + "str_min": 50, + "str_max": 250, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_thconc_floor", @@ -1027,7 +1027,7 @@ { "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%" } + "ranged": { "reduction": [ 100, 100 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -1048,7 +1048,7 @@ "sound_fail": "clang!", "ter_set": "t_pavement_hw_air", "items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 3, 6 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" } } }, { @@ -1068,7 +1068,7 @@ "sound_fail": "clang!", "ter_set": "t_pavement_bg_dp", "items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 3, 6 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" } } }, { @@ -1089,7 +1089,7 @@ "sound_fail": "clang!", "ter_set": "t_pavement", "items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 3, 6 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" } } } ] diff --git a/data/json/furniture_and_terrain/terrain-floors-indoor.json b/data/json/furniture_and_terrain/terrain-floors-indoor.json index c2445cc013d2..836481d51bb2 100644 --- a/data/json/furniture_and_terrain/terrain-floors-indoor.json +++ b/data/json/furniture_and_terrain/terrain-floors-indoor.json @@ -402,7 +402,7 @@ { "item": "sheet_metal_small", "count": [ 10, 20 ] }, { "item": "pipe", "count": [ 0, 2 ] } ], - "//2": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//2": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 20, "block_unaimed_chance": "25%" } }, "examine_action": "transform", diff --git a/data/json/furniture_and_terrain/terrain-flora.json b/data/json/furniture_and_terrain/terrain-flora.json index 713f7d52fdf8..8d446496df07 100644 --- a/data/json/furniture_and_terrain/terrain-flora.json +++ b/data/json/furniture_and_terrain/terrain-flora.json @@ -20,7 +20,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -43,7 +43,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -69,7 +69,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -91,7 +91,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -115,7 +115,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -138,7 +138,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -162,7 +162,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -185,7 +185,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -209,7 +209,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -232,7 +232,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -256,7 +256,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -279,7 +279,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -301,7 +301,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -322,7 +322,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -343,7 +343,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 35, 70 ], "destroy_threshold": 140 } + "ranged": { "reduction": [ 70, 70 ], "destroy_threshold": 140 } } }, { @@ -388,7 +388,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -412,7 +412,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -437,7 +437,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -461,7 +461,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -494,7 +494,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -518,7 +518,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -543,7 +543,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -567,7 +567,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -597,7 +597,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -621,7 +621,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -646,7 +646,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -670,7 +670,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -695,7 +695,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -719,7 +719,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -744,7 +744,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -768,7 +768,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -801,7 +801,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -825,7 +825,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -858,7 +858,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -882,7 +882,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -911,7 +911,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -945,7 +945,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 30, 60 ], "destroy_threshold": 120 } + "ranged": { "reduction": [ 60, 60 ], "destroy_threshold": 120 } } }, { @@ -972,7 +972,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -993,7 +993,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -1020,7 +1020,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -1041,7 +1041,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -1063,7 +1063,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -1085,7 +1085,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -1112,7 +1112,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -1136,7 +1136,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -1161,7 +1161,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -1184,7 +1184,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -1209,7 +1209,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -1232,7 +1232,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -1257,7 +1257,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -1280,7 +1280,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -1302,7 +1302,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 60, 60 ], "destroy_threshold": 180 } } }, { @@ -1993,7 +1993,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "splinter", "count": [ 5, 15 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180, "block_unaimed_chance": "50%" } } }, { @@ -2014,7 +2014,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "splinter", "count": [ 5, 15 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180, "block_unaimed_chance": "25%" } } }, { @@ -2191,7 +2191,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { @@ -2214,7 +2214,7 @@ "sound_fail": "whack!", "ter_set": "t_dirt", "items": [ { "item": "stick_long", "count": [ 3, 10 ] }, { "item": "splinter", "count": [ 10, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 180 } } }, { diff --git a/data/json/furniture_and_terrain/terrain-fungal.json b/data/json/furniture_and_terrain/terrain-fungal.json index 96ee416eb3e8..367dbf3af7f0 100644 --- a/data/json/furniture_and_terrain/terrain-fungal.json +++ b/data/json/furniture_and_terrain/terrain-fungal.json @@ -83,7 +83,7 @@ "sound": "crunch!", "sound_fail": "poof!", "ter_set": "t_fungus", - "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 30, 30 ], "destroy_threshold": 180 } } }, { @@ -102,7 +102,7 @@ "sound": "crunch!", "sound_fail": "poof!", "ter_set": "t_fungus", - "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 30, 30 ], "destroy_threshold": 180 } } }, { @@ -144,7 +144,7 @@ "sound": "crunch!", "sound_fail": "poof!", "ter_set": "t_fungus", - "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 40, 40 ], "destroy_threshold": 180 } } }, { @@ -175,7 +175,7 @@ "sound": "crunch!", "sound_fail": "poof!", "ter_set": "t_fungus", - "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 40, 40 ], "destroy_threshold": 180 } } } ] diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json index 6172342daa17..e1ed11cc39a0 100644 --- a/data/json/furniture_and_terrain/terrain-manufactured.json +++ b/data/json/furniture_and_terrain/terrain-manufactured.json @@ -66,7 +66,7 @@ "sound_fail": "clang!", "ter_set": "t_gas_tank_smashed", "//": "destroy_threshold matches str_min since breaks into broken fuel tank", - "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 40, "flammable": true, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 40, 40 ], "destroy_threshold": 40, "flammable": true, "block_unaimed_chance": "50%" } } }, { @@ -92,7 +92,7 @@ { "item": "steel_chunk", "count": [ 1, 4 ] }, { "item": "scrap", "count": [ 3, 7 ] } ], - "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 100, "flammable": true, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 40, 40 ], "destroy_threshold": 100, "flammable": true, "block_unaimed_chance": "50%" } } }, { @@ -142,6 +142,7 @@ { "item": "steel_chunk", "count": [ 1, 4 ] }, { "item": "scrap", "count": [ 3, 7 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 150, "flammable": true, "block_unaimed_chance": "50%" } } }, @@ -191,6 +192,7 @@ { "item": "steel_chunk", "count": [ 1, 4 ] }, { "item": "scrap", "count": [ 3, 7 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 150, "flammable": true, "block_unaimed_chance": "50%" } } }, @@ -213,7 +215,7 @@ "sound_fail": "clang!", "ter_set": "t_floor", "items": [ { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 4, 8 ] } ], - "//": "destroy_threshold matches str_min since delicate electronics", + "//": "Variable reduction, destroy_threshold matches str_min since delicate electronics", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 40, "flammable": true, "block_unaimed_chance": "50%" } } }, @@ -233,7 +235,9 @@ "str_max": 210, "sound_fail": "clang!", "ter_set": "t_floor", - "items": [ { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 4, 8 ] } ] + "items": [ { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 4, 8 ] } ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 210, "block_unaimed_chance": "50%" } } }, { @@ -252,7 +256,9 @@ "str_max": 210, "sound_fail": "clang!", "ter_set": "t_floor", - "items": [ { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 4, 8 ] } ] + "items": [ { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 4, 8 ] } ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 210, "block_unaimed_chance": "50%" } } }, { @@ -272,7 +278,8 @@ "sound": "metal screeching!", "sound_fail": "clang!", "ter_set": "t_metal_floor_no_roof", - "items": [ { "item": "scrap", "count": [ 8, 16 ] } ] + "items": [ { "item": "scrap", "count": [ 8, 16 ] } ], + "ranged": { "reduction": [ 6, 6 ], "destroy_threshold": 20 } }, "deconstruct": { "ter_set": "t_metal_floor_no_roof", "items": [ { "item": "scrap", "count": [ 8, 16 ] } ] } }, @@ -297,7 +304,9 @@ { "item": "steel_lump", "prob": 50 }, { "item": "steel_chunk", "count": [ 1, 4 ] }, { "item": "scrap", "count": [ 3, 7 ] } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 150, "block_unaimed_chance": "25%" } }, "deconstruct": { "ter_set": "t_pavement", @@ -328,7 +337,9 @@ "sound": "metal screeching!", "sound_fail": "clang!", "ter_set": "t_missile_exploded", - "items": [ { "item": "scrap", "count": [ 4, 8 ] }, { "item": "plut_cell", "charges": [ 0, 3 ] } ] + "items": [ { "item": "scrap", "count": [ 4, 8 ] }, { "item": "plut_cell", "charges": [ 0, 3 ] } ], + "//": "Variable reduction, destroy_threshold matches str_min since delicate electronics", + "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 50, "flammable": true } } }, { @@ -350,7 +361,9 @@ { "item": "steel_lump", "count": [ 0, 2 ] }, { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 4, 8 ] } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 150 } } }, { @@ -443,7 +456,8 @@ "sound": "metal screeching!", "sound_fail": "clang!", "ter_set": "t_sewage", - "items": [ { "item": "scrap", "count": [ 4, 8 ] }, { "item": "steel_plate", "count": [ 0, 2 ] } ] + "items": [ { "item": "scrap", "count": [ 4, 8 ] }, { "item": "steel_plate", "count": [ 0, 2 ] } ], + "ranged": { "reduction": [ 30, 30 ], "destroy_threshold": 210, "block_unaimed_chance": "50%" } } }, { @@ -475,7 +489,8 @@ { "item": "steel_lump", "prob": 50 }, { "item": "steel_chunk", "count": [ 1, 4 ] }, { "item": "scrap", "count": [ 3, 7 ] } - ] + ], + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 150, "block_unaimed_chance": "50%" } } }, { @@ -499,7 +514,7 @@ { "item": "circuit", "count": [ 1, 6 ], "prob": 50 }, { "item": "scrap", "count": [ 2, 8 ], "prob": 50 } ], - "//": "destroy_threshold matches str_min since delicate electronics", + "//": "Variable reduction, destroy_threshold matches str_min since delicate electronics", "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } } }, @@ -566,6 +581,7 @@ { "item": "circuit", "count": [ 1, 6 ] }, { "item": "scrap", "count": [ 12, 18 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 60, 120 ], "destroy_threshold": 150 } } }, @@ -657,7 +673,9 @@ { "item": "amplifier", "prob": 25 }, { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } - ] + ], + "//": "reduction equal to broken console but destroy_threshold matches str_min since fragile", + "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 8, "block_unaimed_chance": "50%" } } }, { @@ -709,7 +727,7 @@ { "item": "plut_cell", "charges": [ 0, 3 ] }, { "item": "lead", "charges": [ 12, 18 ] } ], - "//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics", + "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics", "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" } }, "deconstruct": { "ter_set": "t_concrete", "items": [ { "item": "plut_generator_item", "count": 1 } ] } @@ -725,7 +743,15 @@ "move_cost": 0, "coverage": 90, "flags": [ "NOITEM", "WALL" ], - "bash": { "str_min": 8, "str_max": 80, "sound": "whack!", "sound_fail": "clang!", "ter_set": "t_sai_box_damaged" }, + "bash": { + "str_min": 8, + "str_max": 80, + "sound": "whack!", + "sound_fail": "clang!", + "ter_set": "t_sai_box_damaged", + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80, "block_unaimed_chance": "75%" } + }, "deconstruct": { "ter_set": "t_concrete", "items": [ @@ -764,7 +790,9 @@ { "item": "circuit", "count": [ 1, 6 ], "prob": 50 }, { "item": "amplifier", "count": [ 1, 4 ], "prob": 50 }, { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 80, "block_unaimed_chance": "75%" } }, "deconstruct": { "ter_set": "t_concrete", @@ -802,7 +830,9 @@ { "item": "scrap", "count": [ 8, 16 ] }, { "item": "steel_chunk", "count": [ 2, 6 ] }, { "item": "ceramic_shard", "count": [ 0, 4 ] } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 150, "flammable": true, "block_unaimed_chance": "75%" } }, "deconstruct": { "ter_set": "t_concrete", @@ -839,7 +869,9 @@ { "item": "scrap", "count": [ 6, 12 ] }, { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "ceramic_shard", "count": [ 0, 2 ] } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 150, "flammable": true, "block_unaimed_chance": "50%" } }, "deconstruct": { "ter_set": "t_concrete", @@ -875,7 +907,9 @@ { "item": "scrap", "count": [ 5, 10 ] }, { "item": "steel_chunk", "count": [ 2, 4 ] }, { "item": "plastic_chunk", "count": [ 2, 4 ] } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 150, "flammable": true, "block_unaimed_chance": "75%" } }, "deconstruct": { "ter_set": "t_concrete", @@ -918,7 +952,9 @@ { "item": "power_supply", "count": [ 0, 2 ] }, { "item": "amplifier", "prob": 50 }, { "item": "plastic_chunk", "count": [ 1, 2 ] } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 150, "flammable": true, "block_unaimed_chance": "50%" } }, "deconstruct": { "ter_set": "t_concrete", @@ -1036,7 +1072,9 @@ { "item": "cable", "charges": [ 20, 60 ] }, { "item": "sheet_metal", "count": [ 1, 2 ] }, { "item": "ceramic_shard", "count": [ 2, 6 ] } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 150, "flammable": true, "block_unaimed_chance": "50%" } }, "deconstruct": { "ter_set": "t_concrete", @@ -1074,7 +1112,9 @@ { "item": "cable", "charges": [ 1, 20 ] }, { "item": "sheet_metal", "count": [ 1, 2 ] }, { "item": "ceramic_shard", "count": [ 2, 6 ] } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 150, "flammable": true, "block_unaimed_chance": "50%" } }, "deconstruct": { "ter_set": "t_concrete", @@ -1114,7 +1154,9 @@ "sound": "clang!", "sound_fail": "ting.", "ter_set": "t_rock_floor", - "items": [ { "item": "pipe", "count": [ 1, 3 ] }, { "item": "chain", "prob": 10 }, { "item": "scrap", "count": [ 1, 5 ] } ] + "items": [ { "item": "pipe", "count": [ 1, 3 ] }, { "item": "chain", "prob": 10 }, { "item": "scrap", "count": [ 1, 5 ] } ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 80, "block_unaimed_chance": "25%" } } }, { @@ -1158,7 +1200,9 @@ { "item": "bearing", "charges": [ 2, 8 ] }, { "item": "frame", "prob": 20 }, { "item": "motor", "prob": 10 } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } } }, { @@ -1208,7 +1252,9 @@ { "item": "motor", "prob": 10 }, { "item": "metal_tank", "prob": 20 }, { "item": "motor_large", "prob": 5 } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 80, "block_unaimed_chance": "75%" } } }, { @@ -1256,7 +1302,9 @@ { "item": "splinter", "count": [ 4, 8 ] }, { "item": "2x4", "count": 2 }, { "item": "nail", "charges": [ 2, 5 ] } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } } }, { @@ -1311,7 +1359,9 @@ { "item": "amplifier", "prob": 40 }, { "item": "plastic_chunk", "count": [ 2, 8 ] }, { "item": "scrap", "count": [ 3, 8 ] } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } } }, { @@ -1332,7 +1382,9 @@ { "item": "scrap", "count": [ 1, 6 ] }, { "item": "steel_chunk", "count": [ 1, 4 ] }, { "item": "hose", "count": [ 1, 3 ] } - ] + ], + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 50, "block_unaimed_chance": "75%" } }, "deconstruct": { "ter_set": "t_floor", @@ -1366,7 +1418,8 @@ { "item": "steel_lump", "count": [ 1, 5 ] }, { "item": "sheet_metal", "count": [ 1, 3 ] }, { "item": "steel_chunk", "count": [ 1, 5 ] } - ] + ], + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 80, "block_unaimed_chance": "75%" } }, "deconstruct": { "ter_set": "t_floor", diff --git a/data/json/furniture_and_terrain/terrain-mechanisms.json b/data/json/furniture_and_terrain/terrain-mechanisms.json index d4f25de7aae4..9d88c16db0bc 100644 --- a/data/json/furniture_and_terrain/terrain-mechanisms.json +++ b/data/json/furniture_and_terrain/terrain-mechanisms.json @@ -43,6 +43,7 @@ { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 150, "block_unaimed_chance": "50%" } } }, @@ -480,7 +481,7 @@ { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } ], - "//": "destroy_threshold matches str_min since fragile", + "//": "Variable reduction, destroy_threshold matches str_min since fragile", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, @@ -522,7 +523,7 @@ { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } ], - "//": "destroy_threshold matches str_min since fragile", + "//": "Variable reduction, destroy_threshold matches str_min since fragile", "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } } }, @@ -552,7 +553,9 @@ "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_rock_floor", - "items": [ { "item": "rock", "count": [ 2, 5 ] } ] + "items": [ { "item": "rock", "count": [ 2, 5 ] } ], + "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", + "ranged": { "reduction": [ 100, 100 ], "destroy_threshold": 100, "block_unaimed_chance": "50%" } } }, { @@ -572,7 +575,9 @@ "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_rock_floor", - "items": [ { "item": "rock", "count": [ 2, 5 ] } ] + "items": [ { "item": "rock", "count": [ 2, 5 ] } ], + "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", + "ranged": { "reduction": [ 100, 100 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { diff --git a/data/json/furniture_and_terrain/terrain-migo.json b/data/json/furniture_and_terrain/terrain-migo.json index 65832e8d9570..91c15a5dc402 100644 --- a/data/json/furniture_and_terrain/terrain-migo.json +++ b/data/json/furniture_and_terrain/terrain-migo.json @@ -17,7 +17,7 @@ "sound_fail": "whack!", "ter_set": "t_resin_hole", "items": [ { "item": "resin_chunk", "count": [ 10, 40 ] } ], - "ranged": { "reduction": [ 125, 250 ], "destroy_threshold": 700 } + "ranged": { "reduction": [ 250, 250 ], "destroy_threshold": 700 } } }, { @@ -38,7 +38,7 @@ "sound_fail": "whack!", "ter_set": "t_floor_resin", "items": [ { "item": "resin_chunk", "count": [ 2, 5 ] } ], - "ranged": { "reduction": [ 35, 70 ], "destroy_threshold": 300, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 70, 70 ], "destroy_threshold": 300, "block_unaimed_chance": "50%" } } }, { @@ -111,7 +111,7 @@ "sound_fail": "whack!", "ter_set": "t_resin_hole", "items": [ { "item": "resin_chunk", "count": [ 2, 5 ] } ], - "ranged": { "reduction": [ 45, 90 ], "destroy_threshold": 120 } + "ranged": { "reduction": [ 90, 90 ], "destroy_threshold": 120 } } }, { diff --git a/data/json/furniture_and_terrain/terrain-triffid.json b/data/json/furniture_and_terrain/terrain-triffid.json index 8e0df02e4df3..a5aca8285d41 100644 --- a/data/json/furniture_and_terrain/terrain-triffid.json +++ b/data/json/furniture_and_terrain/terrain-triffid.json @@ -17,7 +17,7 @@ "sound_fail": "whump!", "ter_set": "t_bark_wall_chipped", "items": [ { "item": "splinter", "count": [ 5, 10 ] } ], - "ranged": { "reduction": [ 30, 60 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 60, 60 ], "destroy_threshold": 180 } } }, { @@ -38,7 +38,7 @@ "sound_fail": "whump!", "ter_set": "t_bark_wall_broken", "items": [ { "item": "splinter", "count": [ 5, 10 ] } ], - "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 160 } + "ranged": { "reduction": [ 40, 40 ], "destroy_threshold": 160 } } }, { @@ -57,7 +57,7 @@ "sound_fail": "whump!", "ter_set": "t_barkfloor", "items": [ { "item": "splinter", "count": [ 10, 20 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 150, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 150, "block_unaimed_chance": "50%" } } }, { @@ -78,7 +78,7 @@ "sound_fail": "whump!", "ter_set": "t_barkfloor", "items": [ { "item": "splinter", "count": [ 20, 25 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 160 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 160 } } }, { @@ -170,6 +170,7 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": [ { "item": "splinter", "count": [ 2, 5 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 150 } } }, diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json index 70601dab0b3e..2807e106e05b 100644 --- a/data/json/furniture_and_terrain/terrain-walls.json +++ b/data/json/furniture_and_terrain/terrain-walls.json @@ -44,6 +44,7 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": "wall_bash_results", + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 } } }, @@ -70,7 +71,8 @@ { "item": "nail", "charges": [ 0, 5 ] }, { "item": "splinter", "count": [ 5, 10 ] } ], - "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" } + "//": "reduction and destroy_threshold equal to completed version", + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 150, "block_unaimed_chance": "50%" } } }, { @@ -95,7 +97,7 @@ { "item": "nail", "charges": [ 0, 5 ] }, { "item": "splinter", "count": [ 3, 6 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" } } }, { @@ -130,7 +132,7 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": "wall_bash_results", - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 20, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 20, "block_unaimed_chance": "50%" } } }, { @@ -162,6 +164,7 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": "wall_bash_results", + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 } } }, @@ -194,6 +197,7 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": "wall_bash_results", + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 } } }, @@ -226,6 +230,7 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": "wall_bash_results", + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 } } }, @@ -258,6 +263,7 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": "wall_bash_results", + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 } } }, @@ -290,6 +296,7 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": "wall_bash_results", + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 } } }, @@ -321,6 +328,7 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": "wall_bash_results", + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 } } }, @@ -353,6 +361,7 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": "wall_bash_results", + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 210 } } }, @@ -373,8 +382,8 @@ "sound_fail": "bash!", "ter_set": "t_null", "items": [ { "item": "rock", "count": [ 5, 8 ] }, { "item": "brick", "count": [ 1, 3 ] } ], - "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 30, 60 ], "destroy_threshold": 60, "block_unaimed_chance": "50%" } + "//": "reduction and destroy_threshold equal to completed version", + "ranged": { "reduction": [ 120, 120 ], "destroy_threshold": 120, "block_unaimed_chance": "50%" } } }, { @@ -397,7 +406,7 @@ "ter_set": "t_null", "items": [ { "item": "rock", "count": [ 8, 15 ] }, { "item": "brick", "count": [ 2, 6 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 60, 120 ], "destroy_threshold": 120 } + "ranged": { "reduction": [ 120, 120 ], "destroy_threshold": 120 } } }, { @@ -420,7 +429,7 @@ "ter_set": "t_null", "items": [ { "item": "rock", "count": [ 8, 18 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 80, 160 ], "destroy_threshold": 160 } + "ranged": { "reduction": [ 160, 160 ], "destroy_threshold": 160 } } }, { @@ -441,8 +450,8 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": [ { "item": "rock", "count": [ 3, 8 ] } ], - "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } + "//": "reduction and destroy_threshold equal to completed version", + "ranged": { "reduction": [ 160, 160 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } } }, { @@ -471,7 +480,7 @@ { "item": "material_rocksalt", "prob": 10 } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 120, 240 ], "destroy_threshold": 240 } + "ranged": { "reduction": [ 240, 240 ], "destroy_threshold": 240 } } }, { @@ -492,8 +501,8 @@ "sound_fail": "bash!", "ter_set": "t_null", "items": [ { "item": "material_soil", "count": [ 4, 10 ] }, { "item": "adobe_brick", "count": [ 1, 3 ] } ], - "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } + "//": "reduction and destroy_threshold equal to completed version", + "ranged": { "reduction": [ 90, 90 ], "destroy_threshold": 90, "block_unaimed_chance": "50%" } } }, { @@ -509,14 +518,14 @@ "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ], "connects_to": "WALL", "bash": { - "str_min": 40, + "str_min": 45, "str_max": 120, "sound": "crash!", "sound_fail": "bash!", "ter_set": "t_null", "items": [ { "item": "material_soil", "count": [ 8, 20 ] }, { "item": "adobe_brick", "count": [ 2, 6 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 80 } + "ranged": { "reduction": [ 90, 90 ], "destroy_threshold": 90 } } }, { @@ -539,7 +548,7 @@ "ter_set": "t_reb_cage", "items": [ { "item": "rock", "count": [ 10, 22 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 70, 140 ], "destroy_threshold": 140 } + "ranged": { "reduction": [ 140, 140 ], "destroy_threshold": 140 } } }, { @@ -570,7 +579,7 @@ { "item": "steel_chunk", "count": [ 3, 12 ] }, { "item": "scrap", "count": [ 9, 36 ] } ], - "ranged": { "reduction": [ 100, 200 ], "destroy_threshold": 600 } + "ranged": { "reduction": [ 200, 200 ], "destroy_threshold": 600 } } }, { @@ -596,7 +605,7 @@ { "item": "steel_chunk", "count": [ 3, 12 ] }, { "item": "scrap", "count": [ 9, 36 ] } ], - "ranged": { "reduction": [ 100, 200 ], "destroy_threshold": 600 } + "ranged": { "reduction": [ 200, 200 ], "destroy_threshold": 600 } } }, { @@ -619,7 +628,7 @@ "ter_set": "t_pit_shallow", "items": [ { "item": "rock", "count": [ 10, 22 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 90, 180 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 180, 180 ], "destroy_threshold": 180 } } }, { @@ -640,8 +649,8 @@ "sound_fail": "whump!", "ter_set": "t_pit_shallow", "items": [ { "item": "rock", "count": [ 5, 11 ] } ], - "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } + "//": "reduction and destroy_threshold equal to completed version", + "ranged": { "reduction": [ 180, 180 ], "destroy_threshold": 180, "block_unaimed_chance": "50%" } } }, { @@ -664,7 +673,7 @@ "ter_set": "t_reb_cage", "items": [ { "item": "rock", "count": [ 10, 22 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 120, 240 ], "destroy_threshold": 240 } + "ranged": { "reduction": [ 240, 240 ], "destroy_threshold": 240 } } }, { @@ -685,8 +694,8 @@ "sound_fail": "whump!", "ter_set": "t_reb_cage", "items": [ { "item": "rock", "count": [ 5, 11 ] } ], - "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } + "//": "reduction and destroy_threshold equal to completed version", + "ranged": { "reduction": [ 240, 240 ], "destroy_threshold": 240, "block_unaimed_chance": "50%" } } }, { @@ -738,7 +747,7 @@ "sound_fail": "clang!", "ter_set": "t_pit_shallow", "items": [ { "item": "steel_chunk", "count": [ 10, 22 ] } ], - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 200 } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 200 } } }, { @@ -758,7 +767,8 @@ "sound_fail": "clang!", "ter_set": "t_pit_shallow", "items": [ { "item": "steel_chunk", "count": [ 5, 11 ] } ], - "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 130, "block_unaimed_chance": "50%" } + "//": "reduction and destroy_threshold equal to completed version", + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 200, "block_unaimed_chance": "50%" } } }, { @@ -785,7 +795,7 @@ { "item": "nail", "charges": [ 1, 5 ] }, { "item": "splinter", "count": [ 1, 4 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 150 } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 150 } } }, { @@ -811,7 +821,7 @@ { "item": "nail", "charges": [ 1, 3 ] }, { "item": "splinter", "count": [ 1, 4 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 150 } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 150 } } }, { @@ -836,7 +846,7 @@ { "item": "nail", "charges": [ 4, 10 ] }, { "item": "splinter", "count": [ 1, 5 ] } ], - "ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 110, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 4, 4 ], "destroy_threshold": 110, "block_unaimed_chance": "50%" } } }, { @@ -857,7 +867,8 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": [ { "item": "splinter", "count": [ 10, 20 ] } ], - "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 120, "block_unaimed_chance": "50%" } + "//": "reduction and destroy_threshold equal to completed version", + "ranged": { "reduction": [ 60, 60 ], "destroy_threshold": 180, "block_unaimed_chance": "50%" } } }, { @@ -879,7 +890,7 @@ "sound_fail": "whump!", "ter_set": "t_wall_log_chipped", "items": [ { "item": "splinter", "count": [ 5, 10 ] } ], - "ranged": { "reduction": [ 30, 60 ], "destroy_threshold": 180 } + "ranged": { "reduction": [ 60, 60 ], "destroy_threshold": 180 } } }, { @@ -900,7 +911,7 @@ "sound_fail": "whump!", "ter_set": "t_wall_log_broken", "items": [ { "item": "splinter", "count": [ 5, 10 ] } ], - "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 160 } + "ranged": { "reduction": [ 40, 40 ], "destroy_threshold": 160 } } }, { @@ -919,7 +930,7 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": [ { "item": "splinter", "count": [ 10, 20 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 150, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 8, 8 ], "destroy_threshold": 150, "block_unaimed_chance": "50%" } } }, { @@ -939,7 +950,7 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": [ { "item": "splinter", "count": [ 10, 30 ] } ], - "ranged": { "reduction": [ 18, 35 ], "destroy_threshold": 150 } + "ranged": { "reduction": [ 35, 35 ], "destroy_threshold": 150 } } }, { @@ -959,6 +970,7 @@ "sound": "crunch!", "sound_fail": "whump!", "items": [ { "item": "2x4", "count": [ 0, 3 ] }, { "item": "splinter", "count": [ 0, 6 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 140 } }, "flags": [ "FLAMMABLE_HARD", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "BLOCK_WIND" ] @@ -978,6 +990,7 @@ "sound": "crash!", "sound_fail": "whump!", "items": [ { "item": "2x4", "count": [ 0, 3 ] }, { "item": "splinter", "count": [ 3, 6 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 110, "block_unaimed_chance": "50%" } }, "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "NOITEM", "SUPPORTS_ROOF", "REDUCE_SCENT", "PERMEABLE", "CONNECT_TO_WALL" ] @@ -998,7 +1011,8 @@ "sound": "crunch!", "sound_fail": "whump!", "items": [ { "item": "2x4", "count": [ 1, 3 ] }, { "item": "splinter", "count": [ 6, 6 ] } ], - "ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 75, "block_unaimed_chance": "50%" } + "//": "reduction and destroy_threshold equal to completed version", + "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 140, "block_unaimed_chance": "50%" } }, "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "NOITEM", "REDUCE_SCENT", "MOUNTABLE" ] }, @@ -1020,7 +1034,9 @@ "sound": "heavy rumbling!", "sound_fail": "thump", "ter_set": "t_mud_underground", - "items": [ { "item": "material_soil", "count": [ 50, 100 ] } ] + "items": [ { "item": "material_soil", "count": [ 50, 100 ] } ], + "//": "reduction equal to str_max as with sandbags", + "ranged": { "reduction": [ 200, 200 ], "destroy_threshold": 200 } } }, { @@ -1047,7 +1063,7 @@ { "item": "sheet_metal", "count": [ 1, 2 ] }, { "item": "steel_chunk", "count": [ 1, 30 ] } ], - "ranged": { "reduction": [ 30, 60 ], "destroy_threshold": 200 } + "ranged": { "reduction": [ 60, 60 ], "destroy_threshold": 200 } } }, { @@ -1091,7 +1107,7 @@ "sound_fail": "clang!", "ter_set": "t_floor", "items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 1, 40 ] } ], - "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 200 } + "ranged": { "reduction": [ 30, 30 ], "destroy_threshold": 200 } } }, { @@ -1315,7 +1331,9 @@ "sound_fail": "slap!", "sound_vol": 8, "sound_fail_vol": 4, - "ter_set": "t_floor_paper" + "ter_set": "t_floor_paper", + "//": "Go straight through without taking any damage.", + "ranged": { "block_unaimed_chance": "0%" } } }, { @@ -1332,7 +1350,9 @@ "sound_fail": "slap!", "sound_vol": 8, "sound_fail_vol": 4, - "ter_set": "t_floor_paper_noroof" + "ter_set": "t_floor_paper_noroof", + "//": "Go straight through without taking any damage.", + "ranged": { "block_unaimed_chance": "0%" } } }, { @@ -1352,7 +1372,9 @@ "sound_fail": "slap!", "sound_vol": 20, "sound_fail_vol": 10, - "ter_set": "t_floor_paper_hard" + "ter_set": "t_floor_paper_hard", + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 150 } } }, { @@ -1373,7 +1395,8 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": [ { "item": "splinter", "count": [ 2, 5 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 150 } + "//": "Variable reduction, maximum strength comparable to dirt walls", + "ranged": { "reduction": [ 100, 200 ], "destroy_threshold": 200 } } }, { @@ -1394,6 +1417,7 @@ "sound_fail": "whump!", "ter_set": "t_floor_wax", "items": [ { "item": "wax", "count": [ 3, 5 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 150 } } }, @@ -1422,7 +1446,7 @@ { "group": "rock_mining_extra", "prob": 25 } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 100, 200 ], "destroy_threshold": 200 } + "ranged": { "reduction": [ 200, 200 ], "destroy_threshold": 200 } } }, { @@ -1448,7 +1472,7 @@ { "item": "material_rocksalt", "prob": 10 } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 100, 200 ], "destroy_threshold": 200 } + "ranged": { "reduction": [ 200, 200 ], "destroy_threshold": 200 } } }, { @@ -1474,7 +1498,7 @@ { "item": "material_rocksalt", "prob": 10 } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 100, 200 ], "destroy_threshold": 200 } + "ranged": { "reduction": [ 200, 200 ], "destroy_threshold": 200 } } }, { @@ -1500,7 +1524,7 @@ { "item": "material_rocksalt", "prob": 10 } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 100, 200 ], "destroy_threshold": 200 } + "ranged": { "reduction": [ 200, 200 ], "destroy_threshold": 200 } } }, { @@ -1522,7 +1546,7 @@ "ter_set": "t_null", "items": [ { "item": "rock", "count": [ 1, 3 ] }, { "item": "rebar", "count": [ 0, 2 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 80, "block_unaimed_chance": "75%" } + "ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 80, "block_unaimed_chance": "75%" } } }, { @@ -1543,8 +1567,8 @@ "sound_fail": "whump!", "ter_set": "t_reb_cage", "items": [ { "item": "rock", "count": [ 5, 11 ] } ], - "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 60, 120 ], "destroy_threshold": 120, "block_unaimed_chance": "75%" } + "//": "reduction and destroy_threshold equal to completed version", + "ranged": { "reduction": [ 240, 240 ], "destroy_threshold": 240, "block_unaimed_chance": "75%" } } }, { @@ -1565,7 +1589,7 @@ "ter_set": "t_reb_cage", "items": [ { "item": "rock", "count": [ 10, 22 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 120, 240 ], "destroy_threshold": 240 } + "ranged": { "reduction": [ 240, 240 ], "destroy_threshold": 240 } } }, { @@ -1590,7 +1614,7 @@ { "item": "steel_chunk", "count": [ 2, 6 ] }, { "item": "scrap", "count": [ 5, 18 ] } ], - "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 200 } + "ranged": { "reduction": [ 40, 40 ], "destroy_threshold": 200 } }, "deconstruct": { "ter_set": "t_concrete", @@ -1624,7 +1648,7 @@ { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 2, 9 ] } ], - "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 200 } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 200 } }, "deconstruct": { "ter_set": "t_concrete", @@ -1656,7 +1680,7 @@ "ter_set": "t_null", "items": [ { "item": "rock", "count": [ 8, 18 ] }, { "item": "pebble", "count": [ 20, 38 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 50, 100 ], "destroy_threshold": 100 } + "ranged": { "reduction": [ 100, 100 ], "destroy_threshold": 100 } } }, { @@ -1677,8 +1701,8 @@ "sound_fail": "whump!", "ter_set": "t_null", "items": [ { "item": "rock", "count": [ 3, 8 ] }, { "item": "pebble", "count": [ 20, 38 ] } ], - "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 30, 60 ], "destroy_threshold": 60, "block_unaimed_chance": "50%" } + "//": "reduction and destroy_threshold equal to completed version", + "ranged": { "reduction": [ 100, 100 ], "destroy_threshold": 100, "block_unaimed_chance": "50%" } } }, { @@ -1700,7 +1724,7 @@ "ter_set": "t_reb_cage", "items": [ { "item": "rock", "count": [ 10, 22 ] } ], "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", - "ranged": { "reduction": [ 120, 240 ], "destroy_threshold": 240 } + "ranged": { "reduction": [ 240, 240 ], "destroy_threshold": 240 } } }, { diff --git a/data/json/furniture_and_terrain/terrain-windows.json b/data/json/furniture_and_terrain/terrain-windows.json index 535664c8c6d1..76015f5282e3 100644 --- a/data/json/furniture_and_terrain/terrain-windows.json +++ b/data/json/furniture_and_terrain/terrain-windows.json @@ -354,7 +354,7 @@ "sound_fail_vol": 10, "ter_set": "t_window_frame", "items": [ { "item": "splinter", "count": [ 0, 2 ] }, { "item": "glass_shard", "count": [ 1, 4 ] } ], - "ranged": { "reduction": [ 2, 3 ], "destroy_threshold": 30 } + "ranged": { "reduction": [ 3, 3 ], "destroy_threshold": 30 } } }, { @@ -378,7 +378,7 @@ "sound_fail_vol": 10, "ter_set": "t_window_empty", "items": [ { "item": "splinter", "count": [ 0, 2 ] } ], - "ranged": { "reduction": [ 2, 3 ], "destroy_threshold": 30 } + "ranged": { "reduction": [ 3, 3 ], "destroy_threshold": 30 } } }, { @@ -400,7 +400,7 @@ "sound_fail": "wham!", "ter_set": "t_window_boarded", "items": [ { "item": "splinter", "count": [ 0, 8 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 30 } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 30 } } }, { @@ -422,7 +422,7 @@ "sound_fail": "wham!", "ter_set": "t_window_boarded_noglass", "items": [ { "item": "splinter", "count": [ 0, 8 ] } ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 30 } + "ranged": { "reduction": [ 12, 12 ], "destroy_threshold": 30 } } }, { @@ -455,7 +455,7 @@ "sound_fail": "wham!", "ter_set": "t_window_reinforced", "items": [ { "item": "spike", "count": [ 0, 2 ] }, { "item": "sheet_metal", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 40 } + "ranged": { "reduction": [ 18, 18 ], "destroy_threshold": 40 } } }, { @@ -488,7 +488,7 @@ "sound_fail": "wham!", "ter_set": "t_window_reinforced_noglass", "items": [ { "item": "spike", "count": [ 0, 2 ] }, { "item": "sheet_metal", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 40 } + "ranged": { "reduction": [ 18, 18 ], "destroy_threshold": 40 } } }, { @@ -745,7 +745,8 @@ { "item": "scrap", "count": [ 1, 5 ] }, { "item": "glass_shard", "count": [ 5, 12 ] } ], - "ranged": { "reduction": [ 50, 75 ], "destroy_threshold": 75 } + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 75 } } }, { @@ -789,6 +790,7 @@ { "item": "scrap", "count": [ 1, 5 ] }, { "item": "glass_shard", "count": [ 5, 12 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 75 } } }, @@ -842,7 +844,8 @@ { "item": "scrap", "count": [ 1, 5 ] }, { "item": "glass_shard", "count": [ 5, 12 ] } ], - "ranged": { "reduction": [ 50, 75 ], "destroy_threshold": 75 } + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 75 } } }, { @@ -883,7 +886,8 @@ { "item": "scrap", "count": [ 1, 5 ] }, { "item": "glass_shard", "count": [ 5, 12 ] } ], - "ranged": { "reduction": [ 50, 75 ], "destroy_threshold": 75 } + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 75 } } }, { @@ -927,7 +931,8 @@ { "item": "scrap", "count": [ 1, 5 ] }, { "item": "glass_shard", "count": [ 5, 12 ] } ], - "ranged": { "reduction": [ 50, 75 ], "destroy_threshold": 75 } + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 75 } } }, { @@ -980,7 +985,8 @@ { "item": "scrap", "count": [ 1, 5 ] }, { "item": "glass_shard", "count": [ 5, 12 ] } ], - "ranged": { "reduction": [ 50, 75 ], "destroy_threshold": 75 } + "//": "Variable reduction since might hit more or less material.", + "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 75 } } }, { @@ -2808,7 +2814,7 @@ "sound_fail_vol": 10, "ter_set": "t_window_frame", "items": [ { "item": "stick", "count": 1 }, { "item": "nail", "charges": [ 3, 4 ] }, { "item": "plastic_sheet", "count": 1 } ], - "ranged": { "reduction": [ 2, 3 ], "destroy_threshold": 5 } + "ranged": { "reduction": [ 3, 3 ], "destroy_threshold": 5 } } }, { @@ -2890,7 +2896,7 @@ "sound_fail_vol": 10, "ter_set": "t_window_frame", "items": [ { "item": "stick", "count": 1 }, { "item": "nail", "charges": [ 3, 4 ] }, { "item": "plastic_sheet", "count": 1 } ], - "ranged": { "reduction": [ 2, 3 ], "destroy_threshold": 5 } + "ranged": { "reduction": [ 3, 3 ], "destroy_threshold": 5 } } }, { @@ -2937,7 +2943,7 @@ "sound_fail_vol": 10, "ter_set": "t_window_frame", "items": [ { "item": "stick", "count": 1 }, { "item": "nail", "charges": [ 3, 4 ] }, { "item": "plastic_sheet", "count": 1 } ], - "ranged": { "reduction": [ 2, 3 ], "destroy_threshold": 5 } + "ranged": { "reduction": [ 3, 3 ], "destroy_threshold": 5 } } }, { @@ -3024,7 +3030,7 @@ { "item": "nail", "charges": [ 3, 4 ] }, { "item": "plastic_sheet", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 15 } + "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 15 } } }, { @@ -3065,7 +3071,7 @@ { "item": "nail", "charges": [ 3, 4 ] }, { "item": "plastic_sheet", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 15 } + "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 15 } } }, { @@ -3115,7 +3121,7 @@ { "item": "nail", "charges": [ 3, 4 ] }, { "item": "plastic_sheet", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 15 } + "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 15 } } }, { @@ -3166,7 +3172,7 @@ { "item": "nail", "charges": [ 3, 4 ] }, { "item": "plastic_sheet", "count": [ 1, 2 ] } ], - "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 15 } + "ranged": { "reduction": [ 10, 10 ], "destroy_threshold": 15 } } }, { @@ -3484,6 +3490,7 @@ { "item": "scrap", "count": [ 1, 5 ] }, { "item": "glass_shard", "count": [ 20, 50 ] } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 25, 50 ], "reduction_laser": [ 0, 5 ], "destroy_threshold": 75 } } } diff --git a/data/mods/Magiclysm/furniture.json b/data/mods/Magiclysm/furniture.json index 4c0acf6a47f4..5cde990a69d4 100644 --- a/data/mods/Magiclysm/furniture.json +++ b/data/mods/Magiclysm/furniture.json @@ -49,7 +49,8 @@ { "item": "orichalcum_lump", "count": [ 0, 2 ] }, { "item": "orichalcum_sliver", "count": [ 4, 10 ] } ], - "ranged": { "reduction": [ 80, 160 ], "destroy_threshold": 160 } + "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", + "ranged": { "reduction": [ 128, 128 ], "destroy_threshold": 128, "block_unaimed_chance": "50%" } } }, { @@ -89,7 +90,7 @@ { "item": "cable", "charges": [ 1, 3 ] }, { "item": "cu_pipe", "count": 1 } ], - "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } + "ranged": { "reduction": [ 35, 35 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" } }, "examine_action": "workbench", "workbench": { "multiplier": 1.15, "mass": "300 kg", "volume": "100L" } @@ -122,7 +123,8 @@ "sound": "glass breaking!", "sound_fail": "clang!", "items": [ { "item": "scrap_copper", "count": [ 10, 20 ] }, { "item": "glass_shard", "count": [ 2, 4 ] } ], - "ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 4, "block_unaimed_chance": "25%" } + "//": "Variable reduction, destroy_threshold matches str_min since fragile", + "ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 4, "block_unaimed_chance": "25%" } } }, { @@ -157,7 +159,7 @@ { "item": "pipe", "count": [ 1, 5 ] }, { "item": "wire", "count": [ 3, 10 ] } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 60, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 60, "block_unaimed_chance": "25%" } } }, { @@ -176,7 +178,7 @@ "light_emitted": 12, "bash": { "str_min": 25, - "str_max": 35, + "str_max": 75, "sound": "glass shattering!", "sound_fail": "mana crackling!", "items": [ @@ -184,7 +186,8 @@ { "item": "small_mana_crystal", "count": [ 0, 3 ] }, { "item": "glass_shard", "count": [ 1, 3 ] } ], - "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 35, "block_unaimed_chance": "75%" } + "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", + "ranged": { "reduction": [ 50, 50 ], "destroy_threshold": 75, "block_unaimed_chance": "75%" } } }, { @@ -204,7 +207,8 @@ "sound": "smash!", "sound_fail": "thump.", "items": [ { "item": "rock", "count": [ 5, 15 ] }, { "item": "sharp_rock", "count": [ 3, 5 ] } ], - "ranged": { "reduction": [ 80, 160 ], "destroy_threshold": 160 } + "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", + "ranged": { "reduction": [ 60, 60 ], "destroy_threshold": 60 } } }, { @@ -227,7 +231,7 @@ "sound": "crash!", "sound_fail": "whump.", "items": [ { "item": "demon_chitin_piece", "count": [ 20, 30 ] } ], - "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 50 } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 50 } } } ] diff --git a/data/mods/pride_flags/furniture.json b/data/mods/pride_flags/furniture.json index d10065573903..9f8083b991ea 100644 --- a/data/mods/pride_flags/furniture.json +++ b/data/mods/pride_flags/furniture.json @@ -20,6 +20,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "trans_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -44,7 +45,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "trans_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -68,6 +69,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "rainbow_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -92,7 +94,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "rainbow_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -116,6 +118,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "aromantic_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -140,7 +143,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "aromantic_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -164,6 +167,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "asexual_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -188,7 +192,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "asexual_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -212,6 +216,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "bisexual_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -236,7 +241,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "bisexual_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -260,6 +265,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "intersex_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -284,7 +290,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "intersex_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -308,6 +314,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "lesbian_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -332,7 +339,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "lesbian_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -356,6 +363,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "enby_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -380,7 +388,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "enby_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -404,6 +412,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "pansexual_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -428,7 +437,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "pansexual_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -452,6 +461,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "gay_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -476,7 +486,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "gay_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -500,6 +510,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "genderfluid_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -524,7 +535,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "genderfluid_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, { @@ -548,6 +559,7 @@ { "item": "rope_6", "count": [ 1, 3 ] }, { "item": "autism_flag", "count": 1 } ], + "//": "Variable reduction since might hit more or less material.", "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } }, @@ -572,7 +584,7 @@ { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, { "item": "autism_flag", "count": 1 } ], - "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + "ranged": { "reduction": [ 20, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } } } ]