Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(balance): further standardize and increase use of ranged bash info #4198

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 30 additions & 26 deletions data/json/furniture_and_terrain/furniture-appliances.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{ "item": "cu_pipe", "count": [ 1, 4 ] },
{ "item": "scrap_copper", "count": [ 0, 2 ] }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 50 }
"ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50 }
}
},
{
Expand Down Expand Up @@ -79,7 +79,7 @@
{ "item": "e_scrap", "count": [ 5, 10 ] },
{ "item": "plastic_chunk", "count": [ 0, 2 ] }
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 50 }
"ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 50 }
}
},
{
Expand Down Expand Up @@ -124,7 +124,7 @@
{ "item": "cu_pipe", "count": [ 1, 4 ] },
{ "item": "scrap_copper", "count": [ 0, 2 ] }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -165,7 +165,7 @@
{ "item": "element", "count": [ 1, 3 ] },
{ "item": "cable", "charges": [ 1, 15 ] }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -292,7 +292,7 @@
{ "item": "cable", "charges": [ 1, 4 ] },
{ "item": "plastic_chunk", "count": [ 2, 4 ] }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" }
"ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" }
}
},
{
Expand Down Expand Up @@ -367,7 +367,7 @@
{ "item": "glass_shard", "count": [ 2, 4 ] },
{ "item": "motor_tiny", "prob": 25 }
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 50 }
"ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 50 }
}
},
{
Expand Down Expand Up @@ -512,7 +512,7 @@
{ "item": "cu_pipe", "count": [ 1, 4 ] },
{ "item": "scrap_copper", "count": [ 0, 2 ] }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 50 }
"ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50 }
}
},
{
Expand Down Expand Up @@ -555,7 +555,7 @@
{ "item": "cu_pipe", "count": [ 1, 4 ] },
{ "item": "scrap_copper", "count": [ 0, 2 ] }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -587,7 +587,7 @@
{ "item": "cable", "charges": [ 1, 3 ] },
{ "item": "pilot_light", "count": 1 }
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -622,7 +622,7 @@
{ "item": "water_faucet", "count": 1 },
{ "item": "pot", "count": [ 0, 1 ] }
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -657,7 +657,7 @@
{ "item": "scrap", "count": [ 0, 6 ] },
{ "item": "wire", "count": [ 1, 3 ] }
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -695,7 +695,7 @@
{ "item": "scrap", "count": [ 10, 20 ] },
{ "item": "pipe", "count": [ 1, 3 ] }
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -774,7 +774,7 @@
{ "item": "e_scrap", "count": [ 20, 50 ] },
{ "item": "cable", "charges": [ 2, 8 ] }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 50 }
"ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 40 }
}
},
{
Expand Down Expand Up @@ -817,7 +817,7 @@
{ "item": "cable", "charges": [ 1, 15 ] },
{ "item": "scrap_copper", "count": [ 0, 2 ] }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 50 }
"ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50 }
}
},
{
Expand Down Expand Up @@ -935,7 +935,8 @@
{ "item": "cable", "charges": [ 2, 8 ] },
{ "item": "small_storage_battery", "count": [ 4, 16 ] }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 16, "block_unaimed_chance": "50%" }
"//": "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 @@ -976,7 +977,8 @@
{ "item": "cable", "charges": [ 2, 8 ] },
{ "item": "small_storage_battery", "count": [ 20, 80 ] }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 16, "block_unaimed_chance": "75%" }
"//": "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 @@ -1016,7 +1018,8 @@
{ "item": "cable", "charges": [ 2, 8 ] },
{ "item": "small_storage_battery", "count": [ 40, 160 ] }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 16 }
"//": "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 @@ -1171,7 +1174,7 @@
{ "item": "scrap", "count": [ 1, 4 ] },
{ "item": "cable", "charges": [ 2, 8 ] }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" }
"ranged": { "reduction": [ 8, 16 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" }
}
},
{
Expand Down Expand Up @@ -1265,7 +1268,7 @@
{ "item": "plastic_chunk", "count": [ 1, 2 ] },
{ "item": "frame", "count": [ 0, 1 ] }
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -1334,7 +1337,7 @@
{ "item": "cable", "charges": [ 1, 4 ] },
{ "item": "element", "count": [ 2, 6 ] }
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -1512,7 +1515,7 @@
{ "charges": 0, "item": "food_processor", "prob": 50 },
{ "charges": 0, "item": "press", "prob": 50 }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -1613,7 +1616,7 @@
{ "item": "cable", "charges": [ 2, 8 ] },
{ "item": "frame", "count": [ 0, 1 ] }
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -1680,7 +1683,7 @@
{ "item": "scrap_copper", "count": [ 1, 2 ] },
{ "item": "motor_tiny", "prob": 25 }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 50 }
"ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50 }
}
},
{
Expand Down Expand Up @@ -1802,7 +1805,7 @@
{ "item": "hose", "prob": 50 },
{ "item": "motor_tiny", "prob": 25 }
],
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" }
"ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 50, "block_unaimed_chance": "25%" }
}
},
{
Expand Down Expand Up @@ -1892,7 +1895,7 @@
{ "item": "sheet_metal", "count": [ 1, 4 ] },
{ "item": "cable", "charges": [ 1, 1 ] }
],
"ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -2080,7 +2083,8 @@
{ "item": "plut_cell", "charges": [ 0, 3 ] },
{ "item": "lead", "charges": [ 12, 18 ] }
],
"ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 75, "block_unaimed_chance": "50%" }
"//": "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": {
"items": [
Expand Down
16 changes: 10 additions & 6 deletions data/json/furniture_and_terrain/furniture-barriers.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"examine_action": "chainfence",
"deconstruct": { "items": [ { "item": "2x4", "count": 6 }, { "item": "nail", "charges": 12 } ] },
"bash": {
"str_min": 3,
"str_min": 6,
"str_max": 40,
"sound": "smash!",
"sound_fail": "whump.",
"items": [ { "item": "2x4", "count": [ 2, 6 ] }, { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": 1 } ],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" }
"ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" }
}
},
{
Expand Down Expand Up @@ -51,7 +51,8 @@
"sound": "rrrip!",
"sound_fail": "whump.",
"items": [ { "item": "bag_canvas", "count": [ 10, 16 ] }, { "item": "material_soil", "charges": [ 40, 48 ] } ],
"ranged": { "reduction": [ 75, 75 ], "destroy_threshold": 75, "block_unaimed_chance": "50%" }
"//": "reduction and destroy_threshold equal to str_max of full-sized wall version, designed for ballistic protection",
"ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" }
}
},
{
Expand All @@ -74,7 +75,8 @@
"sound_fail": "whump.",
"furn_set": "f_earthbag_half",
"items": [ { "item": "bag_canvas", "count": [ 15, 20 ] }, { "item": "material_soil", "charges": [ 50, 60 ] } ],
"ranged": { "reduction": [ 100, 100 ], "destroy_threshold": 100 }
"//": "reduction equal to str_max due to being designed for ballistic protection",
"ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 80 }
}
},
{
Expand Down Expand Up @@ -124,7 +126,8 @@
"sound": "rrrip!",
"sound_fail": "whump.",
"items": [ { "item": "bag_canvas", "count": [ 10, 16 ] }, { "item": "material_sand", "charges": [ 800, 960 ] } ],
"ranged": { "reduction": [ 75, 75 ], "destroy_threshold": 75, "block_unaimed_chance": "50%" }
"//": "reduction and destroy_threshold equal to str_max of full-sized wall version, designed for ballistic protection",
"ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" }
}
},
{
Expand All @@ -146,7 +149,8 @@
"sound_fail": "whump.",
"furn_set": "f_sandbag_half",
"items": [ { "item": "bag_canvas", "count": [ 15, 20 ] }, { "item": "material_sand", "charges": [ 1000, 1200 ] } ],
"ranged": { "reduction": [ 100, 100 ], "destroy_threshold": 100 }
"//": "reduction equal to str_max due to being designed for ballistic protection",
"ranged": { "reduction": [ 80, 80 ], "destroy_threshold": 80 }
}
}
]
13 changes: 8 additions & 5 deletions data/json/furniture_and_terrain/furniture-decorative.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"sound_vol": 16,
"furn_set": "f_bigmirror_b",
"items": [ { "item": "glass_shard", "count": [ 3, 6 ] } ],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 5 }
"//": "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 }
}
},
{
Expand All @@ -38,7 +39,7 @@
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "item": "scrap", "count": [ 2, 4 ] } ],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 30 }
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30 }
}
},
{
Expand Down Expand Up @@ -117,7 +118,8 @@
"sound": "smash!",
"sound_fail": "thump.",
"items": [ { "item": "rock", "count": [ 1, 6 ] } ],
"ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
"//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return",
"ranged": { "reduction": [ 16, 32 ], "destroy_threshold": 32, "block_unaimed_chance": "50%" }
}
},
{
Expand All @@ -137,7 +139,7 @@
"sound": "smash!",
"sound_fail": "whump.",
"items": [ { "item": "splinter", "count": [ 9, 12 ] } ],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" }
"ranged": { "reduction": [ 3, 6 ], "destroy_threshold": 40, "block_unaimed_chance": "25%" }
}
},
{
Expand All @@ -157,7 +159,8 @@
"sound": "smash!",
"sound_fail": "thump.",
"items": [ { "item": "rock", "count": [ 1, 6 ] }, { "item": "rebar", "count": [ 1, 2 ] } ],
"ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 15, "block_unaimed_chance": "25%" }
"//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return",
"ranged": { "reduction": [ 16, 32 ], "destroy_threshold": 32, "block_unaimed_chance": "25%" }
}
},
{
Expand Down
11 changes: 6 additions & 5 deletions data/json/furniture_and_terrain/furniture-fireplaces.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"sound": "crash!",
"sound_fail": "whump!",
"items": [ { "item": "rock", "count": [ 15, 30 ] } ],
"ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 80, "block_unaimed_chance": "75%" }
"//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return",
"ranged": { "reduction": [ 50, 100 ], "destroy_threshold": 100, "block_unaimed_chance": "75%" }
}
},
{
Expand All @@ -39,7 +40,7 @@
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "item": "scrap", "count": [ 3, 6 ] }, { "item": "pipe", "prob": 50 } ],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
},
"deconstruct": { "items": [ { "item": "metal_tank", "count": 1 }, { "item": "pipe", "count": 1 } ] }
},
Expand All @@ -66,7 +67,7 @@
{ "item": "steel_chunk", "count": [ 2, 6 ] },
{ "item": "sheet_metal_small", "count": [ 2, 6 ] }
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" }
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" }
}
},
{
Expand Down Expand Up @@ -118,7 +119,7 @@
{ "item": "sheet_metal_small", "count": [ 3, 10 ] },
{ "item": "sheet_metal", "count": [ 0, 1 ] }
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "50%" }
}
},
{
Expand All @@ -145,7 +146,7 @@
{ "item": "sheet_metal_small", "count": [ 2, 5 ] },
{ "item": "sheet_metal", "count": [ 0, 1 ] }
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" }
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 30, "block_unaimed_chance": "25%" }
}
},
{
Expand Down
Loading
Loading