Adjust grenade values #37585

Brian-Otten · 2020-01-31T09:51:19Z

Summary

SUMMARY: Balance "Adjust grenade values "

Purpose of change

Normal military frag grenades now use the same format as other explosives so the code is less confusing. Adjusted values to match the m67 frag grenade.

Describe the solution

https://en.wikipedia.org/wiki/M67_grenade
Explosives power is TNT equivalence, m67 frag has 180 grams of compound B which is 240 grams tnt.
Casing mass used is weight of the grenade minus weight of the explosive filler.

Fragment size was estimated with some help from dev-general at 0.15 grams. This is subject to change if someone has better data / a better way of estimating shrapnel size.

Describe alternatives you've considered

Testing

Spawn grenades ingame, they function as expected of military grenades without errors.

Additional context

Estimations by tenmillimaster
"my hairy inverted golfball has 726 points, by my count

tiny bit of error on the left hand side, but eh
good enough
so if it fragmented perfectly, less fuze elements and whatnot, it'd split into ~1452 pieces?"

The grenade is currently set to fragment in 1466 pieces.

At advice of kevin.

Brian-Otten · 2020-01-31T10:47:46Z

It looks like adjusting the grenade to match its real life values is making it fail the explosion test, going to try seeing if it passes if we assume it fragmenting less evenly and produce less/larger fragments. If that doesn't pass this PR can probably be closed/stalled until someone reworks the explosion tests.

Brian-Otten · 2020-01-31T11:58:45Z

It looks like the test is failing because it thinks the new grenade is too weak, while it now behaves much more like the other ingame explosives. I "suspect" that with the old code it is not generating 212 pieces of shrapnel, but setting the casing mass to 212 and generating a "lot" of tiny shrapnel

Which is extremely effective against completely unarmored zombies but extremely weak against even small armor values.

Grenade versus zombie cops:

Makeshift grenade versus zombie cops

It should be noted that zombie cops only have 6 cut armor.

Brian-Otten · 2020-01-31T16:31:28Z

Kevin helped me figure out that grenade is using the default shrapnel size of 0.005 grams, which gives the frag grenade 42400 pieces of shrapnel, which is probably too much.
Adjusting the shrapnel size to somewhere closer to 1500 is easily done, but we need to adjust the explosion_balance_test.cpp to accept the new values.
First idea was to change it to count wounded zombies as "casualties" in the lethality test.

Makes the grenade splinter into 1446 fragments

Brian-Otten · 2020-01-31T17:20:45Z

New value seems to give very sensible results, passing the 5m test, and i believe would pass the 15m test if we count the wounded as casualties.

It does seem to be failing the vehicle test now though, i think because the shrapnel now does enough damage to harm the vehicle, which it could not before.

Uses the code kevin wrote in CleverRaven#37605 so the grenade change is packed with the new test, so we can see if it passes.

Brian-Otten · 2020-01-31T22:43:41Z

Added the modified explosions test kevin wrote to this PR.

Attempt to fix an error in CleverRaven#37605

To see if this makes it pass the test.

Brian-Otten · 2020-02-01T00:27:35Z

Going to tweak fragment damage to vehicles till i've walked it to the target of narrowly passing the vehicletest again.

Default fragment mass is now the same as the new frag grenade fragment mass.

Brian-Otten · 2020-02-01T01:12:01Z

Explosion test is now passing lethality/casualty tests, but failing the vehicle test. The frag grenade is slightly harming the wheels and the alternator. It only passes if it does not damage the vehicle. Not sure what the best approach to fix it would be.

Brian-Otten · 2020-02-01T01:13:21Z

... i fat fingered the close PR button. Working on a fix for the vehicle test with suggestions from kevin, once that is narrowed down to pass the test this should be ready.

Brian-Otten · 2020-02-02T11:09:46Z

I'm starting to suspect that the code for reducing damage to vehicles is working oddly.
I've been trying to dial it in so the new grenade does not harm vehicles at all (so it can pass the test), but with the new fragment sizes it seems to damage vehicles, even when i've changed it to
g->m.bash( target, damage / 4000, true );
from g->m.bash( target, damage / 10, true );

Brian-Otten · 2020-02-04T13:36:21Z

All right, it took some tuning but i finally got this where i want it / where it should be. Grenades now have realistic values and effects, and shrapnel damage to vehicles/objects is behaving as i might expect, with the grenade barely damaging vehicles / doors (unless detonated from really close) but heavier explosives doing a bit better.
Little showcase:
Before detonation

After detonation

I think this should be ready to merge now. We might want to consider waiting for after 0.E to be fully sure there are no weird interactions in the upcoming stable, but making the grenade handle properly might also be seen as important, so i leave that up to the devs.

kevingranade · 2020-02-11T05:22:15Z

tests/explosion_balance_test.cpp

 }

 TEST_CASE( "grenade_vs_vehicle", "[grenade],[explosion],[balance]" )
 {
    check_vehicle_damage( "grenade_act", "car", 5 );
-}
+}


Suggested change

}

}

Brian-Otten · 2020-02-11T06:16:39Z

