Merge pull request #243 from BlueTheKing/dev

Fix internal bleeding, fix no sound playing when treating, fix pneumothoraxDamageThreshold being ignored
KAT-Advanced-Medical · Feb 5, 2023 · ebdde10 · ebdde10
2 parents 93fd8a5 + fcebc8c
commit ebdde10
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/addons/breathing/XEH_preInit.sqf b/addons/breathing/XEH_preInit.sqf
@@ -185,7 +185,7 @@ PREP_RECOMPILE_END;
     "SLIDER",
     [LLSTRING(PNEUMOTHORAX_DAMAGE_THRESHOLD), LLSTRING(PNEUMOTHORAX_DAMAGE_THRESHOLD_DESCRIPTION)],
     [CBA_SETTINGS_CAT, LSTRING(SubCategory_ThoraxInjuries)],
-    [0, 1, 0.4, 1],
+    [0, 1, 0.4, 2],
     true
 ] call CBA_Settings_fnc_init;
 

diff --git a/addons/breathing/functions/fnc_handlePulmoHit.sqf b/addons/breathing/functions/fnc_handlePulmoHit.sqf
@@ -25,7 +25,7 @@
 
 if (!(GVAR(enable)) || !(_bodyPart isEqualTo "Body") || !(_ammo isKindOF "BulletBase")) exitWith {};
 //Other mods can utilise KAT_Pneumothorax_Exclusion variable to prevent Pneumothorax from happening
-if ((_damage < GVAR(pneumothoraxDamageThreshold)) || (GVAR(pneumothorax) isEqualTo 0) || (_unit getVariable ["KAT_Pneumothorax_Exclusion", false])) exitWith {};
+if ((_damage < GVAR(pneumothoraxDamageThreshold)) || (_unit getVariable ["KAT_Pneumothorax_Exclusion", false])) exitWith {};
 
 private _hemo = _unit getVariable [QGVAR(hemopneumothorax), false];
 private _tension = _unit getVariable [QGVAR(tensionpneumothorax), false];

diff --git a/addons/breathing/functions/fnc_treatmentAdvanced_hemopneumothoraxLocal.sqf b/addons/breathing/functions/fnc_treatmentAdvanced_hemopneumothoraxLocal.sqf
@@ -22,6 +22,7 @@ params ["_medic", "_patient"];
 if !(GVAR(tensionhemothorax_hardcore)) exitWith {
     if ((_patient getVariable [QGVAR(hemopneumothorax), false]) && {_patient getVariable [QGVAR(activeChestSeal), false]}) then {
         _patient setVariable [QGVAR(hemopneumothorax), false, true];
+        [_patient] call EFUNC(circulation,updateInternalBleeding);
         if (!(_patient getVariable [QGVAR(pneumothorax), false]) && {!(_patient getVariable [QGVAR(hemopneumothorax), false]) && {!(_patient getVariable [QGVAR(tensionpneumothorax), false])}}) then {
             _patient setVariable [QGVAR(activeChestSeal), false, true];
         };

diff --git a/addons/circulation/functions/fnc_treatment.sqf b/addons/circulation/functions/fnc_treatment.sqf
@@ -153,7 +153,7 @@ if (vehicle _medic == _medic && {_medicAnim != ""}) then {
 
 // Play a random treatment sound globally if defined
 // Don't attempt to play if sounds array is empty
-if (isArray (_config >> "sounds") && count (_config >> "sounds") != 0) then {
+if (isArray (_config >> "sounds") && count getArray (_config >> "sounds") != 0) then {
     selectRandom getArray (_config >> "sounds") params ["_file", ["_volume", 1], ["_pitch", 1], ["_distance", 10]];
     playSound3D [_file, objNull, false, getPosASL _medic, _volume, _pitch, _distance];
 };

diff --git a/addons/circulation/functions/fnc_updateInternalBleeding.sqf b/addons/circulation/functions/fnc_updateInternalBleeding.sqf
@@ -17,10 +17,12 @@
 
 params ["_unit"];
 
+private _cardiacOutput = [_unit] call ACEFUNC(medical_status,getCardiacOutput);
+private _alphaAction = _unit getVariable [QGVAR(alphaAction), 1];
 private _internalBleeding = 0;
 
 if (_unit getVariable [QEGVAR(breathing,hemopneumothorax), false]) then {
     _internalBleeding = _internalBleeding + EGVAR(breathing,HPTXBleedAmount);
 };
 
-_unit setVariable [VAR_INTERNAL_BLEEDING, _internalBleeding, true];
+_unit setVariable [VAR_INTERNAL_BLEEDING, _internalBleeding * (_cardiacOutput max 0.05) * ACEGVAR(medical,bleedingCoefficient) * _alphaAction, true];
diff --git a/addons/pharma/functions/fnc_getBloodLoss.sqf b/addons/pharma/functions/fnc_getBloodLoss.sqf
@@ -18,11 +18,10 @@
 params ["_unit"];
 
 private _woundBleeding = GET_WOUND_BLEEDING(_unit);
-private _internalBleeding = GET_INTERNAL_BLEEDING(_unit);
-if (_woundBleeding + _internalBleeding == 0) exitWith {0};
+if (_woundBleeding == 0) exitWith {0};
 
 private _cardiacOutput = [_unit] call ACEFUNC(medical_status,getCardiacOutput);
 private _alphaAction = _unit getVariable [QGVAR(alphaAction), 1];
 
 // even if heart stops blood will still flow slowly (gravity)
-((_woundBleeding + _internalBleeding) * (_cardiacOutput max 0.05) * ACEGVAR(medical,bleedingCoefficient) * _alphaAction)
+(_woundBleeding * (_cardiacOutput max 0.05) * ACEGVAR(medical,bleedingCoefficient) * _alphaAction)
diff --git a/addons/pharma/functions/fnc_getBloodVolumeChange.sqf b/addons/pharma/functions/fnc_getBloodVolumeChange.sqf
@@ -20,7 +20,8 @@
 params ["_unit", "_deltaT", "_syncValues"];
 
 private _bloodLoss = [_unit] call EFUNC(pharma,getBloodLoss);
-private _bloodVolumeChange = -_deltaT * _bloodLoss;
+private _internalBleeding = GET_INTERNAL_BLEEDING(_unit);
+private _bloodVolumeChange = -_deltaT * (_bloodLoss + _internalBleeding);
 
 if (!isNil {_unit getVariable [QACEGVAR(medical,ivBags),[]]}) then {
     private _bloodBags = _unit getVariable [QACEGVAR(medical,ivBags), []];