From 42dba5f81d996fa3dbf48f20b144ac3fb4fd550d Mon Sep 17 00:00:00 2001 From: Mia <95135995+MissHeda@users.noreply.github.com> Date: Fri, 2 Feb 2024 02:36:44 +0100 Subject: [PATCH 1/3] save current version --- .hemtt/project.toml | 8 +++++ .../ACE_Medical_Treatment_Actions.hpp | 2 +- addons/breathing/CfgVehicles.hpp | 2 +- addons/breathing/XEH_preInit.sqf | 2 +- ...c_treatmentAdvanced_pulseoximeterLocal.sqf | 12 +++++-- addons/breathing/stringtable.xml | 33 +++++++++++------- addons/circulation/CfgVehicles.hpp | 2 +- addons/misc/CfgVehicles.hpp | 6 ++-- addons/misc/stringtable.xml | 4 +++ addons/misc/ui/KAM_Iteraction_Logo.paa | Bin 0 -> 28906 bytes 10 files changed, 49 insertions(+), 22 deletions(-) create mode 100644 addons/misc/ui/KAM_Iteraction_Logo.paa diff --git a/.hemtt/project.toml b/.hemtt/project.toml index b465fc5c1..cd5cb5aa3 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -50,4 +50,12 @@ preset = "Hemtt" workshop = [ "450814997", # CBA_A3's Workshop ID "463939057", # ACE3's Workshop ID + "1779063631", + "2018593688", + "2369477168", + "1352873741" +] +parameters = [ + '"C:\Users\Heda\OneDrive\Documents\Arma 3 - Other Profiles\Mia\mpmissions\mission.Stratis\mission.sqm"', + '"-profiles=C:\Users\Heda\OneDrive\Documents\Arma 3 - Other Profiles\Mia"' ] diff --git a/addons/breathing/ACE_Medical_Treatment_Actions.hpp b/addons/breathing/ACE_Medical_Treatment_Actions.hpp index e7329aad1..545efd65f 100644 --- 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 index fe3c33f56..d6e549c26 100644 --- 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 index e5b20d13d..781ba0bff 100644 --- 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/functions/fnc_treatmentAdvanced_pulseoximeterLocal.sqf b/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeterLocal.sqf index 1b369b761..cf9348618 100644 --- a/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeterLocal.sqf +++ b/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeterLocal.sqf @@ -33,10 +33,16 @@ _patient setVariable [QGVAR(PulseOximeter_Attached), _attachedPulseOximeter, tru [{ params ["_args", "_idPFH"]; _args params ["_patient", "_bodyPart"]; + + private _displayString = LSTRING(pulseoxi_Log); + if !(missionNamespace getVariable QGVAR(enable)) then { + _displayString = LSTRING(pulseoxi_Log_Disabled); + }; + if !(_patient getVariable [QGVAR(pulseoximeter), false]) exitWith { [_idPFH] call CBA_fnc_removePerFrameHandler; _patient setVariable ["kat_PulseoxiInUse_PFH", nil]; - [_patient, "quick_view", LSTRING(pulseoxi_Log)] call EFUNC(circulation,removeLog); + [_patient, "quick_view", _displayString] call EFUNC(circulation,removeLog); }; private _HR = GET_HEART_RATE(_patient); @@ -47,8 +53,8 @@ _patient setVariable [QGVAR(PulseOximeter_Attached), _attachedPulseOximeter, tru _SpO2 = 0; }; - [_patient, "quick_view", LSTRING(pulseoxi_Log)] call EFUNC(circulation,removeLog); - [_patient, "quick_view", LSTRING(pulseoxi_Log), [round _HR, round _SpO2]] call ACEFUNC(medical_treatment,addToLog); + [_patient, "quick_view", _displayString] call EFUNC(circulation,removeLog); + [_patient, "quick_view", _displayString, [round _HR, round _SpO2]] call ACEFUNC(medical_treatment,addToLog); }, 1, [_patient, _bodyPart]] call CBA_fnc_addPerFrameHandler; [{ diff --git a/addons/breathing/stringtable.xml b/addons/breathing/stringtable.xml index f73141591..f1e6b0533 100644 --- a/addons/breathing/stringtable.xml +++ b/addons/breathing/stringtable.xml @@ -2,20 +2,14 @@ - ACE-Breathing activated? - ACE-Atmung aktiviert? - ACE-Czy zaawansowane oddychanie ma być włączone? - ¿Activar ACE-Respiración? - 啟用ACE-心肺呼吸系統？ - 启用ACE-呼吸系统 - ACE-Breathing aktivováno? - ACE 심폐호흡기 기능 활성화 - ACE-Respiration activé? - ACE-Nefes etkinleştirildi mi? - Attivare ACE-Respirazione? - ACE-дыхание активировано? + Activate Breathing Module + Aktiviere Athmungs Modul + KAM-Breathing を有効化しますか? + + + Sets if SPO2 simulation and according functionality \nlike Pneumothorax, Airway: occlusion & obstruction should be activated + Aktiviere Athmungs Modul KAM-Breathing を有効化しますか? - ACE - Respiração ativada? Lethal SpO2 value @@ -228,6 +222,19 @@ %1 がパルスオキシメーターを装着した %1 conectou um Oxímetro de Pulso + + Pulse Oximeter: PR: %1 + Pulsoximeter: PR: %1 + Pulsoksymetr: PR: %1 + Pulzní Oxymetr: PR: %1 + 맥박 산소포화도: PR: %1 + Oxymètre de pouls: PR: %1 + Nabız Oksimetresi: PR: %1 + Pulsossimetro: PR: %1 + パルスオキシメーター: 脈拍: %1 + Oxímetro de Pulso: FP: %1 + Oximetro de Pulso: RC: %1 + 1x Pneumothorax 1x Pneumothorax diff --git a/addons/circulation/CfgVehicles.hpp b/addons/circulation/CfgVehicles.hpp index 13e04a345..39e2f3903 100644 --- 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 index a856b240e..0c70459b2 100644 --- 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 index 7eb356618..793ae6e15 100644 --- a/addons/misc/stringtable.xml +++ b/addons/misc/stringtable.xml @@ -1,6 +1,10 @@ + + KAT Equipment + KAT Gegenstände + ACE-Misc activated? ACE-Sonstiges aktivieren? diff --git a/addons/misc/ui/KAM_Iteraction_Logo.paa b/addons/misc/ui/KAM_Iteraction_Logo.paa new file mode 100644 index 0000000000000000000000000000000000000000..10aa6a7fb16b1bbfdf6d1a25017841df292f9411 GIT binary patch literal 28906 zcmeHw3tW^{`u};~nSmK#cwbNgL*xuXb4UFZs5LjRR4mer0W>ZHY-{BTqh?XgO*FT* z6m_M&iJJYbezm4qOzk!dBd*%6rS8v0Eel9ZG*j@3$~*J^pBH=wWb?1pcG=(G_rnZ) z=Uku5Ip;agdCnkWCrrr78#f_8ONbD%TCFpBaA8(1hgo2U^{b2l?UN9Iz+17&d%_OND-hW66{1Mc95Y+CCXVQoQUL2QM(A5*hVV?QLLu7 zK&YP##r^qMkP^zI$V{M&Ad#l5CyD|@YNKFlkie*(D1a=>162HQ$F$gr072qP&on$C zNR8RnreQGq4WGHk{L(`g{v@ z-UwA!m)^ChehXJ#k?ol4j|1ivwZELOWNW!4NNi1zqCBOCG8l+yyJWREqoEGc>pNuP z{GviDu4Smy#@Q?6UXgfbsWDSHiXjB@qnTkDA1Xd3MI*abCN*zlX#6CTfICPu`XFM7 zmoHQvkq0Fw37sv1Nd3LwStSs2>j}5^!1~U|<#zGySkJ`c(Lu`HK%u(0IJs?v$lJA! zwpc7ah9Lg9FH0;HL_#O*9T=He5-IdZ79C!COvzH^bRB^Vkk-oHqqJHqChQDQ^H$GW z9S@($F1X8{oxYcWKPx&dEu8jdddaGGfqD&lR-T7MiQ6`54=zgj1fxg1)Uet1xn*)s zvZ&yzmRg2c!{T@*iui)fSzfeNu8R<+To}A+s`IjZB@)Ga?Uo)~Ss#t%x&$m|s5D)= z+?&j@QC&n`gO&tg5t~<}v%I9Ts)B)X)(PWMl)1 z<_L+>Ks-80!n))JqPW9Bl~m)&Alw*@H(lE-5Ihw2w%kUM?C??d5X$fx_9B4?>*Csw zDDAY2`G@iJ1i3B2Zk&wKbf{d~>3(cvK6O;y7{=fvTety~dUGJ>v{C6v5DwkDIjPxs zL9Ry|8nX-K$8P%O8S;!JCT{Tn1#|l)QVKBBE=PNiBnYKWp&`|=xkb=&_ ze3b_iT0}}TLDbd)f>>7)$(AS>MAp!4E>iBu(zTZ^D9A6u$pK2FZA|ZU5`Ujhfs)|8 z?ug(e#Y%!W#Xhn^#oU5Nu;CvCSv34=%8OiqS+5C6c`3E_*2R5jBX-eDPQl z697?+_Jm^^*s7l*uyE=_`8VZmIezZfK_cRTQvW6pVRDe_m_Iq$Ul*tF3?pUYL)IdB zAo{S(X^e}jlQY9W60c9Ks2H~eq(Wqg)9Mr;>K7X@%Fn+{Dwt?N4ZY-KX<>kPO2!z8 z(HR+O3M1qzL`d$S?pPmWu_?)?qVk$_9>NExe^`$_tVdiT2V1ihD;nY*R491h0&Wlt?71z_20$c{rII!D-UxiIm`Z!(jyafB3p|5fFJ|950j_(Yxlzy z?#DDB%=Li}TG>nZQ5d($26XV8#zC`ZvB(>_V{DOA>7X7~7CZA429zb%=uKXkairhu zmpjr|cTwF>pC^^fNTPkL`E`}e1XG#+GB>#uwF_l)%+)TH&8qUa(rhldKK7OI7qgxk zX)7aI*uO7RJJK)2;8jf62ptltkl+IpW&#ayqMS3SxixZ(#9oR_8_rb94HFX2%jOur z+Kr#}B;x`daxVB%l%erbX_3mN`}a2zN-wNrBIb1y!jXFPl^XOaOI+QiFc3rAWrniz z4!LJ!%DF5eKhJE&dkkSgr1tC;rhc&8-n^TUGi8|d92Q0H$o%CSVO3wsjiS#8jL&+g z&rYg66w#0-5hxtd-Y%T%p>QO0wv|1cVD-7w%xu|T))wKmrm#m{r0^bj_nj!pk52}y z#oA!E>1&+CRN@^vlw!EwU#BqK&$3}cSR!&@D%PWVna)ZSS}i`@$-u{Lg0a5n*MbBQ zg+KR9AqSt!d~Ad&P#MH_&jdUJ*lF)56Q@a~52-jcpv3dkFF`-OkP?m99{@dvopqAQbNaS|l6YvsA&#{0sQuVCB{XP2-fJFE0;2WV;)*(7Zv`lE4E0j>_1|!sw&eX;1ot%%Ro#Rm`s@ zEF!gjg)?&A2Bc9PpaW-U|&_N-Of*UpjIt5j;+ z>{5wDo2K#53Ilm|RTMkTnU6<%!yW}LQ|2M4=v_G@6J~5!Al4o#k$cJA^YJ}4PP%7O zb<1HH5w)ZHQsiw5_4r*TnQTUh|;f_5mU6h=FHQZ}~Re)UzI))<+*%=us9VzIT?{fJ}Dvy=O%P%lvm zB)!dP~C#k1}*IU^7zpJLarUscJ2PPTjH`#=#+(FZb=Haf-jD-FCqjuo~)3t9G9 z7V=r-4(Y{hLYgQ%Q8zb8>|Nz3E~?P#o%ssS>XPMkex-*Hyx3sMZeF0UC*l%OL7s|< zO?UeI4O+S5_LeT$4%TIz0<+P??BY67-FSO}!qFrX)1qwD-QsYjX;nI02$Lht=@^yr z4laI*RM>7WCRnZEwwh|WbMU+kSZ$+H^lACH+>p$E@!lIjV#uzk-MdY4CpF}gmr%FT zNeR(JwP!Q#0JB&)CbL|n8!RG@e^i^X_>sgQarfE6|DH(71EK()=b(2^2O0&dyUN7P z8(`@X>DqUUU8vn}hmj#@AKOsatW_}DlwhFaVvtxmw{(78e6qq8EpRswBuT1RX~{*G z((qqf6AEW44QOb)%5H5*F>Wj>%2%;I0U=R3N6mi0qPE>ml+)&*%7~6&sgfxJ8%a}P z^7(uUJ6abVX>L^7<`DNNGa^+%6z`peEDDCWdy!V3oQEs)$rm&Z>i%=#V&mlfa^|Ao z)?<_XTQ(~iBP2Lzqi`}pq~hi6<%u9N(csT7H65iZ#(~N4;?t*S5?ATybOVa2(0H?E zzd#*MKe0jX$rAl_-|JIdk_^AfDJ`{_rKi*8c_>V7 z8zPK7b3avoprFM)hwp$cl*dRo8+;W zsld!;R@pjaUksNjbXs7|>H||O(4ycsQ_*i~=K%$>U*|TDdlZy@*39Uxwo;XmvQ(ES znF<)wgg`)Q8y_?&nh3!Vbhk|vtgw{eGDC6_E9m$?O26EbE}+gFzkACjj3xo&N=Zb> z2l;4uaKV@sTI3UxvQG+I82p&+_?9BNDW|qz-;5-4`=1 zK8~3JCdY7_7bA&h7q;4|NEojPv|DEQ=VFE2vp_KP(qh%okCdQ`PcWaP8$RFP2$O6| zQ;}aAp=^qN-~|ax_qW~mh02qzV(y3aP@J8%&+1axXj%9wQoCQJe+#Ld3tL&2+6YES zwNf`X#qgjRriQi?({To~3XjyIMvYD(9Cp4YDZ<$mUo%naEy|flG6apDB~4+QX;HH{ z`6MBDizb`JFP)>G@rg5ypbkjO43jmz)DVeOj$vBz&Ymg0^%sQFP?9@SWlM*Fur;B& zx~e${=4486j^D4cJy5)`POD!_sBAB3*xx=ksYK~)8@o%UcF;S<;>C8l7^sgQeq>Nq z{HsACauzKz#bY#*MB;ljx@19Yhr8_gLYin6KX`!-^NDeO(08!KKCMCS9s0+8rB9k) z`&g_03`5%*Ck0BW4ekOpOY~4F+o!l-H5?|+4imf!R{ooUGV$u)ty-lpk~x!L!CdAT z)R3mIzvL|nSLrBGOP6v|WJbOf7Rkd28r#Bj1DV*W3dp=N&jOW>c>FmP^A2tFEx@Cg zDoqn+Z&^nRiD@|MRZ@E}iOG}OXdLunA`a|k{CP@ax(ZZ{xb5SxCOlVXNO9a17pL;% z3hq&oq(GwZNMjZbt+u$hO@_?-rnX@WGZa(Iu%go-blbdXmz*m7Qmb4TT3)ezpb0MfhJ95rL~fGt5r-&@j|6mFCfPR z-#MJ13cgd^p$WbN222w34j!XN9U6uevdBiBM_~&4sCJEhln8rmbb6p^r-S%=Vmz84 z7<(o&Y}D5ZW;e0@(g!Ra=Slx;r`(}_Iia2?2g7fZ%5Hc{W>XW=48K#Y)6*oGTi+3$ zu&=rerWL{BQKYt^K&30zFhf(kl`e}Sh_)sa%~!%!>tSVZM5I(@e`}5!wxH|ig3F5F z=POpqSW{^=qhglH0&61_9vbqQo;JS@I&Dv6l{QeiTK^lMbpLf;t@08H+hME{WI5et zfi-MY!gg507N#(VG{$Xt>%pSUN)HZNu~HSlt))u}o^GSVw-D9XWgO)~g80X=2??S; zulZauS<#pk9V@tdGdK*M)KNH=q0~BuDDF$k(l7I?G{2>ncTU#@O3StSZTpLoG@f^+A~F(3 zcvEN1ROzP1HjguxfJJzA6@H>I>rCuCS{T19QFzCB*{V;T(c|~@%U_i>H7&|nEjQA+ zXD`XVdbT!*jUJJ`J5FtET}KO)%nK==owR^VOxO;)F@MJI4$uN*m)VO2TK!3%n%S+? zr8}STRTroOOGm349c5~p@5P5u2W-QOVzRYuMOb2cA=b4z#$-`CYum?4)Viz`Tbs(} z_+`r45`|rMWKvYntTJpwYZZ=Edq>RkK8IPYFvM(42n zR-k5Qi?bWmO(VTs0<~fH-7=N!_7tztT7n;i{UoJBu?uLevQan-X9mK`V&*?-WG{i& zN*K9)dG3MDQhd>~ha_d0txu$hg)f!KFGhNN_t?#R_jUY)N#cUs{kw zt8E zR!~k?@7oV6aMejQQ!CT!rL-VBxur{`%N0E|4?7 z7OGAkznj=p7C&wfyDOa5kb8gxkqM_59~1~AO7`A^EiNVaf~M_SNALUWVzr`)%@UhL z;Y}(VO=M^zQKpkU*dn8aJ{pI6$QWYN1sL8wVSpG+Klt}Q$sOVBm6)MrHjJtKBIe;=_> z!N!Xx#?V67=!D56y0}f_s3`7`8C}!s(p0)OS~Lz1Uatk4Ce^zdSyj#=SKHHa?+QgW ztu+m!aH$=FDugs+DO ztZ&F|VRU|tX>AuR+9DRov|r4i$*tl+FU8QQXaeVt{moPu@NKc#(Tv-4Kp$e1l1rML<@1v{rl(NoKhC~eV1{MnB-!oo3a z`q$GN0~AeX|7KRZCRmxU1qZ+xR0>;3Vu-s!%~*wBFdG?5`D|d|&=1(NQ<7+coDeaO zo`)tRlp;%teXW#0uxq4Z#^E+=r-ESxitLN#H#!wg(~hxqO51MYU`sijAn;N6*S($C zhQ==c8*JYMLq1`5GgD|{+;8v&N*1WR52GPhS`QyQ{t=a(f`bYs3{MD9Lt~yYWF(Ny z$@LvnSEsd9>3Li5`qUTGB3)|F%QQ(;ZjK=;i|9L1Wx^kjl@@J%>Q?j!jr=APem4Nl z`mimvPs!L3<~nV1jcI6mjNoNg^?rqceq~gcAjhQg(8LKuf=6Q{VJ;}N;3fw4Oy~hP z0s?JJm1#VOQ=0Z#&1SXjRDysQWsfm!kzK0IR_T|=X}xHxS))5d6qvzjhY)%isMMiE z!Kk`Azp8OrIf3RRz{iJ>&(@`~CEtpc5p#-rvrdKSB~1y(LhcH=?lIx}$GV%??plTJ z&%*3HXI8Y(^xj(JMMtRU$pa!I7tqa6HaaIigrd_kj9S4^Y7m^N_j zbI&&)UNs;T!=0765HfMOdL9h#+yO-|0*Y_qoBX(`4>!ldl?mbId~kDq{5h--aS(9v zH;9Jd^|AD#TZ(f3hrJ5tocY19e3rZTKy3gb9d7EwPoWPW|7F5{@@Lz@9ST3ZJa`M{ zhr+~cit)h@Uq7fp&x7Ipr{G6#>;M1QYyU3!*U$)orJlv>%N0C@$GkiT;+yjC)i|C% z*VDg<_uR7*-Q`F4{Mw5UB?m!3JicD}f$85>{`(t2-gRk9czJ>o3_T6;6+GU&5~HfL zxH=x|+ByBmFXA!Z-|s7bX$8;^5p#Tf!&(62`cfVfJpqM10fYaM^GRw?|5t?8=PBLe zPX#ZxhSuYS$DN(rJjv5LY!8G2I?so&@Q=U`E}jZ~^L%=v^4|)ZZ5ZEiy!;>@27UCL zgyiwGT?m~Q916+zkNXhXzbOS={LnBwEs(#cu+YL|44-lRzMlL=1LzlgV?Tb#_VJ-;-%LMrqvyf!&h@7k{e0$s<0kja!%tKO`2Mj$2;_q& zgs=4YTG-l7F-`sWk^KdPI?9l*QKK94zlG3V!%43z(PH#eRi4$W`3?#qNQ!#@3H zFMm7wQ_nzj5qrLgr!V$rJ|Boy_Rt@i&)C63rXcdh<<0Y#r}tlQH&nbUxWn zKYHZ<4ejlmj!@ZbduVZMz7~*P25XFK}X7ni+j~{pep}Ycf z0gt)*rao9|)|^>$TD!YXzQ6nW1L#d3=JR8yvnSy?`u;EZFI`P9gL2o&Eu@~W5322X zFuZg1_o6=j{MeZOySwrn#4Gdt;d}H`<5u8|-(Q!;_otOzM@v9Yc+9e`?CbDc3wyhS zvLcHsls^})6To_s$LIgC=nLQGJndx9hStZJnLX%%>Da+Gtm_l>_B#X{ND_DP!Z z#`H_@DFnyXLfkX7+1Gks`&?hR2gB=!NWZ@`v+BsH??2vq_FHv*_BS^lZ-BFCo`0>t z*Mc^V1|S3;j{jzJNgIzbe8$mtE!@(j$QB3$1fSm8Q_scFeBNUZpoo6+1J}y2(D>&1 zgV2aLzC8CEt|Q&B{O{?NXQ=$rxzK;V)WX-ddp<%-toddhzYO*&Y)3*EL+jr}-#s5( zZ7)Xu4eX=0xtljXjJ%=Ro(ID_*Pqmn3o94G6vX4(yCIO)Quzjt*&t*@-`*dSB}NF; zAw)mNm&k_x_~ir_ip=2oRSyA@1=VdAdAt$$3B^P9yso{OCL~f3pDxb6dVFzrdD29Z zWgVhQXfLEctD(HvyfGx-4(N}xttdnfXFnA6 zqc6m-9=+@vuY7x<^kj~o!jU|_<*f5!#KJ!Q3r8>D_LCubaJjh$!;6y__c!-oc>NHV z0)Jd8+=1ikS9kWDb%*-%DA>a6hgIkJbiPO57C#K*DXt&?-fuxj74V1nJ7#;T%yEcn z@? z;Pbb#)&L%uiN`1m-dBDci^KYvB#&xjbw*pPu{)%g&H#Li`)I?WdJ5kkRvC zc<-a;#`Q_~8+UnPKmAPD!)^>-C{N_;vz_5;{r>AoDy*kz{q%zypEUxlpO;4~JNpH) z&N7b2Ec+(R$Ta~Tx3Zjt_kn}QEZZ^vSR)zI2bL`pldiTBKHUwc=-*{LYtFK)k$NEH z--z11+jO8Ge|ne=Z#;kg)3NIJKwLk6SK{aHvJqeP*^5ig|9kdNoHRlF8N7U2VdgW} zNkC_NImnHFZKtar&YgLglz!Hio;$PE#p!r&{?%PIw6C<<#pA`Jz#jQG*#9Fg)CJ(K zTF73eJ_i0Q3PfROmKzEGY5qU($H4{YK7U{4S@$fsFWR>s9P-~IIgax5@%+3V?(x_5 zlV`>TnHc2z8eg6T|BTtM?KeKRCTOqP-}UC~%g?RIzEwQtZev=QXMW9NF0?nY;dsbi zgbNkZ!2-$bOHY**we{&oPy64(9=#U5o4c;|hbmgYIqtj=(vR2=K|eOthvo}(<>Bl5 zv9XdfHZq_6l5anvZTq^b{9RYZ51-ESZy>&M-ty(O(hs&^xL+Ixt79*PEnW90Gk>)@|a~gkFTq`4gPlIKV5s4IC5Tzg->sVdTW<#fDzYQzplN8CeE8x zJm%!PFC#KEA8_@P=?6moK$hiZ1Ty3==E{|{_2~y^Kf-<`)ZRe)ZxpAUFka;!j^5?Y zJ+Qm8i7zkA;^x;M&;Fls`h%+A_{y_<`#is{hu3lEZE-h4mZ2MR*IDmNU z?P?#35DKmLtt@9jtZm@ax&0yBFr3a~PTKwVXK;l9W%RQ*IQxLxu<-d=cFH0bbfFJp zR8Z{-wa@j>3_*r``t|t7r<!6Nwel$N4MZl3a+s9{qr8b9}lN&L1p3pNYpeN*}r330EkF z{%qER$aBZ4zJyr(8}0wK=;iz+as9@V7OZhgKm2X$=T?LM^?AFtCe#Gd`i;jE(;G+> zS}$7JM<*d)$@6^wxbvQ(e*XV&+y3?PzdjYAiW{JBoEP>B?CJe{eRRcJ(w}m_kFGp? ze}uJg)dQ9w9$PQ7tt>1NJm&fNo$+PFJ(w?lADkY;{wd_|V%x#AyjJ{=k((=f%ESKs z^{E1q4B2->+jAzp^30BXd^*bthLDoJ^I>j&%FoLSt@nKUw{@^A(|UObkC(BW{abSz zkNNt(GrowpCqys)n6iBeQ#@Z^Pb!xIUVYU4eDGaw?5k?etbCvE-?#M#&iI_8s@unx z*R(pHXzsVZ5w|Xw`M!H*U;Q^2|HavJC+pHe{y>&pI#-L@KIY}s(zSS$t9n*wKIZ)M z{nvZGKLgKyvo?*d?63cE|76#&ZB>2#&>nf-xIZ-YB->qT420;X&_r&374olv*n1uf z?>|TR;{pD_+)IIt?5V2I`MABE>vf;ME8!!SEr2g-;OP;rSpNT<-)=PigRhU5uMX@j zsdRlmdmv}hQFotx&#l)!lO?ns3@p#%f$~RJ9zLBMK)>?fKdMIbvzJ6*aj+j!=lT3i z7ddwH*>l78a@UijA$|<3|33{&Hjb}U_oH8V4xF3)){AdT&v%u-9psyl(YOC-=~_Cs z`rOKp|GpLGhnW^@$iK(Shu0q-Ur+wmqbI_WS>B)iq(JVXe|`^sT(7uk6!d6+MjWV#7G#jf5)A>)S8Mcq4jdyId;ttiIdN*ssE&=Z@=@S z(|@JGpN#)E+wbAPP5%Ep_a9f(Gc-Tk#JwE2sjoNnmD_0!91kXB;=;A~2g4uVl+5Gdn`%p*Z(oc>O2HCvxC5&9mQp zO_K}z121@J8-C?jIG=bAz6KqBelGM%2820~2No}h?fz{@o}>N>^4i?zw!0Sn<=io- zx&N^wM)qm%!yy_779Q@}O7X1wn+MY08y3K`pdVs{L`v6h8M@f9oKSSF)yoBh--xMuT~ zGIWg29lM~f<`kB{=VW$3l_M8%Zuorj;I;wRY6e~_%0Q$Ait_ytefs^vV#8;HJmI_g z`TFkNd#aZ0f30T#{k;76{MW+V=jOVMkiN6*ybT2Oo6pa}F@>ccc64E6F31msB@e9s z%6N(6%U{8H$!j(SwmO+oK0j31^I&+t5&ghxGAp~lQ^n`MvnNXHo5S>sT!mNo!Ll;( zSN)E`6I+4aqW)nU5T=)wHk!|0-vJ}S5Z8|%&_VCMP?!$qwks;iTgm6=+%#tM`jDIU zjp^`D82W`#bMp!3wolmtF;?uQ&^1$X@}{JNo4@y{n?&%|hsa?nnJO5!{7$4ilX)zpm z_g<3;>0@tLw0{KOf9^L#ZH4r`xFf0}Vy!QMPj6*+&#&}J?&9%Kpxf?mNps0Jnn9R zOB6NpLU>^Qv#TIK6yWoF;n?l>n^X&Vyc&+_v$CzBu$zJ9|A$*Y`nBf;H?HgXe{C=6 z6nlOz#eBk-M^~QjiWA!RRh`W&pU;=)`^)2{7dWl#JJyOk!X0a&L_Ym&5MpFt3FI+f zes$OOQJXev7x0+-T|TF9dU3ZiILH|2ThBk|juolbLgfPpp1xzn+XsXN2|xMwh6RZS z9BbWs;8Lye=&wThq;*qQ9qU}n{t5LT=;R*eC_*nwp40O59|Zj=EGjJe2K(o#YX*s5 ze|6Qd8a@eUrmOnqzuwyW?13K}-zfcD*qTHi=jZ8%Z*NA0@U?IQ>Ho3&|9#tw0DU>q z@7Ox!at?|5t)JJ!myz#`v0wS`+n<}|dpUsN7dKH2rV^|hTr`*R~t>}0AU}O&9x9p+lp@IE@Zx^^Knmy_;_pg}x%$$NlSARPJv~S|- z;2650K`JTU-g`Tbh1)_;=NDS!@AR4tSGKuz53n!Q`*P~+ zzTzR=(+0@x0#|}Yf87Vm#B=`8GWyqjdFI&T z?AaOe-rGe$7K;WGxF-X=acXh|R+aBqm%wu1|9hqLU8@^4WtJloyG0Pey>v%;P z+I|E}Tx%&F7lYYTSfeUry}h^Dxn&wI=N%e!VzV8h+e2mv8Vn7Seal$VfMurW+$Ao0 zgyGCeZrRWOg6n0sZw#1S+%(Bvg7QKd6}4luB<-2B;%!{|+2m=vFq#7UhTArCxR&Ag zC57@+*qoIgONM@muh0v>dL9h#T+Uw9w``=Gf1*MFEaB6`Y8HV0m4%jdUjI1$q`_A` z^ZJ(o(>Mf=nJ4YP`m}$<_+KaWKm8xr-t{nyzpIwP=a){rDw^Pqr8$=GQ$NkQ0trMc zx_a0M?sd`Ycf7}SGI4j`V-H#=Pvec zSGd)_A? literal 0 HcmV?d00001 From db59c452caa5b1afaf7066e5cf35244d9ca7357d Mon Sep 17 00:00:00 2001 From: Mia <95135995+MissHeda@users.noreply.github.com> Date: Fri, 2 Feb 2024 02:37:04 +0100 Subject: [PATCH 2/3] save current progress --- addons/chemical/CfgVehicles.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/chemical/CfgVehicles.hpp b/addons/chemical/CfgVehicles.hpp index 36cd18cde..c30931f3e 100644 --- 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)); From 5dfbe4b54bbf5f2aa46a3a58fa3ec43d1618bc3c Mon Sep 17 00:00:00 2001 From: Mia <95135995+MissHeda@users.noreply.github.com> Date: Fri, 2 Feb 2024 03:11:23 +0100 Subject: [PATCH 3/3] ready for PR --- .hemtt/project.toml | 8 -------- ...nc_treatmentAdvanced_pulseoximeterLocal.sqf | 12 +++--------- addons/breathing/stringtable.xml | 18 ++---------------- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/.hemtt/project.toml b/.hemtt/project.toml index cd5cb5aa3..b465fc5c1 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -50,12 +50,4 @@ preset = "Hemtt" workshop = [ "450814997", # CBA_A3's Workshop ID "463939057", # ACE3's Workshop ID - "1779063631", - "2018593688", - "2369477168", - "1352873741" -] -parameters = [ - '"C:\Users\Heda\OneDrive\Documents\Arma 3 - Other Profiles\Mia\mpmissions\mission.Stratis\mission.sqm"', - '"-profiles=C:\Users\Heda\OneDrive\Documents\Arma 3 - Other Profiles\Mia"' ] diff --git a/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeterLocal.sqf b/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeterLocal.sqf index cf9348618..1b369b761 100644 --- a/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeterLocal.sqf +++ b/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeterLocal.sqf @@ -33,16 +33,10 @@ _patient setVariable [QGVAR(PulseOximeter_Attached), _attachedPulseOximeter, tru [{ params ["_args", "_idPFH"]; _args params ["_patient", "_bodyPart"]; - - private _displayString = LSTRING(pulseoxi_Log); - if !(missionNamespace getVariable QGVAR(enable)) then { - _displayString = LSTRING(pulseoxi_Log_Disabled); - }; - if !(_patient getVariable [QGVAR(pulseoximeter), false]) exitWith { [_idPFH] call CBA_fnc_removePerFrameHandler; _patient setVariable ["kat_PulseoxiInUse_PFH", nil]; - [_patient, "quick_view", _displayString] call EFUNC(circulation,removeLog); + [_patient, "quick_view", LSTRING(pulseoxi_Log)] call EFUNC(circulation,removeLog); }; private _HR = GET_HEART_RATE(_patient); @@ -53,8 +47,8 @@ _patient setVariable [QGVAR(PulseOximeter_Attached), _attachedPulseOximeter, tru _SpO2 = 0; }; - [_patient, "quick_view", _displayString] call EFUNC(circulation,removeLog); - [_patient, "quick_view", _displayString, [round _HR, round _SpO2]] call ACEFUNC(medical_treatment,addToLog); + [_patient, "quick_view", LSTRING(pulseoxi_Log)] call EFUNC(circulation,removeLog); + [_patient, "quick_view", LSTRING(pulseoxi_Log), [round _HR, round _SpO2]] call ACEFUNC(medical_treatment,addToLog); }, 1, [_patient, _bodyPart]] call CBA_fnc_addPerFrameHandler; [{ diff --git a/addons/breathing/stringtable.xml b/addons/breathing/stringtable.xml index f1e6b0533..d19a13759 100644 --- a/addons/breathing/stringtable.xml +++ b/addons/breathing/stringtable.xml @@ -7,9 +7,8 @@ KAM-Breathing を有効化しますか? - Sets if SPO2 simulation and according functionality \nlike Pneumothorax, Airway: occlusion & obstruction should be activated - Aktiviere Athmungs Modul - KAM-Breathing を有効化しますか? + Sets if SPO2 simulation and according functionality like Pneumothorax and \nAirway: occlusion & obstruction (SPO2 reduction will be deactivated) should be activated + Setzt ob SPO2 Simuliert werden soll mit funktionen wie Pneumothorax und Atemwege: Verstopfung & Obstruktion (SPO2 reduktion wird deaktiviert) Lethal SpO2 value @@ -222,19 +221,6 @@ %1 がパルスオキシメーターを装着した %1 conectou um Oxímetro de Pulso - - Pulse Oximeter: PR: %1 - Pulsoximeter: PR: %1 - Pulsoksymetr: PR: %1 - Pulzní Oxymetr: PR: %1 - 맥박 산소포화도: PR: %1 - Oxymètre de pouls: PR: %1 - Nabız Oksimetresi: PR: %1 - Pulsossimetro: PR: %1 - パルスオキシメーター: 脈拍: %1 - Oxímetro de Pulso: FP: %1 - Oximetro de Pulso: RC: %1 - 1x Pneumothorax 1x Pneumothorax