Merge branch 'macroFixes' of https://github.com/MiszczuZPolski/KAM in…

…to macroFixes

addons/breathing/functions/fnc_inspectChest.sqf

@@ -53,8 +53,13 @@ if (GET_HEART_RATE(_patient) isEqualTo 0) then {
     };
 } else {
     if (_hasPneumothorax && (_airwaySecure || _airwayClear)) then {
-        _message = LLSTRING(inspectChest_unevenMovement);
-        _messageLog = LLSTRING(inspectChest_unevenMovement);
+        if (_patient getVariable [QGVAR(tensionpneumothorax), false] || _patient getVariable [QGVAR(hemopneumothorax), false]) then {
+            _message = LLSTRING(inspectChest_none);
+            _messageLog = LLSTRING(inspectChest_none_log);
+        } else {
+            _message = LLSTRING(inspectChest_unevenMovement);
+            _messageLog = LLSTRING(inspectChest_unevenMovement);
+        };
         if (_simpleSetting) then {
             _hintSize = 2;
             _hintWidth = 13;
@@ -69,6 +74,9 @@ if (GET_HEART_RATE(_patient) isEqualTo 0) then {
 
             _message = _message + "<br />" + format [LLSTRING(inspectChest_simple), _type];
             _messageLog = _messageLog + format [" (%1)", _type_log];
+        } else {
+            _message = format ["%1<br />%2", _message, LLSTRING(inspectChest_uneven)];
+            _messageLog = format ["%1%2", _messageLog, LLSTRING(inspectChest_uneven_log)];
         };
     } else {
         if !(_airwayClear) then {

addons/chemical/script_component.hpp

@@ -14,4 +14,4 @@
     #define DEBUG_SETTINGS DEBUG_SETTINGS_CHEMICAL
 #endif
 
-#include "\x\kat\addons\main\script_macros.hpp"
+#include "\x\kat\addons\main\script_macros.hpp"

addons/circulation/XEH_preInit.sqf

@@ -333,6 +333,8 @@ PREP_RECOMPILE_END;
     LLSTRING(SETTING_AdvRhythm_Enable),
     [CBA_SETTINGS_CAT, LSTRING(SubCategory_AdvRhythms)],
     [true],
+    true,
+    {},
     true
 ] call CBA_Settings_fnc_init;
 

addons/circulation/functions/fnc_AEDX_ViewMonitor_AnalyzeFeedback.sqf

@@ -94,7 +94,7 @@ private _fnc_displayMsg = {
 {
     params ["_dlg", "_fnc_displayMsg"];
 
-    if (GVAR(AEDX_MonitorTarget) getVariable [QGVAR(cardiacArrestType), 0] > 2 || (!(GVAR(AdvRhythm)) && GVAR(AEDX_MonitorTarget) getVariable [QACEGVAR(medical,heartRate), 0] isEqualTo 0)) then {
+    if ((GVAR(AdvRhythm) && GVAR(AEDX_MonitorTarget) getVariable [QGVAR(cardiacArrestType), 0] > 2) || (!(GVAR(AdvRhythm)) && GVAR(AEDX_MonitorTarget) getVariable [QACEGVAR(medical,heartRate), 0] isEqualTo 0)) then {
         [_dlg, 2] call _fnc_displayMsg;
 
         [{

addons/circulation/functions/fnc_AED_Analyze.sqf

@@ -66,6 +66,7 @@ playsound3D [QPATHTOF_SOUND(sounds\analyzingnow.wav), _soundSource, false, getPo
             playsound3D [QPATHTOF_SOUND(sounds\shockadvised.wav), _soundSource, false, getPosASL _soundSource, 6, 1, 15];
             [{ // If shock advised begin to charge
                 params ["_medic", "_patient", "_defibrillatorType", "_soundSource"];
+
                 [_medic, _patient, _soundSource, _defibrillatorType] call FUNC(AED_Charge);
             }, [_medic, _patient, _defibrillatorType, _soundSource], 1.7] call CBA_fnc_waitAndExecute;
         } else { // no shock advised
@@ -74,10 +75,11 @@ playsound3D [QPATHTOF_SOUND(sounds\analyzingnow.wav), _soundSource, false, getPo
         };
     } else { // If advanced rhythms are disabled just check if patient is in cardiac arrest
         if (_patient getVariable [QACEGVAR(medical,heartRate), 0] isEqualTo 0) then {
+            playsound3D [QPATHTOF_SOUND(sounds\shockadvised.wav), _soundSource, false, getPosASL _soundSource, 6, 1, 15];
             [{ // If shock advised begin to charge
                 params ["_medic", "_patient", "_defibrillatorType", "_soundSource"];
 
-                [_medic, _patient, _defibrillatorType, _soundSource] call FUNC(AED_Charge);
+                [_medic, _patient, _soundSource, _defibrillatorType] call FUNC(AED_Charge);
             }, [_medic, _patient, _defibrillatorType, _soundSource], 1.7] call CBA_fnc_waitAndExecute;
         } else {
             playsound3D [QPATHTOF_SOUND(sounds\noshockadvised.wav), _soundSource, false, getPosASL _soundSource, 6, 1, 15];

addons/circulation/functions/fnc_handleCardiacArrest.sqf

@@ -29,7 +29,8 @@ params ["_unit", "_active", ["_initial",true]];
 
 private _cardiacArrestType = 0;
 
-if !(alive _unit) exitWith {};
+if !(GVAR(AdvRhythm)) exitWith {};
+if !(alive _unit) exitWith {_unit setVariable [QGVAR(cardiacArrestType), 1, true];};
 
 if (_initial) then {
     if !(_active) exitWith {};

addons/gui/functions/fnc_updateInjuryList.sqf

@@ -336,7 +336,7 @@ private _fnc_processWounds = {
 [GET_STITCHED_WOUNDS(_target), "[S] %1", [0.7, 0.7, 0.7, 1]] call _fnc_processWounds;
 
 if (_ptxEntry isNotEqualTo []) then {
-    _woundEntries pushBack _ptxEntry;
+    _woundEntries append _ptxEntry;
 };
 
 // Handle no wound entries

addons/gui/stringtable.xml

@@ -49,26 +49,38 @@
         <Key ID="STR_KAT_GUI_Status_NoIv">
             <English>No pushed fluids</English>
             <Korean>주입된 액체 없음</Korean>
+            <Japanese>注入された液体なし</Japanese>
+            <German>Keine verabreichten Flüssigkeiten</German>
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_showInactiveStatuses">
             <English>Show Inactive Statuses</English>
             <Korean>비활성 상태 표시</Korean>
+            <Japanese>非活動状態の表示</Japanese>
+            <German>Inaktive Status anzeigen</German>
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_showBleedRate">
             <English>Show Bleed Rate</English>
             <Korean>출혈 속도 표시</Korean>
+            <Japanese>出血率の表示</Japanese>
+            <German>Blutungsrate anzeigen</German>
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_showBleedRate_DESC">
             <English>Display bleed rate (slow/moderate/severe/massive)</English>
             <Korean>출혈 속도(느림/중간/심각/과다)를 표시합니다</Korean>
+            <Japanese>出血率を表示する (遅い/中程度/重い/大量)</Japanese>
+            <German>Blutungsrate anzeigen (langsam/mäßig/stark/massiv)</German>
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_overlayBodyPart">
             <English>Overlay Selected Body Part</English>
             <Korean>선택한 신체 부위 오버레이</Korean>
+            <Japanese>選択した身体部位のオーバーレイ表示</Japanese>
+            <German>Ausgewähltes Körperteil überlagern</German>
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_showPatientSideLabels">
             <English>Label Patient Sides</English>
             <Korean>환자 측면에 라벨 붙이기</Korean>
+            <Japanese>患者側面のラベル</Japanese>
+            <German>Beschriftung der Patientenseiten</German>
         </Key>
     </Package>
 </Project>

addons/main/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 2
 #define MINOR 13
-#define PATCH 0
-#define BUILD 35
+#define PATCH 1
+#define BUILD 36

addons/misc/stringtable.xml

@@ -830,35 +830,21 @@
             <Japanese>患者を担ぐ</Japanese>
             <French>Transporter le patient</French>
             <Korean>환자 운반</Korean>
+            <German>Trage Patient</German>
         </Key>
         <Key ID="STR_KAT_Misc_CancelCarrying">
             <English>Cancel Carrying</English>
             <Japanese>担ぐのを止める</Japanese>
             <French>Annuler le transport</French>
             <Korean>운반 취소</Korean>
+            <German>Tragen abbrechen</German>
         </Key>
         <Key ID="STR_KAT_Misc_StoppedCarrying%1">
             <English>Stopped carrying %1</English>
             <Japanese>%1 を担ぐのを止めました</Japanese>
             <French>Arrêt du transport de %1</French>
             <Korean>%1의 운반 취소함</Korean>
-        </Key>
-        <Key ID="STR_ACE_Medical_Category">
-            <English>Medical</English>
-            <Czech>Zdravotní</Czech>
-            <French>Médical</French>
-            <German>Sanitäter</German>
-            <Italian>Medico</Italian>
-            <Polish>Medyczne</Polish>
-            <Portuguese>Médico</Portuguese>
-            <Russian>Медик</Russian>
-            <Spanish>Médico</Spanish>
-            <Hungarian>Orvosi</Hungarian>
-            <Japanese>治療</Japanese>
-            <Korean>의료</Korean>
-            <Chinesesimp>医疗设定</Chinesesimp>
-            <Chinese>醫療設定</Chinese>
-            <Turkish>Medikal</Turkish>
+            <German>Das Tragen von %1 wurde gestoppt</German>
         </Key>
     </Package>
 </Project>

addons/pharma/functions/fnc_init.sqf

@@ -127,7 +127,7 @@ if (GVAR(coagulation)) then {
             [_idPFH] call CBA_fnc_removePerFrameHandler;
         };
 
-        private _openWounds = _unit getVariable [VAR_OPEN_WOUNDS, []];
+        private _openWounds = _unit getVariable [VAR_OPEN_WOUNDS, createHashMap];
         private _pulse = _unit getVariable [VAR_HEART_RATE, 80];
         private _coagulationFactor = _unit getVariable [QGVAR(coagulationFactor), 10];
 

addons/pharma/stringtable.xml

@@ -249,18 +249,21 @@
             <Japanese>ペンスロックス吸入器</Japanese>
             <French>Inhalateur de Penthrox</French>
             <Korean>펜트록스 흡입기</Korean>
+            <German>Penthrox-Inhalator</German>
         </Key>
         <Key ID="STR_KAT_Pharma_Use_Penthrox">
             <English>Use Penthrox Inhaler</English>
             <Japanese>ペンスロックス吸入器を使う</Japanese>
             <French>Utiliser l'inhalateur de Penthrox</French>
             <Korean>펜트록스 흡입기 사용</Korean>
+            <German>Verwende Penthrox-Inhalator</German>
         </Key>
         <Key ID="STR_KAT_Pharma_Penthrox_DescShort">
             <English>Used to manage moderate pain</English>
             <Japanese>中度の痛みの対処に使用されます</Japanese>
             <French>Utilisé pour traiter les douleurs modérées</French>
             <Korean>중간 정도의 통증 관리에 사용됩니다</Korean>
+            <German>Wird zur Behandlung mäßiger Schmerzen eingesetzt</German>
         </Key>
         <Key ID="STR_KAT_Pharma_Naloxone_DescShort">
             <English>Used to reverse opioid overdoses</English>
@@ -817,7 +820,7 @@
             <French>Cathéther intra-veineux</French>
             <Turkish>Ağrıyı bastırmak için kullanılır</Turkish>
             <Italian>Catetere intravenoso</Italian>
-            <Japanese>静脈注射(IV)針</Japanese>
+            <Japanese>経静脈注射(IV)針</Japanese>
             <Russian>Внутривенное игла</Russian>
             <Portuguese>Cateter Intravenoso</Portuguese>
         </Key>
@@ -849,7 +852,7 @@
             <French>Cathéther intra-osseux</French>
             <Turkish>Ağrıyı bastırmak için kullanılır</Turkish>
             <Italian>Sistema d'infusione intraossea</Italian>
-            <Japanese>骨髄穿刺注射(IO)針</Japanese>
+            <Japanese>経骨髄注射(IO)針</Japanese>
             <Russian>Внутривенное игла</Russian>
             <Portuguese>Infusão Intraóssea</Portuguese>
         </Key>
@@ -2084,12 +2087,14 @@
             <Japanese>ペンスロックス吸入器の許可</Japanese>
             <French>Niveau médical requis pour l'inhalateur de Penthrox</French>
             <Korean>펜트록스를 사용하는 데 필요한 의료 레벨 수준 변경</Korean>
+            <German>Erforderliches medizinischer Grad für die Verwendung des Penthrox-Inhalators</German>
         </Key>
         <Key ID="STR_KAT_Pharma_SETTING_treatmentTime_Penthrox">
             <English>Treatment time for Penthrox Inhaler</English>
             <Japanese>ペンスロックス吸入器の使用時間</Japanese>
             <French>Durée d'utilisation de l'inhalateur de Penthrox</French>
             <Korean>펜트록스로 치료하는 시간</Korean>
+            <German>Behandlungszeit für den Penthrox-Inhalators</German>
         </Key>
         <Key ID="STR_KAT_Pharma_SubCategory_Basic">
             <English>Basic Settings</English>
@@ -2331,7 +2336,7 @@
             <Italian>Impostazione della Nalbufina (Nubain)</Italian>
             <French>Paramètres de la Nalbuphine</French>
             <Korean>날부핀 설정</Korean>
-            <German> Nalbuphin Einstellungen</German>
+            <German>Nalbuphin Einstellungen</German>
             <Japanese>ナルブフィン設定</Japanese>
             <Spanish>Parámetros de la Nalbufina</Spanish>
             <Portuguese>Configurações de Nalbufina</Portuguese>
@@ -2380,12 +2385,14 @@
             <Japanese>ペンスロックス吸入器設定</Japanese>
             <French>Paramètres de l'inhalateur de Penthrox</French>
             <Korean>펜트록스 흡입기 설정</Korean>
+            <German>Penthrox Einstellungen</German>
         </Key>
         <Key ID="STR_KAT_Pharma_flush_log">
             <English>%1 performed a saline flush</English>
             <Japanese>%1 は生理食塩水フラッシュを実施しました</Japanese>
             <French>%1 a effectué le rinçage salin</French>
             <Korean>%1이(가) 식염수 주입을 수행했다</Korean>
+            <German>%1 hat eine Kochsalzlösungsspülung durchgeführt</German>
         </Key>
         <Key ID="STR_KAT_Pharma_IVblock_closed">
             <English>Patient's IV is blocked</English>
@@ -2838,10 +2845,14 @@
         <Key ID="STR_KAT_Pharma_SETTING_staminaMedication">
             <English>Medication Modifies Stamina</English>
             <Korean>약물이 스태미나를 조절합니다</Korean>
+            <Japanese>薬品によるスタミナの変化</Japanese>
+            <German>Medikamente beeinflussen die Ausdauer</German>
         </Key>
         <Key ID="STR_KAT_Pharma_SETTING_staminaMedication_DESC">
             <English>Allow certain medications to modify (vanilla/advanced fatigue) stamina as a side effect</English>
             <Korean>부작용으로 특정 약물이 (바닐라/고급 피로도) 스태미나를 조절할 수 있도록 허용</Korean>
+            <Japanese>特定の薬の副作用としてスタミナ(バニラ/高度な疲労)を変更することを許可する</Japanese>
+            <German>Erlaubt es, dass bestimmte Medikamente als Nebenwirkung die Ausdauer beeinflussen (Vanilla/fortgeschrittene Ausdauer).</German>
         </Key>
     </Package>
 </Project>