From 437f85a3b350294a72dc834d8b5c64d3920de88b Mon Sep 17 00:00:00 2001 From: BaerMitUmlaut Date: Fri, 29 Apr 2016 13:18:44 +0200 Subject: [PATCH] Removed in-vehicle interactions from interactions addon --- addons/interaction/CfgVehicles.hpp | 80 ---------------------------- addons/interaction/UI/btn-01.paa | Bin 5625 -> 0 bytes addons/interaction/UI/btn-02.paa | Bin 5625 -> 0 bytes addons/interaction/UI/btn-03.paa | Bin 5625 -> 0 bytes addons/interaction/UI/btn-04.paa | Bin 5625 -> 0 bytes addons/interaction/UI/btn-05.paa | Bin 5625 -> 0 bytes addons/interaction/UI/btn-06.paa | Bin 5625 -> 0 bytes addons/interaction/UI/btn-07.paa | Bin 5625 -> 0 bytes addons/interaction/UI/btn-08.paa | Bin 5625 -> 0 bytes addons/interaction/XEH_postInit.sqf | 5 -- 10 files changed, 85 deletions(-) delete mode 100644 addons/interaction/UI/btn-01.paa delete mode 100644 addons/interaction/UI/btn-02.paa delete mode 100644 addons/interaction/UI/btn-03.paa delete mode 100644 addons/interaction/UI/btn-04.paa delete mode 100644 addons/interaction/UI/btn-05.paa delete mode 100644 addons/interaction/UI/btn-06.paa delete mode 100644 addons/interaction/UI/btn-07.paa delete mode 100644 addons/interaction/UI/btn-08.paa diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp index 2ec3f48312..f12054e466 100644 --- a/addons/interaction/CfgVehicles.hpp +++ b/addons/interaction/CfgVehicles.hpp @@ -383,86 +383,6 @@ class CfgVehicles { class ACE_SelfSpatialActions {}; }; - class Helicopter_Base_F: Helicopter {}; - class Helicopter_Base_H: Helicopter_Base_F {}; - class Heli_Light_01_base_F: Helicopter_Base_H { - class ACE_SelfSpatialActions: ACE_SelfSpatialActions { - class ACE_TurnEngineOn { - icon = PATHTOF(UI\btn-06.paa); - displayName = ""; - selection = ""; - position = "[0.057,1.725,-0.24]"; - distance = 1.5; - condition = "!isEngineOn _target"; - statement = QUOTE([ARR_3('ace_interaction_engineOn',_target,[ARR_2(_target, true)])] call EFUNC(common,objectEvent);); - }; - class ACE_TurnEngineOff { - icon = PATHTOF(UI\btn-05.paa); - displayName = ""; - selection = ""; - position = "[0.057,1.725,-0.24]"; - distance = 1.5; - condition = "isEngineOn _target"; - statement = QUOTE([ARR_3('ace_interaction_engineOn',_target,[ARR_2(_target, false)])] call EFUNC(common,objectEvent);); - }; - - class ACE_BatOn { - icon = PATHTOF(UI\btn-02.paa); - displayName = ""; - selection = ""; - position = "[-0.08,1.74,-0.01]"; - distance = 1.5; - condition = QUOTE(!(_target getVariable [ARR_2('ace_interact_batStatus',false)])); - statement = QUOTE(_target setVariable [ARR_2('ace_interact_batStatus',true)];); - }; - class ACE_BatOff { - icon = PATHTOF(UI\btn-01.paa); - displayName = ""; - selection = ""; - position = "[-0.08,1.74,-0.01]"; - distance = 1.5; - condition = QUOTE((_target getVariable [ARR_2('ace_interact_batStatus',false)])); - statement = QUOTE(_target setVariable [ARR_2('ace_interact_batStatus',false)];); - }; - class ACE_GenOn { - icon = PATHTOF(UI\btn-04.paa); - displayName = ""; - selection = ""; - position = "[-0.08,1.735,-0.05]"; - distance = 1.5; - condition = QUOTE(!(_target getVariable [ARR_2('ace_interact_genStatus',false)])); - statement = QUOTE(_target setVariable [ARR_2('ace_interact_genStatus',true)];); - }; - class ACE_GenOff { - icon = PATHTOF(UI\btn-03.paa); - displayName = ""; - selection = ""; - position = "[-0.08,1.735,-0.05]"; - distance = 1.5; - condition = QUOTE((_target getVariable [ARR_2('ace_interact_genStatus',false)])); - statement = QUOTE(_target setVariable [ARR_2('ace_interact_genStatus',false)];); - }; - class ACE_FuelPumpOn { - icon = PATHTOF(UI\btn-08.paa); - displayName = ""; - selection = ""; - position = "[-0.055,1.74,-0.015]"; - distance = 1.5; - condition = QUOTE(!(_target getVariable [ARR_2('ace_interact_fuelPumpStatus',false)])); - statement = QUOTE(_target setVariable [ARR_2('ace_interact_fuelPumpStatus',true)];); - }; - class ACE_FuelPumpOff { - icon = PATHTOF(UI\btn-07.paa); - displayName = ""; - selection = ""; - position = "[-0.055,1.74,-0.015]"; - distance = 1.5; - condition = QUOTE((_target getVariable [ARR_2('ace_interact_fuelPumpStatus',false)])); - statement = QUOTE(_target setVariable [ARR_2('ace_interact_fuelPumpStatus',false)];); - }; - }; - }; - class Plane: Air { class ACE_Actions { class ACE_MainActions { diff --git a/addons/interaction/UI/btn-01.paa b/addons/interaction/UI/btn-01.paa deleted file mode 100644 index 473d6b7a7b365ba7adf458af5619dd6febb54d91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5625 zcmeI0UuauZ7{I^OWGiTEGAtr>w3J|>I$I1@q1$rHLYlxz11@t=D64h#sm%mgpSoN{ zXnfFi)gfg_iuht5w6*1m1X;A$?V)ty25U_(bgbBkc$-aVUAf`-oqO+hZhE&dh4v-x zaFg6$&N<(|^PNBUdRSXq>#-wk$6MV1aDDaK8G}!>wsU4!IJdPP4Rdzkhx2RUaEFBV zGJb}<03SUCaJ~v)89)E6NFV{A1pHo=Dpwh6@IWjUV-PLlf((ww&^`Yp4$Lck zH#hp%h(U#XkOLOpE|60Ca+CXW#QZ;A1T)C`kN$}B^ZxcZ?R7HO2T$g0d8T;5Om%qy zFOr{u$a{Xghy$5$qD48?Nz5`}?H8s!zFwswH}hco1M1v*VPTkeH~fujc(Y!k6NBnH z?W%vUeU`bxKB%Mh+logol-1%TP7Lo|xao`5V%dp5lBDXl%14sb8h`I3Id0DBU98SqjP|s1@=n z#I>ox#dKj&)LRA!-evzW|IOq_g~tr?D1+|xgM7wWtR5ikNFt7^V}q}F}I};pK@V9LufuJj^%L~ zIcgvKe7t^gzu4y5e?~4k);03>UlznMu$Lc$n%@-ij2AZ1JA9QfGD_z1K)*x`+V*4Y zb6-ujR8LoJQ2q1TaAEdhLFk7ixiT+R7N|b-8(Y3~x%(_JM$9P0=cea+4&p`Ztas`U zbg`Q1Df<``**y2ztiF7O`UhCot#IU+SNhQ?k|$?8cNm6< zxNai&?1>`w-MFjI7IDS5&HXJ!4Cia|+(+tf=r69f0zma%9KVQ>|JH(EYn{okfzfn_ zxmH#xfc+ID{gRBz7ZUa|By+9yv5@UBOEOpfvDo&!{8gX}4rU{tv&b99G~{o8Ad5MR zD*?R?a`OAxX#QgKq-fvxo${yu@JfQ*dO}qWbq-aFr<>RFO8bR(5By5?(IrJap8C)} z-ENkDP#$?)4BInTf7ti(PxjM6<*iqj=ez8*h%RC0l+E7ko^iJIwFsjZ-}W(FNl4%Q z7{l-d)t5s#e<8Z^qWg62?O(3b>azlHO*#Ah3xW?1K3$*a6lPYhcq%UYKNVu!xT0b_ TXO4Wbv3lku$>@f|X_kKg1T5L5 diff --git a/addons/interaction/UI/btn-02.paa b/addons/interaction/UI/btn-02.paa deleted file mode 100644 index 1344610a002146d886f01616796b54fd3ff774f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5625 zcmeHLVQ5=b6h5ixR?yaDSVZb*DZ&2G*1Xlu(839`6iw;!byC)k=k=xDSN@im*+y7I#H-1~CxdwJb(gVrB$ zmzU&yIrrXkzH`pK_qkF}j_bppWR;$P<&KGoVzF~LT0TkG)v#SZ*X{7N9u zA>qA@pJ5lk2TuT8tOi)Y&x17yBmkTNzcW%*hAN~J5D1mA-x9@;g53V0+9rj1;A`iz=lszUOFqB^V!2G@hgWUThe(2&Ys3@t+nT?AP3g7fyH_JywL|(1 z-XGUP?zn<*^Zt>4TMxS&f4e=UjwPV^ zIO-%MlSQtQf$92YI9#H*uE4JvpLgO;yeO8i8CeeSOLlE_0$a&p;OAo|TaE1@e-?i{ zuUY)DyrPZn$C+$694NBlLy5y*Zw_XOIg=Q z`+t@fWnhGsLCvp=`Pd7a&}~YGWtdFo1N|DupcR*~&wM`JQZrq>$>q;#Bl+1Yd7&Sc z<*J-imFIH*uVm%g^`7$_Q=iht@rCKR-ototY)DPHUB9=R)YeRyWlV7E!Y8x($|4`{ zCEeLT@XNP226gEXopcC$U%FZR7;s0NDnY2g>hig{LE3bP#zRa-`cU1J}%(0I)Gv{8A LjK3j_5ykcobBM!9 diff --git a/addons/interaction/UI/btn-03.paa b/addons/interaction/UI/btn-03.paa deleted file mode 100644 index 3cbee80b5cea245ede747c3817fda131463197de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5625 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 diff --git a/addons/interaction/UI/btn-05.paa b/addons/interaction/UI/btn-05.paa deleted file mode 100644 index d9cee8e329ee19f9d668c622829308efb4f50d9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5625 zcmeHLZ)jUp6hA9zw=XrRwIG(ZA$I*xQCpv8Ds7W$X!D?>5%=7W^H zjY%u$+SE-cSW?QMI2f+$ctb=Q1UrS04yP_P3v{-$8^~*Pur4;)_1yPz?@Kdct*al5 zyX5t~U+=m1oZmg?p8Kbmw70kJd9i(Os|f&pTKN8L4ex8+O)J-Cop9`%zVGAz>3C>SP}0Es?;BBiF*#~Qiwm9~_3^Q(O7oomHwP7<^#X{)wc=5n zKbi3(5UTC?nqwoM>h&98h(iL*iM;VBgq07;T9B&K#AYKingKj0f}LB{LuIvamlr>qv3^J~cT_Zm)3rT`#}S%4h;TjuFp20JRa-+_x$ftBZJxTE~vr2=;Us0kD#h6=^5`b zv)82t(@{rimf?-~+k73vBss|W2b+OC1n*VwJ z%+03-h;hGV?BA@I9>D~jv6369$OzVu`0*5d}5jF>X|@RW=9DRkRzq(SY1YEG;AFQ|U;r^R(jo9{Ac`W1$|G29n$f@S+b?r zDl4TxZaSE~P8pR)yha+5sZwKGN46L{WvcumzU*1(Rp2&g3c1ILo9^!Q+aCyFOk*a< zhmVEC#I$&T%U{81)LB+O&S;4trFmDNyOQBK5N*%6j~`<=0phtj&kIcq@BGGo{oB39 z>7wSBBR_V%_Zkm_#<|Jzg~r!8e)`w>t26IV{koehp^`E3$LD+)EqL2UFq0VdcVire zQ>=am?4TE-^E*v%#@H#8xv+!9MAL5 Qp175I-{I7np*!{RC))wxkpKVy diff --git a/addons/interaction/UI/btn-06.paa b/addons/interaction/UI/btn-06.paa deleted file mode 100644 index 744de61fe0551e3be7ec09e218b50528dd71c55a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5625 zcmeHLZ)jUp6hA9jw=XrRwIG)MA!hv|YU|TZrEO9TZ60*AV&7O1+`3^wp^N&#e2|j2 zF=+)||F|gyOG+se3&VAlH-<=qV5g9!gDFeR0-cR*2J#vmu8U1}J@>udo7XpMEvp}l zyX4RNy?gFG|IfMa?IcZ24Q($r?QgIEz@BgS0u*ZdNxe!})SBj4!1#zNr5o#O+W%hl$9S;DFI&023q$_Q ztTWB|`_$AlxxLKgbE{|TqUaJP|7QA|=L^ZJM@mpdw%$HLX45r?vsiUv@K1Ao_Fm=j zXwSdrf43U$Gse512D&4Y`?x%UsxD_{yh}`8w;ISqoatGH&H9L7gg% z_H_Ta(R#b8dhaauX#qj^njk~NkqI%qwOCnQPA zMU3YydVbUVkHxV9zyhr!`8U$xW!}b!Y#6)oiq*U{w^7r zhrL=_BKtNXQ*HVkybWzLcFC0aM;5lfjlK%p0kuKTDDh-Z_YlOG#!A4oCjN=ELf%-}j%|Z_mlH{3xWaq=tkH;9cU`0iHe(~(7Tj}?m MF8wx0=usSh0!nGiH2?qr diff --git a/addons/interaction/UI/btn-07.paa b/addons/interaction/UI/btn-07.paa deleted file mode 100644 index 6c2321fcf863b3aa20637fe764557488aa39d8f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5625 zcmeHLVQ5=b6h7(Fb%V7{#QyMyU5sHuMOv)H{s`n1OOhuWMqES~6lphq2wRE>1*POU z=US23&{1$8ri}Tgf7+siLWBhdvtX#gek`*Kgsx2d(}oUN=aOB|x$m9#UP99<1jTNb zm*jmp=bm%Ed+$5Vh2QRX0>I6+8y`yiPX95&0vq9Q|IrX(2Yv{@6$-tf z;Jt>QaTmasPXkPM0NlpUKWhpo0B8Zf*Oaz3A-b9&8jT82o5+yFu~=-cVaP(MB~faT z{5m>1Ktb{bf21E3g4hFeHRE_-+iMuINZ#O&^qIe$Z=?@8{iKh^2d96}VV%FezKK3J zdf@n;exKmSV>}9=PC3=2ljqyYcRK&wFcdhS7~|yyt-Lf@W_vJNBR3Wq%SU(d?*;X& zFLD;2N5g&rlHx&%pj@xD@liZMDb?lPO!`=`DS~2$iLdZ;g#)s0m<9=i-N-ic(FWFBZpbd*uQjt138frTN|VijQFR(_ou+lfC~u;yQO z!Xe=PwHOB4OXQN}|2BWfI7;N38pYui{;z!M)D^~%6C#-CcQBrS2+pU)r_TI)Sf6ZC z``bA8OM6*qlQB`hSng{1=S2B%z5cOW`qani;X5oJ#dw9dcbGA*|EhR*UH{}18~4{y zecWjN?t*{lMEdj!`}fY`-BSDu6X(uV1U{0Cdvis)J;c~uNR*a7v-;P@-)R1|_8&K_ z$ow{C?tePA^4%WA=JSpDe8>Gq&nnjQ^S{TG+^h2Y6aHBLRPS%Fr!mgIwf}j*1K@<{ z%>LiY%Ntm>b~PWzCN%vRzwjZ5Yjwj`|LH;obYa->tAN@77@wi75 zmz;(_e9MJbH3Xs6N4yQm0~U3Ype!p6lKh#?RmPo!KdIcR!l6~%+HCqGO$25CQPNlS zN(I@#k!i&9Rv8*ETpteL#rj%J+39}Mf98(A(<~DpfMpk6tPg?evfI5r()Jr(Ebkp$ zaIY*pYi`T$Ed_u0@uRPAupIrz?fx<7q`gdXi&uu8_YY-QKQJ*qmLIp`4~Wo^FSPnC z%XR-}O#g%5-P#oMt)~AYo9##QI0URO`P(p!5jB=aFiqRz>D>&r+_mX<&p!AgYs0XP zXF9h2gY=qUEBmBzo7{!-6OrrRNbnvb2VekFx53z>rCUMV3o<`NL+8tJD-CJn)s}`D zj1`TXUo^LU7aavUAdrn*7Lg&G7X9=GviJ0uLh z|D?9A%v<`d?EV??=bSl=EU?GQ%*s?@sZkJk7yicjcs|Veup|n7JBCprR5j%A zU-P&5cQkW%o9(1&`#S&gvyEStrtZZbS1{wxC!q_(d^?8GzABj%@_(B@WE@qpO@sE~ zW&SUG^4vv%A;(xS8FC0b15u2p$!C}NdxSo%N#lWW?#I5m)XVoo^OW4B`qgCp;BNDk zoc8vI+W4lBPvU+VyKzupJpWtvd*Ab)jN%aUb+kKfH-C50A3vs@SQqxai}-6T@tJ{h zryC3}Nr8uRCHi?lV0STDUHinGZ{L5r`PhkT&%2GB!WoaM&FUmr@@sP^S zJ1zEJQW1nV?wa<{xLhO1&xrjbf3mhA@BrbD8rNEIcmqqDMSr4;AfG=;`m)}s5Z^=d zh?mVaG*P@V9>7EBtG2e&{hI&erhmX_6Ci+X7al?%0>sN29WI~?gg)nQ!Q>+vLLS95ZQajsE!chCqCdEJ`)1aHVGEz>Smuw> zZGxrk}M-PO-j=9tAoekd0no(YO&7$l^6%x%;u>(^#N>0Ln*JXYU9+Skj9531>v$k*%FGg&Fg-cwBq;#FenQpBHYeempWi zZrB_ALGD>!HuYWEy$kHmCBtnleA> "CfgMovesMaleSdr" >> "States" >> animationState (_this select 0) >> "ACE_isLadder") != 1}] call EFUNC(common,addCanInteractWithCondition); - -[QGVAR(engineOn), { - params ["_unit", "_state"]; - _unit engineOn _state; -}] call EFUNC(common,addEventHandler);