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 Engine - Improve damage calculation for explosive-resistant armor #9216

Merged
merged 20 commits into from
Sep 23, 2023

Conversation

LinkIsGrim
Copy link
Contributor

@LinkIsGrim LinkIsGrim commented Jun 13, 2023

When merged this pull request will:

I've only done limited testing but this doesn't seem to break fire/fall damage/drowning/explosives or have anything beyond the intended effect on wound creation.

Doesn't break anything.

This also improves protection from vests and helmets against pistol calibers, especially the lower tier tactical vests and armored uniforms as a side effect, but this is closer to expected performance when using vanilla as a reference.

image

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}.

@LinkIsGrim
Copy link
Contributor Author

LinkIsGrim commented Jun 13, 2023

Here's some math:
image

This is just taking the base armor into account. Ingame damage values are going to be lower due to units' innate armor.

@LinkIsGrim
Copy link
Contributor Author

Marked as WIP. High damage diverts to limbs again.

@LinkIsGrim LinkIsGrim changed the title Medical Engine - Fix #9063 WIP - Medical Engine - Fix #9063 Jun 14, 2023
LinkIsGrim and others added 4 commits June 13, 2023 22:52
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
@LinkIsGrim LinkIsGrim closed this Jun 14, 2023
@LinkIsGrim LinkIsGrim reopened this Jun 14, 2023
@LinkIsGrim LinkIsGrim changed the title WIP - Medical Engine - Fix #9063 Medical Engine - Fix #9063 Jun 14, 2023
@LinkIsGrim
Copy link
Contributor Author

Fixed the sorting, though if anyone has a more elegant solution, I'll take it.

@LinkIsGrim LinkIsGrim added the kind/enhancement Release Notes: **IMPROVED:** label Jun 19, 2023
@LinkIsGrim LinkIsGrim changed the title Medical Engine - Fix #9063 Medical Engine - Improve damage calculation by scaling armor with passthrough Jun 19, 2023
@LinkIsGrim LinkIsGrim requested a review from kymckay June 28, 2023 14:15
@LinkIsGrim LinkIsGrim added this to the 3.16.0 milestone Jun 28, 2023
@veteran29 veteran29 self-requested a review June 28, 2023 16:01
@LinkIsGrim LinkIsGrim changed the title Medical Engine - Improve damage calculation by scaling armor with passthrough Medical Engine - Improve damage calculation for explosive-resistant armor Sep 4, 2023
Copy link
Member

@Mike-MF Mike-MF left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested it, it works as advertised. Someone other than me should probably review the code though.

@LinkIsGrim
Copy link
Contributor Author

FINALLY, BEGONE ISSUES

@LinkIsGrim LinkIsGrim merged commit da60a1b into acemod:master Sep 23, 2023
5 checks passed
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
4 participants