Medical - Add Additional Hitpoints to the medical system #10482

Cplhardcore · 2024-11-05T01:38:08Z

When merged this pull request will:

Adds 6 new hitpoints to the ace medical system (Neck, Chest, and four upper limbs) for better compatibility and modularity to other medical mods

ToDo
-GUI

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

addons/medical_damage/script_component.hpp

addons/medical_damage/functions/fnc_woundsHandlerBurning.sqf

addons/medical_engine/functions/fnc_handleDamage.sqf

veteran29 · 2024-11-05T02:23:51Z

addons/medical/functions/fnc_deserializeState.sqf

@@ -97,7 +97,7 @@ private _state = [_json] call CBA_fnc_parseJSON;
    [QEGVAR(medical,ivBags), nil],
    [QEGVAR(medical,triageLevel), 0],
    [QEGVAR(medical,triageCard), []],
-    [QEGVAR(medical,bodyPartDamage), [0,0,0,0,0,0]]
+    [QEGVAR(medical,bodyPartDamage), [0,0,0,0,0,0,0,0,0,0,0,0]]
    // Offset needs to be converted
    // [VAR_MEDICATIONS, []]
 ];


This function needs handling of previous format of bodyPartDamage array.

For BWC? or is there something else I am oblivious to

addons/medical_damage/functions/fnc_woundsHandlerBase.sqf

addons/medical_engine/script_component.hpp

veteran29 · 2024-11-05T02:29:04Z

addons/medical_treatment/functions/fnc_handleBandageOpening.sqf

