Merge branch 'dev-Tomcat' into particles

KAT-Advanced-Medical · Dec 18, 2024 · 6e4ad39 · 6e4ad39
2 parents c9a6a45 + a36f536
commit 6e4ad39
Show file tree

Hide file tree

Showing 38 changed files with 259 additions and 138 deletions.
diff --git a/.hemtt/launch.toml b/.hemtt/launch.toml
@@ -4,3 +4,9 @@ workshop = [
     "463939057", # ACE3's Workshop ID
     "2369477168" # Advanced Developer Tools's Workshop ID
 ]
+
+[rhs]
+extends = "default"
+workshop = [
+    "843577117", # RHS USAF Workshop ID
+]
diff --git a/addons/airway/ACE_Medical_Treatment_Actions.hpp b/addons/airway/ACE_Medical_Treatment_Actions.hpp
@@ -140,7 +140,7 @@ class ACE_Medical_Treatment_Actions {
         allowedSelections[] = {"Head"};
         allowSelfTreatment = 0;
         callbackSuccess = QFUNC(checkAirway);
-        condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && (missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && !([_patient] call FUNC(checkMask)));
+        condition = QUOTE((missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && !([_patient] call FUNC(checkMask)));
         animationPatientUnconscious = "AinjPpneMstpSnonWrflDnon_rolltoback";
         animationPatientUnconsciousExcludeOn[] = {"ainjppnemstpsnonwrfldnon", "kat_recoveryposition"};
     };

diff --git a/addons/airway/functions/fnc_checkAirway.sqf b/addons/airway/functions/fnc_checkAirway.sqf
@@ -55,6 +55,15 @@ if (!(_patient getVariable [QGVAR(occluded), false]) && !(_patient getVariable [
     _hintWidth = 10;
 };
 
+if (_patient getVariable [QEGVAR(chemical,airPoisoning), false]) exitWith {
+    _message = LLSTRING(AirwayStatus_Poison);
+
+    [_message, _hintSize, _medic, _hintWidth] call ACEFUNC(common,displayTextStructured);
+    [_patient, "quick_view", LSTRING(checkAirway_log)] call EFUNC(circulation,removeLog);
+    [_patient, "quick_view", LSTRING(checkAirway_poisonLog)] call EFUNC(circulation,removeLog);
+    [_patient, "quick_view", LSTRING(checkAirway_poisonLog), [[_medic] call ACEFUNC(common,getName)]] call ACEFUNC(medical_treatment,addToLog);
+};
+
 [_message, _hintSize, _medic, _hintWidth] call ACEFUNC(common,displayTextStructured);
 
 [_patient, "quick_view", LSTRING(checkAirway_log)] call EFUNC(circulation,removeLog);

diff --git a/addons/airway/stringtable.xml b/addons/airway/stringtable.xml
@@ -195,6 +195,9 @@
             <Chinesesimp>%1 检查呼吸道: %2, %3</Chinesesimp>
             <Dutch>%1 Heeft de luchtwegen gecheckt: %2, %3</Dutch>
         </Key>
+        <Key ID="STR_KAT_Airway_checkAirway_poisonLog">
+            <English>%1 checked airways: Heavily Blistered</English>
+        </Key>
         <Key ID="STR_KAT_Airway_airway_log">
             <English>%1 inserted a %2</English>
             <German>%1 intubierte mit %2</German>
@@ -399,6 +402,9 @@
             <Finnish>Tuuliputki on selkeä</Finnish>
             <Dutch>Luchtweg is vrij</Dutch>
         </Key>
+        <Key ID="STR_KAT_Airway_AirwayStatus_Poison">
+            <English>Airway is heavily blistered</English>
+        </Key>
         <Key ID="STR_KAT_Airway_AirwayStatus_NotClearForItem">
             <English>Item could not be used, airways are not clear</English>
             <German>Gegenstand konnte nicht verwendet werden, Atemwege sind nicht frei</German>

diff --git a/addons/breathing/CfgMagazines.hpp b/addons/breathing/CfgMagazines.hpp
@@ -47,11 +47,11 @@ class CfgMagazines {
         picture = QPATHTOF(ui\oxygenTank.paa);
 
         ammo = "";
-        count = 60;
+        count = 30;
         initSpeed = 0;
         tracersEvery = 0;
         lastRoundsTracer = 0;
-        mass = 3;
+        mass = 5;
         ACE_isMedicalItem = 1;
         ACE_asItem = 1;
     };

diff --git a/addons/breathing/CfgSounds.hpp b/addons/breathing/CfgSounds.hpp
@@ -30,4 +30,11 @@ class CfgSounds
         sound[] = { QPATHTOF(audio\pneumothoraxcough.ogg), 5, 1, 2 };
         titles[] = {};
     };
+    class GVAR(respiratorTone) {
+        name = QGVAR(respiratorTone);
+
+        // filename, volume, pitch, distance (optional)
+        sound[] = { QPATHTOF(audio\respiratorTone.ogg), 5, 1, 2 };
+        titles[] = {};
+    };
 };  
diff --git a/addons/breathing/XEH_postInit.sqf b/addons/breathing/XEH_postInit.sqf
@@ -14,6 +14,12 @@
     _unit say3D [QGVAR(pneumothoraxcough), 15];
 }] call CBA_fnc_addEventHandler;
 
