Skip to content

Add bleedout timer recovery #78

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

Draft
amsteadrayle wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Add bleedout timer recovery #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b781a14
Add initial hard-coded bleedout timer regen
amsteadrayle May 28, 2022
e48f9b4
Add bleedout regen coeff and toggle to settings
amsteadrayle May 28, 2022
52bfe39
Update addons/main/functions/fnc_regenBleedout.sqf
amsteadrayle May 28, 2022
0c8cdd2
Move prep into else of if statement
amsteadrayle May 28, 2022
60e2fdc
Remove macros
amsteadrayle May 28, 2022
34720ea
Move block comment to below `#include`
amsteadrayle May 28, 2022
51a0a66
Only start calling function if enabled
amsteadrayle Jun 11, 2022
dc67ca6
Add missed semicolons and parentheses
amsteadrayle Jun 11, 2022
82ab5a8
Move initial call behind ace medical check
amsteadrayle Jun 11, 2022
ca44907
Switch to on-demand calculation of regen
amsteadrayle Jun 11, 2022
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
14 changes: 7 additions & 7 deletions addons/main/XEH_postInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ if (GVAR(aceMedicalLoaded)) then {
_unit setVariable [QGVAR(bleedoutKillTime), _recovered, true];
};
_unit setVariable [QGVAR(holdLimiter), false, true];
}, _unit, 3] call CBA_fnc_waitAndExecute;
}, _unit, 3] call CBA_fnc_waitAndExecute;
};
}] call CBA_fnc_addEventHandler;
};
Expand Down Expand Up @@ -360,7 +360,7 @@ if !(GVAR(aceMedicalLoaded)) then {
{}, [], [0,0,0], 5,[false,true,false,false,false]
] call ace_interact_menu_fnc_createAction;
["CAManBase", 0, ["ACE_MainActions"], _action, true] call ace_interact_menu_fnc_addActionToClass;

if (GVAR(bleedoutStop) > 0) then {
private _action = ["apsPreventBleed", LLSTRING(pressureWound), "\a3\ui_f\data\IGUI\Cfg\Cursors\unitBleeding_ca.paa",
{
Expand All @@ -377,12 +377,12 @@ if !(GVAR(aceMedicalLoaded)) then {
};
};
_target setVariable [QGVAR(isHold), true, true];
_target setVariable [QGVAR(holdingUnit), _player, true];
_target setVariable [QGVAR(holdingUnit), _player, true];

[21.5, [_target,_player], { // complete
params ["_args"];
_args params ["_target", "_caller"];
if (isNull objectParent _caller) then {
if (isNull objectParent _caller) then {
private _anim = ["amovpknlmstpsloww[wpn]dnon", "amovppnemstpsrasw[wpn]dnon"] select (_caller getVariable [QGVAR(wasProne), false]);
private _wpn = ["non", "rfl", "lnr", "pst"] param [["", primaryWeapon _caller, secondaryWeapon _caller, handgunWeapon _caller] find currentWeapon _caller, "non"];
_anim = [_anim, "[wpn]", _wpn] call CBA_fnc_replace;
Expand All @@ -393,14 +393,14 @@ if !(GVAR(aceMedicalLoaded)) then {
}, {// fail
params ["_args"];
_args params ["_target", "_caller"];
if (isNull objectParent _caller) then {
if (isNull objectParent _caller) then {
private _anim = ["amovpknlmstpsloww[wpn]dnon", "amovppnemstpsrasw[wpn]dnon"] select (_caller getVariable [QGVAR(wasProne), false]);
private _wpn = ["non", "rfl", "lnr", "pst"] param [["", primaryWeapon _caller, secondaryWeapon _caller, handgunWeapon _caller] find currentWeapon _caller, "non"];
_anim = [_anim, "[wpn]", _wpn] call CBA_fnc_replace;
[QGVAR(switchMove), [_caller, _anim]] call CBA_fnc_globalEvent;
};
_target setVariable [QGVAR(isHold), nil, true];
_target setVariable [QGVAR(holdingUnit), nil, true];
_target setVariable [QGVAR(holdingUnit), nil, true];
}, format [LLSTRING(pressureUnit), name _target], // title
{ // pfh
params ["_args"];
Expand Down
4 changes: 4 additions & 0 deletions addons/main/functions/fnc_setUnconscious.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ if (_set) then {
};
GVAR(bleedOutTimeMalus) = GVAR(bleedOutTimeMalus) + GVAR(bleedoutTimeSubtraction);
_restBleedout = (GVAR(bleedoutTime) - GVAR(bleedOutTimeMalus)) max GVAR(minBleedoutTime);

// For coeff == 1, 1 second regenerated per duration of bleedout timer. coeff == 0 is no regeneration.
private _regen = round(sqrt(2*GVAR(bleedoutRegenCoeff)*(cba_missionTime - _downTime) + _restBleedout^2) - _restBleedout);
_restBleedout = (_restBleedout + _regen) min GVAR(bleedoutTime);
};
_unit setVariable [QGVAR(bleedoutKillTime), _downTime + _restBleedout, true];
} else {
Expand Down
13 changes: 13 additions & 0 deletions addons/main/initSettings.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,19 @@ _category = [_header, LLSTRING(subCategoryGeneral)];
}
] call CBA_fnc_addSetting;

[
QGVAR(bleedoutRegenCoeff),
"SLIDER",
[LLSTRING(bleedoutRegenCoeff), LLSTRING(bleedoutRegenCoeff_desc)],
_category,
[0.0, 10, 0.0, 1],
true,
{
params ["_value"];
GVAR(bleedoutRegenCoeff) = (parseNumber (_value toFixed 1));
}
] call CBA_fnc_addSetting;

[
QGVAR(medicReviveTime),
"SLIDER",
Expand Down
6 changes: 6 additions & 0 deletions addons/main/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,12 @@
<Key ID="STR_diw_armor_plates_main_pressureUnit">
<English>Preventing %1 from bleeding out, keep holding the button!</English>
</Key>
<Key ID="STR_diw_armor_plates_main_bleedoutRegenCoeff">
<English>Bleedout timer recovery coefficient</English>
</Key>
<Key ID="STR_diw_armor_plates_main_bleedoutRegenCoeff_desc">
<English>Speed of bleedout timer recovery. Zero is disabled, higher is faster. Approximately how many seconds recovered per bleedout timer duration. (default: 0).</English>
</Key>
<Key ID="STR_diw_armor_plates_main_medicReviveTime">
<English>Medic revive time</English>
<Polish>Czas leczenia przez medyka</Polish>
Expand Down