Misc - Add / Change - KAT self-interaction category & Remove pulsoxim…

…eter requirement (#470) **When merged this pull request will:** - Add new self interaction category to easily access all kat self interactions without needing to go through 3 menus. - Remove the requirement to have breathing enabled to use pulsoximeter. - Change enable breathing string to be more telling of what it does.
KAT-Advanced-Medical · Feb 29, 2024 · 86e8c81 · 86e8c81
1 parent e360eb3
commit 86e8c81
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 20 deletions.
diff --git a/addons/breathing/ACE_Medical_Treatment_Actions.hpp b/addons/breathing/ACE_Medical_Treatment_Actions.hpp
@@ -60,7 +60,7 @@ class ACE_Medical_Treatment_Actions {
         medicRequired = QGVAR(medLvl_Pulseoximeter);
         treatmentTime = 2;
         items[] = {"kat_Pulseoximeter"};
-        condition = QUOTE(missionNamespace getVariable [ARR_2(QQGVAR(enable),true)] && !(_patient getVariable [ARR_2(QQGVAR(pulseoximeter),false)]) && !([ARR_2(_patient,_bodyPart)] call FUNC(checkPulseOximeter)));
+        condition = QUOTE(!(_patient getVariable [ARR_2(QQGVAR(pulseoximeter),false)]) && !([ARR_2(_patient,_bodyPart)] call FUNC(checkPulseOximeter)));
         callbackSuccess = QFUNC(treatmentAdvanced_pulseoximeter);
         callbackFailure = "";
         callbackProgress = "";

diff --git a/addons/breathing/CfgVehicles.hpp b/addons/breathing/CfgVehicles.hpp
@@ -74,7 +74,7 @@ class CfgVehicles {
     class Man;
     class CAManBase: Man {
         class ACE_SelfActions {
-            class ACE_Equipment {
+            class KAT_Equipment {
                class PulseOximeter_removeSound {
                     displayName = CSTRING(PulseOximeter_Action_removeSound);
                     condition = QUOTE('kat_Pulseoximeter' in (items _player) && (_player getVariable [ARR_2(QQGVAR(PulseOximeter_Volume),false])));

diff --git a/addons/breathing/XEH_preInit.sqf b/addons/breathing/XEH_preInit.sqf
@@ -12,7 +12,7 @@ PREP_RECOMPILE_END;
 [
     QGVAR(enable),
     "CHECKBOX",
-    LLSTRING(SETTING_ENABLE),
+    [LLSTRING(SETTING_ENABLE),LLSTRING(SETTING_ENABLE_DESC)],
     [CBA_SETTINGS_CAT, ELSTRING(GUI,SubCategory_Basic)],
     [true],
     true

diff --git a/addons/breathing/stringtable.xml b/addons/breathing/stringtable.xml
@@ -2,20 +2,13 @@
 <Project name="KAT">
     <Package name="Breathing">
         <Key ID="STR_KAT_Breathing_SETTING_ENABLE">
-            <English>ACE-Breathing activated?</English>
-            <German>ACE-Atmung aktiviert?</German>
-            <Polish>ACE-Czy zaawansowane oddychanie ma być włączone?</Polish>
-            <Spanish>¿Activar ACE-Respiración?</Spanish>
-            <Chinese>啟用ACE-心肺呼吸系統？</Chinese>
-            <Chinesesimp>启用ACE-呼吸系统</Chinesesimp>
-            <Czech>ACE-Breathing aktivováno?</Czech>
-            <Korean>ACE 심폐호흡기 기능 활성화</Korean>
-            <French>ACE-Respiration activé?</French>
-            <Turkish>ACE-Nefes etkinleştirildi mi?</Turkish>
-            <Italian>Attivare ACE-Respirazione?</Italian>
-            <Russian>ACE-дыхание активировано?</Russian>
+            <English>Activate Breathing Module</English>
+            <German>Aktiviere Athmungs Modul</German>
             <Japanese>KAM-Breathing を有効化しますか?</Japanese>
-            <Portuguese>ACE - Respiração ativada?</Portuguese>
+        </Key>
+        <Key ID="STR_KAT_Breathing_SETTING_ENABLE_DESC">
+            <English>Sets if SPO2 simulation and according functionality like Pneumothorax and \nAirway: occlusion &amp; obstruction (SPO2 reduction will be deactivated) should be activated</English>
+            <German>Setzt ob SPO2 Simuliert werden soll mit funktionen wie Pneumothorax und Atemwege: Verstopfung &amp; Obstruktion (SPO2 reduktion wird deaktiviert)</German>
         </Key>
         <Key ID="STR_KAT_Breathing_SETTING_SpO2_dieValue">
             <English>Lethal SpO2 value</English>

diff --git a/addons/chemical/CfgVehicles.hpp b/addons/chemical/CfgVehicles.hpp
@@ -2,7 +2,7 @@ class CfgVehicles {
     class Man;
     class CAManBase: Man {
         class ACE_SelfActions {
-            class ACE_Equipment {
+            class KAT_Equipment {
                 class KAT_CheckGasMaskDur {
                     displayName = CSTRING(CheckGasMaskDurability);
                     condition = QUOTE([_player] call FUNC(hasGasMaskOn));

diff --git a/addons/circulation/CfgVehicles.hpp b/addons/circulation/CfgVehicles.hpp
@@ -245,7 +245,7 @@ class CfgVehicles {
                     class CheckBloodPressure {};
                 };
             };
-            class ACE_Equipment {
+            class KAT_Equipment {
                 class openCrossPanel {
                     displayName = CSTRING(open_crosspanel);
                     condition = "('kat_crossPanel' in (uniformItems _player)) || ('kat_crossPanel' in (vestItems _player))";

diff --git a/addons/misc/CfgVehicles.hpp b/addons/misc/CfgVehicles.hpp
@@ -199,8 +199,10 @@ class CfgVehicles {
     class CAManBase: Man {
         class ACE_SelfActions
         {
-            class ACE_Equipment
-            {
+            class KAT_Equipment {
+                displayName = CSTRING(Kat_Equipment);
+                icon = QPATHTOF(ui\KAM_Iteraction_Logo.paa);
+
                 class Armband {
                     displayName = CSTRING(Armband_Sling);
                     condition = QUOTE(_player call FUNC(checkArmbandCondition));

diff --git a/addons/misc/stringtable.xml b/addons/misc/stringtable.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="KAT">
     <Package name="Misc">
+        <Key ID="STR_KAT_Misc_Kat_Equipment">
+            <English>KAT Equipment</English>
+            <German>KAT Gegenstände</German>
+        </Key>
         <Key ID="STR_KAT_Misc_SETTING_ENABLE">
             <English>ACE-Misc activated?</English>
             <German>ACE-Sonstiges aktivieren?</German>

diff --git a/addons/misc/ui/KAM_Iteraction_Logo.paa b/addons/misc/ui/KAM_Iteraction_Logo.paa