Thanks for the review and teamwork on this one kevin. Would not have been possible without your help on the explosives test.

Brian-Otten added 3 commits January 31, 2020 10:42

Makes grenades use modern code

61159bb

Linting

442472d

Remove legacy distance factor

3b9bff7

At advice of kevin.

Brian-Otten changed the title ~~Makes grenades use modern code~~ Adjust grenade values Jan 31, 2020

Adjusted to ingame weight

cb6537a

Larger shrapnel

07fd7e7

Change fragment mass

6885b1d

Makes the grenade splinter into 1446 fragments

Brian-Otten mentioned this pull request Jan 31, 2020

Give bomb fragments an armor piercing value #37510

Closed

kevingranade mentioned this pull request Jan 31, 2020

Adjust grenade lethality test to count casualties differently from kills #37605

Closed

Update explosion_balance_test.cpp

9fdcd26

Uses the code kevin wrote in CleverRaven#37605 so the grenade change is packed with the new test, so we can see if it passes.

Update explosion_balance_test.cpp

2d8457b

Attempt to fix an error in CleverRaven#37605

ZhilkinSerg added [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON Code: Tests Measurement, self-control, statistics, balancing. Game: Balance Balancing of (existing) in-game features. labels Feb 1, 2020

Tweak fragment damage to vehicles slightly.

4a9a28b

To see if this makes it pass the test.

Brian-Otten added 2 commits February 1, 2020 01:59

Update explosion.cpp

8bf8bd4

Change default fragment mass

22a0c41

Default fragment mass is now the same as the new frag grenade fragment mass.

Brian-Otten closed this Feb 1, 2020

Brian-Otten reopened this Feb 1, 2020

Brian-Otten added 2 commits February 1, 2020 02:41

Update explosion.cpp

e383347

Update explosion.cpp

008d7dd

Brian-Otten added 6 commits February 1, 2020 09:37

Update explosion.cpp

af4dbbe

Update explosion.cpp

7f405ca

Update explosion.cpp

c9f9c91

Update explosion.cpp

3ddc350

Update explosion.cpp

d0cc1c5

Update explosion.cpp

8481772

weekly-digest bot mentioned this pull request Feb 2, 2020

Weekly Digest (26 January, 2020 - 2 February, 2020) #37641

Closed

Brian-Otten added 6 commits February 2, 2020 12:10

Update explosion.cpp

a14e758

Update explosion.cpp

14b72b9

Update explosion.cpp

400c2ad

Update explosion.cpp

3569352

Update explosion.cpp

e637142

Update explosion.cpp

655ecd5

Brian-Otten requested a review from kevingranade February 4, 2020 13:37

This was referenced Feb 9, 2020

Weekly Digest (2 February, 2020 - 9 February, 2020) #37848

Closed

Weekly Digest (2 February, 2020 - 9 February, 2020) #37851

Closed

kevingranade reviewed Feb 11, 2020

View reviewed changes

kevingranade merged commit 6d26b22 into CleverRaven:master Feb 11, 2020

This was referenced Feb 16, 2020

Weekly Digest (9 February, 2020 - 16 February, 2020) #38055

Closed

Weekly Digest (9 February, 2020 - 16 February, 2020) #38058

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adjust grenade values #37585

Adjust grenade values #37585

Brian-Otten commented Jan 31, 2020 •

edited

Loading

Brian-Otten commented Jan 31, 2020

Brian-Otten commented Jan 31, 2020 •

edited

Loading

Brian-Otten commented Jan 31, 2020

Brian-Otten commented Jan 31, 2020

Brian-Otten commented Jan 31, 2020

Brian-Otten commented Feb 1, 2020

Brian-Otten commented Feb 1, 2020

Brian-Otten commented Feb 1, 2020

Brian-Otten commented Feb 2, 2020 •

edited

Loading

Brian-Otten commented Feb 4, 2020 •

edited

Loading

kevingranade Feb 11, 2020

Brian-Otten commented Feb 11, 2020 •

edited

Loading

Adjust grenade values #37585

Adjust grenade values #37585

Conversation

Brian-Otten commented Jan 31, 2020 • edited Loading

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Brian-Otten commented Jan 31, 2020

Brian-Otten commented Jan 31, 2020 • edited Loading

Brian-Otten commented Jan 31, 2020

Brian-Otten commented Jan 31, 2020

Brian-Otten commented Jan 31, 2020

Brian-Otten commented Feb 1, 2020

Brian-Otten commented Feb 1, 2020

Brian-Otten commented Feb 1, 2020

Brian-Otten commented Feb 2, 2020 • edited Loading

Brian-Otten commented Feb 4, 2020 • edited Loading

kevingranade Feb 11, 2020

Choose a reason for hiding this comment

Brian-Otten commented Feb 11, 2020 • edited Loading

Brian-Otten commented Jan 31, 2020 •

edited

Loading

Brian-Otten commented Jan 31, 2020 •

edited

Loading

Brian-Otten commented Feb 2, 2020 •

edited

Loading

Brian-Otten commented Feb 4, 2020 •

edited

Loading

Brian-Otten commented Feb 11, 2020 •

edited

Loading