Skip to content

Commit

Permalink
feat(balance): consistency updates to ranged bash info, only use vari…
Browse files Browse the repository at this point in the history
…able `reduction` for specific ter/furn (#5582)

* feat(balance): consistency updates to ranged bash info, only use variable `reduction` for specific ter/furn

* Lil tweak

* Update mods

* Fix a lil oops
  • Loading branch information
chaosvolt authored Oct 16, 2024
1 parent 07ab5ba commit 76d8027
Show file tree
Hide file tree
Showing 35 changed files with 603 additions and 383 deletions.
42 changes: 33 additions & 9 deletions data/json/furniture_and_terrain/furniture-appliances.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
},
Expand Down Expand Up @@ -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 }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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 }
}
},
Expand Down Expand Up @@ -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 }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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 }
}
},
Expand Down Expand Up @@ -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 }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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 }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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 }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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%" }
}
},
Expand Down Expand Up @@ -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 }
}
},
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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%" }
}
}
Expand Down
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/furniture-barriers.json
Original file line number Diff line number Diff line change
Expand Up @@ -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%" }
}
},
{
Expand Down
15 changes: 8 additions & 7 deletions data/json/furniture_and_terrain/furniture-decorative.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
},
{
Expand All @@ -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 }
}
},
{
Expand All @@ -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" ]
},
Expand All @@ -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" ]
},
Expand Down Expand Up @@ -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%" }
}
},
{
Expand All @@ -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%" }
}
},
{
Expand All @@ -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%" }
}
},
{
Expand Down Expand Up @@ -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%" }
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
Loading

0 comments on commit 76d8027

Please sign in to comment.