Skip to content
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

Ace medical update #517

Merged
merged 10 commits into from
Jan 19, 2020
Merged

Ace medical update #517

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
631e8d6
Update ACE medical function name in ModuleACEHeal
DeliciousJaffa Jan 3, 2020
46d59c5
Update ACE medical function name in ModuleACEImmersiveHeal
DeliciousJaffa Jan 3, 2020
866e49d
Remove deprecated function from setACEInjury
DeliciousJaffa Jan 3, 2020
47c71c2
fn_ModuleACEHeal.sqf back-compat
DeliciousJaffa Jan 12, 2020
0d16441
fn_ModuleACEImmersiveHeal back-compat
DeliciousJaffa Jan 12, 2020
11cfcbc
fn_setACEInjury back-compat
DeliciousJaffa Jan 12, 2020
35a8514
Fix vars
DeliciousJaffa Jan 12, 2020
1c42a37
Fix var
DeliciousJaffa Jan 12, 2020
fbb741f
Removed duplicate code by extracting code
CreepPork Jan 15, 2020
7a755a0
Merge branch 'master' into ACE_Medical_Update
Kexanone Jan 19, 2020
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
1 change: 1 addition & 0 deletions @AresModAchillesExpansion/addons/functions_f_achilles/cfgFunctions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class CfgFunctions
class vectDirUpFromDirPitchBank;
class arrayStdDev;
class transferOwnership;
class getAceMedicalFunction;
};

class interpolation
Expand Down
23 changes: 23 additions & 0 deletions ...hillesExpansion/addons/functions_f_achilles/functions/common/fn_getAceMedicalFunction.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Author: DeliciousJaffa
* Determines what function we need to call (are we ACE v3.13+? (medical rewrite)).
*
* Arguments:
* None
*
* Return Value:
* Return Value <CODE>
*
* Example:
* [] call Achilles_fnc_getAceMedicalFunction
*
* Public: No
*/

private _function = switch (true) do {
case (!isNil "ace_medical_treatment_fnc_fullHeal"): {ace_medical_treatment_fnc_fullHeal};
case (!isNil "ace_medical_fnc_treatmentAdvanced_fullHeal"): {ace_medical_fnc_treatmentAdvanced_fullHeal};
default {{}};
};

_function
5 changes: 4 additions & 1 deletion @AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_setACEInjury.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@

params ["_unit","_injury_type","_injury_value_list","_hits"];

[_unit] call ace_medical_fnc_addVitalLoop;
// Add vital loop if ace medical is pre-rewrite
if (!isNil "ace_medical_fnc_treatmentAdvanced_fullHeal") then {
[_unit] call ace_medical_fnc_addVitalLoop;
};

{
private _value = _injury_value_list select _forEachIndex;
Expand Down
9 changes: 2 additions & 7 deletions @AresModAchillesExpansion/addons/modules_f_achilles/ACE/functions/fn_ModuleACEHeal.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,8 @@ if (isClass (configfile >> "CfgPatches" >> "ace_medical")) exitWith
if (_selected_units isEqualTo []) exitWith {};

{
if (local _x) then
{
[_x, _x] call ace_medical_fnc_treatmentAdvanced_fullHealLocal
} else
{
[_x, _x] remoteExecCall ["ace_medical_fnc_treatmentAdvanced_fullHealLocal", _x]
};
// Let ace handle propagating the heal (through CBA_fnc_targetEvent)
[player, _x] call (call Achilles_fnc_getAceMedicalFunction);
} forEach _selected_units;
};

Expand Down
9 changes: 2 additions & 7 deletions ...odAchillesExpansion/addons/modules_f_achilles/ACE/functions/fn_ModuleACEImmersiveHeal.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,8 @@ private _fnc_reviveUnit = {
// do the actual revive
if (isClass (configfile >> "CfgPatches" >> "ace_medical")) then
{
if (local _player) then
{
[_player, _player] call ace_medical_fnc_treatmentAdvanced_fullHealLocal
} else
{
[_player, _player] remoteExecCall ["ace_medical_fnc_treatmentAdvanced_fullHealLocal", _player]
};
// Let ace handle propagating the heal (through CBA_fnc_targetEvent)
[_ai, _player] call (call Achilles_fnc_getAceMedicalFunction);
};

if (!isNil "FAR_ReviveMode") then
Expand Down