Circulation - Add setting to apply AED pads during CPR (KAT-Advanced-…

…Medical#499) **When merged this pull request will:** - Create a setting to allow medics to apply AED pads while CPR is being performed. Not tested in multiplayer but it's a simple PR, should work fine. ### IMPORTANT - [x] [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied. - [x] Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`. --------- Co-authored-by: Blue <[email protected]>
Apricot-ale · Mar 25, 2024 · 7cb1ea6 · 7cb1ea6
1 parent 1673a3b
commit 7cb1ea6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/addons/circulation/XEH_preInit.sqf b/addons/circulation/XEH_preInit.sqf
@@ -73,6 +73,17 @@ PREP_RECOMPILE_END;
     true
 ] call CBA_Settings_fnc_init;
 
+// Allow application of AED pads while CPR is performed
+[
+    QGVAR(AED_duringCpr),
+    "CHECKBOX",
+    LLSTRING(SETTING_AED_duringCpr),
+    [CBA_SETTINGS_CAT, LSTRING(SubCategory_AED)],
+    [true],
+    true
+] call CBA_Settings_fnc_init;
+
+
 //Max Succes chance for AED-X
 [
     QGVAR(AED_X_MaxChance),

diff --git a/addons/circulation/functions/fnc_Defibrillator_Pads_CheckCondition.sqf b/addons/circulation/functions/fnc_Defibrillator_Pads_CheckCondition.sqf
@@ -51,4 +51,4 @@ switch (_AEDOrigin) do {
 
 if (_exit) exitWith {false};
 
-_condition && !(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) && !(_patient getVariable [QEGVAR(airway,recovery), false]) && (objectParent _patient isEqualTo objectParent _medic) && {["",_patient] call ACEFUNC(medical_treatment,canCPR)};
+_condition && !(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) && !(_patient getVariable [QEGVAR(airway,recovery), false]) && (objectParent _patient isEqualTo objectParent _medic) && (["",_patient] call ACEFUNC(medical_treatment,canCPR) || GVAR(AED_duringCpr));
diff --git a/addons/circulation/stringtable.xml b/addons/circulation/stringtable.xml
@@ -1979,6 +1979,9 @@
             <Portuguese>Permitir DEA-X</Portuguese>
             <Finnish>Salli AUD-X</Finnish>
         </Key>
+        <Key ID="STR_KAT_Circulation_SETTING_AED_duringCpr">
+            <English>Allow AED pad application during CPR</English>
+        </Key>
         <Key ID="STR_KAT_Circulation_TRAINING_LEVEL_AED_X">
             <English>Training level required to use an AED-X</English>
             <Polish>Poziom wyszkolenia wymagany do korzystania z AED-X</Polish>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,4 +51,4 @@ switch (_AEDOrigin) do {

		if (_exit) exitWith {false};

		_condition && !(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) && !(_patient getVariable [QEGVAR(airway,recovery), false]) && (objectParent _patient isEqualTo objectParent _medic) && {["",_patient] call ACEFUNC(medical_treatment,canCPR)};
		_condition && !(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) && !(_patient getVariable [QEGVAR(airway,recovery), false]) && (objectParent _patient isEqualTo objectParent _medic) && (["",_patient] call ACEFUNC(medical_treatment,canCPR) \|\| GVAR(AED_duringCpr));