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

Medical Damage - Improve falling and collision damage #8861

Merged
merged 7 commits into from
May 17, 2022

Conversation

pterolatypus
Copy link
Contributor

@pterolatypus pterolatypus commented Apr 4, 2022

When merged this pull request will:

  • Shift wound weighting so that bruises are more likely at low damage values
  • Adjust wound thresholds so that low damage values have a chance to be ignored
  • Add size multipliers to wounds

Falling
The overall result should be fewer, larger wounds and less bandaging required, particularly for small falls.
Longer falls (more than about 4-5m) will cause larger wounds, but KO/kill potential should be unchanged.
Pain incurred from falling should be increased across the board.

Collisions
As above, overall effect should be fewer wounds overall and much less bleeding for very small collisions.
Apparently armor is taken into account for collisions, so I've added a custom handler to reduce its effect and scaled down the base damage to offset this. The numbers are all just tweaked by empirical testing, repeatedly running people over in the editor. Unfortunately not viable as falling damage is sometimes registered as collision and this was causing it to occasionally do much more damage than intended.

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@pterolatypus pterolatypus changed the title Medical Damage - Improve falling damage Medical Damage - Improve falling and collision damage May 11, 2022
@kymckay
Copy link
Member

kymckay commented May 12, 2022

Should falling damage also have reduced armor influence since it's a form of collision?

* medical_damage - cleanup woundHandler naming

* woundsHandlerBase

(cherry picked from commit bdeb347)
@pterolatypus
Copy link
Contributor Author

Should falling damage also have reduced armor influence

It appears to have a different effect already, which is unexpected. I suppose collisions with terrain are handled differently from collisions with objects.

Results from testing a 5m fall

Vest Body Damage (Approx)
None 0.36
Carrier Lite 0.36
Carrier Special Rig 0.36
GA Carrier GL Rig 0.23

As opposed to hitting a dude with a car, which appears to have the full effect of their gear's armor value.

@PabstMirror
Copy link
Contributor

Still having issues getting large multipart damage https://www.youtube.com/watch?v=uhWiwO64HV8
We should get fractures, not bleed out from a fall like that

@pterolatypus
Copy link
Contributor Author

Unfortunately whats happening there is the falling damage is being registered as collision and the armor reduction is actually significantly increasing the damage, so I've reverted that change until falling detection can be improved.

@PabstMirror PabstMirror added this to the 3.14.2 milestone May 16, 2022
@PabstMirror PabstMirror added the kind/enhancement Release Notes: **IMPROVED:** label May 16, 2022
@PabstMirror
Copy link
Contributor

seems a lot better imho
diff on github is weird but I think it will merge ok

@PabstMirror PabstMirror merged commit bf8aa1a into acemod:master May 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants