Medical Engine - Remove ACE_HDBracket hitpoint by LinkIsGrim · Pull Request #9732 · acemod/ACE3

LinkIsGrim · 2024-01-14T16:50:29Z

When merged this pull request will:

Arma 2.16 adds "context" param to HD which lets us know if we're at the last iteration of the event: https://community.bistudio.com/wiki/Arma_3:_Event_Handlers#HandleDamage
Some stuff had to be moved around in the function but it'll work the same.
While this means that medical will still work even with broken inheritance now, arm/leg hitpoints could still be missing due to the same issue. I've added a check for presence of those hitpoints, but it's slower than just checking HDBracket by about 25% (0.05ms for 1k iterations vs. 0.04ms). This is only relevant at unit init, and time is saved during damage events (which is where performance suffers most) by reducing a hitpoint.

I'm looking into whether it's possible to simplify more of the function via other events or the directHit param.

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

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

johnb432 · 2024-02-08T12:38:30Z

Looks like this has been pushed to 2.18
https://community.bistudio.com/wiki?title=Arma_3:_Event_Handlers#HandleDamage

LinkIsGrim · 2024-03-26T13:38:03Z

Check if this made it into 2.16 or not. SPOTREP says it did.

LinkIsGrim · 2024-03-26T14:12:17Z

Made it into 2.16. Just need to fix merge conflicts

johnb432 · 2024-03-26T14:52:46Z

I was not expecting this at all and thought we had more time for 2.16.

LinkIsGrim · 2024-03-26T16:14:21Z

Eh, it'll work.

jonpas · 2024-03-28T13:12:50Z

Don't we need to include this in 3.17.0 for 2.16 compatibility?

LinkIsGrim · 2024-03-28T13:40:57Z

Nothing breaks AFAIK

johnb432 · 2024-04-01T10:27:30Z

Doesn't seem like anything breaks, at least for "normal" damage (being shot, being driven over and falling). I didn't test very much, I feel more in depth testing could be better done by an RC.

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

Stale, handled

johnb432

Tested being shot, falling, being driven over, crashing and drowning - all work as expected.

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

johnb432

LGTM, testing suggests this is fine.

Mike-MF · 2024-06-07T13:55:12Z

I played around with this for about an hour or so, tried a bunch of things to cause different types of injury, no obvious issues or errors.

Only change this PR needs to address now is this:

ACE3/addons/medical/XEH_preStart.sqf

Line 5 in 565d64d

    
           [false] call compile preprocessFileLineNumbers QPATHTOF(dev\test_hitpointConfigs.sqf);

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

LinkIsGrim · 2024-06-11T14:11:26Z

Green button go brrt (flood my inbox if something breaks)

* Medical Engine - Remove ACE_HDBracket hitpoint * skip context 4 * move checks to vars * skip uav/logic entities * add check for arm/leg hitpoints * Update addons/medical_engine/functions/fnc_handleDamage.sqf Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com> * don't skip context 2 * clearer custom hitpoint array name * reenable compile cache * remove debug mode * lazy eval * whitespace * update comment * Update fnc_handleDamage.sqf header * Update addons/medical_engine/functions/fnc_handleDamage.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/medical_engine/XEH_postInit.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * update hitpoint test * missing " * Update addons/medical/dev/test_hitpointConfigs.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> --------- Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com> Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

Medical Engine - Remove ACE_HDBracket hitpoint

4a705df

LinkIsGrim added the target/next-arma Requires something in arma dev branch label Jan 14, 2024

LinkIsGrim marked this pull request as draft January 14, 2024 16:50

LinkIsGrim mentioned this pull request Jan 14, 2024

Medical Engine - Exit early if incoming damage is 0 #9733

Merged

skip context 4

daa7a17

veteran29 added the kind/enhancement Release Notes: **IMPROVED:** label Jan 14, 2024

veteran29 previously requested changes Jan 14, 2024

View reviewed changes

Comment thread addons/medical_engine/XEH_postInit.sqf

LinkIsGrim and others added 4 commits January 14, 2024 15:17

move checks to vars

8c50fbc

skip uav/logic entities

dae10be

add check for arm/leg hitpoints

84c2feb

Merge branch 'master' into medical-noHDbracket

5bbdb69

rautamiekka suggested changes Jan 14, 2024

