Skip to content

Medical - Fix blood spurts from discarded damage #11432

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.

Sign up for GitHub

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

Open
DarkBall123 wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −6
Open

Medical - Fix blood spurts from discarded damage #11432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions addons/medical_blood/functions/fnc_handleWoundReceived.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,26 @@
*
* Arguments:
* 0: Unit <OBJECT>
* 1: Damage done to each body part <ARRAY>
* 1: Damage <NUMBER or ARRAY>
* 2: Shooter <OBJECT>
* 3: Ammo classname or damage type <STRING>
*
* Return Value:
* None
*
* Example:
* [player, "Body", 0.5, badGuy] call ace_medical_blood_fnc_handleWoundReceived
* [player, 0.5, badGuy, "bullet"] call ace_medical_blood_fnc_handleWoundReceived
*
* Public: No
*/

params ["_unit", "_allDamages", "_shooter", "_damageType"];
(_allDamages select 0) params ["_damage"];
params ["_unit", "_damage", "_shooter", "_damageType"];

if (_damage isEqualTo []) exitWith {};

if (_damage isEqualType []) then {
_damage = _damage select 0 select 0;
};

// Don't bleed if damage type does not cause bleeding
if (_damageType in (uiNamespace getVariable QGVAR(noBloodDamageTypes))) exitWith {};
Expand Down
9 changes: 7 additions & 2 deletions addons/medical_blood/functions/fnc_init.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@

params ["_mode"];

private _woundEvent = [
QEGVAR(medical,woundReceived),
QEGVAR(medical,woundProcessed)
] select isClass (configFile >> "CfgPatches" >> "ace_medical_damage");

@DartRuffian DartRuffian Jul 20, 2026 •
edited by johnb432
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Will eventually be used to toggle ace medical via setting if possible, currently always set to true by ace_medical_engine if loaded

Suggested change
] select isClass (configFile >> "CfgPatches" >> "ace_medical_damage");
] select (missionNamespace getVariable [QEGVAR(medical,enabled), false]);

@PabstMirror PabstMirror Jul 20, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

we could just have m_blood require m_damage?

@LinkIsGrim LinkIsGrim Aug 7, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think the idea was to have m_blood not require it at some point so it could be used for just blood spurts with vanilla damage handling?


// Exit if setting is refreshed to the same value
if (!isNil QGVAR(currentSetup) && {_mode == GVAR(currentSetup)}) exitWith {
TRACE_2("Setting refreshed to current setup",GVAR(currentSetup),_mode);
Expand All @@ -34,7 +39,7 @@ if (!isNil QGVAR(stateMachine)) then {

// Remove wound received if it was previously added
if (!isNil QGVAR(woundReceivedEH)) then {
[QEGVAR(medical,woundReceived), GVAR(woundReceivedEH)] call CBA_fnc_removeEventHandler;
[_woundEvent, GVAR(woundReceivedEH)] call CBA_fnc_removeEventHandler;
GVAR(woundReceivedEH) = nil;
};

Expand All @@ -60,6 +65,6 @@ private _listCode = if (_mode == BLOOD_ONLY_PLAYERS) then {
GVAR(stateMachine) = [_listCode, true] call CBA_statemachine_fnc_create;
[GVAR(stateMachine), LINKFUNC(onBleeding), {}, {}, "Bleeding"] call CBA_statemachine_fnc_addState;

GVAR(woundReceivedEH) = [QEGVAR(medical,woundReceived), LINKFUNC(handleWoundReceived)] call CBA_fnc_addEventHandler;
GVAR(woundReceivedEH) = [_woundEvent, LINKFUNC(handleWoundReceived)] call CBA_fnc_addEventHandler;

TRACE_3("Set up state machine and wounds event",_mode,GVAR(stateMachine),GVAR(woundReceivedEH));
10 changes: 10 additions & 0 deletions addons/medical_damage/functions/fnc_woundReceived.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ if !(_typeOfDamage in GVAR(damageTypeDetails)) exitWith {};
(GVAR(damageTypeDetails) get _typeOfDamage) params ["", "", "_woundHandlers"];
if (_woundHandlers isEqualTo []) exitWith {};

private _oldBodyPartDamage = +GET_BODYPART_DAMAGE(_unit);
private _damageData = [_unit, _allDamages, _typeOfDamage, _ammo];
private _originalCount = count _damageData;
private _lastHandlerName = _woundHandlers select -1 select 0; // will usually be ace_medical_damage_woundsHandlerBase
Expand All @@ -53,3 +54,12 @@ private _lastHandlerName = _woundHandlers select -1 select 0; // will usually be
break;
};
} forEach _woundHandlers;

private _damage = 0;
{
_damage = _damage max (_x - (_oldBodyPartDamage select _forEachIndex));
} forEach GET_BODYPART_DAMAGE(_unit);

if (_damage > 0) then {
[QEGVAR(medical,woundProcessed), [_unit, _damage, _shooter, _typeOfDamage]] call CBA_fnc_localEvent;
};