Ophthalmology - Add manual blinking and eye injuries

addons/ophthalmology/XEH_preInit.sqf

@@ -1,92 +1,15 @@
 #include "script_component.hpp"
+#include "initKeybinds.inc.sqf"
 
 ADDON = false;
 
 PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;
 
-#define CBA_SETTINGS_CAT "KAT - ADV Medical: Ophthalmology"
+#define CBA_SETTINGS_CAT LSTRING(cba_name)
 
-// Enable Dust Injury
-[
-    QGVAR(enable),
-    "CHECKBOX",
-    LLSTRING(setting_enable),
-    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_injury)],
-    [true],
-    true
-] call CBA_Settings_fnc_init;
+#include "initKeybinds.inc.sqf"
+#include "initSettings.inc.sqf"
 
-// Probability to get dust in the eyes
-[
-    QGVAR(probability_dust),
-    "SLIDER",
-    [LLSTRING(setting_probability_dust)],
-    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_injury)],
-    [1, 100, 5, 0],
-    true
-] call CBA_Settings_fnc_init;
-
-// Probability to get dust in the eyes which is not treated by blink
-[
-    QGVAR(probability_dust_heavy),
-    "SLIDER",
-    [LLSTRING(setting_probability_dust_heavy)],
-    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_injury)],
-    [1, 100, 1, 0],
-    true
-] call CBA_Settings_fnc_init;
-
-// Probability to treat the dust in the eyes with blinking
-[
-    QGVAR(probability_treatment_dust),
-    "SLIDER",
-    [LLSTRING(setting_probability_treatment_dust)],
-    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_injury)],
-    [1, 100, 20, 0],
-    true
-] call CBA_Settings_fnc_init;
-
-// Eye Wash treatment time
-[
-    QGVAR(eyewash_treatment_time),
-    "SLIDER",
-    [LLSTRING(setting_eyewash_treatment_time)],
-    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_manual_blink)],
-    [1, 10, 2, 0],
-    true
-] call CBA_Settings_fnc_init;
-
-// Eye Wash medic required
-[
-    QGVAR(eyewash_medic_required),
-    "LIST",
-    [LLSTRING(setting_eyewash_medic_required)],
-    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_manual_blink)],
-    [[0, 1, 2], ["STR_ACE_Medical_Treatment_Anyone", "STR_ACE_Medical_Treatment_Medics", "STR_ACE_Medical_Treatment_Doctors"], 0],
-    true
-] call CBA_Settings_fnc_init;
-
-// Eye Shield treatment time
-[
-    QGVAR(eyeshield_treatment_time),
-    "SLIDER",
-    [LLSTRING(setting_eyeShield_treatment_time)],
-    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_manual_blink)],
-    [1, 10, 2, 0],
-    true
-] call CBA_Settings_fnc_init;
-
-
-// Eye Shield medic required
-[
-    QGVAR(eyeshield_medic_required),
-    "LIST",
-    [LLSTRING(setting_eyeShield_medic_required)],
-    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_manual_blink)],
-    [[0, 1, 2], ["STR_ACE_Medical_Treatment_Anyone", "STR_ACE_Medical_Treatment_Medics", "STR_ACE_Medical_Treatment_Doctors"], 0],
-    true
-] call CBA_Settings_fnc_init;
-
-ADDON = true;
+ADDON = true;

addons/ophthalmology/functions/fnc_treatmentAdvanced_eyeShield.sqf

@@ -14,16 +14,25 @@
 
 params ["_medic", "_patient"];
 
-private _eyeInjuries = _patient getVariable ["kat_ophthalmology_eyeInjuries", [1, 1]];
+private _eyeInjuries = _patient getVariable [QGVAR(eyeInjuries), [1, 1]];
+
+#define leftEyeDisplay 17103
+#define rightEyeDisplay 17102
 
 "KAT_EyeShield" cutRsc ["KAT_EyeShield", "PLAIN", 0, true];
 
 private _display = uiNamespace getVariable ["KAT_EyeShield", displayNull];
-private _activeEye = _display displayCtrl 17102;
+private _activeEye = _display displayCtrl rightEyeDisplay;
 