+[QGVAR(playRespiratorTone), {
+    params ["_unit"];
+    _unit say3D [QGVAR(respiratorTone), 10];
+}] call CBA_fnc_addEventHandler;
+
+
 [QEGVAR(misc,handleRespawn), LINKFUNC(handleRespawn)] call CBA_fnc_addEventHandler;
 
 [QACEGVAR(medical_status,initialized), LINKFUNC(handleBreathingConditions)] call CBA_fnc_addEventHandler;

diff --git a/addons/breathing/audio/respiratorTone.ogg b/addons/breathing/audio/respiratorTone.ogg
diff --git a/addons/breathing/functions/fnc_attachPersonalOxygen.sqf b/addons/breathing/functions/fnc_attachPersonalOxygen.sqf
@@ -42,6 +42,8 @@ _patient removeMagazines "kat_personal_oxygen";
 
 _patient setVariable [QGVAR(oxygenMaskStatus), [(_largestTankValue + 1), 1], true];
 
+[QGVAR(playRespiratorTone), [_patient], _patient] call CBA_fnc_targetEvent;
+
 [{
     _this params ["_args", "_pfhID"];
     _args params ["_patient"];
@@ -68,6 +70,11 @@ _patient setVariable [QGVAR(oxygenMaskStatus), [(_largestTankValue + 1), 1], tru
     };
 
     private _maskStatus = _patient getVariable [QGVAR(oxygenMaskStatus), [0,0]];
+    _patient setVariable [QGVAR(oxygenMaskStatus), [((_maskStatus select 0) - 1), _pfhID]];
+
+    if ((_maskStatus select 0) < 4) then {
+        [QGVAR(playRespiratorTone), [_patient], _patient] call CBA_fnc_targetEvent;
+    };
 
     if ((_maskStatus select 0) == 0) exitWith {
         [LLSTRING(PersonalOxygen_Empty), 1.5, _patient] call ACEFUNC(common,displayTextStructured);
@@ -78,7 +85,6 @@ _patient setVariable [QGVAR(oxygenMaskStatus), [(_largestTankValue + 1), 1], tru
         _pfhID call CBA_fnc_removePerFrameHandler;
     };
 
-    _patient setVariable [QGVAR(oxygenMaskStatus), [((_maskStatus select 0) - 1), _pfhID]];
 }, 60, [
     _patient
 ]] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/breathing/functions/fnc_attachVehicleOxygen.sqf b/addons/breathing/functions/fnc_attachVehicleOxygen.sqf
@@ -24,6 +24,8 @@ if (_patient getVariable [QGVAR(oxygenMaskActive), false]) exitWith {
 
 _patient setVariable [QGVAR(oxygenMaskActive), true, true];
 
+[QGVAR(playRespiratorTone), [_patient], _patient] call CBA_fnc_targetEvent;
+
 [{
     _this params ["_args", "_pfhID"];
     _args params ["_patient"];

diff --git a/addons/breathing/functions/fnc_checkBreathing.sqf b/addons/breathing/functions/fnc_checkBreathing.sqf
@@ -28,7 +28,7 @@ private _breathing = LLSTRING(breathing_isNormal);
 private _breathing_log = localize ACELSTRING(medical_treatment,Check_Pulse_Normal);
 private _breath = "";
 
-if (_patient getVariable [QGVAR(pneumothorax), 0] > 0) then {
+if ((_patient getVariable [QGVAR(pneumothorax), 0] > 0) || (_patient getVariable [QEGVAR(chemical,airPoisoning), false])) then {
     _breathing = LLSTRING(breathing_isShallow);
     _breathing_log = LLSTRING(breathing_shallow);
 };
@@ -44,6 +44,7 @@ if (_ph < 7.2) then {
 _output = format ["%1%2", _breathing ,_breath];
 _output_log = format ["%1%2", _breathing_log, _breath];
 
+
 if (_hr == 0 || !(alive _patient) || (_patient getVariable [QEGVAR(airway,obstruction), false] && !(_patient getVariable [QEGVAR(airway,overstretch), false])) || _patient getVariable [QEGVAR(airway,occluded), false] || _patient getVariable [QGVAR(hemopneumothorax), false] || _patient getVariable [QGVAR(tensionpneumothorax), false]) then {
     _output = LLSTRING(breathing_none);
     _output_log = ACELSTRING(medical_treatment,Check_Pulse_None);

diff --git a/addons/breathing/stringtable.xml b/addons/breathing/stringtable.xml
@@ -2748,50 +2748,62 @@
         <Key ID="STR_KAT_Breathing_SETTING_AVAIL_OXYMASK">
             <English>Available Oxygen Masks</English>
             <Japanese>使用可能な酸素マスク</Japanese>
+            <French>Masques à oxygène disponibles</French>
         </Key>
         <Key ID="STR_KAT_Breathing_SETTING_AVAIL_OXYMASK_DISC">
             <English>Sets which goggles can act as oxygen masks</English>
             <Japanese>酸素マスクとして動作させたいゴーグルを指定します</Japanese>
+            <French>Spécifiez les masques que vous souhaitez utiliser comme masque à oxygène.</French>
         </Key>
         <Key ID="STR_KAT_Breathing_AttachPersonalOxygenTank">
             <English>Connect Personal Oxygen</English>
             <Japanese>個人用酸素供給機に接続</Japanese>
+            <French>Connecter de l'oxygène personnel</French>
         </Key>
         <Key ID="STR_KAT_Breathing_RemovePersonalOxygenTank">
             <English>Disconnect Personal Oxygen</English>
             <Japanese>個人用酸素供給機を切断</Japanese>
+            <French>Déconnexion de l'oxygène personnel</French>
         </Key>
         <Key ID="STR_KAT_Breathing_CheckPersonalOxygenTank">
             <English>Check Personal Oxygen Status</English>
             <Japanese>個人用酸素供給機の状態を確認</Japanese>
+            <French>Vérifier l'état de l'oxygène personnel</French>
         </Key>
         <Key ID="STR_KAT_Breathing_PersonalOxygen_Remaining">
             <English>Minutes Remaining</English>
             <Japanese>分残っています</Japanese>
+            <French>Minutes restantes</French>
         </Key>
         <Key ID="STR_KAT_Breathing_PersonalOxygen_Empty">
             <English>Oxygen Tank Empty</English>
             <Japanese>酸素ボンベは空です</Japanese>
+            <French>Réservoir d'oxygène vide</French>
         </Key>
         <Key ID="STR_KAT_Breathing_AttachOxygenVehicle">
             <English>Connect to Aircraft Oxygen</English>
             <Japanese>航空機酸素供給機に接続</Japanese>
+            <French>Connexion à l'oxygène de l'aéronef</French>
         </Key>
         <Key ID="STR_KAT_Breathing_VehicleOxygen_Affirm">
             <English>Attached to Aircraft Oxygen</English>
             <Japanese>航空機酸素供給機に接続済</Japanese>
+            <French>Attaché à l'oxygène de l'aéronef</French>
         </Key>
         <Key ID="STR_KAT_Breathing_PersonalOxygen_Affirm">
             <English>Oxygen already connected</English>
             <Japanese>既に酸素供給機に接続済です</Japanese>
+            <French>Oxygène déjà connecté</French>
         </Key>
         <Key ID="STR_KAT_Breathing_PersonalOxygen_Disconnect">
             <English>Oxygen tank disconnected</English>
             <Japanese>酸素供給機から切断しました</Japanese>
+            <French>Réservoir d'oxygène déconnecté</French>
         </Key>
         <Key ID="STR_KAT_Breathing_Remove_OxyMask">
             <English>Remove Oxygen Mask</English>
             <Japanese>酸素マスクを取り外す</Japanese>
+            <French>Retirer le masque à oxygène</French>
         </Key>
     </Package>
 </Project>
diff --git a/addons/chemical/XEH_preInit.sqf b/addons/chemical/XEH_preInit.sqf
@@ -64,4 +64,14 @@ PREP_RECOMPILE_END;
     [0, 3600, 60],
     true
 ] call CBA_Settings_fnc_init;
+
+// Shows poisioning image
+[
+    QGVAR(showPoisoning),
+    "CHECKBOX",
+    [LLSTRING(SETTING_showPoisoning), LLSTRING(SETTING_showPoisoning_DESC)],
+    CBA_SETTINGS_CHEM,
+    [true],
+    true
+] call CBA_Settings_fnc_init;
 ADDON = true;
diff --git a/addons/chemical/functions/fnc_gui_updateBodyImage.sqf b/addons/chemical/functions/fnc_gui_updateBodyImage.sqf
@@ -20,7 +20,7 @@
 params ["_ctrlGroup", "_target", "_selectionN"];
 
 private _ctrlAirInfected = _ctrlGroup controlsGroupCtrl IDC_BODY_TORSO_I;
-if (_target getVariable [QGVAR(airPoisoning), false]) then {
+if ((_target getVariable [QGVAR(airPoisoning), false]) && (missionNamespace getVariable [QGVAR(showPoisoning), true])) then {
     _ctrlAirInfected ctrlShow true;
 } else {
     _ctrlAirInfected ctrlShow false;

diff --git a/addons/chemical/functions/fnc_gui_updateInjuryListGeneral.sqf b/addons/chemical/functions/fnc_gui_updateInjuryListGeneral.sqf
@@ -21,6 +21,7 @@
 params ["_ctrl", "_target", "_selectionN", "_entries"];
 
 private _poisontype = _target getVariable [QGVAR(poisonType),""];
-if (_target getVariable [QGVAR(airPoisoning),false]) then{
+
+if (_target getVariable [QGVAR(airPoisoning),false] && (missionNamespace getVariable [QGVAR(showPoisoning), true])) then{
     _entries pushBack [LLSTRING(Intoxication), [0.4,0,0.5,1]];
 };
diff --git a/addons/chemical/functions/fnc_poison.sqf b/addons/chemical/functions/fnc_poison.sqf
@@ -44,6 +44,11 @@ if (_gasLevel == 0) exitWith {
     };
 };
 
+// We assume that oxygen masks only cover the mouth and nose, leaving the eyes exposed to CS gas
+if ((_unit getVariable [QEGVAR(breathing,oxygenMaskActive), false])) exitWith {
+    TRACE_1("unit has oxygen mask",_unit);
+};
+
 private _currentInfectionArray = _unit getVariable [QGVAR(infectionArray), []];
 
 if ((_currentInfectionArray findIf { _x isEqualTo _infectedObject}) == -1) then {

diff --git a/addons/chemical/stringtable.xml b/addons/chemical/stringtable.xml
@@ -121,6 +121,12 @@
             <Russian>Определяет, влияет ли GAS на искусственный интеллект (если вы запускаете его на локальном сервере, это может вызвать проблемы с производительностью).</Russian>
             <Dutch>Bepaald of KI/AI beïnvloed wordt door gas (als je dit doet op een lokale server kan dit leiden tot prestatieproblemen)</Dutch>
         </Key>
+        <Key ID="STR_KAT_Chemical_SETTING_showPoisoning">
+            <English>Show Poisoning</English>
+        </Key>
+        <Key ID="STR_KAT_Chemical_SETTING_showPoisoning_DESC">
+            <English>Determines if poisoning and intoxication is shown in the medical menu</English>
+        </Key>
         <Key ID="STR_KAT_Chemical_GasFilterItem">
             <English>Gas mask filter</English>
             <Spanish>Filtro de la mascara de gas</Spanish>
@@ -793,7 +799,7 @@
         <Key ID="STR_KAT_Chemical_PutOnGasMask">
             <English>Put on gas mask</English>
             <Japanese>ガスマスクを装着</Japanese>
-            <French>Mettre le masque à gaz</French>          
+            <French>Mettre le masque à gaz</French>         
         </Key>
         <Key ID="STR_KAT_Chemical_TakeOffGasMask">
             <English>Take off gas mask</English>
@@ -814,9 +820,11 @@
         </Key>
         <Key ID="STR_KAT_Chemical_SETTING_dropWeaponChance">
             <English>Drop Weapon Chance</English>
+            <French>Chance de lâcher l'arme</French>
         </Key>
         <Key ID="STR_KAT_Chemical_SETTING_dropWeaponChance_DESC">
             <English>Determines chance for dropping weapon while in tear gas</English>
+            <French>Détermine les chances de lâcher l'arme en cas d'exposition aux gaz lacrymogènes.</French>
         </Key>
     </Package>
-</Project>
+</Project>