Medical - Add Additional Hitpoints to the medical system

addons/interaction/CfgVehicles.hpp

@@ -172,56 +172,96 @@ class CfgVehicles {
 
             class ACE_Torso {
                 displayName = CSTRING(Torso);
+                selection = "spine1";
+                distance = 1.5;
+                condition = "";
+                statement = "";
+                exceptions[] = {"isNotSwimming"};
+            };
+            class ACE_Chest {
+                displayName = CSTRING(Chest);
                 selection = "spine3";
-                distance = 1.50;
+                distance = 1.5;
                 condition = "";
                 statement = "";
                 exceptions[] = {"isNotSwimming"};
             };
             class ACE_Head {
                 displayName = CSTRING(Head);
                 selection = "pilot";
-                distance = 1.50;
+                distance = 1.5;
                 condition = "";
                 statement = "";
                 exceptions[] = {"isNotSwimming"};
             };
             class ACE_ArmLeft {
                 displayName = CSTRING(ArmLeft);
+                selection = "LWrist";
+                distance = 1.5;
+                condition = "";
+                statement = "";
+                exceptions[] = {"isNotSwimming"};
+            };
+            class ACE_ArmUpperLeft {
+                displayName = CSTRING(ArmUpperLeft);
                 selection = "LeftForeArm";
-                distance = 1.50;
+                distance = 1.5;
                 condition = "";
                 statement = "";
                 exceptions[] = {"isNotSwimming"};
             };
             class ACE_ArmRight {
                 displayName = CSTRING(ArmRight);
+                selection = "RWrist";
+                distance = 1.5;
+                condition = "";
+                statement = "";
+                exceptions[] = {"isNotSwimming"};
+            };
+            class ACE_ArmUpperRight {
+                displayName = CSTRING(ArmUpperRight);
                 selection = "RightForeArm";
-                distance = 1.50;
+                distance = 1.5;
                 condition = "";
                 statement = "";
                 exceptions[] = {"isNotSwimming"};
             };
             class ACE_LegLeft {
                 displayName = CSTRING(LegLeft);
+                selection = "LeftFoot";
+                distance = 1.5;
+                condition = "";
+                statement = "";
+                exceptions[] = {"isNotSwimming"};
+            };
+            class ACE_LegUpperLeft {
+                displayName = CSTRING(LegUpperLeft);
                 selection = "LKnee";
-                distance = 1.50;
+                distance = 1.5;
                 condition = "";
                 statement = "";
                 exceptions[] = {"isNotSwimming"};
             };
             class ACE_LegRight {
                 displayName = CSTRING(LegRight);
+                selection = "RightFoot";
+                distance = 1.5;
+                condition = "";
+                statement = "";
+                exceptions[] = {"isNotSwimming"};
+            };
+            class ACE_LegUpperRight {
+                displayName = CSTRING(LegUpperRight);
                 selection = "RKnee";
-                distance = 1.50;
+                distance = 1.5;
                 condition = "";
                 statement = "";
                 exceptions[] = {"isNotSwimming"};
             };
             class ACE_Weapon {
                 displayName = CSTRING(Weapon);
                 position = QUOTE(call DFUNC(getWeaponPos));
-                distance = 1.50;
+                distance = 1.5;
                 condition = "";
                 statement = "";
                 exceptions[] = {"isNotSwimming"};

addons/interaction/stringtable.xml

@@ -51,6 +51,9 @@
             <Chinese>身體</Chinese>
             <Turkish>Gövde</Turkish>
         </Key>
+        <Key ID="STR_ACE_Interaction_Chest">
+            <English>Chest</English>
+        </Key>
         <Key ID="STR_ACE_Interaction_Head">
             <English>Head</English>
             <French>Tête</French>
@@ -85,6 +88,9 @@
             <Chinese>左手</Chinese>
             <Turkish>Sol Kol</Turkish>
         </Key>
+        <Key ID="STR_ACE_Interaction_ArmUpperLeft">
+            <English>Upper Left Arm</English>
+        </Key>
         <Key ID="STR_ACE_Interaction_ArmRight">
             <English>Right Arm</English>
             <German>Rechter Arm</German>
@@ -102,6 +108,9 @@
             <Chinese>右手</Chinese>
             <Turkish>Sağ Kol</Turkish>
         </Key>
+        <Key ID="STR_ACE_Interaction_ArmUpperRight">
+            <English>Upper Right Arm</English>
+        </Key>
         <Key ID="STR_ACE_Interaction_LegLeft">
             <English>Left Leg</English>
             <German>Linkes Bein</German>
@@ -119,6 +128,9 @@
             <Chinese>左腳</Chinese>
             <Turkish>Sol Bacak</Turkish>
         </Key>
+        <Key ID="STR_ACE_Interaction_LegUpperLeft">
+            <English>Upper Left Leg</English>
+        </Key>
         <Key ID="STR_ACE_Interaction_LegRight">
             <English>Right Leg</English>
             <German>Rechtes Bein</German>
@@ -136,6 +148,9 @@
             <Chinese>右腳</Chinese>
             <Turkish>Sağ Bacak</Turkish>
         </Key>
+        <Key ID="STR_ACE_Interaction_LegUpperRight">
+            <English>Upper Right Leg</English>
+        </Key>
         <Key ID="STR_ACE_Interaction_Weapon">
             <English>Weapon</English>
             <French>Arme</French>

addons/medical/dev/test_hitpointConfigs.sqf

@@ -27,7 +27,7 @@ private _testPass = true;
     private _typeOf = configName _x;
     if (_typeOf == "") then { continue };
     private _hitpoints = (configProperties [_x >> "HitPoints", "isClass _x", true]) apply {toLowerANSI configName _x};
-    private _expectedHitPoints = ["hitleftarm","hitrightarm","hitleftleg","hitrightleg","hithead","hitbody"];
+    private _expectedHitPoints = ["hitleftarm","hitrightarm","hitleftleg","hitrightleg","hitbody","hithead","hitneck","hitabdomen"];
     private _missingHitPoints = _expectedHitPoints select {!(_x in _hitpoints)};
     if (_missingHitPoints isNotEqualTo []) then {
         WARNING_3("%1 missing ace hitpoints: %2 - class hitpoints: %3",_typeOf,_missingHitPoints,_hitpoints);

addons/medical/dev/watchVariable.sqf

@@ -59,7 +59,7 @@ GVAR(dev_watchVariableRunning) = true;
     _return pushBack format [" - [Pain: %1] [Suppress: %2]", _pain toFixed 3, _painSuppress toFixed 3];
 
     // Damage:
-    private _damage = _unit getVariable [QEGVAR(medical,bodyPartDamage), [0,0,0,0,0,0]];
+    private _damage = GET_BODYPART_DAMAGE(unit);
     private _limping = ["", "[<t color ='#FFCC22'> Limping </t>]"] select (_unit getVariable [QEGVAR(medical,isLimping), false]);
     _return pushBack format ["BodyPartDamage: [H: %1] [B: %2]", (_damage select 0) toFixed 2, (_damage select 1) toFixed 2];
     _return pushBack format ["[LA:%1] [RA: %2] [LL:%3] [RL: %4]", (_damage select 2) toFixed 2, (_damage select 3) toFixed 2, (_damage select 4) toFixed 2, (_damage select 5) toFixed 2];

addons/medical/functions/fnc_addDamageToUnit.sqf

@@ -46,22 +46,22 @@ if (!_overrideInvuln && {!((isDamageAllowed _unit) && {_unit getVariable [QEGVAR
 };
 
 // Extension is case sensitive and expects this format (different from ALL_BODY_PARTS)
-_bodyPart = ["Head", "Body", "LeftArm", "RightArm", "LeftLeg", "RightLeg"] select _bodyPartIndex;
+_bodyPart = ["_Head", "_Neck", "_Chest", "_Body", "_LeftArm", "_LeftUpperArm", "_RightArm", "_RightUpperArm", "_LeftLeg", "_LeftUpperLeg", "_RightLeg", "_RightUpperLeg"] select _bodyPartIndex;
 
 if (!isNull _instigator) then {
     _unit setVariable [QEGVAR(medical,lastDamageSource), _instigator];
     _unit setVariable [QEGVAR(medical,lastInstigator), _instigator];
 };
 
 #ifdef DEBUG_TESTRESULTS
-private _startDmg = +(_unit getVariable [QEGVAR(medical,bodyPartDamage), [0,0,0,0,0,0]]);
+private _startDmg = +(GET_BODYPART_DAMAGE(unit) ;);
 private _startPain = GET_PAIN(_unit);
 #endif
 
 [QEGVAR(medical,woundReceived), [_unit, [[_damageToAdd, _bodyPart, _damageToAdd]], _instigator, _typeOfDamage]] call CBA_fnc_localEvent;
 
 #ifdef DEBUG_TESTRESULTS
-private _endDmg = _unit getVariable [QEGVAR(medical,bodyPartDamage), [0,0,0,0,0,0]];
+private _endDmg = GET_BODYPART_DAMAGE(unit);
 private _endPain = GET_PAIN(_unit);
 private _typeOfDamageAdj = _typeOfDamage call EFUNC(medical_damage,getTypeOfDamage);
 private _config = configFile >> "ACE_Medical_Injuries" >> "damageTypes" >> _typeOfDamageAdj;

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, []]
 ];

addons/medical/functions/fnc_serializeState.sqf

@@ -44,7 +44,7 @@ private _state = [] call CBA_fnc_createNamespace;
     [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]]
     // Time needs to be converted
     // [VAR_MEDICATIONS, []]
 ];

addons/medical_damage/functions/fnc_handleIncapacitation.sqf

@@ -18,9 +18,9 @@
 params ["_unit"];
 
 private _painLevel = GET_PAIN_PERCEIVED(_unit);
-private _bodyPartDamage = _unit getVariable [QEGVAR(medical,bodyPartDamage), [0,0,0,0,0,0]];
+private _bodyPartDamage = GET_BODYPART_DAMAGE(unit);
 
-_bodyPartDamage params ["_headDamage", "_bodyDamage"];
+_bodyPartDamage params ["_headDamage", "_neckDamage", "_chestDamage","_bodyDamage"];
 
 // Exclude non penetrating body damage
 {

addons/medical_damage/functions/fnc_woundsHandlerBase.sqf

@@ -35,14 +35,26 @@ private _createdWounds = false;
 private _updateDamageEffects = false;
 private _painLevel = 0;
 private _criticalDamage = false;
-private _bodyPartDamage = _unit getVariable [QEGVAR(medical,bodyPartDamage), [0,0,0,0,0,0]];
+private _bodyPartDamage = GET_BODYPART_DAMAGE(unit);
 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; // 10% chance for neck damage
+        _bodyPart = ["head", "neck"] select (_isNeck);
+    };
+    if (_bodyPart in ["leftarm", "rightarm", "leftleg", "rightleg"]) then {
+    private _isUpper = (random 1) < 0.5;
+    switch (_bodyPart) do {
+        case "leftarm":  { _bodyPart = ["leftarm", "upperleftarm"] select (_isUpper);};
+        case "rightarm": { _bodyPart = ["rightarm", "upperrightarm"] select (_isUpper);};
+        case "leftleg":  { _bodyPart = ["leftleg", "upperleftleg"] select (_isUpper);};
+        case "rightleg": { _bodyPart = ["rightleg", "upperrightleg"] select (_isUpper); };
+        };
+    };
     // silently ignore structural damage
     if (_bodyPart == "#structural") then {continue};
 
@@ -90,7 +102,7 @@ private _bodyPartVisParams = [_unit, false, false, false, false]; // params arra
         private _woundDamage = _dmgPerWound * _dmgMultiplier * random [0.9, 1, 1.1];
 
         _bodyPartDamage set [_bodyPartNToAdd, (_bodyPartDamage select _bodyPartNToAdd) + _woundDamage];
-        _bodyPartVisParams set [[1,2,3,3,4,4] select _bodyPartNToAdd, true]; // Mark the body part index needs updating
+        _bodyPartVisParams set [[1,1,1,2,2,2,3,3,3,4,4,4] select _bodyPartNToAdd, true]; // Mark the body part index needs updating
 
         // Anything above this value is guaranteed worst wound possible
         private _worstDamage = 2;
@@ -116,7 +128,7 @@ private _bodyPartVisParams = [_unit, false, false, false, false]; // params arra
         // Create a new injury. Format [0:classComplex, 1:amountOf, 2:bleedingRate, 3:woundDamage]
         private _injury = [_classComplex, 1, _bleeding, _woundDamage];
 
-        if (_bodyPart isEqualTo "head" || {_bodyPart isEqualTo "body" && {_woundDamage > PENETRATION_THRESHOLD}}) then {
+       if (_bodyPart in ["head", "body", "neck", "chest"] && {_woundDamage > PENETRATION_THRESHOLD}) then {
             _criticalDamage = true;
         };
         if ([_unit, _bodyPartNToAdd, _bodyPartDamage, _woundDamage] call FUNC(determineIfFatal)) then {
@@ -134,7 +146,7 @@ private _bodyPartVisParams = [_unit, false, false, false, false]; // params arra
             case (
                 _causeFracture
                 && {EGVAR(medical,fractures) > 0}
-                && {_bodyPartNToAdd > 1}
+                && {_bodyPartNToAdd > 3}
                 && {_woundDamage > FRACTURE_DAMAGE_THRESHOLD}
                 && {random 1 < (_fractureMultiplier * EGVAR(medical,fractureChance))}
             ): {

addons/medical_engine/functions/fnc_handleDamage.sqf

@@ -28,7 +28,6 @@ if (_structuralDamage) then {
 } else {
     _oldDamage = _unit getHitIndex _hitPointIndex;
 };
-
 // Damage can be disabled with old variable or via sqf command allowDamage
 if !(isDamageAllowed _unit && {_unit getVariable [QEGVAR(medical,allowDamage), true]}) exitWith {_oldDamage};
 
@@ -84,7 +83,7 @@ if (
     // todo: no way to detect if stationary and another vehicle hits you
 ) exitWith {
     TRACE_5("Crash",_unit,_shooter,_instigator,_damage,_newDamage);
-    [QEGVAR(medical,woundReceived), [_unit, [[_newDamage, _hitPoint, _newDamage]], _unit, "vehiclecrash"]] call CBA_fnc_localEvent;
+    [QEGVAR(medical,woundReceived), [_unit, [[_newDamage, _hitpoint, _newDamage]], _unit, "vehiclecrash"]] call CBA_fnc_localEvent;
 
     0
 };
@@ -104,13 +103,13 @@ if (
     _unit setVariable [QEGVAR(medical,lastDamageSource), _shooter];
     _unit setVariable [QEGVAR(medical,lastInstigator), _instigator];
 
-    [QEGVAR(medical,woundReceived), [_unit, [[_newDamage, _hitPoint, _newDamage]], _shooter, "vehiclehit"]] call CBA_fnc_localEvent;
+    [QEGVAR(medical,woundReceived), [_unit, [[_newDamage, _hitpoint, _newDamage]], _shooter, "vehiclehit"]] call CBA_fnc_localEvent;
 
     0
 };
 
 // Damages are stored for last iteration of the HandleDamage event (_context == 2)
-_unit setVariable [format [QGVAR($%1), _hitPoint], [_realDamage, _newDamage]];
+_unit setVariable [format [QGVAR($%1), _hitpoint], [_realDamage, _newDamage]];
 
 // Ref https://community.bistudio.com/wiki/Arma_3:_Event_Handlers#HandleDamage
 // Context 2 means this is the last iteration of HandleDamage, so figure out which hitpoint took the most real damage and send wound event
@@ -124,23 +123,29 @@ if (_context == 2) then {
     // --- Head
     private _damageHead = [
         _unit getVariable [QGVAR($HitFace), [0,0]],
-        _unit getVariable [QGVAR($HitNeck), [0,0]],
         _unit getVariable [QGVAR($HitHead), [0,0]]
     ];
     _damageHead sort false;
     _damageHead = _damageHead select 0;
 
+    // --- Neck
+    private _damageNeck = _unit getVariable [QGVAR($HitNeck), [0,0]];
+
     // --- Body
     private _damageBody = [
         _unit getVariable [QGVAR($HitPelvis), [0,0]],
-        _unit getVariable [QGVAR($HitAbdomen), [0,0]],
-        _unit getVariable [QGVAR($HitDiaphragm), [0,0]],
-        _unit getVariable [QGVAR($HitChest), [0,0]]
-        // HitBody removed as it's a placeholder hitpoint and the high armor value (1000) throws the calculations off
+        _unit getVariable [QGVAR($HitAbdomen), [0,0]]
     ];
     _damageBody sort false;
     _damageBody = _damageBody select 0;
 
+    private _damageChest = [
+        _unit getVariable [QGVAR($HitDiaphragm), [0,0]],
+        _unit getVariable [QGVAR($HitChest), [0,0]]
+    ];
+    _damageChest sort false;
+    _damageChest = _damageChest select 0;
+
     // --- Arms and Legs
     private _damageLeftArm = _unit getVariable [QGVAR($HitLeftArm), [0,0]];
     private _damageRightArm = _unit getVariable [QGVAR($HitRightArm), [0,0]];
@@ -152,6 +157,8 @@ if (_context == 2) then {
     // _realDamage, priority, _newDamage, body part name
     private _allDamages = [
         [_damageHead select 0,       PRIORITY_HEAD,       _damageHead select 1,       "Head"],
+        [_damageNeck select 0,       PRIORITY_NECK,       _damageNeck select 1,       "Neck"],
+        [_damageChest select 0,      PRIORITY_CHEST,      _damageChest select 1,      "Chest"],
         [_damageBody select 0,       PRIORITY_BODY,       _damageBody select 1,       "Body"],
         [_damageLeftArm select 0,    PRIORITY_LEFT_ARM,   _damageLeftArm select 1,    "LeftArm"],
         [_damageRightArm select 0,   PRIORITY_RIGHT_ARM,  _damageRightArm select 1,   "RightArm"],

addons/medical_engine/functions/fnc_updateBodyPartVisuals.sqf

@@ -22,17 +22,17 @@
 params ["_unit", "_updateHead", "_updateBody", "_updateArms", "_updateLegs"];
 TRACE_5("updateBodyPartVisuals",_unit,_updateHead,_updateBody,_updateArms,_updateLegs);
 
-private _bodyPartDamage = _unit getVariable [QEGVAR(medical,bodyPartDamage), [0,0,0,0,0,0]];
+private _bodyPartDamage = GET_BODYPART_DAMAGE(unit);
 
 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);
 };
 if (_updateBody) then {
-    [_unit, "body", (_bodyPartDamage select 1) > VISUAL_BODY_DAMAGE_THRESHOLD] call FUNC(damageBodyPart);
+    [_unit, "body", ((_bodyPartDamage select 2) max (_bodyPartDamage select 3)) > VISUAL_BODY_DAMAGE_THRESHOLD] call FUNC(damageBodyPart);
 };
 if (_updateArms) then {
-    [_unit, "arms", ((_bodyPartDamage select 2) max (_bodyPartDamage select 3)) > VISUAL_BODY_DAMAGE_THRESHOLD] call FUNC(damageBodyPart);
+    [_unit, "arms", (((_bodyPartDamage select 4) max (_bodyPartDamage select 5)) max ((_bodyPartDamage select 6) max (_bodyPartDamage select 7))) > VISUAL_BODY_DAMAGE_THRESHOLD] call FUNC(damageBodyPart);
 };
 if (_updateLegs) then {
-    [_unit, "legs", ((_bodyPartDamage select 4) max (_bodyPartDamage select 5)) > VISUAL_BODY_DAMAGE_THRESHOLD] call FUNC(damageBodyPart);
+    [_unit, "legs", (((_bodyPartDamage select 8) max (_bodyPartDamage select 9)) max ((_bodyPartDamage select 10) max (_bodyPartDamage select 11))) > VISUAL_BODY_DAMAGE_THRESHOLD] call FUNC(damageBodyPart);
 };