From 5c89232306c0dab657356e885ff15b9f1dc2c654 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 12:59:40 +0100 Subject: [PATCH 01/30] Removed cardiac arrest check --- addons/medical/functions/fnc_getCardiacOutput.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/medical/functions/fnc_getCardiacOutput.sqf b/addons/medical/functions/fnc_getCardiacOutput.sqf index 9804520d9f..4c2edc3dff 100644 --- a/addons/medical/functions/fnc_getCardiacOutput.sqf +++ b/addons/medical/functions/fnc_getCardiacOutput.sqf @@ -23,8 +23,6 @@ params ["_unit"]; -if (_unit getVariable [QGVAR(inCardiacArrest), false]) exitWith { 0 }; - private _bloodVolume = ((_unit getVariable [QGVAR(bloodVolume), DEFAULT_BLOOD_VOLUME]) / DEFAULT_BLOOD_VOLUME) * 100; private _heartRate = _unit getVariable [QGVAR(heartRate), DEFAULT_HEART_RATE]; private _cardiacOutput = ((_bloodVolume / MODIFIER_CARDIAC_OUTPUT) + ((_heartRate / DEFAULT_HEART_RATE) - 1)) / 60; From 0d329e0f63d54a1a397d42c7c3959abc4dac2dfa Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:03:19 +0100 Subject: [PATCH 02/30] Added startCallback config entry --- .../ACE_Medical_Treatment_Actions.hpp | 1 + .../medical_treatment/functions/fnc_treatment.sqf | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp index 45e01cbe4f..a092a9fff7 100644 --- a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp +++ b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp @@ -252,6 +252,7 @@ class GVAR(Actions) { callbackSuccess = QFUNC(treatmentCPR); callbackFailure = ""; callbackProgress = QUOTE(!([(_this select 0) select 1] call EFUNC(common,isAwake))); + callbackStart = ""; animationPatient = ""; animationPatientUnconscious = "AinjPpneMstpSnonWrflDnon_rolltoback"; animationCaller = "AinvPknlMstpSlayW[wpn]Dnon_medic"; diff --git a/addons/medical_treatment/functions/fnc_treatment.sqf b/addons/medical_treatment/functions/fnc_treatment.sqf index cdb170c7ad..fdefeed292 100644 --- a/addons/medical_treatment/functions/fnc_treatment.sqf +++ b/addons/medical_treatment/functions/fnc_treatment.sqf @@ -179,6 +179,19 @@ if (isArray (_config >> "sounds")) then { ]; }; +private _startCallback = getText (_config >> "callbackStart"); +if (isNil _startCallback) then { + _startCallback = compile _startCallback; +} else { + _startCallback = missionNamespace getVariable _startCallback; +}; + +if !(_startCallback isEqualType {}) then { + _startCallback = {TRACE_1("startCallback was NOT code",_startCallback)}; +}; + +[_caller, _target, _bodyPart, _className, _items, _usersOfItems] call _startCallback; + // start treatment [ _treatmentTime, From c1238501d358cc59739db976674dc66d6d52cb56 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:14:38 +0100 Subject: [PATCH 03/30] Added CPRcreatePulse setting --- addons/medical_treatment/ACE_Settings.hpp | 7 +++++++ addons/medical_treatment/stringtable.xml | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/addons/medical_treatment/ACE_Settings.hpp b/addons/medical_treatment/ACE_Settings.hpp index 0767cfb9d1..2fce6faa6b 100644 --- a/addons/medical_treatment/ACE_Settings.hpp +++ b/addons/medical_treatment/ACE_Settings.hpp @@ -23,4 +23,11 @@ class ACE_Settings { typeName = "SCALAR"; value = 0; }; + class EGVAR(medical,CPRcreatesPulse) { + category = ECSTRING(medical,Category_Medical); + displayName = CSTRING(CPRcreatesPulse); + description = CSTRING(CPRcreatesPulse_Description); + typeName = "BOOL"; + value = 1; + }; }; diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml index 6c665e0ba6..085bdd2e0b 100644 --- a/addons/medical_treatment/stringtable.xml +++ b/addons/medical_treatment/stringtable.xml @@ -27,6 +27,14 @@ Abilita la creazione della barella dopo trattamento 治療を始めると、医療廃棄物の作成を有効化する + + CPR creates pulse + HLW erzeugt einen Puls + + + CPR will create a pulse for the patient while performing + HLW erzeugt während der Behandlung beim Patienten einen Puls + Litter Simulation Detail Detale zużytych medykamentów From 477496e4f699a782aec511ca8ab2e20505ceaac7 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:15:17 +0100 Subject: [PATCH 04/30] Added cpr start callback and function --- .../ACE_Medical_Treatment_Actions.hpp | 2 +- .../functions/fnc_treatmentCPR_start.sqf | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf diff --git a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp index a092a9fff7..9435283c4d 100644 --- a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp +++ b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp @@ -252,7 +252,7 @@ class GVAR(Actions) { callbackSuccess = QFUNC(treatmentCPR); callbackFailure = ""; callbackProgress = QUOTE(!([(_this select 0) select 1] call EFUNC(common,isAwake))); - callbackStart = ""; + callbackStart = QFUNC(treatmentCPR_start); animationPatient = ""; animationPatientUnconscious = "AinjPpneMstpSnonWrflDnon_rolltoback"; animationCaller = "AinvPknlMstpSlayW[wpn]Dnon_medic"; diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf new file mode 100644 index 0000000000..3ea1966dae --- /dev/null +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf @@ -0,0 +1,18 @@ +/* + * Author: Zakant + * Handels the start of the CPR treatment. + * + * Return Value: + * NONE + * + * Public: No + */ +#include "script_component.hpp" +params ["_caller", "_target", "_selectionName", "_className", "_items"]; + +_target setVariable [QGVAR(receiveCPR), true, true]; // Target receives CPR +if(EGVAR(medical,CPRcreatesPulse)) then { + _target setVariable [QEGVAR(medical,heartRate), round (30 + random [-5, 0, 5]) , true]; // And we have a (random) pulse +}; + +_target setVariable [QEGVAR(medical,lastTimeUpdated), CBA_missionTime, true]; From 5714374a9995e2c0523219a502f01b745648fdaf Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:17:04 +0100 Subject: [PATCH 05/30] Added function to PREP --- addons/medical_treatment/XEH_PREP.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/medical_treatment/XEH_PREP.hpp b/addons/medical_treatment/XEH_PREP.hpp index cbbfda23cf..f1b80d9e40 100644 --- a/addons/medical_treatment/XEH_PREP.hpp +++ b/addons/medical_treatment/XEH_PREP.hpp @@ -21,6 +21,7 @@ PREP(treatmentBandage); PREP(treatmentBandageLocal); PREP(treatmentCPR); PREP(treatmentCPRLocal); +PREP(treatmentCPR_start); PREP(treatmentFullHeal); PREP(treatmentFullHealLocal); PREP(treatmentIV); From 0cad7d0da631a5d287c0644db3775c342e5fd8ab Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:19:25 +0100 Subject: [PATCH 06/30] Fixed arguments and function header --- .../medical_treatment/functions/fnc_treatmentCPR_start.sqf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf index 3ea1966dae..f6ba840ba7 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf @@ -2,13 +2,17 @@ * Author: Zakant * Handels the start of the CPR treatment. * + * Arguments: + * 0: The medic + * 1: The patient + * * Return Value: * NONE * * Public: No */ #include "script_component.hpp" -params ["_caller", "_target", "_selectionName", "_className", "_items"]; +params ["_caller", "_target"]; _target setVariable [QGVAR(receiveCPR), true, true]; // Target receives CPR if(EGVAR(medical,CPRcreatesPulse)) then { From b1dc4e0c52542fa8b1fc6eae2ae207cb9cf7f89e Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:21:36 +0100 Subject: [PATCH 07/30] Added progress function, reorganized PREPs --- addons/medical_treatment/XEH_PREP.hpp | 3 ++- .../functions/fnc_treatmentCPR_progress.sqf | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf diff --git a/addons/medical_treatment/XEH_PREP.hpp b/addons/medical_treatment/XEH_PREP.hpp index f1b80d9e40..415f42bd79 100644 --- a/addons/medical_treatment/XEH_PREP.hpp +++ b/addons/medical_treatment/XEH_PREP.hpp @@ -19,9 +19,10 @@ PREP(treatment_success); PREP(treatmentBandage); PREP(treatmentBandageLocal); +PREP(fnc_treatmentCPR_progress); +PREP(treatmentCPR_start); PREP(treatmentCPR); PREP(treatmentCPRLocal); -PREP(treatmentCPR_start); PREP(treatmentFullHeal); PREP(treatmentFullHealLocal); PREP(treatmentIV); diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf new file mode 100644 index 0000000000..2b8136eb20 --- /dev/null +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf @@ -0,0 +1,17 @@ +/* + * Author: Zakant + * Handels the progress of the CPR treatment. + * + * Arguments: + * 0: Arguments + * 0: Caller + * 1: Target + * 1: Elapsed Time + * 2: Total Time + * + * Return Value: + * Treatment may continue + * + * Public: No + */ +#include "script_component.hpp" From d9aab91f9757e471229ec844236ea7650f41bbd4 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:26:06 +0100 Subject: [PATCH 08/30] Implemented cpr progress function --- .../functions/fnc_treatmentCPR_progress.sqf | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf index 2b8136eb20..69c9a0d9fd 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf @@ -15,3 +15,13 @@ * Public: No */ #include "script_component.hpp" +params ["_args", "_elapsedTime", "_totalTime"]; +_args params ["_caller", "_target"]; + +// If the patient awakes my mysterious force, no cpr is needed! +if(_target call EFUNC(common,isAwake)) exitWith {false}; +if(!(_target getVariable [QEGVAR(medical,inCardiacArrest), false])) exitWith {false}; + +[_target] call FUNC(calculateBlood); // Calculate blood volume. If their is no pulse, nothing happens! + +(alive _target) // CPR may only proceed if the patient is not dead From a570a6862c32b1255e7ec93fcb64b82599e151d4 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:28:01 +0100 Subject: [PATCH 09/30] Modified CPR success to work with pulse --- addons/medical_treatment/functions/fnc_treatmentCPR.sqf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR.sqf index 0cfb3bddc8..570878c4f2 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR.sqf @@ -18,6 +18,10 @@ params ["_caller", "_target", "_selectionName", "_className", "_items"]; +_target setVariable [QEGVAR(medical,heartRate), 0, true]; +_target setVariable [QGVAR(receiveCPR), false, true]; // CPR finished +[_target] call FUNC(calculateBlood); + if (alive _target && {_target getVariable [QEGVAR(medical,inCardiacArrest), false]}) then { [_target, "activity_view", ELSTRING(medical,Activity_cpr), [[_caller, false, true] call EFUNC(common,getName)]] call FUNC(addToLog); From d815bd8bdc8cf9a5b4a18803683a9a66d68715ec Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:30:40 +0100 Subject: [PATCH 10/30] Added cpr failure function and fixed PREP mistake --- addons/medical_treatment/XEH_PREP.hpp | 3 ++- .../functions/fnc_treatmentCPR_failure.sqf | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf diff --git a/addons/medical_treatment/XEH_PREP.hpp b/addons/medical_treatment/XEH_PREP.hpp index 415f42bd79..9d779d3154 100644 --- a/addons/medical_treatment/XEH_PREP.hpp +++ b/addons/medical_treatment/XEH_PREP.hpp @@ -19,7 +19,8 @@ PREP(treatment_success); PREP(treatmentBandage); PREP(treatmentBandageLocal); -PREP(fnc_treatmentCPR_progress); +PREP(treatmentCPR_failure); +PREP(treatmentCPR_progress); PREP(treatmentCPR_start); PREP(treatmentCPR); PREP(treatmentCPRLocal); diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf new file mode 100644 index 0000000000..d7a78b7468 --- /dev/null +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf @@ -0,0 +1,15 @@ +/* + * Author: Zakant + * Handels the failure of the CPR treatment. + * + * Arguments: + * 0: The medic + * 1: The patient + * + * Return Value: + * NONE + * + * Public: No + */ +#include "script_component.hpp" +params ["_caller", "_target"]; From 918a62ebce87b201c266a7a26b83dad74d4f0dcf Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:32:14 +0100 Subject: [PATCH 11/30] Implemented cpr failure function --- .../functions/fnc_treatmentCPR_failure.sqf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf index d7a78b7468..a702021384 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf @@ -13,3 +13,9 @@ */ #include "script_component.hpp" params ["_caller", "_target"]; + +if(!(_target call EFUNC(common,isAwake)) || {_target getVariable [QEGVAR(medical,inCardiacArrest), false]) then { + _target setVariable [QEGVAR(medical,heartRate), 0, true]; +}; +_target setVariable [QGVAR(receiveCPR), false, true]; +[_target] call FUNC(calculateBlood); From c790d0eb3e078d70d5c5fe7d755f2cdcd255bb75 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:32:49 +0100 Subject: [PATCH 12/30] Added failure callback --- addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp index 9435283c4d..daf5299ab8 100644 --- a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp +++ b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp @@ -250,7 +250,7 @@ class GVAR(Actions) { items[] = {}; condition = QUOTE(!(_target call EFUNC(common,isAwake))); callbackSuccess = QFUNC(treatmentCPR); - callbackFailure = ""; + callbackFailure = QFUNC(treatmentCPR_failure); callbackProgress = QUOTE(!([(_this select 0) select 1] call EFUNC(common,isAwake))); callbackStart = QFUNC(treatmentCPR_start); animationPatient = ""; From 86bf9f4262d43294ab138f775c280aca9e5a2354 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:34:25 +0100 Subject: [PATCH 13/30] Fixed progress callback --- addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp index daf5299ab8..c52e70aca0 100644 --- a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp +++ b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp @@ -251,7 +251,7 @@ class GVAR(Actions) { condition = QUOTE(!(_target call EFUNC(common,isAwake))); callbackSuccess = QFUNC(treatmentCPR); callbackFailure = QFUNC(treatmentCPR_failure); - callbackProgress = QUOTE(!([(_this select 0) select 1] call EFUNC(common,isAwake))); + callbackProgress = QFUNC(treatmentCPR_progress); callbackStart = QFUNC(treatmentCPR_start); animationPatient = ""; animationPatientUnconscious = "AinjPpneMstpSnonWrflDnon_rolltoback"; From 59c4485ef9439e8c3019b75304693a2b9a5862f3 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:36:57 +0100 Subject: [PATCH 14/30] Only create pulse if their isn't any --- addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf index f6ba840ba7..8d77bb9190 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf @@ -15,7 +15,7 @@ params ["_caller", "_target"]; _target setVariable [QGVAR(receiveCPR), true, true]; // Target receives CPR -if(EGVAR(medical,CPRcreatesPulse)) then { +if(EGVAR(medical,CPRcreatesPulse) && {_target getVariable [QEGVAR(medical,heartRate), 80] == 0}) then { _target setVariable [QEGVAR(medical,heartRate), round (30 + random [-5, 0, 5]) , true]; // And we have a (random) pulse }; From 58ed8a6c8194c0bd4d75041f373da7f3edcae95f Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 13:41:49 +0100 Subject: [PATCH 15/30] Modified cpr condition --- addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp index c52e70aca0..58d86e2274 100644 --- a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp +++ b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp @@ -248,7 +248,7 @@ class GVAR(Actions) { requiredMedic = 0; treatmentTime = 15; items[] = {}; - condition = QUOTE(!(_target call EFUNC(common,isAwake))); + condition = QUOTE(!(_target call EFUNC(common,isAwake)) && {!(_target getVariable [QQGVAR(receiveCPR),false])}); callbackSuccess = QFUNC(treatmentCPR); callbackFailure = QFUNC(treatmentCPR_failure); callbackProgress = QFUNC(treatmentCPR_progress); From f1fbf6a8ebe09cfd166e5995271adf61b8d38596 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 14:00:55 +0100 Subject: [PATCH 16/30] Removed legacy code --- .../medical/functions/fnc_setCardiacArrest.sqf | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/addons/medical/functions/fnc_setCardiacArrest.sqf b/addons/medical/functions/fnc_setCardiacArrest.sqf index 9354784662..8e7509eb6f 100644 --- a/addons/medical/functions/fnc_setCardiacArrest.sqf +++ b/addons/medical/functions/fnc_setCardiacArrest.sqf @@ -25,20 +25,3 @@ _unit setVariable [QGVAR(heartRate), 0, true]; [_unit, true] call FUNC(setUnconscious); [QEGVAR(medical,InjuryCritical), _unit] call CBA_fnc_localEvent; -private _timeInCardiacArrest = 120 + round(random(600)); - -[{ - params ["_args", "_idPFH"]; - _args params ["_unit", "_startTime", "_timeInCardiacArrest"]; - - private _heartRate = _unit getVariable [QGVAR(heartRate), DEFAULT_HEART_RATE]; - if (_heartRate > 20 || !alive _unit) exitWith { - [_idPFH] call CBA_fnc_removePerFrameHandler; - _unit setVariable [QGVAR(inCardiacArrest), nil, true]; - }; - if (CBA_missionTime - _startTime >= _timeInCardiacArrest) exitWith { - [_idPFH] call CBA_fnc_removePerFrameHandler; - _unit setVariable [QGVAR(inCardiacArrest), nil, true]; - [_unit] call FUNC(setDead); - }; -}, 1, [_unit, CBA_missionTime, _timeInCardiacArrest] ] call CBA_fnc_addPerFrameHandler; From 327124003cf491fdbf182da3ea110caecf3a9e20 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 14:01:07 +0100 Subject: [PATCH 17/30] Fixed condition expression --- addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp index 58d86e2274..eda67eda38 100644 --- a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp +++ b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp @@ -248,7 +248,7 @@ class GVAR(Actions) { requiredMedic = 0; treatmentTime = 15; items[] = {}; - condition = QUOTE(!(_target call EFUNC(common,isAwake)) && {!(_target getVariable [QQGVAR(receiveCPR),false])}); + condition = QUOTE(!(_target call EFUNC(common,isAwake)) && {!(_target getVariable [ARR_2('GVAR(receiveCPR)', false)])}); callbackSuccess = QFUNC(treatmentCPR); callbackFailure = QFUNC(treatmentCPR_failure); callbackProgress = QFUNC(treatmentCPR_progress); From 6ed90496a2b531398a49ddb5abc5bd18f56da7b9 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 14:12:08 +0100 Subject: [PATCH 18/30] Added calculateBlood function --- addons/medical_treatment/XEH_PREP.hpp | 1 + .../functions/fnc_calculateBlood.sqf | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 addons/medical_treatment/functions/fnc_calculateBlood.sqf diff --git a/addons/medical_treatment/XEH_PREP.hpp b/addons/medical_treatment/XEH_PREP.hpp index 9d779d3154..a6e460be46 100644 --- a/addons/medical_treatment/XEH_PREP.hpp +++ b/addons/medical_treatment/XEH_PREP.hpp @@ -49,6 +49,7 @@ PREP(healTime); PREP(isBeingCarried); PREP(isBeingDragged); PREP(onMedicationUsage); +PREP(calculateBlood); // items PREP(checkItems); diff --git a/addons/medical_treatment/functions/fnc_calculateBlood.sqf b/addons/medical_treatment/functions/fnc_calculateBlood.sqf new file mode 100644 index 0000000000..c1c53265fa --- /dev/null +++ b/addons/medical_treatment/functions/fnc_calculateBlood.sqf @@ -0,0 +1,30 @@ +/* + * Author: Zakant + * Calculate the blood loost and blood volume for a unit. Used from CPR to simulate a heart rate while in cardiac arrest + * + * Arguments: + * 0: The unit + * + * Return Value: + * NONE + * + * Public: No + */ +#include "script_component.hpp" + +params["_unit"]; + +// We will just simulate blood flow for now! +private _lastTimeUpdated = _unit getVariable [QEGVAR(medical,lastTimeUpdated), CBA_missionTime]; +private _deltaT = CBA_missionTime - _lastTimeUpdated; + +private _lastTimeValuesSynced = _unit getVariable [QEGVAR(medical,lastMomentValuesSynced), 0]; +private _syncValues = (CBA_missionTime - _lastTimeValuesSynced) >= (10 + floor(random(10))); + +_unit setVariable [QEGVAR(medical,lastTimeUpdated), CBA_missionTime]; +if (_deltaT != 0) then { + private _change = ([_unit, _deltaT, _syncValues] call EFUNC(medical,getBloodVolumeChange)); + private _bloodVolume = (_unit getVariable [QEGVAR(medical,bloodVolume), DEFAULT_BLOOD_VOLUME]) + _change ; + _bloodVolume = 0 max _bloodVolume min DEFAULT_BLOOD_VOLUME; + _unit setVariable [QEGVAR(medical,bloodVolume), _bloodVolume, _syncValues]; +}; From c90de84d0401c09ac4fbb437f85044e0ba62e5e3 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 14:49:21 +0100 Subject: [PATCH 19/30] Added myself to author list --- AUTHORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.txt b/AUTHORS.txt index dcf94277cc..15bfcca46a 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -124,4 +124,5 @@ Valentin Torikian voiper VyMajoris(W-Cephei) Winter +Zakant zGuba From 2cfeb5a10e622031ac0c305b232776388972d756 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 15:09:59 +0100 Subject: [PATCH 20/30] Fixed missing bracket --- addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf index a702021384..8b092a1c56 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf @@ -14,7 +14,7 @@ #include "script_component.hpp" params ["_caller", "_target"]; -if(!(_target call EFUNC(common,isAwake)) || {_target getVariable [QEGVAR(medical,inCardiacArrest), false]) then { +if(!(_target call EFUNC(common,isAwake)) || {_target getVariable [QEGVAR(medical,inCardiacArrest), false]}) then { _target setVariable [QEGVAR(medical,heartRate), 0, true]; }; _target setVariable [QGVAR(receiveCPR), false, true]; From d47d1831191b4389fe01340f2c0abb597f0434a0 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 16:55:00 +0100 Subject: [PATCH 21/30] Fixed typo --- .../medical_treatment/functions/fnc_treatmentCPR_progress.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf index 69c9a0d9fd..c3da032e38 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf @@ -18,7 +18,7 @@ params ["_args", "_elapsedTime", "_totalTime"]; _args params ["_caller", "_target"]; -// If the patient awakes my mysterious force, no cpr is needed! +// If the patient awakes by mysterious force, no cpr is needed! if(_target call EFUNC(common,isAwake)) exitWith {false}; if(!(_target getVariable [QEGVAR(medical,inCardiacArrest), false])) exitWith {false}; From 07033061e35737237e06ee282945460508ef38c1 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 17:23:18 +0100 Subject: [PATCH 22/30] Fixed function headers --- addons/medical_treatment/functions/fnc_calculateBlood.sqf | 2 +- .../functions/fnc_treatmentCPR_progress.sqf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/medical_treatment/functions/fnc_calculateBlood.sqf b/addons/medical_treatment/functions/fnc_calculateBlood.sqf index c1c53265fa..92da9fb11b 100644 --- a/addons/medical_treatment/functions/fnc_calculateBlood.sqf +++ b/addons/medical_treatment/functions/fnc_calculateBlood.sqf @@ -3,7 +3,7 @@ * Calculate the blood loost and blood volume for a unit. Used from CPR to simulate a heart rate while in cardiac arrest * * Arguments: - * 0: The unit + * 0: Unit * * Return Value: * NONE diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf index c3da032e38..0faa3cbc24 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf @@ -4,13 +4,13 @@ * * Arguments: * 0: Arguments - * 0: Caller - * 1: Target + * 0: Caller + * 1: Target * 1: Elapsed Time * 2: Total Time * * Return Value: - * Treatment may continue + * May Treatment continue * * Public: No */ From 89cf679af3e5cb20490062dcf7273ae49c3af263 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 17:26:16 +0100 Subject: [PATCH 23/30] Replaces return by --- addons/common/functions/fnc_player.sqf | 2 +- addons/medical_treatment/functions/fnc_calculateBlood.sqf | 2 +- addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf | 2 +- addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf | 2 +- addons/reloadlaunchers/functions/fnc_canLoad.sqf | 2 +- addons/reloadlaunchers/functions/fnc_load.sqf | 2 +- addons/reloadlaunchers/functions/fnc_reloadLauncher.sqf | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/common/functions/fnc_player.sqf b/addons/common/functions/fnc_player.sqf index 1a268515a7..1675c36537 100644 --- a/addons/common/functions/fnc_player.sqf +++ b/addons/common/functions/fnc_player.sqf @@ -4,7 +4,7 @@ * Use this in INIT and RESPAWN eh scripts, because ACE_player isn't reset yet. * * Arguments: - * NONE. + * None. * * Return Value: * Player controlled unit diff --git a/addons/medical_treatment/functions/fnc_calculateBlood.sqf b/addons/medical_treatment/functions/fnc_calculateBlood.sqf index 92da9fb11b..c5badffb1e 100644 --- a/addons/medical_treatment/functions/fnc_calculateBlood.sqf +++ b/addons/medical_treatment/functions/fnc_calculateBlood.sqf @@ -6,7 +6,7 @@ * 0: Unit * * Return Value: - * NONE + * None * * Public: No */ diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf index 8b092a1c56..09ea84e35f 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf @@ -7,7 +7,7 @@ * 1: The patient * * Return Value: - * NONE + * None * * Public: No */ diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf index 8d77bb9190..0fed4c5039 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf @@ -7,7 +7,7 @@ * 1: The patient * * Return Value: - * NONE + * None * * Public: No */ diff --git a/addons/reloadlaunchers/functions/fnc_canLoad.sqf b/addons/reloadlaunchers/functions/fnc_canLoad.sqf index 5072d44a48..8e120b8a20 100644 --- a/addons/reloadlaunchers/functions/fnc_canLoad.sqf +++ b/addons/reloadlaunchers/functions/fnc_canLoad.sqf @@ -9,7 +9,7 @@ * 3: missile name (String) * * Return Value: - * NONE + * None * * Public: No */ diff --git a/addons/reloadlaunchers/functions/fnc_load.sqf b/addons/reloadlaunchers/functions/fnc_load.sqf index 2f822bb6d7..1382faed47 100644 --- a/addons/reloadlaunchers/functions/fnc_load.sqf +++ b/addons/reloadlaunchers/functions/fnc_load.sqf @@ -9,7 +9,7 @@ * 3: missile name (String) * * Return Value: - * NONE + * None * * Public: No */ diff --git a/addons/reloadlaunchers/functions/fnc_reloadLauncher.sqf b/addons/reloadlaunchers/functions/fnc_reloadLauncher.sqf index 96db7cdca5..d6a00c6ad2 100644 --- a/addons/reloadlaunchers/functions/fnc_reloadLauncher.sqf +++ b/addons/reloadlaunchers/functions/fnc_reloadLauncher.sqf @@ -9,7 +9,7 @@ * 3: missile name (String) * * Return Value: - * NONE + * None * * Public: No */ From ad1e233a298c68df3fe92689be5949ef44673073 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 17:27:11 +0100 Subject: [PATCH 24/30] Fixed indentation --- addons/medical_treatment/functions/fnc_calculateBlood.sqf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/medical_treatment/functions/fnc_calculateBlood.sqf b/addons/medical_treatment/functions/fnc_calculateBlood.sqf index c5badffb1e..df62e678dc 100644 --- a/addons/medical_treatment/functions/fnc_calculateBlood.sqf +++ b/addons/medical_treatment/functions/fnc_calculateBlood.sqf @@ -23,8 +23,8 @@ private _syncValues = (CBA_missionTime - _lastTimeValuesSynced) >= (10 + floor(r _unit setVariable [QEGVAR(medical,lastTimeUpdated), CBA_missionTime]; if (_deltaT != 0) then { - private _change = ([_unit, _deltaT, _syncValues] call EFUNC(medical,getBloodVolumeChange)); - private _bloodVolume = (_unit getVariable [QEGVAR(medical,bloodVolume), DEFAULT_BLOOD_VOLUME]) + _change ; - _bloodVolume = 0 max _bloodVolume min DEFAULT_BLOOD_VOLUME; - _unit setVariable [QEGVAR(medical,bloodVolume), _bloodVolume, _syncValues]; + private _change = ([_unit, _deltaT, _syncValues] call EFUNC(medical,getBloodVolumeChange)); + private _bloodVolume = (_unit getVariable [QEGVAR(medical,bloodVolume), DEFAULT_BLOOD_VOLUME]) + _change ; + _bloodVolume = 0 max _bloodVolume min DEFAULT_BLOOD_VOLUME; + _unit setVariable [QEGVAR(medical,bloodVolume), _bloodVolume, _syncValues]; }; From ff823e059035e58401dc25e6530b99d9de4011d0 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 17:27:53 +0100 Subject: [PATCH 25/30] Fixed space --- addons/medical_treatment/functions/fnc_calculateBlood.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/functions/fnc_calculateBlood.sqf b/addons/medical_treatment/functions/fnc_calculateBlood.sqf index df62e678dc..7e7f9e5831 100644 --- a/addons/medical_treatment/functions/fnc_calculateBlood.sqf +++ b/addons/medical_treatment/functions/fnc_calculateBlood.sqf @@ -24,7 +24,7 @@ private _syncValues = (CBA_missionTime - _lastTimeValuesSynced) >= (10 + floor(r _unit setVariable [QEGVAR(medical,lastTimeUpdated), CBA_missionTime]; if (_deltaT != 0) then { private _change = ([_unit, _deltaT, _syncValues] call EFUNC(medical,getBloodVolumeChange)); - private _bloodVolume = (_unit getVariable [QEGVAR(medical,bloodVolume), DEFAULT_BLOOD_VOLUME]) + _change ; + private _bloodVolume = (_unit getVariable [QEGVAR(medical,bloodVolume), DEFAULT_BLOOD_VOLUME]) + _change; _bloodVolume = 0 max _bloodVolume min DEFAULT_BLOOD_VOLUME; _unit setVariable [QEGVAR(medical,bloodVolume), _bloodVolume, _syncValues]; }; From b5a48bb4dc2e8f23b7b9302c9add2f8ede7f3f8d Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 17:32:03 +0100 Subject: [PATCH 26/30] Fixed newline after include --- addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf | 1 + addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf | 1 + addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf | 1 + 3 files changed, 3 insertions(+) diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf index 09ea84e35f..476dd6b0a7 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf @@ -12,6 +12,7 @@ * Public: No */ #include "script_component.hpp" + params ["_caller", "_target"]; if(!(_target call EFUNC(common,isAwake)) || {_target getVariable [QEGVAR(medical,inCardiacArrest), false]}) then { diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf index 0faa3cbc24..b48311d41b 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf @@ -15,6 +15,7 @@ * Public: No */ #include "script_component.hpp" + params ["_args", "_elapsedTime", "_totalTime"]; _args params ["_caller", "_target"]; diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf index 0fed4c5039..e93fa502b1 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf @@ -12,6 +12,7 @@ * Public: No */ #include "script_component.hpp" + params ["_caller", "_target"]; _target setVariable [QGVAR(receiveCPR), true, true]; // Target receives CPR From f8a2d404e24d0dfdf906adae1b24d379aae830cc Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 18:17:38 +0100 Subject: [PATCH 27/30] Fixed more typos --- addons/medical_treatment/functions/fnc_calculateBlood.sqf | 2 +- addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf | 2 +- .../medical_treatment/functions/fnc_treatmentCPR_progress.sqf | 2 +- addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/medical_treatment/functions/fnc_calculateBlood.sqf b/addons/medical_treatment/functions/fnc_calculateBlood.sqf index 7e7f9e5831..8245fe5758 100644 --- a/addons/medical_treatment/functions/fnc_calculateBlood.sqf +++ b/addons/medical_treatment/functions/fnc_calculateBlood.sqf @@ -1,6 +1,6 @@ /* * Author: Zakant - * Calculate the blood loost and blood volume for a unit. Used from CPR to simulate a heart rate while in cardiac arrest + * Calculate the blood lost and blood volume for a unit. Used from CPR to simulate a heart rate while in cardiac arrest * * Arguments: * 0: Unit diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf index 476dd6b0a7..7026425682 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf @@ -1,6 +1,6 @@ /* * Author: Zakant - * Handels the failure of the CPR treatment. + * Handles the failure of the CPR treatment. * * Arguments: * 0: The medic diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf index b48311d41b..ee6ba564e8 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf @@ -1,6 +1,6 @@ /* * Author: Zakant - * Handels the progress of the CPR treatment. + * Handles the progress of the CPR treatment. * * Arguments: * 0: Arguments diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf index e93fa502b1..76277a1a93 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf @@ -1,6 +1,6 @@ /* * Author: Zakant - * Handels the start of the CPR treatment. + * Handles the start of the CPR treatment. * * Arguments: * 0: The medic From 7bd2725f2943a9b4e9367b983d37430adf659aa4 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 18:40:18 +0100 Subject: [PATCH 28/30] Fixed space after if --- .../medical_treatment/functions/fnc_treatmentCPR_failure.sqf | 2 +- .../medical_treatment/functions/fnc_treatmentCPR_progress.sqf | 4 ++-- addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf index 7026425682..bca59a1246 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_failure.sqf @@ -15,7 +15,7 @@ params ["_caller", "_target"]; -if(!(_target call EFUNC(common,isAwake)) || {_target getVariable [QEGVAR(medical,inCardiacArrest), false]}) then { +if (!(_target call EFUNC(common,isAwake)) || {_target getVariable [QEGVAR(medical,inCardiacArrest), false]}) then { _target setVariable [QEGVAR(medical,heartRate), 0, true]; }; _target setVariable [QGVAR(receiveCPR), false, true]; diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf index ee6ba564e8..02504607d4 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_progress.sqf @@ -20,8 +20,8 @@ params ["_args", "_elapsedTime", "_totalTime"]; _args params ["_caller", "_target"]; // If the patient awakes by mysterious force, no cpr is needed! -if(_target call EFUNC(common,isAwake)) exitWith {false}; -if(!(_target getVariable [QEGVAR(medical,inCardiacArrest), false])) exitWith {false}; +if (_target call EFUNC(common,isAwake)) exitWith {false}; +if (!(_target getVariable [QEGVAR(medical,inCardiacArrest), false])) exitWith {false}; [_target] call FUNC(calculateBlood); // Calculate blood volume. If their is no pulse, nothing happens! diff --git a/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf index 76277a1a93..0012a01d2b 100644 --- a/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf +++ b/addons/medical_treatment/functions/fnc_treatmentCPR_start.sqf @@ -16,7 +16,7 @@ params ["_caller", "_target"]; _target setVariable [QGVAR(receiveCPR), true, true]; // Target receives CPR -if(EGVAR(medical,CPRcreatesPulse) && {_target getVariable [QEGVAR(medical,heartRate), 80] == 0}) then { +if (EGVAR(medical,CPRcreatesPulse) && {_target getVariable [QEGVAR(medical,heartRate), 80] == 0}) then { _target setVariable [QEGVAR(medical,heartRate), round (30 + random [-5, 0, 5]) , true]; // And we have a (random) pulse }; From 14e146cbebc569a27e7312915496861a0826fb9e Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 18:44:45 +0100 Subject: [PATCH 29/30] Added missing dot --- addons/medical_treatment/functions/fnc_calculateBlood.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_treatment/functions/fnc_calculateBlood.sqf b/addons/medical_treatment/functions/fnc_calculateBlood.sqf index 8245fe5758..d805ee1ffa 100644 --- a/addons/medical_treatment/functions/fnc_calculateBlood.sqf +++ b/addons/medical_treatment/functions/fnc_calculateBlood.sqf @@ -1,6 +1,6 @@ /* * Author: Zakant - * Calculate the blood lost and blood volume for a unit. Used from CPR to simulate a heart rate while in cardiac arrest + * Calculate the blood lost and blood volume for a unit. Used from CPR to simulate a heart rate while in cardiac arrest. * * Arguments: * 0: Unit From 466bdce9e4eee66c67583b187af01c041269eaf6 Mon Sep 17 00:00:00 2001 From: Zakant Date: Thu, 23 Mar 2017 18:45:46 +0100 Subject: [PATCH 30/30] Removing point --- addons/common/functions/fnc_player.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/common/functions/fnc_player.sqf b/addons/common/functions/fnc_player.sqf index 1675c36537..2d2093f401 100644 --- a/addons/common/functions/fnc_player.sqf +++ b/addons/common/functions/fnc_player.sqf @@ -4,7 +4,7 @@ * Use this in INIT and RESPAWN eh scripts, because ACE_player isn't reset yet. * * Arguments: - * None. + * None * * Return Value: * Player controlled unit