View reviewed changes

Comment thread addons/medical_engine/functions/fnc_handleDamage.sqf Outdated

Update addons/medical_engine/functions/fnc_handleDamage.sqf

3f030c1

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

PabstMirror changed the title ~~Medical Engine - Remove ACE_HDBracket hitpoint~~ Medical Engine - Remove ACE_HDBracket hitpoint [2.16] Jan 16, 2024

don't skip context 2

12e3fd8

johnb432 added the 2.16 label Feb 3, 2024

johnb432 added 2.18 and removed 2.16 labels Feb 10, 2024

johnb432 changed the title ~~Medical Engine - Remove ACE_HDBracket hitpoint [2.16]~~ Medical Engine - Remove ACE_HDBracket hitpoint [2.18] Feb 10, 2024

LinkIsGrim removed target/next-arma Requires something in arma dev branch 2.18 labels Mar 26, 2024

Merge branch 'master' into medical-noHDbracket

42762e0

LinkIsGrim marked this pull request as ready for review March 26, 2024 14:15

LinkIsGrim requested a review from veteran29 March 26, 2024 14:15

LinkIsGrim commented Mar 26, 2024

View reviewed changes

Comment thread addons/medical_engine/XEH_preInit.sqf Outdated

Comment thread addons/medical_engine/XEH_postInit.sqf Outdated

Comment thread addons/medical_engine/script_component.hpp Outdated

LinkIsGrim added 2 commits March 26, 2024 11:19

clearer custom hitpoint array name

56e0b15

reenable compile cache

d4101d8

whitespace

37ee2f0

LinkIsGrim commented Mar 26, 2024

View reviewed changes

Comment thread addons/medical_engine/functions/fnc_handleDamage.sqf Outdated

update comment

93c7b80

LinkIsGrim added this to the 3.17.1 milestone Mar 26, 2024

Update fnc_handleDamage.sqf header

0b26be2

johnb432 reviewed Apr 1, 2024

View reviewed changes

Comment thread addons/medical_engine/functions/fnc_handleDamage.sqf Outdated

Update addons/medical_engine/functions/fnc_handleDamage.sqf

f99d67e

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

LinkIsGrim modified the milestones: 3.17.1, 3.18.0 Apr 7, 2024

johnb432 self-requested a review May 26, 2024 08:36

johnb432 requested changes Jun 2, 2024

View reviewed changes

Comment thread addons/medical_engine/XEH_postInit.sqf Outdated

Update addons/medical_engine/XEH_postInit.sqf

a035a11

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

johnb432 self-requested a review June 3, 2024 09:07

johnb432 approved these changes Jun 6, 2024

View reviewed changes

LinkIsGrim added 2 commits June 7, 2024 11:52

update hitpoint test

5fe3c06

missing "

52995d7

johnb432 reviewed Jun 7, 2024

View reviewed changes

Comment thread addons/medical/dev/test_hitpointConfigs.sqf Outdated

Update addons/medical/dev/test_hitpointConfigs.sqf

43a2beb

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

Mike-MF approved these changes Jun 7, 2024

View reviewed changes

LinkIsGrim merged commit a85074a into master Jun 11, 2024

LinkIsGrim deleted the medical-noHDbracket branch June 11, 2024 14:11

Conversation

LinkIsGrim commented Jan 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

IMPORTANT

Uh oh!

Uh oh!

Uh oh!

johnb432 commented Feb 8, 2024

Uh oh!

LinkIsGrim commented Mar 26, 2024

Uh oh!

LinkIsGrim commented Mar 26, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

johnb432 commented Mar 26, 2024

Uh oh!

LinkIsGrim commented Mar 26, 2024

Uh oh!

jonpas commented Mar 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

LinkIsGrim commented Mar 28, 2024

Uh oh!

Uh oh!

johnb432 commented Apr 1, 2024

Uh oh!

johnb432 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

johnb432 left a comment

Choose a reason for hiding this comment

Uh oh!

Mike-MF commented Jun 7, 2024

Uh oh!

Uh oh!

LinkIsGrim commented Jun 11, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

LinkIsGrim commented Jan 14, 2024 •

edited

Loading

jonpas commented Mar 28, 2024 •

edited

Loading

johnb432 left a comment •

edited

Loading