-if ((_eyeInjuries find 0) == 0) then {
-    _patient linkItem "kat_eyecovers_left";
-    _activeEye = _display displayCtrl 17103;
+private _fnc_applyEyeCover = {
+    params ["_patient", "_shieldItem", "_eyeDisplay"];
+
+    if (hmd _patient != "") then {
+        _patient addItem (hmd _patient);
+    };
+
+    _patient linkItem _shieldItem;
+    _activeEye = _display displayCtrl _eyeDisplay;
 
     _activeEye ctrlShow true;
     _activeEye ctrlCommit 0;
@@ -32,40 +41,23 @@ if ((_eyeInjuries find 0) == 0) then {
         _this params ["_args", "_pfhID"];
         _args params ["_unit", "_activeEye"];
 
-        if ((hmd _unit) != "kat_eyecovers_left") exitWith {
+        if ((hmd _unit) != _shieldItem) exitWith {
             _pfhID call CBA_fnc_removePerFrameHandler;
             "KAT_EyeShield" cutText ["","PLAIN",0,true];
         };
 
-        private _eyeInjury = _unit getVariable ["kat_ophthalmology_eyeInjuries", [1, 1]];
-        _unit setVariable ["kat_ophthalmology_eyeInjuries", [(((_eyeInjury select 0) + 0.001) min 1), (_eyeInjury select 1)], true];
+        private _eyeInjury = _unit getVariable [QGVAR(eyeInjuries), [1, 1]];
+        _unit setVariable [QGVAR(eyeInjuries), [(((_eyeInjury select 0) + 0.001) min 1), (_eyeInjury select 1)], true];
     }, 30, [
         _patient,
         _activeEye
     ]] call CBA_fnc_addPerFrameHandler;
+};
 
+if ((_eyeInjuries find 0) == 0) then {
+    [_patient, "kat_eyecovers_left", leftEyeDisplay] call _fnc_applyEyeCover;
 } else {
-    _patient linkItem "kat_eyecovers_right";
-    _activeEye = _display displayCtrl 17102;
-
-    _activeEye ctrlShow true;
-    _activeEye ctrlCommit 0;
-
-    [{
-        _this params ["_args", "_pfhID"];
-        _args params ["_unit", "_activeEye"];
-
-        if ((hmd _unit) != "kat_eyecovers_right") exitWith {
-            _pfhID call CBA_fnc_removePerFrameHandler;
-            "KAT_EyeShield" cutText ["","PLAIN",0,true];
-        };
-
-        private _eyeInjury = _unit getVariable ["kat_ophthalmology_eyeInjuries", [1, 1]];
-        _unit setVariable ["kat_ophthalmology_eyeInjuries", [(_eyeInjury select 0), (((_eyeInjury select 1) + 0.001) min 1)], true];
-    }, 1, [
-        _patient,
-        _activeEye
-    ]] call CBA_fnc_addPerFrameHandler;
+    [_patient, "kat_eyecovers_right", rightEyeDisplay] call _fnc_applyEyeCover;
 };
 
 [_patient, LLSTRING(eyeshield_item)] call ACEFUNC(medical_treatment,addToTriageCard);

addons/ophthalmology/initKeybinds.inc.sqf

@@ -0,0 +1,29 @@
+#include "script_component"
+#include "\a3\ui_f\hpp\defineDIKCodes.inc"
+/*
+ * Author: Katalam
+ * Initialize the keybinds.
+ *
+ * Return Value:
+ * None
+ *
+ * Public: No
+ *
+ * https://community.bistudio.com/wiki/DIK_KeyCodes
+ */
+
+if (!hasInterface) exitWith {};
+
+[QUOTE(COMPONENT_BEAUTIFIED), QGVAR(blinking), LLSTRING(blink_action),
+{
+    [0.2, false] call EFUNC(feedback,effectEyeBlink);
+
+    private _random = floor(random 100);
+
+    if (_random <= GVAR(probability_treatment_dust)) then {
+        private _dustInjurySeverity = ACE_player getVariable [QGVAR(dustInjurySeverity), 0];
+        ACE_player setVariable [QGVAR(dustInjurySeverity), ((_dustInjurySeverity - 0.5) max 0), true];
+    };
+}, "",
+[DIK_TAB, [false, false, false]], false] call CBA_fnc_addKeybind;
+// [DIK, [shift, ctrl, alt]]

addons/ophthalmology/initSettings.inc.sqf

@@ -0,0 +1,82 @@
+// Enable Dust Injury
+[
+    QGVAR(enable),
+    "CHECKBOX",
+    LLSTRING(setting_enable),
+    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_injury)],
+    [true],
+    true
+] call CBA_fnc_addSetting;
+
+// Probability to get dust in the eyes
+[
+    QGVAR(probability_dust),
+    "SLIDER",
+    [LLSTRING(setting_probability_dust)],
+    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_injury)],
+    [1, 100, 5, 0],
+    true
+] call CBA_fnc_addSetting;
+
+// Probability to get dust in the eyes which is not treated by blink
+[
+    QGVAR(probability_dust_heavy),
+    "SLIDER",
+    [LLSTRING(setting_probability_dust_heavy)],
+    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_injury)],
+    [1, 100, 1, 0],
+    true
+] call CBA_fnc_addSetting;
+
+// Probability to treat the dust in the eyes with blinking
+[
+    QGVAR(probability_treatment_dust),
+    "SLIDER",
+    [LLSTRING(setting_probability_treatment_dust)],
+    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_injury)],
+    [1, 100, 20, 0],
+    true
+] call CBA_fnc_addSetting;
+
+// Eye Wash treatment time
+[
+    QGVAR(eyewash_treatment_time),
+    "SLIDER",
+    [LLSTRING(setting_eyewash_treatment_time)],
+    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_manual_blink)],
+    [1, 10, 2, 0],
+    true
+] call CBA_fnc_addSetting;
+
+// Eye Wash medic required
+[
+    QGVAR(eyewash_medic_required),
+    "LIST",
+    [LLSTRING(setting_eyewash_medic_required)],
+    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_manual_blink)],
+    [[0, 1, 2], ["STR_ACE_Medical_Treatment_Anyone", "STR_ACE_Medical_Treatment_Medics", "STR_ACE_Medical_Treatment_Doctors"], 0],
+    true
+] call CBA_fnc_addSetting;
+
+// Eye Shield treatment time
+[
+    QGVAR(eyeshield_treatment_time),
+    "SLIDER",
+    [LLSTRING(setting_eyeShield_treatment_time)],
+    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_manual_blink)],
+    [1, 10, 2, 0],
+    true
+] call CBA_fnc_addSetting;
+
+
+// Eye Shield medic required
+[
+    QGVAR(eyeshield_medic_required),
+    "LIST",
+    [LLSTRING(setting_eyeShield_medic_required)],
+    [CBA_SETTINGS_CAT, LSTRING(setting_subcategory_manual_blink)],
+    [[0, 1, 2], ["STR_ACE_Medical_Treatment_Anyone", "STR_ACE_Medical_Treatment_Medics", "STR_ACE_Medical_Treatment_Doctors"], 0],
+    true
+] call CBA_fnc_addSetting;
+
+ADDON = true;