@@ -124,7 +124,7 @@ if (random 1 <= _reopeningChance * GVAR(woundReopenChance)) then {
                // Re-add trauma and damage visuals
                if (GVAR(clearTrauma) == 2) then {
                    private _injuryDamage = (_selectedInjury select 4) * _impact;
-                    private _bodyPartDamage = _target getVariable [QEGVAR(medical,bodyPartDamage), [0,0,0,0,0,0]];
+                    private _bodyPartDamage = _target getVariable [QEGVAR(medical,bodyPartDamage), [0,0,0,0,0,0,0,0,0,0,0,0]];


Looking at how frequently the default state array of body parts damage is being used would be nice to move it to a macro.

Ive attempted that, hopefully its correct

veteran29 · 2024-11-05T02:30:00Z

cc @pterolatypus

Drofseh · 2024-11-05T02:38:47Z

If the upper limbs are called upper the lower limbs should be called lower.
Upper Arm and Arm sounds weird compared to Upper Arm and Lower Arm.

LinkIsGrim · 2024-11-05T03:00:12Z

cc @pterolatypus

MIA

LinkIsGrim · 2024-11-05T03:01:33Z

I don't hate this on principle but oh dear this can break in so many ways (both itself and BWC)

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

…nto Hitpoint-Rework

Cplhardcore · 2024-11-05T03:23:32Z

I don't hate this on principle but oh dear this can break in so many ways (both itself and BWC)

I know, its horrible for BWC, but its a very much needed update as KAM needs more granularity in terms of hitpoints (and overwrites are not great

I had a differing path as well, but that would have had me make hitpoints for everything, down to the granularity of individual hands and joints, which would have been worse

LinkIsGrim

Surprisingly few changes necessary to make this work (though I'll admit I haven't looked at this under a microscope), which is good, but this is a big enough change this late into the lifecycle that I'd put it under a setting. Which you can't do, because hitpoints are tied too strongly into how the system works and was balanced.

This warrants similar testing as the wound handler rework and medical rewrite IMO.

Some other considerations:
Do you bleed twice as much for explosions now? (I have a feeling you do)
Is sway just twice as strong on the worst case too?

This is a pretty big change so we're going to be nitpicky. You're going to see "Requested Changes" a lot. Sorry, not sorry (please use hemtt), I still have an armor penetration PR that hasn't been reviewed because no one wants to touch medical.

addons/interaction/CfgVehicles.hpp

LinkIsGrim · 2024-11-05T03:03:48Z

addons/medical_damage/functions/fnc_woundsHandlerBase.sqf

 private _bodyPartVisParams = [_unit, false, false, false, false]; // params array for EFUNC(medical_engine,updateBodyPartVisuals);

 // process wounds separately for each body part hit
 {   // forEach _allDamages
    _x params ["_damage", "_bodyPart"];
    _bodyPart = toLowerANSI _bodyPart;
-
+    if (_bodyPart == "head") then {
+    private _isNeck = (random 1) < 0.1; // 15% chance for neck damage


This seems arbitrary. Can this not be handled via medical_engine?

No, as the hitbox for neck damage is unbelievably small, to the point its impossible to hit
Plus jaw/lower head damage still affects the neck area

addons/medical_engine/functions/fnc_handleDamage.sqf

LinkIsGrim · 2024-11-05T03:06:43Z

addons/medical_engine/functions/fnc_updateBodyPartVisuals.sqf


 if (_updateHead) then {
-    [_unit, "head", (_bodyPartDamage select 0) > VISUAL_BODY_DAMAGE_THRESHOLD] call FUNC(damageBodyPart);
+    [_unit, "head", ((_bodyPartDamage select 0) max (_bodyPartDamage select 1)) > VISUAL_BODY_DAMAGE_THRESHOLD] call FUNC(damageBodyPart);


This will break KAM FYI.

Oh i am aware, ill have to do my own refactor of KAM with these changes if they do get merged

LinkIsGrim · 2024-11-05T03:10:20Z

addons/medical_engine/script_macros_medical.hpp

+#define HITPOINT_INDEX_NECK 1
+#define HITPOINT_INDEX_CHEST 2
+#define HITPOINT_INDEX_BODY 3
+#define HITPOINT_INDEX_LARM 4
+#define HITPOINT_INDEX_ULARM 5
+#define HITPOINT_INDEX_RARM 6
+#define HITPOINT_INDEX_URARM 7
+#define HITPOINT_INDEX_LLEG 8
+#define HITPOINT_INDEX_ULLEG 9
+#define HITPOINT_INDEX_RLEG 10
+#define HITPOINT_INDEX_URLEG 11


I'd prefer if the new hitpoints were added on at the end, even if it seems less logical, less places to break

Reason why it's like that is for update body image using a series of greater-than-checks

LinkIsGrim · 2024-11-05T03:12:49Z

addons/medical_engine/script_macros_medical.hpp

@@ -130,9 +136,9 @@
 #define DEFAULT_BANDAGE_REOPENING_MIN_DELAY 120
 #define DEFAULT_BANDAGE_REOPENING_MAX_DELAY 200

-#define DEFAULT_TOURNIQUET_VALUES [0,0,0,0,0,0]
+#define DEFAULT_TOURNIQUET_VALUES [0,0,0,0,0,0,0,0,0,0,0,0]


Do we really need upper/lower limb tourniquets/splints? If either end of the limb is broken, you still can't use it, and a tourniquet on the upper limb will still cut off blood flow to the whole thing.

I get that this can be interesting for something like numbness/necrosis in the case of tourniquets, but there's no reason in baseline medical to not throw the tourniquet on the upper limb (assuming that works as expected).

Its for compatibility with KAM, as tissue necrosis will be a thing soon plus we have IVs so a lower limb TQ wont occlude upper IV access

addons/medical_gui/functions/fnc_onKeyDown.sqf

addons/medical_gui/functions/fnc_updateBodyImage.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

Cplhardcore · 2024-11-05T03:32:10Z

Some other considerations:
Do you bleed twice as much for explosions now? (I have a feeling you do),

Yes, but there is another PR in the pipe that reworks wounds and their creation, so in the end it will be equivalent to how it was before

Is sway just twice as strong on the worst case too?

Yes, and I'm looking at making a change to that

…nto Hitpoint-Rework

Cplhardcore · 2024-11-05T07:20:12Z

Current issues
~~GUI, i need to do it~~ Done

Explosions are kinda weird for damage, likes to leave parts of limbs untouched, might need the damage randomizer to be a flip flop instead, unless its all one EH and if so ill need to work at explosive damage

~~End key is broken, somehow, no idea where or how~~ (it was a keybind issue)

~~Chest and torso can be fractured, to be fixed~~ (its fixed, didn't change a number)

addons/medical_damage/functions/fnc_woundsHandlerBase.sqf

addons/medical_engine/functions/fnc_handleDamage.sqf

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

…nto Hitpoint-Rework

Cplhardcore · 2024-11-18T00:29:10Z

Current issue, explosions are one call of woundshandlerbase per hitpoint, and splitting it isn't fruitful,

Cplhardcore added 6 commits November 4, 2024 17:31

initial commit

a38767b

Update CfgVehicles.hpp

4f03f3c

Merge branch 'master' into Damage-Rework

2d0f1a9

Missing curly bracket

71daaa7

another one

434f709

small fix

9243175

veteran29 self-requested a review November 5, 2024 02:13

veteran29 requested changes Nov 5, 2024

View reviewed changes

veteran29 requested a review from LinkIsGrim November 5, 2024 02:29

veteran29 requested a review from BrettMayson November 5, 2024 02:30

Small fixes

c6effc9

Cplhardcore and others added 4 commits November 4, 2024 19:12

Update addons/medical_engine/functions/fnc_handleDamage.sqf

305654d

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

Multiple fixes

822019f

Merge branch 'Damage-Rework' of https://github.com/Cplhardcore/ACE3 i…

97c9fd4

…nto Hitpoint-Rework

Fixing stringtables

f4f3905

LinkIsGrim requested changes Nov 5, 2024

View reviewed changes

Cplhardcore and others added 3 commits November 4, 2024 19:24

Update addons/medical_gui/functions/fnc_updateBodyImage.sqf

7c78535

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

Update addons/medical_engine/functions/fnc_handleDamage.sqf

2aeda77

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

Fixes

0737077

Cplhardcore added 4 commits November 4, 2024 19:33

Merge branch 'Damage-Rework' of https://github.com/Cplhardcore/ACE3 i…

799c794

…nto Hitpoint-Rework

Adds switching to keypresses

b6b1225

Adds a GET_BODYPART_DAMAGE macro, i think

5b8e144

small fix

6fbea5a

Cplhardcore added 5 commits November 4, 2024 23:21

Fixing fractures

fd4c4cd

GUI update

9961493

Hemtt suggestions

1810f08

Update fnc_updateBodyImage.sqf

7270e8d

Update script_component.hpp

ac42769

rautamiekka suggested changes Nov 16, 2024

View reviewed changes

addons/medical_damage/functions/fnc_woundsHandlerBase.sqf Outdated Show resolved Hide resolved

addons/medical_engine/functions/fnc_handleDamage.sqf Outdated Show resolved Hide resolved

Cplhardcore and others added 5 commits November 16, 2024 09:24

Update addons/medical_engine/functions/fnc_handleDamage.sqf

4b119bf

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

Merge branch 'Damage-Rework' of https://github.com/Cplhardcore/ACE3 i…

263fbca

…nto Hitpoint-Rework

Update fnc_woundsHandlerBase.sqf

ef08054

GUI fixes

3c906ce

Update fnc_woundsHandlerBase.sqf

09db653

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Medical - Add Additional Hitpoints to the medical system #10482

Medical - Add Additional Hitpoints to the medical system #10482

Cplhardcore commented Nov 5, 2024

veteran29 Nov 5, 2024

Cplhardcore Nov 5, 2024

veteran29 Nov 5, 2024

Cplhardcore Nov 5, 2024

veteran29 commented Nov 5, 2024

Drofseh commented Nov 5, 2024

LinkIsGrim commented Nov 5, 2024

LinkIsGrim commented Nov 5, 2024

Cplhardcore commented Nov 5, 2024

LinkIsGrim left a comment

LinkIsGrim Nov 5, 2024

Cplhardcore Nov 5, 2024

LinkIsGrim Nov 5, 2024

Cplhardcore Nov 5, 2024

LinkIsGrim Nov 5, 2024

Cplhardcore Nov 5, 2024

LinkIsGrim Nov 5, 2024

Cplhardcore Nov 5, 2024

Cplhardcore commented Nov 5, 2024 •

edited

Loading

Cplhardcore commented Nov 5, 2024 •

edited

Loading

Cplhardcore commented Nov 18, 2024

Medical - Add Additional Hitpoints to the medical system #10482

Are you sure you want to change the base?

Medical - Add Additional Hitpoints to the medical system #10482

Conversation

Cplhardcore commented Nov 5, 2024

IMPORTANT

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

veteran29 commented Nov 5, 2024

Drofseh commented Nov 5, 2024

LinkIsGrim commented Nov 5, 2024

LinkIsGrim commented Nov 5, 2024

Cplhardcore commented Nov 5, 2024

LinkIsGrim left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Cplhardcore commented Nov 5, 2024 • edited Loading

Cplhardcore commented Nov 5, 2024 • edited Loading

Cplhardcore commented Nov 18, 2024

Cplhardcore commented Nov 5, 2024 •

edited

Loading

Cplhardcore commented Nov 5, 2024 •

edited

Loading