From d0d7a2f9748f2fa6df341966d55e092bd7bd2fd9 Mon Sep 17 00:00:00 2001 From: Kex Date: Fri, 16 Jun 2017 21:00:35 +0200 Subject: [PATCH 1/6] re-establish dev --- .../addons/data_f_achilles.pbo | Bin 292960 -> 292960 bytes .../data_f_achilles.pbo.achilles_0.0.8.bisign | Bin 567 -> 0 bytes .../data_f_achilles.pbo.achilles_dev.bisign | Bin 0 -> 565 bytes .../addons/data_f_ares.pbo | Bin 592021 -> 592021 bytes .../data_f_ares.pbo.achilles_0.0.8.bisign | Bin 567 -> 0 bytes .../data_f_ares.pbo.achilles_dev.bisign | Bin 0 -> 565 bytes .../addons/functions_f_achilles.pbo | Bin 227123 -> 227123 bytes ...tions_f_achilles.pbo.achilles_0.0.8.bisign | Bin 567 -> 0 bytes ...nctions_f_achilles.pbo.achilles_dev.bisign | Bin 0 -> 565 bytes .../addons/functions_f_ares.pbo | Bin 68057 -> 68057 bytes ...functions_f_ares.pbo.achilles_0.0.8.bisign | Bin 567 -> 0 bytes .../functions_f_ares.pbo.achilles_dev.bisign | Bin 0 -> 565 bytes .../addons/language_f.pbo | Bin 137532 -> 137532 bytes .../language_f.pbo.achilles_0.0.8.bisign | Bin 567 -> 0 bytes .../addons/language_f.pbo.achilles_dev.bisign | Bin 0 -> 565 bytes .../addons/modules_f_achilles.pbo | Bin 189834 -> 189834 bytes ...dules_f_achilles.pbo.achilles_0.0.8.bisign | Bin 567 -> 0 bytes ...modules_f_achilles.pbo.achilles_dev.bisign | Bin 0 -> 565 bytes .../addons/modules_f_ares.pbo | Bin 166005 -> 166005 bytes .../modules_f_ares.pbo.achilles_0.0.8.bisign | Bin 567 -> 0 bytes .../modules_f_ares.pbo.achilles_dev.bisign | Bin 0 -> 565 bytes .../addons/settings_f.pbo | Bin 12089 -> 12089 bytes .../settings_f.pbo.achilles_0.0.8.bisign | Bin 567 -> 0 bytes .../addons/settings_f.pbo.achilles_dev.bisign | Bin 0 -> 565 bytes @AresModAchillesExpansion/addons/ui_f.pbo | Bin 309087 -> 309087 bytes .../addons/ui_f.pbo.achilles_0.0.8.bisign | Bin 567 -> 0 bytes .../addons/ui_f.pbo.achilles_dev.bisign | Bin 0 -> 565 bytes .../keys/Achilles_0.0.8.bikey | Bin 167 -> 0 bytes .../keys/Achilles_dev.bikey | Bin 0 -> 165 bytes 29 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 @AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_0.0.8.bisign create mode 100644 @AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_dev.bisign delete mode 100644 @AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_0.0.8.bisign create mode 100644 @AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_dev.bisign delete mode 100644 @AresModAchillesExpansion/addons/functions_f_achilles.pbo.achilles_0.0.8.bisign create mode 100644 @AresModAchillesExpansion/addons/functions_f_achilles.pbo.achilles_dev.bisign delete mode 100644 @AresModAchillesExpansion/addons/functions_f_ares.pbo.achilles_0.0.8.bisign create mode 100644 @AresModAchillesExpansion/addons/functions_f_ares.pbo.achilles_dev.bisign delete mode 100644 @AresModAchillesExpansion/addons/language_f.pbo.achilles_0.0.8.bisign create mode 100644 @AresModAchillesExpansion/addons/language_f.pbo.achilles_dev.bisign delete mode 100644 @AresModAchillesExpansion/addons/modules_f_achilles.pbo.achilles_0.0.8.bisign create mode 100644 @AresModAchillesExpansion/addons/modules_f_achilles.pbo.achilles_dev.bisign delete mode 100644 @AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_0.0.8.bisign create mode 100644 @AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_dev.bisign delete mode 100644 @AresModAchillesExpansion/addons/settings_f.pbo.achilles_0.0.8.bisign create mode 100644 @AresModAchillesExpansion/addons/settings_f.pbo.achilles_dev.bisign delete mode 100644 @AresModAchillesExpansion/addons/ui_f.pbo.achilles_0.0.8.bisign create mode 100644 @AresModAchillesExpansion/addons/ui_f.pbo.achilles_dev.bisign delete mode 100644 @AresModAchillesExpansion/keys/Achilles_0.0.8.bikey create mode 100644 @AresModAchillesExpansion/keys/Achilles_dev.bikey diff --git a/@AresModAchillesExpansion/addons/data_f_achilles.pbo b/@AresModAchillesExpansion/addons/data_f_achilles.pbo index 8a757eda4590d01783bf5d3c8f3cb20bfbea6d99..223562779e3fc9406ae47a90e412a68852ae6ac7 100644 GIT binary patch delta 112 zcmaFxLGZx`!3hVMXK1-hJYvfMq#`FXF)&QGDq&IHti$+=kvUb!d9o(6Hi+IF&isgp z4W!12f3o2{@y%gu3dh;ZOw7#9&6;b@w%43x1Y)M`HD{SGtP&At6`EUqZnM~mO(oeM MJ_dRi2%RYa0Nu1I00000 delta 112 zcmaFxLGZx`!3hVMc?F#(9w0z{MZU_qo=fiYndGCBfbEMJMj0b zbG{z+JpiC004jh z008f{vG#6OOXf#spkW}XhY;aSYy3=T153=&4RLhpC5*4KI|&VazeurW(BRgU)DQ^I z`@&F)drve}m!X##GXOM1Fip!*Q!QE6@5}Vmwb@h3uzhtwrL?G;G`*Ivy^42qXtEM| z>dpe6XhUqId`NY=n5A+hj7YKs<}8mujw*lv006(6H?bZ{Ic0G3igBkH#H$7KTvFjk zju$+CL(+A7N>UB?24<}1Z_{zIPz0lGwS=R^BGsK-!b0XiepNCbZatP)H|y};)$*t0 z_I&hjLz4^UkT=|yYQM^14rwvInQ6>YPSbyAP&@?m^2in!<36Hk*x%gB@o3qco2F&? F^HJ=e5WWBa diff --git a/@AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_dev.bisign new file mode 100644 index 0000000000000000000000000000000000000000..4bc77c468a5fca987c8d0819bf15b541054dc33c GIT binary patch literal 565 zcmV-50?PeCV`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7a>jZ^7>xV)23Xu)355+94_gOnTIbo<|$MLT~~6 zxcfw|lXX!YlwsH=cmiFZ9dgQo8<;B+Q;fb1FH7@Uok^~OQMp^w6z`Hp0ssI2fB*mh zZls@T{^ADP7$@LTgoG@qreGUNp`FfB*mh+nJm{0w+4_6RrQj@)i8k$Je{fnJc8* z*lXIS8W*HLyUysT0Z1`<1jtG{ZF-&g`^=2E5P-Z)e~*ng0}u%T`>0VGy!fS47C*?^dRdz3VX`dbkOw)1wqi|vym5^J~$4_2t3pC2v&05TjO AE&u=k diff --git a/@AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_0.0.8.bisign b/@AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_0.0.8.bisign deleted file mode 100644 index 6cddd8e4baf7ce5452e423cd72863601c46cb728..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 567 zcmV-70?7SAV`yn?Y-Mv_FfK4IH~^FY000I80000a002@`K`{UX000310RXu(z9;eW zMtNY8V-eg<)Z$2d8J<rcs>_>z7;p?`;*6{hr>gK& z%xwwoe2hCG9Q&UcPfkBgFt;%`%$x~s>BjS-^g2iR?CsGMOp*>F3~av9nGreCqqck`Ar;ym(?KA`qqi4($RK34EEoa+004jh z0013!09Buaz5cg1mqu@Mv&o@krH^c`@!am5hTkR^qdZbpo*5rk;y>AYjrXi8s45V` znxjM-OUHoab_j27PJqTjCpax$?H-m$HWx5oGMe4EQ{3i=A-H{GS_d=bL zMGE|ZKY4AH%?Y`4{6$)FvNV3T@HV?#VNwl(=hJ()n6u+HqJltF+&MuI>I}9c+V#7b zu%Kn;0oz4d$k0Sfv~uxF;~ykG)-{)tNa=73eA~abrM!6H?#u;dwDxz4FI1V;gnLp} FfsD|V2Pgml diff --git a/@AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_dev.bisign new file mode 100644 index 0000000000000000000000000000000000000000..9316329bdb4c46c0bd87bfda7618eca684f201bc GIT binary patch literal 565 zcmV-50?PeCV`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ70$>v%(AZW z=J)WZFBy^{->w}FMH@_>b%SroxsNwBKT4J<8;tROR&Prk?~zFC2-gb6IY zo?|j2m&D{v94cV$Y$h=G3r7-|+s+E+mT(4xxl=g7+^3wA!CY<`FgK2iZSov0h?}nP zfrK{S;F5&+po9gigr8>)$c>xV@vLEFN)?(M!{-b(L5gp30-wg_vwYHwU_ZR(uK|k- zvQK`;uR3{>fEZZYY5{ddHZv15b91xi8-ndO1Q~&tY5NU9X7^N)@86ZKwVYlknP5=j_XZQdB delta 348 zcmdn|j(77r-U*e=yn@aXYm}IiKR8WX=m_F%e5%aI<{)Mhna?zNBa7H%6{ct~*NYX* zoy{Z%=9)5sxmTHHGHZ$1OfF>J#`f~9Q{+@0u&^_WB3P9qSk>kRmKH|VukW2AmruUP zD85;Nt%Ql~#3!f7^&FEKxg;iU;!t6Wt+I)n%>?Ft;Yeazv)U%IofXV2;S6R2S`j&g z6U=?eIhpNjphG0L4450o#Wr~kmmHh$G@HmPd?2CCH@GArJ}6-UE8*vv!(7m8yLlbY z8b+oN?#VHH&TOhjZ6c-kCMWP|Y(C2;&B$z1Wi$CTe+`@RR>w#|_Q~(~RVPmp5M!Qk zz;W|x0d+<;Q*#q@1H8B-)v^36i5nhoJW>H4448G1 z>$LL^D;*jf+1BqV=KHrHaFrsSTixT?t)_*M%eZf=C9UvvZA%^~&O!aQFCAdIB3Gy7 z!GS~pW3{K=T(Q!7vlLtA{Mf9P>_S2008-Sl;O&~+q^5gw=c_@s9Rz?U7nZ* z&<_**+;1IWm?V_ F%^L@#5&r-H diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.achilles_dev.bisign new file mode 100644 index 0000000000000000000000000000000000000000..16fcb84c5981ed426e213dbfb6bb92341d828ebc GIT binary patch literal 565 zcmV-50?PeCV`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ70`90bY4W8W$f1bL$L@ms{&uD}f3WLR~Mh=B6N+bCT z5s?4h*p$hUf@(Tdl=#(YOBkRv_V-x-1I(C|n>NKBgT*a?+SDpBWbOoWMQ3U0Bq9Kh ze7lJ*+oxcON~8axnAX|f#Mm4}0hyP?fB*mhc>KPw>A5N|^a5M53z{z_bC!EOO%{;3 zIjECxDHxP#?}+#ky{@FNjnq?MwF(K!JZ5e@6~TcyES)mtvR9d`|D?gG7F!v)kq~z1 za}tv0{|Nw3x*N#= diff --git a/@AresModAchillesExpansion/addons/functions_f_ares.pbo.achilles_0.0.8.bisign b/@AresModAchillesExpansion/addons/functions_f_ares.pbo.achilles_0.0.8.bisign deleted file mode 100644 index 2b696330e14d937e9bb666b47b6fb8520677b44c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 567 zcmV-70?7SAV`yn?Y-Mv_FfK4IH~^FY000I80000a002@`K`{UX000310RXu(z9;eW zMtNY8V-eg<)Z$2d8J<yQCyIgN~JAIff)h-004jh z005-re1UbpT^3|84p!?u#xbnEJC=cm{W=Ol-$Ei|>22T42y&^vM{}ir?mn8VZAvL9 z2{#?=3ChYaWF*jt9Jn`ReqIldoMKkyB3Z<==>yyR$I>jKO_Yp{V!WFcu1f9SMA^b-NGR!+`Tjd*5&d~S@GCb F5(L{93F80& diff --git a/@AresModAchillesExpansion/addons/functions_f_ares.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/functions_f_ares.pbo.achilles_dev.bisign new file mode 100644 index 0000000000000000000000000000000000000000..e9d12dad5dff012bf3bf3b6e2756a408b59f360b GIT binary patch literal 565 zcmV-50?PeCV`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7`0(E@$nz0# z`;|-geO?Q#0Es8p@^?~Irl*sj&Qr)JfB*mh-zJ*$%F(z^A|8HgjNajpi-S+fi&F^w z8h#~tQ9+B151E=P8r#?nlH|oN5JDY=OWQk9PXKGrk!y!GEo?;!`m31&c$#^Y^ffbD zPa6FH$H3Y)39iMfGc nvm9f)93$g)IYuTf2@$U9dn=-Zf2Ce=UU8sUU6IjPpz9z2Wl9-7 diff --git a/@AresModAchillesExpansion/addons/language_f.pbo.achilles_0.0.8.bisign b/@AresModAchillesExpansion/addons/language_f.pbo.achilles_0.0.8.bisign deleted file mode 100644 index afc2c5322ee99c2bf0e502269845e9e350da0d7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 567 zcmV-70?7SAV`yn?Y-Mv_FfK4IH~^FY000I80000a002@`K`{UX000310RXu(z9;eW zMtNY8V-eg<)Z$2d8J<S+1I&e&VS9 z3i^9=6igGZNxH&|PCsj7He;%{92Gv%V}h(_hbudkyHoC-#Q1`&7L`MRZvZcFt(5t1 zsl^f6Ya-xOJ@K%|`rahOssnBpkaEjBJ~W6Ou0PQMg@MVTJ}e&$eKJTUuay?V?RyAH zO}=0JV(#a!WIrssuEYel( z31PLUn+grs;1DgZ&M4wp;cRzYYB^p;)7xy$hvr=cEiaHKzc}6~^b(X0TVX3so0(MY zwu43c3Yo5?>k9Ptq7+2rVo|+SOkR9=JLWVPnYOhYxhO{(=gqkUI^OU7;Iu>uJ>x09 FQ(oOv0*L?s diff --git a/@AresModAchillesExpansion/addons/language_f.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/language_f.pbo.achilles_dev.bisign new file mode 100644 index 0000000000000000000000000000000000000000..cd7b0e6eebe6303666d401d997175b8dbdb23f54 GIT binary patch literal 565 zcmV-50?PeCV`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7?4V?VpSGj zO1J_fHGT}Fv2~G{LGVg!t4$Ysq$Hoyig@Iu?* zT2o^~5V?*NOfyxxJ4@aWKeXCr;3G1w4ek#kbDTjF;_+1hk)#NHIbdj~5P?44G$J-Z z*k`P6ifb$pr89Dye*@OS*YDhWw#1oUfB*mh@n6>pd10(&Dd+b9I_RN{^H40A$%cQ= zc&t2IN|?eosv$00DrJ!zshDBQL@25EQ9ijSknDY&H6esBny^EL`>!_LkD=c*^6#~8 z#b^Et-sV~We9nE;woxS9lclG#)ShsB(uwQlW~^m#jpmvG@~^625IPvKyMxGy$2CHW D${h-t literal 0 HcmV?d00001 diff --git a/@AresModAchillesExpansion/addons/modules_f_achilles.pbo b/@AresModAchillesExpansion/addons/modules_f_achilles.pbo index 99decbf3cc764ea9faaa9049859a150e5fdb31d2..170f83516bf1421c72b99ecb2c5f71a41d648c77 100644 GIT binary patch delta 322 zcmeA=&E0jHd%`p3R3YbyFU>&IWF;Frx%Wc=J8RU`DXK z39~Zu3@w+*oJWS%4_J$Z$|Zf=m;SwK^xQcEW{@`y}s5)=iSGfU76tWt<$@?1fQ$?pWE z!N&fWEGQ(pSy`yUkIl@)%-r0pd0|5P!UV?c3lo^Gwumrt)kP#v(~FdRtI6YX%IJCE Hva3e`^Eq1u delta 322 zcmeA=&E0jHd%`p3vw;p1Uz#xs202VtVl-!V5VM&a!)VJk`-f9xF~{VGj4G24GfFVG zPqf*5k1?2$+3dU1WD{m(W?n((%~8x{jLcd<4VPK8nU%zCCNr|ifFvd>uo^SpsI!?I z#%jq{S8o%k#y&ZpO=0p@)-B9O>ufgXuw7>5_;%JQl1YStVX|eHyeI=Q2#~XhbY%p} z6iiW_ynu(7*;CGD@&=wpR-oG={U_`3$xjaD4P;aN?i9((H(8%gZu2SLy-aLCheSSP zo+Kzed4<4kZjk$D0ZolcEuGxRBQm*3P?Q-cHhGqy8CwUBbEFW*uT1PY*vqd6n1yHqXnldy-fTZ1{(QND~w zItXXcE6_oMy^wa*WVBoM=onzgL;mTU28)DlbSlwvErcf>-s2R_2?|~ROs2Rp%93<13Px(RaI=yf-*)`Un zRwl@ot-IkxwL+>{@{mZJ2}tDO6MrZSF3&iH0K{%)y%iTv%s0}tGi*sJF|Fk8MKsVQ F@SPeX2fP3P diff --git a/@AresModAchillesExpansion/addons/modules_f_achilles.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/modules_f_achilles.pbo.achilles_dev.bisign new file mode 100644 index 0000000000000000000000000000000000000000..20551d3120bea10514cdb6cc731ba1f89e63b419 GIT binary patch literal 565 zcmV-50?PeCV`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7-rwy#oT%$^_yV=fx>R{d zZvQhairO$#gh=Qs!iV&bQmrxaXiS+qp*f9R+g2h|(T7aD)tmt4LOtok)>YPhGh#16 zRr%T_*FRM?(^3~}NH^QIh8xJ078k3JIrzaWj8YDF(2+sGkGS%TcNbWo0ssI2fB*mh z?ol;Yj6`uzhmh@v_?meTJYYx>JI(0$>wAQ0rmKqf0ConRnXya*}CCI zz>I2*>`tK5#Y#We4)rB%8%u}}_f)K850TA4Fqc0}vaw&Pif$jqxEWk)?!@a~1`nV2 z0FJzILtjZ!fd4E0kWL8$e&8#fujLb8%TqfJI&IHk$ zZ?novgB8p0PTr`XH2vx}M#0I(ih^LVWdb0v$vKL$%s}%t_b3W7ff);wvzWmQUiBH> rY-T2A=H_P2t2b?5y@_$#RT0k%XR1H_J5H?y*sGcxlEI#0G|oe82h z-)5DUX44Y0iIm};yiq}E`qgcWf|HFE1;Jv=1VCbwa};Hnfl4;_C<-!x84HxNn3>N7 yI&9`upV7@`YHng~VA#BR)ArSy7`I&&xhwDdy7^GsqV>j>SFa^ml$`r|um}KdNHn?t diff --git a/@AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_0.0.8.bisign b/@AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_0.0.8.bisign deleted file mode 100644 index 72caaef4d11eeb6906c6d5515c2df49b22646944..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 567 zcmV-70?7SAV`yn?Y-Mv_FfK4IH~^FY000I80000a002@`K`{UX000310RXu(z9;eW zMtNY8V-eg<)Z$2d8J<5&cx%>71?lKlfO7e&Sx25XCRr$8*O}>!V)dRQ8btABcN4dnqxU+ z1oF=4QzsHX-a1fq&8q)f=@YqAr}5Ho26#4$yt2+J587U8zHSqoXRO7^X-@(G004jh z0060&>S!>}=SFANTYfZP?hvK)7ZAj?z4uXO;aWBu*or2ARr980up$M2FnmE4#j2Dg zINfDXu6|7%-R zDnm^Rx`8vmFAc(_rt2*L>?2 FH#;n21yBG0 diff --git a/@AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_dev.bisign new file mode 100644 index 0000000000000000000000000000000000000000..15cde9d4f15e0ac411104957cf7bc492ced1ae6e GIT binary patch literal 565 zcmV-50?PeCV`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7od*MTPunON6Y`4sZy;iiRL6%HG}fg!z&NfJU(8SoLR41Xp1OJQro zRR%;^fN5sDx@&@NS4=0=320tAy@)OsfB*mh*X8+b3?+C@n>cAQ=_4!Fc52YZrL?pk zFFdDX(`ZKUEu|HfaTJGw#5@=>u zZK&|gNoHIVrMFImFPqO&^cje|>u9uocHCe7a7Y_nm4O)DGwff&pfZdRsguOSV)9L` DO``)0 literal 0 HcmV?d00001 diff --git a/@AresModAchillesExpansion/addons/settings_f.pbo b/@AresModAchillesExpansion/addons/settings_f.pbo index ac23ee294371ed59e4aaec9d6251dc5efe198625..6584490b4059ee11cd05280103b1bf93f8fce846 100644 GIT binary patch delta 69 zcmdlPw=-@+KJyGMmx)DbVCwcs<}@Ma$;%l-nNxxEf5uccGZQm&bF{S{(np6?gRj%sT>ag delta 69 zcmdlPw=-@+J~OYN^TeVwFm?MRb8wZ- X%-bi$%2S(qC(nOPXYy!oakkQ-^)Cr{)wPdP7I?>3625)004jh z005^2lwTfvkwY4JzOKNl)@|lqP6PG|sTZINa6MtzkF{fFgwn`s9kW0#f*o9DYl%%} z<3SVjmY8Iunsg-L{D{>?Rs`Qj38$&X!UUzt9OWGQLE<;hv0IK!C&9VL zyYee>c0HJ#>ad1W%NvT#GGIPS3u`uD=xJ1H$?#K=_`1MnUlY54Pdf_7C36?t{J#zS zLUm-p1#bXQsk#NcnWi=mMbvfqF}-!GU`8aiCMw{3^Pmw#R)&{SF`g*dU)|z0YX^L> Fi8}ig1hxPG diff --git a/@AresModAchillesExpansion/addons/settings_f.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/settings_f.pbo.achilles_dev.bisign new file mode 100644 index 0000000000000000000000000000000000000000..e7bb2d789d9965b04f35422870649541e1f4c492 GIT binary patch literal 565 zcmV-50?PeCV`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7F9;XD7J20ssI2fB*mh z-d00L@C`*L3SrpLMbf?bp;kl{eqHH`aeUSZGJ)zir1g(I723 zuJq9PRGP#=2&|@v6f>G*S5sfJ16f>|fz`$^XnG{@?734_=5~KByf=S&`hq2aM5yZb zF+#a+;dFp>F{*=)aXHeFkKj*f_R9MifB*mhzcUs9UY>UMJ&4FB{eaK){WwS?4`1#@9v*kCm+k6m`fJ_LCs{Q3PF0+P5x8@@p#2s*D9VMU@NN<& zU5#q31By%|Y_Qo3S(+RwvnjiNe@`W33QYDed!w-6GstNYl4y3TQm&C%4l$PvZ$nhG Dr{M=D literal 0 HcmV?d00001 diff --git a/@AresModAchillesExpansion/addons/ui_f.pbo b/@AresModAchillesExpansion/addons/ui_f.pbo index 3d2c799a3fce44d83d32304293a24da469ddb17b..9a361ae8543939cccc60bb26190e3b5228daa007 100644 GIT binary patch delta 361 zcmccrPU!wSp$VDHGqhYL<|r|z2{})kXa}Y)IkEu-BSn}ePhb+;tj{RU$Oe>+j9~-v zwKtbD&0zv5n=Hnf3l^8=o*c+3HhDg)1em*vWAa8eoyp!Z0-Jxbu3`g=DX>j`$0IZO zD33B&=W8ApR*;F?C%@&HEbpX@*cx%D59iIzW^H0Xfj(nPvH}WNexl`GI zT(!v#{3>8>A`6&1fnOG^X#>9-SojV^m6CuY#4G`4Fx?_h0+D8)>>wgGnWvs}v#ek; z3s_7}VsfCU+++hLw#lnR+rY{?c%x2;xM>e2fqzLom2~1*}^%=z(+3wD> ziHugcx#zIpR$>3 z$L9jp{F8CABcJBvjeN;q?o>7)S8cKbzY5#i>rRo0EMV>gep#>~8~EMW*iPF--hrr6 z5|9K7+X*;>=@x+!HpdT6k$2c9JBWx)=Bel0EGwAI!nS6SO{AQ}tU`Loze%}vY=44VVR+XKZJftU%1nYRauv;3MbqLdzX WT*mXty diff --git a/@AresModAchillesExpansion/addons/ui_f.pbo.achilles_0.0.8.bisign b/@AresModAchillesExpansion/addons/ui_f.pbo.achilles_0.0.8.bisign deleted file mode 100644 index d00d46b92a75aa63033a4b6f69be30a46bbe2981..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 567 zcmV-70?7SAV`yn?Y-Mv_FfK4IH~^FY000I80000a002@`K`{UX000310RXu(z9;eW zMtNY8V-eg<)Z$2d8J<zId7BaGegN#kF7pQi54WiA-+%G(XHGycMkOb729d=z`+l7m|&~F9sE<%Pq zoZf$pfK45Rr8b)Tl26`C`Nil^Za-}!4wZla001GwS58)xHGZG_3S;lpOjfU8eWR{L zkIfLXJ&YYaa|zKH5xi$sz7)6EBpJbX*6a}TxsT?^UcWYn{&cWIQT=9z%G82`?$2%c znX<}nkD{(KMd0v+mBqj@EnhnX5jH3J^-mW#UuT|5Ii+}BzK;onZ;2&ZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7Z|V(?4AvQH?-_>1&DVW78g-DQAzaw%3p>Jj;1ZP8RJEL%k= z6eCKKKA*FL44!+*xckzfmjllhp9Mi4$zd3ALVfgSwKjAgycj*k093&t0ssI2fB*mh z9*LP9s7&oAqIJj@qA9Qm>Z2~ci$}p>JwDs>n49;{z}j;tt4SgU0#B>m-b1clR~v zI5mxXfI{1maIOfxSGk5aq`G$ERjrGUfB*mhFM_uqZ%7L;q&6({(fTE0Wzha(=W9El zcgZ4hFT=sWEj(|l68wY^p&p^e)oJc9r8YE#o-6Qqm|{?Nw4~->{IQIYw)40L-THpp zddePlrhuyt$%g}{C3E77G4KZ)1erxgGhgWhlFXGcX0RH|SgUzOZQ_#^JQ&^%l)>r~ D&Bh3{ literal 0 HcmV?d00001 diff --git a/@AresModAchillesExpansion/keys/Achilles_0.0.8.bikey b/@AresModAchillesExpansion/keys/Achilles_0.0.8.bikey deleted file mode 100644 index 09581df0e9c7a63468859c0d5ef23da8023644bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmV;Y09gM)V`yn?Y-Mv_FfK4IH~^FY000I80000a002@`K`{UX000310RXu(z9;eW zMtNY8V-eg<)Z$2d8J<ZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7 Date: Mon, 26 Jun 2017 02:01:33 +0200 Subject: [PATCH 2/6] 0.0.8c --- .../addons/data_f_achilles.pbo | Bin 292960 -> 292960 bytes .../data_f_achilles.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../addons/data_f_ares.pbo | Bin 592021 -> 592021 bytes .../data_f_ares.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../addons/functions_f_achilles.pbo | Bin 227123 -> 226779 bytes ...nctions_f_achilles.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../functions/common/fn_arrayMean.sqf | 11 +- .../functions/features/fn_changePylonAmmo.sqf | 47 ++--- .../functions/features/fn_changeSkills.sqf | 15 +- .../functions/init/fn_onCuratorStart.sqf | 10 +- .../replacement/fn_showCuratorAttributes.sqf | 3 + .../fn_toggleCuratorVisionMode.sqf | 6 +- .../selectUnit/fn_switchUnit_start.sqf | 13 +- .../addons/functions_f_ares.pbo | Bin 68057 -> 68057 bytes .../functions_f_ares.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../addons/language_f.pbo | Bin 137532 -> 138294 bytes .../addons/language_f.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../addons/language_f/stringtable.xml | 18 ++ .../addons/modules_f_achilles.pbo | Bin 189834 -> 196144 bytes ...modules_f_achilles.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../Replacement/cfgFunctionsReplacement.hpp | 1 + .../functions/fn_moduleRemoteControl.sqf | 164 ++++++++++++++++++ .../addons/modules_f_ares.pbo | Bin 166005 -> 166005 bytes .../modules_f_ares.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../addons/settings_f.pbo | Bin 12089 -> 12089 bytes .../addons/settings_f.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes @AresModAchillesExpansion/addons/ui_f.pbo | Bin 309087 -> 309717 bytes .../addons/ui_f.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../addons/ui_f/cfgFunctions.hpp | 4 +- .../RscDisplayAttributesVehicle.hpp | 4 +- .../fn_addCuratorInterfaceEventHandler.sqf | 42 ----- .../eventHandler/fn_onDisplayCuratorLoad.sqf | 13 +- .../fn_onDisplayCuratorUnload.sqf | 7 +- .../keyEvents/fn_HandleCuratorKeyPressed.sqf | 10 +- .../keyEvents/fn_HandleCuratorKeyReleased.sqf | 17 -- .../fn_HandleCuratorObjectDoubleClicked.sqf | 40 ----- .../keyEvents/fn_HandleMouseDoubleClicked.sqf | 37 ++++ .../addons/ui_f/scripts/RscAttributeCAS.sqf | 1 - .../addons/ui_f/scripts/RscAttributeSkill.sqf | 25 ++- @AresModAchillesExpansion/changelog.md | 30 ++-- 40 files changed, 309 insertions(+), 209 deletions(-) create mode 100644 @AresModAchillesExpansion/addons/modules_f_achilles/Replacement/functions/fn_moduleRemoteControl.sqf delete mode 100644 @AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_addCuratorInterfaceEventHandler.sqf delete mode 100644 @AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleCuratorKeyReleased.sqf delete mode 100644 @AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleCuratorObjectDoubleClicked.sqf create mode 100644 @AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleMouseDoubleClicked.sqf diff --git a/@AresModAchillesExpansion/addons/data_f_achilles.pbo b/@AresModAchillesExpansion/addons/data_f_achilles.pbo index 223562779e3fc9406ae47a90e412a68852ae6ac7..74fe618f6d1f4e7af433f78d26720d2318d315e5 100644 GIT binary patch delta 96 zcmaFxLGZx`!3hVMxA+B2JYvfMq#`FXF)&QGDq&IHti#C5$_5g0;-74IPkeJ2oBVNh y3lkF~6H}w+nzQXSXBmN*X?x9C<_oJt{BxVMHf{9U)4-IsmG6|~^rMf?N&o==)h15> delta 96 zcmaFxLGZx`!3hVMXK1-hJYvfMq#`FXF)&QGDq&IHti#C5$_5g0;-74IPkeJ2oBVNh xb2Ae&b91xinzQXSXBmN*X?x9C<_oJt#94*rmY>@!wqjFB_J@yw9tJ{Z3IMp9B>4aU diff --git a/@AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_dev.bisign index 4bc77c468a5fca987c8d0819bf15b541054dc33c..86a319dda030ef6c5830db3e38cf9441c8a87e94 100644 GIT binary patch delta 406 zcmV;H0crlV1hoW^sek$g#{J59S2Z>39 z?TD*%*;zH|?Py*d-${olPEP4Kp)!T@d!fEJ)k`AE3S z_}pc2+K^}7EPs=44)I+YE&^M~fB*mh1+)lDXaBlS{gj74RAh{tP7^8I)6~K})-QzK z4KbP6HhclSG#PT(I}2&-PL%s728hP)=%nR}LutO!(COM$jvix;cXByuj=iUo{dD5^ zPdx*$82=AnALbxT5ejct*+pO0V z9wp5P#7scU48$xz%nHP8K+L{9N}5Cctw@gRt;PTC)mOgl^54xcizVPfg%&3O4v!+c diff --git a/@AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_dev.bisign index 9316329bdb4c46c0bd87bfda7618eca684f201bc..35b82f44ca95b85bff38b8b203c47372e0f5854a 100644 GIT binary patch delta 406 zcmV;H0crlV1hoW^segtj2Qpt?1&>mg1^#ZNgqhIq5Kf4TME>q(5K;nR%_%Ujw&b=l zsOwRRG@7UAO{R>v1xcch*iI^oay$`!5sUP1P#JX|A(%h!l}c4_7~SF!&iw>m(>>LS zU_^%i@L?)m3T;0EM5U<7&sr!R7t~bE^?@S@vIjg~oJvm^Y=1Zc0001h0001rSs7k~ zrhNtYha?;Y14cZ$Lu5}c)97|-fXp8#eC)aUiQ5NI}8&~Qa+C}H`4)vz;Pc$3=Rv!RQYUl?${zS6Z zi~V3gjU$x+cNWsNRnI@XvYg0&rhH%lKN$#qQU?)z&GZ{4+g0dMpx zAQ0h)xOUU(8vg%jGJQnylOVN*D3?$xG!wD2G*LL}5q*e#DFlp*wN}D^=hcW+4JgOU zbq>8_Qoda~Z*j~H{AW^I1BE7+CTK@ytnH)bzU~cgC}drD^nVuu0001h0000`e9~t0 z*s-XfmZ8+;aSx6_@3xryIDT0-CM10$>v%(AZW=J)WZXaE)H*N1*>#Bi7`ev1D8V2>kL?Zn{gFfHXuHR^O*8N#Gme%z< z&7amU?~SJIboIlQGoYcrug}+a-dFv$^->>o!PA2S5J3IR_T&7MFPq zK~CmG4HZ=wfPzwyHOOfNQS~>{Vh%bFlL6>;L9`-jPl;Lqu6wVL69*;q-iY6JaMZ8! z^Y2t)^!gql_UYGNbQ*g>FbnjiFKMG12KNBIIR;WV908qpI|3fD75O|T4y%cZG84Lcm-f32~MA!JMtAcbxD+@BroUn53a&k??{+&m}7JVHPYQeMMG*W zPMPOwk0FJ0u1J3;W_YQBY6(>mv#4wqLk^c8_XwaJug!v`F6SW)f@fi-7IMob)a`Zm zxV3Tx&AIT-Jct`?22|?)EyN&@FD&+hHV=8sb|(JAcJSK*xZLT?m}-y8pCkPovLbW& zZ1~kh;4_x8;JyDtnbDjFG4LSLFp+k__^|*sx7&!_h}EBLq&*(nOgNc}vdjQH-|f{m z^y9|I-Ifh%#PoE{<-8=tMO76QnO#^UJE=lPT*+1>6i-a8me3eqL~&l#P?;Mg8)2GX zDTlob-I zOhuBQ6SodfkK&(0R14k?Qubp+h_bL~=Ezp|d<~8pTVAR}JAy)i*Z`@VBF7Xy8>*Cf zO({oZ(sGU$5P|7K*G?Kkerg`z?is5637ai*6g4eN_s6a8YZ$_h1*ndFq)`k|zcqu4 zc%$3WWxO1xB9{7u#IK?<4kjq}U1x#<=TcKiE}TrVNp6~nPI1u`xrbOL6^gRcDTm)2 zqxtn}ZSLdn=aW>6bvif`!rx3%QlptRM-x@aJN(@wbS4~$hGJo}Zjc*EvP{_M fPg1uZKe4;>%)qU+TOF2N|Lecse)F#TQWNzTu4X&A delta 1774 zcmaJ>TWs4@7}l}Vl%&miSvnXM)4>~RLeopywPgw^-O^-9w_fO4(Jl&}=bR)~T|2d% zC?Nz865;{SE}l4`Jybj)ap?qkuox0z4+S9sqS7`hKw?NBkfx&XFjh@M!_JyZFYsiY z|NqbT|Nr-W$3Nb*75=oH&600DK78)^Sn>1Qta^(u5!VUzBh#M3NpQJV9kQB;i#8Ql zA5wcPv^u1x!w(wA!X?Z5rW(}jo4r?{cMSpanw*`vW>!z_YE?gPa1=AIscQ|NnvI&P zmcmlweo#Bmf3SaGpue!%v~W=UZaJhL|De9G7*GLWv#R-^$L3(gl%PObNpP}LUHSTL zyhsvtg=lDL-PG6B^8|kM0iq2rT?Tbp@CXh64RDJw^2VB#A~*=UOH*3zqg!^E zFqx7QM;LbQeiOQKKZ0*~ft{sG6C0g&xNl6iZEs^f7tFAE+hvmIYvVzH~h#L^&3p z^@GTs(s;!XDiYe^*4Oic-VO=Hf}5!>RvQ}q2j$ot0BtX3V3LuTc^QVO5<`@Ws-ll7 z>Ru64ml8>`L4g<2o4YcS#AHL|d=L(hQdBjN7O9+%ri%X1vh(`klJAy>B^P^1)!;145URBM_6sha;U)bzqH z2>kackj66!uur?dfFB6$uP6wBVgT!bn6?}PmzGI)S1OCNz=FXTm*;koA!q)tpt(kK1XCn#;Tn=sYX4U4JM zJo51zJNITE(NlfKul5se?Rp<^W?gIQA{VS?Q8+F#QSF^WWEQ9y*4E2JqrQ~HD56v} zeT-p|KaB(>$Ous$Nk!9J!jvdX3%q_)|J&v8t*5{U=DcJ*$g2yiefJI++Ls>E+^AlC z#i89kMg|G|@d{zb-;9%o-#tG@0(@hf?8JA+$QFEUg=jVsPuHiIwC)r^f0ihUFHVro pVpXkA6ckD1wHp)U?+5I6?(C#-FCxn!sf;av=@VoT;qfR2vA$8z zl$#VmaYF^(OGvjG_uta0pifJ-(Vr|sm_(1G*BDf~8}$=DuG>XB6 zz^*OLVKSf9&Jqv5A%@7h1ec*8!J;)UISqv4iwSBUYCZBBRDX~H0001h0001Lcwn&c zxNcPEaiysr!&Rd@i%MMbx3c#Nndh#9=jQA1rTQVHX{zyL;rlpV2NB6dvPxcdPw>LT z+SH<8z*fBFL@Jloyoa;S!;seFzi>jF7VRE1YMWZj$au}EwwhV;a5MBjqu3C=rVmuODt#sC>}+QyW{&HdRbhC^ AcmMzZ delta 406 zcmV;H0crlV1hoW^sekSFG1k@+2KLoFoX;E0<9o)4!_>W1vNHV*#A+QyLK?nejI=Xk z@l`WUt*jh2hF`Wpccij%)jHfn6NEhQNXwQnrfseUe@(ka zzT}a|!3G8YnC0nXw5WB^-z?jI1$=TGfuQ=3g`+6Qv>H1ZIe(%80001h0001xZmO=u zhI|T7#8hweB_^A+*hJ+*24T$&p4|+8p1Qn5EzG^oXoMFEgT<>x4uvdABl!yvkpJG; zl*y5TYC2Vv_|<7k7@#%w_gMb}%$Ss$HpL!;#Vvr^)G9G#?gVp1XKCpqA^?wkyNNE_ zr(lUnqyM6q)_>XG#Mm4}0hyP?fB*mhc>KPw>A5N|^a5M53z{z_bC!EOO%{;3IjECx zDHxP#?}+#ky{@FNjnq?MwF(K!JZ5e@6~TcyES)mtvR9d`|D?gG7F!v)kq~z1a}tv< zI}ue{0wnEe5GHUO?<2w4O&-(=4+MvIcSu;CE662~g%1M1@7f<3V_~WOU*c<;U9zmi AI{*Lx diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/common/fn_arrayMean.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/common/fn_arrayMean.sqf index d4e54333..edc1d9fe 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/common/fn_arrayMean.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/common/fn_arrayMean.sqf @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // AUTHOR: Kex -// DATE: 9/2/16 -// VERSION: 1.0 +// DATE: 6/19/16 +// VERSION: 2.0 // FILE: functions_f_achilles\functions\common\functions\fn_arrayMean.sqf // DESCRIPTION: Determines the mean of an array // @@ -16,9 +16,10 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// private ["_sum"]; - -_sum = 0; +private _n_items = count _this; +if (_n_items == 0) exitWith {0}; +private _sum = 0; { _sum = _sum + _x; } forEach _this; -_sum / (count _this); \ No newline at end of file +_sum / _n_items; \ No newline at end of file diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_changePylonAmmo.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_changePylonAmmo.sqf index 3c1a3dc7..a169b4e7 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_changePylonAmmo.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_changePylonAmmo.sqf @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // AUTHOR: Kex -// DATE: 5/28/17 -// VERSION: 1.0 +// DATE: 6/25/17 +// VERSION: 2.0 // DESCRIPTION: opens the "ammo" dialog for vehicles. // // ARGUMENTS: @@ -14,21 +14,6 @@ // [_vehicle] call Achilles_fnc_changePylonAmmo; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -if (isNil {uiNamespace getVariable "Achilles_var_PylonMagDataCache"}) then -{ - private _pylonMagDataCache = []; - private _mag_cfgs = (configFile >> "cfgMagazines") call BIS_fnc_returnChildren; - { - private _hardpoints = [_x, "hardpoints", []] call BIS_fnc_returnConfigEntry; - if (count _hardpoints > 0) then - { - _pylonMagDataCache pushBack [_x, _hardpoints]; - }; - } forEach _mag_cfgs; - _pylonMagDataCache = [_pylonMagDataCache, [], {getText (_x select 0 >> "displayName")}] call BIS_fnc_sortBy; - uiNamespace setVariable ["Achilles_var_PylonMagDataCache", _pylonMagDataCache]; -}; - params ["_plane"]; private _planeType = typeOf _plane; if (not isClass (configFile >> "cfgVehicles" >> _planeType >> "Components" >> "TransportPylonsComponent")) exitWith {[localize "STR_NO_DYNAMIC_LOADOUT"] call Ares_fnc_ShowZeusMessage; playSound "FD_Start_F"; nil}; @@ -36,30 +21,21 @@ if (not isClass (configFile >> "cfgVehicles" >> _planeType >> "Components" >> "T private _allCurrentPylonMagazines = getPylonMagazines _plane; private _pylon_cfgs = (configFile >> "cfgVehicles" >> _planeType >> "Components" >> "TransportPylonsComponent" >> "pylons") call BIS_fnc_returnChildren; private _entries = []; -private _allPylonMagIndices = []; { private _pylon_cfg = _x; private _pylonIndex = _forEachIndex + 1; - private _pylonMagIndices = [-1]; private _magazineNames = ["Empty"]; - private _refHardpoints = [_pylon_cfg, "hardpoints", []] call BIS_fnc_returnConfigEntry; private _defaultIndex = 0; { - _x params ["_mag_cfg","_hardpoints"]; - private _intersect = _refHardpoints arrayIntersect _hardpoints; - if (count _intersect > 0) then - { - _magazineNames pushBack format ["%1 (%2)", getText (_mag_cfg >> "displayName"), getText (_mag_cfg >> "DisplayNameShort")]; - _pylonMagIndices pushBack _forEachIndex; - if (configName _mag_cfg == _allCurrentPylonMagazines select (_pylonIndex - 1)) then {_defaultIndex = count _pylonMagIndices - 1}; - }; - } forEach (uiNamespace getVariable "Achilles_var_PylonMagDataCache"); + _mag_cfg = (configFile >> "cfgMagazines" >> _x); + _magazineNames pushBack format ["%1 (%2)", getText (_mag_cfg >> "displayName"), getText (_mag_cfg >> "DisplayNameShort")]; + if (configName _mag_cfg == _allCurrentPylonMagazines select (_pylonIndex - 1)) then {_defaultIndex = _forEachIndex + 1}; + } forEach (_plane getCompatiblePylonMagazines _pylonIndex); _entries pushBack [configName _pylon_cfg, _magazineNames, _defaultIndex, true]; - _allPylonMagIndices pushBack _pylonMagIndices; } forEach _pylon_cfgs; -_dialogResult = [localize "STR_AMMO", _entries] call Ares_fnc_ShowChooseDialog; +_dialogResult = [localize "STR_LOADOUT", _entries] call Ares_fnc_ShowChooseDialog; if (count _dialogResult == 0) exitWith {}; _curatorSelected = ["vehicle"] call Achilles_fnc_getCuratorSelected; @@ -68,14 +44,15 @@ _curatorSelected = _curatorSelected select {_x isKindOf _planeType}; { _plane = _x; { - private _pylonMagIndex = if (_x > 0) then {_allPylonMagIndices select _forEachIndex select _x} else {-1}; - private _magClassName = if (_x > 0) then {configName ((uiNamespace getVariable "Achilles_var_PylonMagDataCache") select _pylonMagIndex select 0)} else {""}; + private _magIndex = _x; + private _pylonIndex = _forEachIndex + 1; + private _magClassName = if (_x > 0) then {(_plane getCompatiblePylonMagazines _pylonIndex) select (_magIndex - 1)} else {""}; if (local _plane) then { - _plane setPylonLoadOut [_forEachIndex + 1, _magClassName]; + _plane setPylonLoadOut [_pylonIndex, _magClassName]; } else { - [_plane, [_forEachIndex + 1, _magClassName]] remoteExecCall ["setPylonLoadOut", _plane]; + [_plane, [_pylonIndex, _magClassName]] remoteExecCall ["setPylonLoadOut", _plane]; }; } forEach _dialogResult; } forEach _curatorSelected; \ No newline at end of file diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_changeSkills.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_changeSkills.sqf index 2b754312..0b4d16bd 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_changeSkills.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_changeSkills.sqf @@ -24,7 +24,7 @@ _entity = param [0, ObjNull, [grpNull, ObjNull]]; _is_single_unit = (typeName _entity == "OBJECT"); _ace_loaded = isClass (configfile >> "CfgPatches" >> "ace_main"); -_skill_choices = +private _skill_choices = [ [localize "STR_AIMING_ACCURACY","SLIDER"], [localize "STR_AIMING_SHAKE","SLIDER"], @@ -36,12 +36,13 @@ _skill_choices = [localize "STR_RELOAD_SPEED","SLIDER"], [localize "STR_COMMANIDNG","SLIDER"] ]; -_curatorSelected = []; +private _curatorSelected = []; +private _skillRange = getArray (configFile >> "Cfg3DEN" >> "Attributes" >> "Skill" >> "Controls" >> "Value" >> "sliderRange"); if (_is_single_unit) then { { _skill_value = _entity skill (SKILLS select _forEachIndex); - _skill_value = linearConversion [0.2,1,_skill_value,0,1,true]; + _skill_value = linearConversion (_skillRange + [_skill_value,0,1,true]); _x append [_skill_value, true]; } forEach _skill_choices; @@ -75,7 +76,7 @@ if (_is_single_unit) then _entity = leader _entity; { _skill_value = _entity skill (SKILLS select _forEachIndex); - _skill_value = linearConversion [0.2,1,_skill_value,0,1,true]; + _skill_value = linearConversion (_skillRange + [_skill_value,0,1,true]); _x append [_skill_value, true]; } forEach _skill_choices; @@ -107,10 +108,11 @@ if (_is_single_unit) then _code = { params ["_unit", "_skill_values"]; + private _skillRange = getArray (configFile >> "Cfg3DEN" >> "Attributes" >> "Skill" >> "Controls" >> "Value" >> "sliderRange"); { _skill_type = _x; _skill_value = _skill_values select _forEachIndex; - _skill_value = linearConversion [0,1,_skill_value,0.2,1]; + _skill_value = linearConversion ([0,1,_skill_value] + _skillRange); _unit setSkill [_skill_type, _skill_value]; } forEach SKILLS; }; @@ -135,6 +137,7 @@ if (_is_single_unit) then _code = { params ["_unit", "_trait_values", "_skill_values"]; + private _skillRange = getArray (configFile >> "Cfg3DEN" >> "Attributes" >> "Skill" >> "Controls" >> "Value" >> "sliderRange"); { _trait_type = _x; _trait_value = if (_trait_values select _forEachIndex == 0) then {false} else {true}; @@ -144,7 +147,7 @@ if (_is_single_unit) then { _skill_type = _x; _skill_value = _skill_values select _forEachIndex; - _skill_value = linearConversion [0,1,_skill_value,0.2,1]; + _skill_value = linearConversion ([0,1,_skill_value] + _skillRange); _unit setSkill [_skill_type, _skill_value]; } forEach SKILLS; }; diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/init/fn_onCuratorStart.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/init/fn_onCuratorStart.sqf index 0786ecf1..6e334045 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/init/fn_onCuratorStart.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/init/fn_onCuratorStart.sqf @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // AUTHOR: Kex -// DATE: 1/3/17 -// VERSION: 3.0 +// DATE: 6/26/17 +// VERSION: 5.0 // DESCRIPTION: Initalization function; this function is called when the curator display is loaded for the first time //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -19,7 +19,10 @@ if (not ("achilles_modules_f_achilles" in (curatorAddons getAssignedCuratorLogic waitUntil {sleep 1; not isNull (findDisplay 312)}; // Wait until Zeus modules are avaiable (e.g. respawns has to be placed before) - waitUntil {sleep 1; _tree_ctrl tvText [(_tree_ctrl tvCount []) - 1] == localize "STR_ZEUS"}; + if (count allMissionObjects "ModuleMPTypeGameMaster_F" > 0) then + { + waitUntil {sleep 1; missionnamespace getvariable ["BIS_moduleMPTypeGameMaster_init", false]}; + }; [[getAssignedCuratorLogic player], { @@ -55,7 +58,6 @@ Achilles_var_reloadVisionModes = nil; _curatorModule = getassignedcuratorLogic player; _curatorModule addEventHandler ["CuratorObjectPlaced", { _this call Achilles_fnc_HandleCuratorObjectPlaced; }]; _curatorModule addEventHandler ["CuratorGroupPlaced", { _this call Achilles_fnc_HandleCuratorGroupPlaced; }]; -_curatorModule addEventHandler ["CuratorObjectDoubleClicked", { _this call Achilles_fnc_HandleCuratorObjectDoubleClicked; }]; _curatorModule addEventHandler ["CuratorObjectEdited", {_this call Achilles_fnc_HandleCuratorObjectEdited; }]; _curatorModule addEventHandler ["CuratorObjectDeleted", {_this call Achilles_fnc_HandleCuratorObjectDeleted; }]; _curatorModule addEventHandler ["CuratorWaypointPlaced", {_this call Achilles_fnc_HandleCuratorWpPlaced; }]; diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/replacement/fn_showCuratorAttributes.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/replacement/fn_showCuratorAttributes.sqf index 21a73b38..11af3daa 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/replacement/fn_showCuratorAttributes.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/replacement/fn_showCuratorAttributes.sqf @@ -13,6 +13,9 @@ //#include "\A3\ui_f_curator\ui\defineResinclDesign.inc" +// handle double click as remote control / switch unit instead +if(not isNull (missionNamespace getVariable ["bis_fnc_moduleRemoteControl_unit", objNull])) exitWith {}; + _entity = [_this] param [0,objnull,[objnull,grpnull,[],""]]; _curator = getAssignedCuratorLogic player; _isPlayer = false; diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/replacement/fn_toggleCuratorVisionMode.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/replacement/fn_toggleCuratorVisionMode.sqf index 5e9d853c..531947cc 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/replacement/fn_toggleCuratorVisionMode.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/replacement/fn_toggleCuratorVisionMode.sqf @@ -51,7 +51,7 @@ if !(isnull curatorcamera) then { { _effect = ppEffectCreate ["ColorCorrections", 312312]; missionNamespace setVariable ["Achilles_var_NVGBrightnessEffect", _effect]; - ["onLoad", + ["Achilles_onLoadCuratorInterface", { private _curator = getAssignedCuratorLogic player; private _modes = _curator call bis_fnc_curatorVisionModes; @@ -60,8 +60,8 @@ if !(isnull curatorcamera) then { { (missionNamespace getVariable "Achilles_var_NVGBrightnessEffect") ppEffectEnable true; }; - }] call Achilles_fnc_addCuratorInterfaceEventHandler; - ["onUnload", {(missionNamespace getVariable "Achilles_var_NVGBrightnessEffect") ppEffectEnable false}] call Achilles_fnc_addCuratorInterfaceEventHandler; + }] call CBA_fnc_addEventHandler; + ["Achilles_onUnloadCuratorInterface", {(missionNamespace getVariable "Achilles_var_NVGBrightnessEffect") ppEffectEnable false}] call CBA_fnc_addEventHandler; }; //--- NVG => enable brightness adjustment diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/selectUnit/fn_switchUnit_start.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/selectUnit/fn_switchUnit_start.sqf index 644b8008..a2b7e411 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/selectUnit/fn_switchUnit_start.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/selectUnit/fn_switchUnit_start.sqf @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // AUTHOR: Kex -// DATE: 6/15/17 -// VERSION: 2.0 +// DATE: 6/19/17 +// VERSION: 3.0 // DESCRIPTION: application of "selectPlayer" script command. // // ARGUMENTS: @@ -17,11 +17,12 @@ private _error = ""; private _unit = effectiveCommander (param [0]); if (not (side group _unit in [east,west,resistance,civilian])) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorEmpty";}; -if (isplayer _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorPlayer";}; +if (isPlayer _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorPlayer";}; if (not alive _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorDestroyed";}; -if (isClass (configfile >> "CfgPatches" >> "ace_medical") and {_unit getVariable ["ACE_isUnconscious", false]}) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorDestroyed";}; -if (isnull _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorNull";}; -if (isuavconnected vehicle _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorControl";}; +if (isClass (configfile >> "CfgPatches" >> "ace_medical") and {_unit getVariable ["ACE_isUnconscious", false]}) then {_error = localize "STR_ERROR_UNIT_IS_UNCONSCIOUS";}; +if (isNull _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorNull";}; +if (isUAVConnected vehicle _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorControl";}; +if (unitIsUAV vehicle _unit) then {_error = localize "STR_ERROR_VEHICLE_IS_A_DRONE";}; if (_error != "") exitWith {[_error] call Ares_fnc_ShowZeusMessage; playSound "FD_Start_F"; nil}; diff --git a/@AresModAchillesExpansion/addons/functions_f_ares.pbo b/@AresModAchillesExpansion/addons/functions_f_ares.pbo index e6a67ed89d36398db97062b72bde49c981d15d13..8d293aadf0755b62e61c3575df76eb621b8245b8 100644 GIT binary patch delta 63 zcmcaPndRnWmI}g6%tAzr4JxdKv)Fr5Gjv delta 63 zcmcaPndRnWmIHk}@a3h|;4Y>ZapN`7N?OrUd&Mh!pc65?FU3=w@~%a@lBvbzJ@18B7d6#0001h0000HWyXG1 z0nw2@^^?4E=9cu-5a>1S>0@LeyiEpO#wh{_c$;WZ^x8G1C(qv-8p9UY6cmFHQjzJ5 z#BgZ5$4@#Hny{_%?04)sV&6wOe$d63UoW64VYHA$Umhx;D^Ar*zG%5nVbWiN`%r^;9F zHp&lzV0GdPdqBJ`?Trs$d8%KSEt*jMP8>28YgY_@9fI@=9L#r zfc;52#iJJ+RY?ZGV7vOnX(9B`o|f&7ELym3ayD<(OGfVghaaeUQ`==!ZU)NedRkyCT@(B3TNNhh zDVit3g47x9)JD_+!jL%6^B~7>n@i29_R7kTvfMcM!e-b(_=0=kPBp|E!wC`u{j&-*mQ_=Y^(i%JG&%!kr>LE+1p`n@qgyi7XV{}% z(0OY770RJ2U{p~lj55rnTlEvzYdSfSPLJ)VtiB6JYn-1RTp73c@ZT=T^AU0Tl}q=1 zUJI=Ni6__ccYjh<|#SRC3~ucy
kA?Q)Ea-_}m&S;r{L?&I(1;vX6^{o-Xt1y%?%a4w@5myfz*kguz+t6#`; z#W{?kTu!dxj&5##p?>bu7fxr?+%B@7(L-hWgguM`;z2?FLGht}o+0s`!9d#C-!ItN z(?4|bLvC?N*P^2QA}fW^yv!1X%wmPoJfLfflQZ*6r!#gjDoEj!E}pD-MphLlomvXi z?xS7`G~n<`h1B8_h2q4#Vg;Zvd5M|DKz8zE!+x>J2mIL8+)^`gQh};nGxIW1!STz6Dt@cL{Z(G zsE|^WpO-q_a5JO47@C8jav;Zw!W`?Y4svB_9#|X9adOxkmztTEs^C(TpOH7YP*!gG lf!mDg+nX;lE_D?NUfnOqu-V1AaNswN6=Fw9BzR&YF0?HRTn2PsAYF+3%#lS~U3Y zR(*gde?+1emOjhORCn$L{`U!;H0B8^*0bXPc?{&)~O!Kg79%0f2d$cDYO2Iv8(gCb~w1bTOA%R%2*p{<=VT8oe*@_=(;6`JP; zwHk4O=J0qu`5S**Q-q~+8%SN*x=zoq`yp9wn zCzs}ZHMu`{nMwJ2`n)(Px;l?JSm2>&{_d`g)birSHd%b)QgnYR2D9xgHMoua%hH@} z-5?DZ10*LpQexinNM;U<=4%tw_g3z4z6c-e`GV;g1rK$;0JYxPv?$RPGaB)e2nd+Q A9smFU delta 406 zcmV;H0crlV1hoW^sed$)rtO#Vv)?4&0Z_S1ZDCa~> zH&MY>p4mVG+UWy=20htl35WsNKmC+%`l%>x==fWgHiTPKhJUI80001h0002O&&n@lk0wy|^bP8KfOPpd10(&Dd+b9I_RN{^H40A$%cQ=c&t2I zN|?eosv$00DrJ!zshDBQL@25EQ9ijSknDY&H6esBny^EL`>!_LkD=c*^6#~8#b^Et z-sV~We9nE;woxS9lclG#)ShsB(uwQlW~^m#jpmvG@(-`7Ul2MNvAcuFiN`fUi%5yY AhX4Qo diff --git a/@AresModAchillesExpansion/addons/language_f/stringtable.xml b/@AresModAchillesExpansion/addons/language_f/stringtable.xml index ecbe25d1..6d8fab0c 100644 --- a/@AresModAchillesExpansion/addons/language_f/stringtable.xml +++ b/@AresModAchillesExpansion/addons/language_f/stringtable.xml @@ -2778,6 +2778,12 @@ no dynamic loadout available Pas de l'armement dynamique Keine dynamische Bewaffnung verfügbar + + + LOADOUT + LOADOUT + L'ARMEMENT + BEWAFFNUNG Switch unit @@ -2996,6 +3002,18 @@ Pas de joueur a été choisi! Kein Spieler wurde ausgewählt! + + Error: Unit is unconscious! + Error: Unit is unconscious! + Erreur: L'unité est sans connaissance! + Fehler: Einheit ist nicht bei Bewusstsein + + + Error: Unit is a drone! + Error: Unit is a drone! + Erreur: C'est un drone! + Fehler: Einheit ist eine Drohne + diff --git a/@AresModAchillesExpansion/addons/modules_f_achilles.pbo b/@AresModAchillesExpansion/addons/modules_f_achilles.pbo index 170f83516bf1421c72b99ecb2c5f71a41d648c77..3937f6457d937623f69c0aca7b2a703c0194da35 100644 GIT binary patch delta 6054 zcmb_g&5s;M6}QJqNGGzbAO}Sgk@HUF?7@ zuY0?y-uL^xU-d_Sd+EU!FFkng)TvLeZ$JF;sXw385A3E~y*o?nBf zZ@e&#&n``Wc(y$qoPB+HhxcX5FUvShWVEV&+Bs4Dlm1}){VT7YI5EBV(fNmeJ^T0V zuUy>NSlifK`}zG_zqo(v%h>WV zi)7$Oj8^dXC86SB6tQ5K_^C_+zt0nYg{3_nv&rcfPrvBYY8NhCU^jWv7qOpmHpZny z+spzonhC}HDB*s%$3)BqiR>m^DL5=TY^iEg9Q^iPg-w6?UwhbHX71e zSz-JGk&Z>$W0U<$1rxr{Q-*utN5~VjSjhx*XaQ`C83}O2Y4_z&@f#!9w#E8FDIwz+ zTvG!-;OyYRy~-Id-tVCh{baDBN{T z9G0p|gq(E~IUJBmOnH<0D)q)3ek43oLZyBja4!%e5eYwTV(ku@aHs08(d) zma2XP2`Z{NQcL#q?p%S0C3264GflQ#3Jx8qX|bYAH|Jd7u0wMbl-Ry6R1l!Sr0^?b z)sG^IgW7+V1ZKx(&;VV*7NLgz2+WP433$j%89Y^}7X~0(SUDxVP}*2MwoI_Tt%tDW z>KF?kpAJDYLvs)YiYZw*g0@;?r$2jgelbi?J9%j`p~d%#>FmA z2U7Xz+*CF;z&_jyW18Xu5fO39lh}`3h_D~rajgMn>mcC+KjEpLfMiyM;^aI|Wj2;c z6r%l`VD)BerL2HlH)q2<1Pf)_X@vz=-q4XF1|eA_I?H97WfgHgfZgBTv_Y!o6+$tV0Y4O!YfV4uN9SSJyU8Xi!y#y4G@CG!WnOA>B~N zFw`KX9i$6T=|LnFjzh<(cA&IFnmTN~u?E_3&AwS9N5>##7^hJDlSTY$U;CGVI8yp9 zu$`c%kdP!JYEkxO%$5KxOs5yo3zA@gLutu$z*Nmh@UfPaIb;WzVcRC8 zal~{pkwTl#V!c6Rhz!mZ9O%g^%gLI zAk?r%XkO?if?OV&mzr`LRHOhl+h)mgOLTLG#)&Zc|WG>PYy#+TdjViD5nYIyMHG2PVFd$+?0Sy9LZ>^T$<>qaK2xxPPI$2~p=-Ec^;>n9W z0M{!KccEs?1L?X%{ul5d}?U8U&qWAN6<-dVbvHG=b@&VwZLG6hVUB zy<4CO+SUvi_lzbKcO$P@!8_ulKz(x}NOn5^4X+AVv@ntYf)=b$AH-+IV~z}_1}+Gy zcDEEy_FZNoT?RyJryqu9fAxZX$hs!$?2Y^+6??A4HbLEtDaUeW)6Rsh6py=i>Hi76 z1dN6YqRj`zYQMBIb0$m0@G_bRZ$(PNt(vapct_LMH{|em*N$Zh3U+M}yFeq4amVv6lmQyV`ULHfeQ z4kf6VpH0f0Au2}i(X*23UmeYL5eZ8~7pE&_gB&Rr5vAq|(9j+u5=HUHQ}pE6loh|G z;1bUIWX9pR>`KqY_`2v3bv`r zea0j3aYBbIXFVhn%Eug_hGJ@*A^E4s&r|fL`49mhMxK1x;AMwyOFDWc+cQo&M_-Fy zt&d}`9UtP-nyc6%eSPaNf1Mk-I%35DHx2fC^a1BUvWj=oIr!Hnm9J0#@zs|f|LIZX eQSIFCzQ#U&wfd8t#-)FM*nD*ElgBrIGyD%tq@`&9 delta 124 zcmdn+hr8=E_l9t0<{4Tpo1>TyGlCfktVcLmKSxPK&YS#_&z23uQsJ1K$FDfqmp^{< zNB(yK?B-@BX6EK*(+h)`#3z49=4xh7Y-dko+|HiJlxMts(iEm9#mP$(`M0N^W7?`O a!pKz@kvvT=Qu3`PkIN~e=Yh+v9svNz;Vl{f diff --git a/@AresModAchillesExpansion/addons/modules_f_achilles.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/modules_f_achilles.pbo.achilles_dev.bisign index 20551d3120bea10514cdb6cc731ba1f89e63b419..fbef9405cf824866c515abf45fa29a16cbb36b00 100644 GIT binary patch delta 406 zcmV;H0crlV1hoW^seeWgJV=#21Nm7UAsfOZT^V*(T%mzB^t%cix@A4w1f( zv#+XXoNSmT9AaW<3!*dTg%6SpIjEpO*oJr_qS7(i&`kqP)I*r{4Kf(dmw=< zqnwjWo!IqF1AqKScXF#h>hktpfB*mh>BP})Xprl!G1n{tH(mNc5QBO!v~7)G>M*rV zoQP~@#y*Er$MM{e`-_M35f@;ReHy_s@sFZt0U!h#bha_OY@Kt@MG$EC>lstyWh(X< zH_0@w)f5Hg^F-c;`~t@d`{4hMsmNATdU>trg}I2(%?}-**e%hxvhf%gC)$HEi?LC~R>vH%4wavOzc}Z^nGcAhR zFjRy{=qtj9^pH}mG4g0knLD95ja}PTB2&?aOuW^c0OmqH>BQDm)_pT#FF{rL+9lUN zRW;L67i&m2+qQ-q$dwistB*PO!7PkY4tLOzLBWr>@{D&ESbv}b0001h0002)Q8ibL zL~&4uknM>0nt2dBU`P==&FJ{+dxUAGv1ASQPdRWXLeBbslB3X7(BW~}y5UB^jB1VS zPN37pNPgI~hF5K7Ybc&c8l+!F{+ifB*mhxkz(Bs}2vsFO+pPw=8wg(lug<;^XKlk)oB{ zb??Q!7pJQk^N4!^{QBt?*YTz~Ht~LuZGZ0~6MM573HF*!)MxeI&{AnWA)CEoOPYVY zEgV*6_bFsxBS@9DCu1dW#?;f<^{MLOcdu^&^gAMEw-2GA!}t<8 diff --git a/@AresModAchillesExpansion/addons/modules_f_achilles/Replacement/cfgFunctionsReplacement.hpp b/@AresModAchillesExpansion/addons/modules_f_achilles/Replacement/cfgFunctionsReplacement.hpp index 57a175c1..a443d814 100644 --- a/@AresModAchillesExpansion/addons/modules_f_achilles/Replacement/cfgFunctionsReplacement.hpp +++ b/@AresModAchillesExpansion/addons/modules_f_achilles/Replacement/cfgFunctionsReplacement.hpp @@ -3,5 +3,6 @@ class Achilles_Replacement_Function_Base file = "\achilles\modules_f_achilles\Replacement\functions"; class moduleMine; + class moduleRemoteControl; class moduleCAS_server; }; \ No newline at end of file diff --git a/@AresModAchillesExpansion/addons/modules_f_achilles/Replacement/functions/fn_moduleRemoteControl.sqf b/@AresModAchillesExpansion/addons/modules_f_achilles/Replacement/functions/fn_moduleRemoteControl.sqf new file mode 100644 index 00000000..443bc334 --- /dev/null +++ b/@AresModAchillesExpansion/addons/modules_f_achilles/Replacement/functions/fn_moduleRemoteControl.sqf @@ -0,0 +1,164 @@ +_logic = _this select 0; +_units = _this select 1; +_activated = _this select 2; + +if (_activated && local _logic && !isnull curatorcamera) then { + + //--- Terminate when remote control is already in progress + if !(isnull (missionnamespace getvariable ["bis_fnc_moduleRemoteControl_unit",objnull])) exitwith {}; + + //--- Get unit under cursor + _unit = objnull; + _mouseOver = missionnamespace getvariable ["bis_fnc_curatorObjectPlaced_mouseOver",[""]]; + if ((_mouseOver select 0) == typename objnull) then {_unit = _mouseOver select 1;}; + _unit = effectivecommander _unit; + + //--- Temp owner + private _tempOwner = _unit getvariable ["bis_fnc_moduleRemoteControl_owner", objnull]; + + //--- Check if the unit is suitable + _error = ""; + if !(side group _unit in [east,west,resistance,civilian]) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorEmpty";}; + if (isplayer _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorPlayer";}; + if !(alive _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorDestroyed";}; + if (isnull _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorNull";}; + if (!isnull _tempOwner && {_tempOwner in allPlayers}) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorControl";}; + if (isuavconnected vehicle _unit) then {_error = localize "str_a3_cfgvehicles_moduleremotecontrol_f_errorControl";}; + + if (_error == "") then { + bis_fnc_moduleRemoteControl_unit = _unit; + _unit spawn { + scriptname "bis_fnc_moduleRemoteControl: Loop"; + _unit = _this; + _vehicle = vehicle _unit; + _vehicleRole = str assignedvehiclerole _unit; + + _unit setvariable ["bis_fnc_moduleRemoteControl_owner",player,true]; + + //--- Play wind cue to all players + [format ["wind%1",ceil random 5],"bis_fnc_playsound"] call bis_fnc_mp; + + _blur = ppeffectcreate ["RadialBlur",144]; + _blur ppeffectenable true; + _blur ppeffectadjust [0,0,0.3,0.3]; + _blur ppeffectcommit 0; + _blur ppeffectadjust [0.03,0.03,0.1,0.1]; + _blur ppeffectcommit 1; + + _cam = "camera" camcreate getposatl curatorcamera; + _cam cameraeffect ["internal","back"]; + _cam campreparetarget (screentoworld [0.5,0.5]); + _cam camcommitprepared 0; + _cam campreparetarget _unit; + _cam campreparefov 0.1; + _cam camcommitprepared 1; + sleep 0.75; + + ("bis_fnc_moduleRemoteCurator" call bis_fnc_rscLayer) cuttext ["","black out",0.25]; + sleep 0.25; + + //--- Wait for interface to close + (finddisplay 312) closedisplay 2; + waituntil {isnull curatorcamera}; + + //--- Switch + player remotecontrol _unit; + if (cameraon != _vehicle) then { + _vehicle switchcamera cameraview; + }; + + ppeffectdestroy _blur; + _cam cameraeffect ["terminate","back"]; + camdestroy _cam; + + _color = ppeffectcreate ["colorCorrections",1896]; + _color ppeffectenable true; + _color ppeffectadjust [1,1,0,[0,0,0,1],[1,1,1,1],[0,0,0,0],[0.9,0.0,0,0,0,0.5,1]]; + _color ppeffectcommit 0; + + _curator = getassignedcuratorlogic player; + [_curator,"curatorObjectRemoteControlled",[_curator,player,_unit,true]] call bis_fnc_callScriptedEventHandler; + [["Curator","RemoteControl"],nil,nil,nil,nil,nil,nil,true] call bis_fnc_advHint; + + sleep 0.3; + _color ppeffectadjust [1,1,0,[0,0,0,1],[1,1,1,1],[0,0,0,0],[0.9,0.85,0,0,0,0.5,1]]; + _color ppeffectcommit 0.3; + ("bis_fnc_moduleRemoteCurator" call bis_fnc_rscLayer) cuttext ["","black in",0.5]; + + //--- Back to player + _vehicle = vehicle _unit; + _vehicleRole = str assignedvehiclerole _unit; + _rating = rating player; + waituntil { + //--- Refresh when vehicle or vehicle role changes + if ((vehicle _unit != _vehicle || str assignedvehiclerole _unit != _vehicleRole) && {alive _unit}) then { + player remotecontrol _unit; + _vehicle = vehicle _unit; + _vehicleRole = str assignedvehiclerole _unit; + }; + if (rating player < _rating) then { + player addrating (-rating player + _rating); + }; + sleep 0.01; + !isnull curatorcamera + || + {cameraon == vehicle player} + || + {!alive _unit} //--- Also isnull check, objNull is not alive + || + {!alive player} + || + {isnull getassignedcuratorlogic player} + //|| + //{_unit getvariable ["bis_fnc_moduleRemoteControl_owner",objnull] != player} //--- Another curator stole the unit + }; + + player addrating (-rating player + _rating); + objnull remotecontrol _unit; + _unit setvariable ["bis_fnc_moduleRemoteControl_owner",nil,true]; + + if (alive player) then { + //--- Death screen + if ( + isnull curatorcamera + && + {cameraon != vehicle player} + && + {!isnull _unit} + && + {!isnull getassignedcuratorlogic player} + //&& + //{(_unit getvariable ["bis_fnc_moduleRemoteControl_owner",objnull] == player)} + ) then { + sleep 2; + ("bis_fnc_moduleRemoteCurator" call bis_fnc_rscLayer) cuttext ["","black out",1]; + sleep 1; + }; + if !(isnull _unit) then { + _unitPos = getposatl _unit; + _camPos = [_unitPos,10,direction _unit + 180] call bis_fnc_relpos; + _camPos set [2,(_unitPos select 2) + (getterrainheightasl _unitPos) - (getterrainheightasl _camPos) + 10]; + //[_camPos,_unit] call bis_fnc_setcuratorcamera; + (getassignedcuratorlogic player) setvariable ["bis_fnc_modulecuratorsetcamera_params",[_camPos,_unit]]; + }; + + sleep 0.1; //--- Engine needs a delay in case controlled unit was deleted + ("bis_fnc_moduleRemoteCurator" call bis_fnc_rscLayer) cuttext ["","black in",1e10]; + opencuratorinterface; + ppeffectdestroy _color; + + waituntil {!isnull curatorcamera}; + } else { + ppeffectdestroy _color; + }; + player switchcamera cameraview; + bis_fnc_moduleRemoteControl_unit = nil; + ("bis_fnc_moduleRemoteCurator" call bis_fnc_rscLayer) cuttext ["","black in",1]; + [_curator,"curatorObjectRemoteControlled",[_curator,player,_unit,false]] call bis_fnc_callScriptedEventHandler; + sleep 0.01; + }; + } else { + [objnull,_error] call bis_fnc_showCuratorFeedbackMessage; + }; + deletevehicle _logic; +}; \ No newline at end of file diff --git a/@AresModAchillesExpansion/addons/modules_f_ares.pbo b/@AresModAchillesExpansion/addons/modules_f_ares.pbo index 371884b81de066e425c2aadb433077983965780a..40d9170f026130063a9165adf1e9e01c65866275 100644 GIT binary patch delta 64 zcmex5f$Qr8t_?P<%v<~dCfl>l1ksysvz}bTZee0#WMXR6yn562)teZ%T@{%SueN@D Ukp82RO$;TwH*~I3*z#Hg0A|`89{>OV delta 64 zcmex5f$Qr8t_?P<%rmrHCfl>l1ksysvz}bTZf<5`W^QiQyn562)teZ%T@~@XaHjgx Uze6<~*DAI6Gq*df&)e7l0AD~HegFUf diff --git a/@AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_dev.bisign index 15cde9d4f15e0ac411104957cf7bc492ced1ae6e..8641ac32f7bb57e88fc17f64b65fad6a698185d8 100644 GIT binary patch delta 406 zcmV;H0crlV1hoW^sejDSan>g3JRE4!iS6#V$9;ZtOQh!4i`6a)&lmyWhq0QNVo-K> z2)O|J+_*n-9iaMFQ1BS&Rz|sDV?4dBi<|ZIj5;1WAm$4-JB_~+lJs~Cow6vRydTDT z-}TS1a2NRzE=Xc<-(s2DHr-}P_1E&PVPF}HxMbFNZTHxumw!b90001h0001*|E;R+ zL(QNYjDN-5U25K@Pue?eiq`gsD3e1nGz%$YLdgf4#kGYw+M(!O{_@S zgfHSK7sot1kQT^m`L6INRbf@<0dwenoWRZ+5f2C$C__D`v3FK-a#n5+3r1`o`_iyC z8YM>|ki&NQVSi+r!^)dX6sOj@fB*mh)^!vU_ei8~Bd)g%Zm*dbya^a{X#$$*ld%qO z76ej8jYj`_yVsNKJWPsvqcS;xgyp4X%qq0v=Yn0jN#5X{!9p~~H+L4bA44Q6}`1Mh}Lv=HcYxy+8hD#3gvpa{ivf Ac>n+a delta 406 zcmV;H0crlV1hoW^sefzS=E}BP?945zo=u9MgSl*=TFvC5O_@lbi0pD|0tERay-iw#s1#8kxnw_RsG>A0)C<;wHWLFzT!V?k?^lhRV&V=Wx`H9SKHZ&zu! zo^(hloZ(Dy(*9KjCmT=zo%J%r_oH-0b+$!2ab+tc=<8-+9Dig20001h0001vX!gh- z>9{6#2}Lge6W4yfcn2&lay|sZB;6tw+~9fN6I2C?Dd}?V8W*NZJR2emtSYy|6t(%J zcUZI~l&7Wge#PCB8eVz`{n)bMriEM;4jaFLA-#-A5<*ZJ@DZvEecAQ=_4!Fc52YZrL?pkFFdDX(`ZKUEu|HfaTJGw#5@=>uZK&|g zNoHIVrMFImFPqO&^cje|>u9uocHCe7a7Y_nm4O)DGY{-v!k{vY5vh~J#A5PIt;4gt A`2YX_ diff --git a/@AresModAchillesExpansion/addons/settings_f.pbo b/@AresModAchillesExpansion/addons/settings_f.pbo index 6584490b4059ee11cd05280103b1bf93f8fce846..50e7c285e5126b11f33920b297e53ae47af428e5 100644 GIT binary patch delta 55 zcmdlPw=-@+KJym8fQdzEAZp|74n}qh6B8p7Q=`pUOuKbN_^)nMD({OId0%64=}NnY JW@uma8USa77FqxR delta 55 zcmdlPw=-@+KJyGMmx)DbAZp|74n}r!GZQm&bF{S K{(np6?gRi|CKn_C diff --git a/@AresModAchillesExpansion/addons/settings_f.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/settings_f.pbo.achilles_dev.bisign index e7bb2d789d9965b04f35422870649541e1f4c492..8eb9b8ede2d5a083628cd4e4be42f4781838cc9a 100644 GIT binary patch delta 406 zcmV;H0crlV1hoW^seiEeM50;mp1n}1qZl2~MEaVRr1&%PvxeehpwILyg-BgR-%x%V zud2x%6Z8)n*kJ5sN$Fk(nykyD=NN$A2vX0001h0001+GCy;a z{umjWER-$0%cMSm@L`c4W~*Sf8tr-f>||cHJVNevzfOTr+wJdFqYsALlxK)Pn?gv_ z&?a}xW^v;rl2Z+!(DU_5N{IC02i(V~{5e*3#fDX=2WCar2E-Vuy3b##xT;Ylfq=TD|C`j1ee*1W4iE@@yxez0~Ww6WwNgrE_w4pJ&6J zJH+}xuDcXi5CfDe9aK~?mD*93y0z-U-paPFTjw>g zuZjc+P<-@Pah>jBasAWiUMJ&4FB{eaK){WwS?4`1#@9v*kCm+k6m`fJ_LCs{Q3PF0+P5x8@@p#2s*D9VMU@NN<&U5#q3 z1By%|Y_Qo3S(+RwvnjiNe@`W33QYDed!w-6GstNYk`HKht5U9!Sq?Fm4R1qKvnON0 A6aWAK diff --git a/@AresModAchillesExpansion/addons/ui_f.pbo b/@AresModAchillesExpansion/addons/ui_f.pbo index 9a361ae8543939cccc60bb26190e3b5228daa007..7cb1e51f305b80ff144ff4389d285ede967096ae 100644 GIT binary patch delta 1829 zcma)6TWl0n7|zU@-R&-Hx7*I{x`oQgh_H*Tz0ej?EbR715xU*B6x=j8PIph+X-{W1 zGqcr#q!>}-6K%$N5=}H3(I+otNj5%!;lae1fO2~Rq6D-)aE-4Do|!Ez5{N$R=KN>= z^L^j>zi;N3Tjdx3ET5IZ@kDYC3yxPdCsUu!nTMRTPVvB;WrO)zrkQoZSTZ&5qctQi zB$(jbf;ayac*E`Zt~Hs8nKxI~n36Z-_?%Yr`GZ~u<9vS;T{338G-@6z4Leug?Mii8 zET<<-##iCozcZQo66E7$RgBZW z(3QF#GGlzuJg9i`hyC3Q2rqQye=46~oaeVEQ~RCy81DhD&5ex>jZF>tzR+35>XStdfReg;;Pm<#wz1_wIh{hjeBxqF@o zRob%Ka)zNQ9mCk3j!=ETq9FB0Sw7e;DH)6&9U$3!oxT4! zsthWa+&aw$BmYmnv4!lq%r+J7FR(`;nb`nJNt+vl>R@dxl(0Oiz+ARw3Z)HIgRjcQ z7~EeYy(a50l0hR<4jV1-rKs2AK0wy|0K$bSH`vX%CS_fhRfYI}WS%A$e`S4jLNy$b zu#Wa^p}hyKzqF(y*wox&@x*uSwjk)w{m{{>r{dTUccN)AsUclQnI#Z%_Bp^8K3D-V zE^^pQ=UsJ;T|?l`ZQ zV8s%cqw-1o(H0U4fWH5NT1nmufJSo43+l*U0gx+l1UL{Xyd4CG%4fte+w=@DoH3PR^TDAe+bgTjZj-R_xUOcq zivsF29O*F_F|-_t!i-9{ES{pzkw;i;U)&D6!Lp{?y(FCU@gPWMdGMm&JtR_p;86 z3VqxSijT;R0NCcRyU6oF(9SHT1+8TLBo^RG$e|$c7w$!Xx%QotJ)m&1hih2Za0$~f0s@?hRXLL6MKzTN>Eh;M=`3q5EMbu4F) z)-Nfeh?++FZn5D+`^f0Vj?RPtw{C?(+%PnGIA8DhB%DLV z2M>V?QL=4<3zus)!^3peejPC;xV`Igifq_vEQWRfVVXwzrrN2nLuQ5NNtfZ5FJoyF zrz{~vIRQcrTNCk(gLUM{IOp?PHZ9}bf0x@%{+Qu>grDTjEsd%0`y_{U@Eu>AKE2|t SkDeJ%s!i;N@Z~ey(a=BDvr7s9 delta 1377 zcma)5Z%i9y9L~M(OG^tar7f@)#Mcg&7KR1JKv*zC*amY71B{YF&Rei*CfJ(Zs|AL!yf=W{dA#$)>~@le^13 z&-;7c=lT8KyQ{zYzx~C(Ai-A~`!C3ml9a!1{MH3B?_hX52+0DdF2uPG;8;#HjlW#M zFfN>fZ@S3-O2nCDqr902o*El{RmgivIO`SM;z+MIMn3R{9FA)bKb^MVF0#MENp5?m z?Fs?e)I!AydB=B$34LCbH z+B-TsI|{GWta46QQWi7~Q|=0gkaUQU_rp$d$y-J~4g1NTp$NlXw`v@d#Xea|&XAA8 zwd7hwd0{O4!ez2>w2Xw-s>yd>c9Tn|9EFYbJzODkwa&49<;9J4b7P%5dxwUWK!9sE z&s_&+L3K7K%?i4R`J_4}^0K7qxCck+nNnEK#pvSaTpfL88SIE9CMWlK+$R#eo|d#p zoD^gk^UvmSO3fV*lIeSTlm7-lXkIqJaYR=Rab>h-2{h4**TMbf?H|F1ocBMhZY+av z)Bm>8_tDxM*lYIu1m41do*vxR73;?FIPM!8IpT4N zXT&+o1nq4_!RWx?!7)q0ZdY$k)cDb~l+yXf#5sPLK~0=uW3e`(XLiE~-E_hlWYtsO z5)7HcrErY%B_ftD9uZ}cnM_6KxC`D#*9@>Te$TqS%})3a!$ib}+m$yB&|vnuq3%Rd zik-=3C9ImjY7YNcB`tuvCQu^kj4BWhWCItsff?}znHwsf~~Pq97BIMyKjJ_--h z&-`$Yn-O^|%FKw$0eCcK;jPF?S=GdTNs!fP+{(COU2#HEif#sAXSo%N4b47z+8c#I z`gQ<$=x`7|N1ueS%KSYD=lyiv342Yk2_9~UYIB+{X8O{Cj-!!`Fde~7SkrTu&(6uJ z!ZRjj`MYTA6R_&k;t(_!hft)Bu5_WjH2w*!quGAcOuJ+>M2!aYAbn&4Hq)PFl6=XxSf8bRG zg`6=aZF#8m6&dcLJ{1M2aULC_e;kAr)Tcp2PpW9yoX8?^Fu3yd4ex=G@X7qnkG^=x Mo&Vv;+{Mzr02*kz5dZ)H diff --git a/@AresModAchillesExpansion/addons/ui_f.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/ui_f.pbo.achilles_dev.bisign index 50415daf160215e8cf76b74652fb8cde31e0ece7..0163257f18843faacf6236e0e240101a93190239 100644 GIT binary patch delta 406 zcmV;H0crlV1hoW^seceKm?3IRNVg#;;`<2XrzMExWm$QpLzd6WCr@AHV|crCsM=!5 zk-uG5=CY68)%fcZYn2KPUQlZSIww~eUOyaWzj{%FGa0_h7}ukk!Of`%0WyP4xX4p_|ViD&!p1p*q0LPOJ!hbLV0001h0000?yM9rs zmoIO8XE94erW0dv(IIQvIC6Dv&=8Ca*ET@7O0%Q(t+F2irvt4UK-dHM5>cuZad;1> z!Mua-J4O46Nly5UHGQ3-gYW&~0{(8I`kPwRZbz)TcOM3_jh^`Sg#l0{+;?gEA+hQqsh`&;?lwx{pj}J&x{4NpuLz_gCzaaGAs4mXH ASO5S3 delta 406 zcmV;H0crlV1hoW^seh4S+X3iTJm}2s`LsZ0SiA*Dl|aL?z?m9jAgpXetf!r0@l1H3 z!nJYRI?jc^+=XKBOTe;ED98AV^gdyrw{YEMfO&E$Rzd0!`Cx6)R4Oc6MJN;_N|HXG zvx5wtd&#)_(xI0F&laBrK_1Cr7;!><^k=m;bRWDJJ;nf3!G9qF0001h0000UiJ2X! zOzkJ4b;uW@DX?|w#xzv`Gg%|?h9t5Ja- zAT88sU&}Lk{<~5K4%V8<45_4Vryne;$TbV&127ii4#;AI#`(tUB#dNt_ciG_HH~|K zLfesWt_Z$YxqpT?q`G$ERjrGUfB*mhFM_uqZ%7L;q&6({(fTE0Wzha(=W9ElcgZ4h zFT=sWEj(|l68wY^p&p^e)oJc9r8YE#o-6Qqm|{?Nw4~->{IQIYw)40L-THppddePl zrhuyt$%g}{C3E77G4KZ)1erxgGhgWhlFXGcX0RH|SP!dtMQ!4f6+9T;4wS*_6Huta Ap#T5? diff --git a/@AresModAchillesExpansion/addons/ui_f/cfgFunctions.hpp b/@AresModAchillesExpansion/addons/ui_f/cfgFunctions.hpp index d6ebf995..23e85788 100644 --- a/@AresModAchillesExpansion/addons/ui_f/cfgFunctions.hpp +++ b/@AresModAchillesExpansion/addons/ui_f/cfgFunctions.hpp @@ -18,7 +18,6 @@ class CfgFunctions class onDisplayCuratorLoad; class onDisplayCuratorUnload; class onModuleTreeLoad; - class addCuratorInterfaceEventHandler; }; @@ -27,9 +26,8 @@ class CfgFunctions file = "\achilles\ui_f\functions\keyEvents"; class HandleCuratorKeyPressed; - class HandleCuratorKeyReleased; class HandleRemoteKeyPressed; - class HandleCuratorObjectDoubleClicked; + class HandleMouseDoubleClicked; class HandleCuratorObjectPlaced; class HandleCuratorGroupPlaced; class HandleCuratorObjectEdited; diff --git a/@AresModAchillesExpansion/addons/ui_f/dialogs/Replacement/RscDisplayAttributesVehicle.hpp b/@AresModAchillesExpansion/addons/ui_f/dialogs/Replacement/RscDisplayAttributesVehicle.hpp index 8d1c3aef..dff52ddc 100644 --- a/@AresModAchillesExpansion/addons/ui_f/dialogs/Replacement/RscDisplayAttributesVehicle.hpp +++ b/@AresModAchillesExpansion/addons/ui_f/dialogs/Replacement/RscDisplayAttributesVehicle.hpp @@ -45,7 +45,7 @@ class RscDisplayAttributesVehicle : RscDisplayAttributes }; class ButtonAmmo : ButtonCustomLeftBelow { - text = "$STR_AMMO"; + text = "$STR_LOADOUT"; onMouseButtonClick = "[BIS_fnc_initCuratorAttributes_target] spawn Achilles_fnc_changePylonAmmo;"; colorBackground[] = {0.518,0.016,0,0.8}; }; @@ -101,7 +101,7 @@ class RscDisplayAttributesVehicleEmpty : RscDisplayAttributes }; class ButtonAmmo : ButtonCustomLeftBelow { - text = "$STR_AMMO"; + text = "$STR_LOADOUT"; onMouseButtonClick = "[BIS_fnc_initCuratorAttributes_target] spawn Achilles_fnc_changePylonAmmo;"; colorBackground[] = {0.518,0.016,0,0.8}; }; diff --git a/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_addCuratorInterfaceEventHandler.sqf b/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_addCuratorInterfaceEventHandler.sqf deleted file mode 100644 index 32a9ce70..00000000 --- a/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_addCuratorInterfaceEventHandler.sqf +++ /dev/null @@ -1,42 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -// AUTHOR: Kex -// DATE: 6/10/17 -// VERSION: 1.0 -// DESCRIPTION: Adds an event handler to the curator interface -// -// ARGUMENTS: -// _this select 0: STRING - event handler type -// _this select 1: CODE - code executed in unscheduled environment when the event handler is triggered (available params: _this select 0: curator display) -// -// RETURNS: -// _this SCALAR - positive scalar id of the event handler; -1 if it failed -// -// Example: -// ["onLoad", {systemChat "Hello World!"}] call Achilles_fnc_addCuratorInterfaceEventHandler; -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -#include "\A3\ui_f_curator\ui\defineResinclDesign.inc" - -params ["_type", "_code"]; -private _curator = getAssignedCuratorLogic player; -private _id = -1; -if (isNull _curator) exitWith {_id}; - -switch (toLower _type) do -{ - case "onload": - { - private _code_list = _curator getVariable ["Achilles_var_onLoadCuratorInterface", []]; - _id = count _code_list; - _code_list pushBack _code; - _curator setVariable ["Achilles_var_onLoadCuratorInterface", _code_list]; - }; - case "onunload": - { - private _code_list = _curator getVariable ["Achilles_var_onUnloadCuratorInterface", []]; - _id = count _code_list; - _code_list pushBack _code; - _curator setVariable ["Achilles_var_onUnloadCuratorInterface", _code_list]; - }; -}; -_id; \ No newline at end of file diff --git a/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_onDisplayCuratorLoad.sqf b/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_onDisplayCuratorLoad.sqf index 134d3e82..8d36eeae 100644 --- a/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_onDisplayCuratorLoad.sqf +++ b/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_onDisplayCuratorLoad.sqf @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // AUTHOR: Kex -// DATE: 6/10/17 -// VERSION: 4.0 +// DATE: 6/26/17 +// VERSION: 6.0 // DESCRIPTION: Called when display curator is loaded // // ARGUMENTS: @@ -20,8 +20,7 @@ ["onLoad",_this,"RscDisplayCurator","CuratorDisplays"] call (uinamespace getvariable "BIS_fnc_initDisplay"); // custom stacked curator display event handler -private _code_list = (getAssignedCuratorLogic player) getVariable ["Achilles_var_onLoadCuratorInterface",[]]; -{[_this] call _x} forEach _code_list; +["Achilles_onLoadCuratorInterface", _this, player] call CBA_fnc_targetEvent; _this spawn { @@ -39,10 +38,6 @@ _this spawn // reject player if both mods are running (protect players from themselves) if (isClass (configfile >> "CfgPatches" >> "Ares")) then {while {true} do {sleep 1; hint "Error: Please unload Ares Mod!"; systemChat "Ares Mod and Ares Mod - Achilles Expansion are standalone add-ons and are NOT compatible with each other!"}}; - // initialize key variables - Ares_Ctrl_Key_Pressed = false; - Ares_Shift_Key_Pressed = false; - // execute init _display_reload = [_tree_ctrl] call Achilles_fnc_onCuratorStart; @@ -61,7 +56,7 @@ _this spawn }; _display displayAddEventHandler ["KeyDown",{_this call Achilles_fnc_HandleCuratorKeyPressed;}]; - _display displayAddEventHandler ["KeyUp",{_this call Achilles_fnc_HandleCuratorKeyReleased;}]; + (_display displayCtrl IDC_RSCDISPLAYCURATOR_MOUSEAREA) ctrlAddEventHandler ["MouseButtonDblClick",{_this call Achilles_fnc_HandleMouseDoubleClicked;}]; // handle module tree loading [true] call Achilles_fnc_OnModuleTreeLoad; diff --git a/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_onDisplayCuratorUnload.sqf b/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_onDisplayCuratorUnload.sqf index 00ee1373..34bb0a64 100644 --- a/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_onDisplayCuratorUnload.sqf +++ b/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_onDisplayCuratorUnload.sqf @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // AUTHOR: Kex -// DATE: 6/10/17 -// VERSION: 1.0 +// DATE: 6/26/17 +// VERSION: 3 // DESCRIPTION: Called when display curator is unloaded // // ARGUMENTS: @@ -17,8 +17,7 @@ #include "\A3\ui_f_curator\ui\defineResinclDesign.inc" // custom stacked curator display event handler -_code_list = (getAssignedCuratorLogic player) getVariable ["Achilles_var_onUnloadCuratorInterface",[]]; -{[_this] call _x} forEach _code_list; +["Achilles_onUnloadCuratorInterface", _this, player] call CBA_fnc_targetEvent; // execute vanilla display curator function ["onUnload",_this,"RscDisplayCurator","CuratorDisplays"] call (uinamespace getvariable "BIS_fnc_initDisplay"); \ No newline at end of file diff --git a/@AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleCuratorKeyPressed.sqf b/@AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleCuratorKeyPressed.sqf index 53e15ff6..8be8b85b 100644 --- a/@AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleCuratorKeyPressed.sqf +++ b/@AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleCuratorKeyPressed.sqf @@ -3,15 +3,7 @@ _key = _this select 1; _handled = false; switch (true) do { - case (_key == 29): // CTRL - { - Ares_Ctrl_Key_Pressed = true; - }; - case (_key == 42): // SHIFT - { - Ares_Shift_Key_Pressed = true; - }; - case (_key in actionKeys "CuratorLevelObject"): + case (_key in actionKeys "CuratorLevelObject"): // align up-vector with z-axis (default: X) { _curatorSelected = ["object"] call Achilles_fnc_getCuratorSelected; { diff --git a/@AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleCuratorKeyReleased.sqf b/@AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleCuratorKeyReleased.sqf deleted file mode 100644 index 23fc5be9..00000000 --- a/@AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleCuratorKeyReleased.sqf +++ /dev/null @@ -1,17 +0,0 @@ -_key = _this select 1; -_handled = false; -[format ["Key Released %1", _key]] call Ares_fnc_LogMessage; -switch (_key) do -{ - case 29: // CTRL - { - ["CTRL Released"] call Ares_fnc_LogMessage; - Ares_Ctrl_Key_Pressed = false; - }; - case 42: // SHIFT - { - ["SHIFT Released"] call Ares_fnc_LogMessage; - Ares_Shift_Key_Pressed = false; - }; -}; -_handled; \ No newline at end of file diff --git a/@AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleCuratorObjectDoubleClicked.sqf b/@AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleCuratorObjectDoubleClicked.sqf deleted file mode 100644 index 534924fa..00000000 --- a/@AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleCuratorObjectDoubleClicked.sqf +++ /dev/null @@ -1,40 +0,0 @@ -private ["_curator","_clickedObject"]; -_curator = _this select 0; -_clickedObject = _this select 1; -_handled = false; - -[format ["Double-clicked object %1", _clickedObject]] call Ares_fnc_LogMessage; - -if (Ares_Ctrl_Key_Pressed or Ares_Shift_Key_Pressed) then -{ - ["CTRL and/or Shift Key was pressed for double-click!"] call Ares_fnc_LogMessage; - _handled = true; - - // Hack - trick the BIS function into thinking the mouse is over the double-clicked unit - missionnamespace setVariable ["bis_fnc_curatorObjectPlaced_mouseOver",["OBJECT", _clickedObject]]; - - if (Ares_Ctrl_Key_Pressed) then - { - _logic = [getPos _clickedObject, "LOGIC"] call Ares_fnc_CreateLogic; - [_logic, [], true] call BIS_fnc_moduleRemoteControl - } else - { - [Achilles_fnc_switchUnit_start, [_clickedObject]] call CBA_fnc_directCall - }; - - closeDialog 1; -} else -{ - if (_clickedObject isKindOf "Land_ClutterCutter_small_F") then - { - switch (true) do - { - case (not isNil {_clickedObject getVariable "source"}): - { - [_clickedObject] spawn Achilles_fnc_lightSourceAttributes; - }; - }; - }; -}; - -_handled; diff --git a/@AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleMouseDoubleClicked.sqf b/@AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleMouseDoubleClicked.sqf new file mode 100644 index 00000000..04e6e0e9 --- /dev/null +++ b/@AresModAchillesExpansion/addons/ui_f/functions/keyEvents/fn_HandleMouseDoubleClicked.sqf @@ -0,0 +1,37 @@ +private _handled = false; + +curatorMouseOver params ["_typeName","_clickedObject"]; +if (_typeName == typeName objNull) then +{ + private _ctrlKeyPressed = param [5]; + private _altKeyPressed = param [6]; + + switch (true) do + { + case (_ctrlKeyPressed): + { + missionnamespace setVariable ["bis_fnc_curatorObjectPlaced_mouseOver",[_typeName, _clickedObject]]; + _logic = [getPos _clickedObject, "LOGIC"] call Ares_fnc_CreateLogic; + [_logic, [], true] call Achilles_fnc_moduleRemoteControl; + _handled = true; + }; + case (_altKeyPressed): + { + [_clickedObject] call Achilles_fnc_switchUnit_start; + _handled = true; + }; + case (_clickedObject isKindOf "Land_ClutterCutter_small_F"): + { + switch (true) do + { + case (not isNil {_clickedObject getVariable "source"}): + { + [_clickedObject] spawn Achilles_fnc_lightSourceAttributes; + _handled = true; + }; + }; + }; + }; +}; + +_handled; diff --git a/@AresModAchillesExpansion/addons/ui_f/scripts/RscAttributeCAS.sqf b/@AresModAchillesExpansion/addons/ui_f/scripts/RscAttributeCAS.sqf index 3e087a81..14c8a621 100644 --- a/@AresModAchillesExpansion/addons/ui_f/scripts/RscAttributeCAS.sqf +++ b/@AresModAchillesExpansion/addons/ui_f/scripts/RscAttributeCAS.sqf @@ -31,7 +31,6 @@ switch _mode do { _pylon_cfgs = (_planeCfg >> "Components" >> "TransportPylonsComponent" >> "pylons") call BIS_fnc_returnChildren; { _pylon_mag = getText (_x >> "attachment"); - systemChat ("mag" + str _pylon_mag); _weapon_classes pushBack getText (configFile >> "cfgMagazines" >> _pylon_mag >> "pylonWeapon"); if (count getArray (configFile >> "cfgMagazines" >> _pylon_mag >> "turret") > 0) then {_gunner_is_driver = false}; } forEach _pylon_cfgs; diff --git a/@AresModAchillesExpansion/addons/ui_f/scripts/RscAttributeSkill.sqf b/@AresModAchillesExpansion/addons/ui_f/scripts/RscAttributeSkill.sqf index 2bc1169d..a0c8d74c 100644 --- a/@AresModAchillesExpansion/addons/ui_f/scripts/RscAttributeSkill.sqf +++ b/@AresModAchillesExpansion/addons/ui_f/scripts/RscAttributeSkill.sqf @@ -1,28 +1,27 @@ #include "\A3\ui_f_curator\ui\defineResinclDesign.inc" -_mode = _this select 0; -_params = _this select 1; -_entity = _this select 2; +params ["_mode", "_params", "_entity"]; switch _mode do { case "onLoad": { if (typename _entity == typename grpnull) then {_entity = leader _entity;}; - _display = _params select 0; - _ctrlValue = _display displayctrl IDC_RSCATTRIBUTESKILL_VALUE; - _ctrlValue slidersetrange [2,10]; - _ctrlValue slidersetposition (skill _entity * 10); + private _display = _params select 0; + private _ctrlValue = _display displayctrl IDC_RSCATTRIBUTESKILL_VALUE; + private _sliderRange = getArray (configFile >> "Cfg3DEN" >> "Attributes" >> "Skill" >> "Controls" >> "Value" >> "sliderRange"); + _ctrlValue slidersetrange _sliderRange; + _ctrlValue slidersetposition (skill _entity); _ctrlValue ctrlenable alive _entity; }; case "confirmed": { - private ["_mode", "_unit","_curatorSelected"]; - _display = _params select 0; - _ctrlValue = _display displayctrl IDC_RSCATTRIBUTESKILL_VALUE; - _skill_value = (sliderposition _ctrlValue) * 0.1; + private ["_unit","_curatorSelected"]; + private _display = _params select 0; + private _ctrlValue = _display displayctrl IDC_RSCATTRIBUTESKILL_VALUE; + private _skill_value = sliderposition _ctrlValue; if (typename _entity == typename grpnull) then { - _selectedGroups = ["group"] call Achilles_fnc_getCuratorSelected; + private _selectedGroups = ["group"] call Achilles_fnc_getCuratorSelected; _curatorSelected = []; {_curatorSelected append units _x} forEach _selectedGroups; _unit = leader _entity; @@ -30,7 +29,7 @@ switch _mode do _curatorSelected = ["man"] call Achilles_fnc_getCuratorSelected; _unit = _entity; }; - _previousSkillValue = skill _unit; + private _previousSkillValue = skill _unit; if (abs (_skill_value - _previousSkillValue) > 0.01) then { if (local _entity) then { diff --git a/@AresModAchillesExpansion/changelog.md b/@AresModAchillesExpansion/changelog.md index a3ed56ca..943f4fa0 100644 --- a/@AresModAchillesExpansion/changelog.md +++ b/@AresModAchillesExpansion/changelog.md @@ -1,19 +1,32 @@ -Known issues
-───────────────────────────────────
+Known issues
+───────────────────────────────────
* Switch Unit for non-local units: Notable delay observed before control works. * CUP planes are not working properly for vanilla CAS module. * Reinforcement module may mix up groups of 3rd pary add-ons. Versioning (introduced with 0.0.8)
───────────────────────────────────
-X.X.Xc
+X.X.Xc
│ │ │└ hotfixes (optional)
-│ │ └─ "small" update
-│ └─── "major" update
-└───── stage (alpha, beta, ...)
+│ │ └─ "small" update
+│ └─── "major" update
+└───── stage (alpha, beta, ...)
-Change log
+Change log
───────────────────────────────────
+V.0.0.8c +* Change: Skill slider range is no longer hard-coded. It takes the range as in 3den instead (see [BIS forum](https://forums.bistudio.com/forums/topic/191113-ares-mod-achilles-expansion/?do=findComment&comment=3204945)). +* Change: Renamed vehicle attribute button "AMMO" to "LOADOUT" to make clear that ammo has to be adjusted with the slider. +* Change: Dynamic Loadout interface makes use of the new getCompatiblePylonMagazines command. +* Change: Faction whitelist option was temporarly removed due to instabilities (actually it was already removed in 0.0.8). +* Change: Swich Unit hotkey was changed due to conflict with MCC (new hotkey: Alt + 2xLMB). +* Change: Improved Achilles initialization for Zeus Game Master missions. +* Change: Replaced Achilles_fnc_addCuratorInterfaceEventHandler by CBA event handler system with "Achilles_onLoadCuratorInterface" and "Achilles_onUnloadCuratorInterface" as keywords. +* Fix: "Switch Unit" module does not work properly for drones => introduced exception handling. +* Fix: "Switch Unit" and "Remote Control" were triggered by 2xLMB without an additional key in certain cases. +* Fix: Debug logging was still present for the bomb strike module. +* Fix: Achilles_fnc_arrayMean had no exception handling for empty arrays. + V.0.0.8 * Change: Carrier base gets added automatically; Deletion will affect all carrier parts (the carrier is not movable though). * Change: Intel: The map only opens for the player that picked it up. Who actually gets the intel as well still depends on the settings. @@ -37,9 +50,6 @@ V.0.0.8 * Fix: "Create/Edit Intel" did not handle newline characters (Hotkey: LSHIFT+RETURN). * Fix: Create/Edit Intel: Dialog title did not describe the exact action (create, spawn or edit). -### Remarks: -- [ ] txt files have changed => Adjust links on Steam and BIS forum accordingly! - V.0.0.7d (Achilles Expansion (alpha version)) * Change: Several critical modules can no longer be added to Zeus (prevents unintended deletion). * Change: Specify position (spawn attribute) was improved (it is now a valuable tool for placing objects on a carrier). From fc950c1167cd0670b2a0588ccd57a205985415c3 Mon Sep 17 00:00:00 2001 From: Ralfs Date: Fri, 30 Jun 2017 14:32:11 +0300 Subject: [PATCH 3/6] Removed wind noise --- .../Replacement/functions/fn_moduleRemoteControl.sqf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/@AresModAchillesExpansion/addons/modules_f_achilles/Replacement/functions/fn_moduleRemoteControl.sqf b/@AresModAchillesExpansion/addons/modules_f_achilles/Replacement/functions/fn_moduleRemoteControl.sqf index 443bc334..beeab08b 100644 --- a/@AresModAchillesExpansion/addons/modules_f_achilles/Replacement/functions/fn_moduleRemoteControl.sqf +++ b/@AresModAchillesExpansion/addons/modules_f_achilles/Replacement/functions/fn_moduleRemoteControl.sqf @@ -35,9 +35,6 @@ if (_activated && local _logic && !isnull curatorcamera) then { _unit setvariable ["bis_fnc_moduleRemoteControl_owner",player,true]; - //--- Play wind cue to all players - [format ["wind%1",ceil random 5],"bis_fnc_playsound"] call bis_fnc_mp; - _blur = ppeffectcreate ["RadialBlur",144]; _blur ppeffectenable true; _blur ppeffectadjust [0,0,0.3,0.3]; @@ -161,4 +158,4 @@ if (_activated && local _logic && !isnull curatorcamera) then { [objnull,_error] call bis_fnc_showCuratorFeedbackMessage; }; deletevehicle _logic; -}; \ No newline at end of file +}; From 89c07e5d63d3585a010dc25dd0c21dd070f06bb9 Mon Sep 17 00:00:00 2001 From: Kex Date: Mon, 3 Jul 2017 23:31:54 +0200 Subject: [PATCH 4/6] 0.0.8c part2 --- .../addons/data_f_achilles.pbo | Bin 292960 -> 292960 bytes .../data_f_achilles.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../addons/data_f_ares.pbo | Bin 592021 -> 592021 bytes .../data_f_ares.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../addons/functions_f_achilles.pbo | Bin 226779 -> 226996 bytes ...nctions_f_achilles.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../functions/features/fn_chute.sqf | 20 +++++++++++------- .../addons/functions_f_ares.pbo | Bin 68057 -> 68057 bytes .../functions_f_ares.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../addons/language_f.pbo | Bin 138294 -> 138294 bytes .../addons/language_f.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../addons/modules_f_achilles.pbo | Bin 196144 -> 196144 bytes ...modules_f_achilles.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../addons/modules_f_ares.pbo | Bin 166005 -> 166005 bytes .../modules_f_ares.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../addons/settings_f.pbo | Bin 12089 -> 12089 bytes .../addons/settings_f.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes @AresModAchillesExpansion/addons/ui_f.pbo | Bin 309717 -> 310158 bytes .../addons/ui_f.pbo.achilles_dev.bisign | Bin 565 -> 565 bytes .../eventHandler/fn_onDisplayCuratorLoad.sqf | 17 +++++++++++++-- @AresModAchillesExpansion/changelog.md | 7 ++++-- @AresModAchillesExpansion/credits.txt | 1 + 22 files changed, 33 insertions(+), 12 deletions(-) diff --git a/@AresModAchillesExpansion/addons/data_f_achilles.pbo b/@AresModAchillesExpansion/addons/data_f_achilles.pbo index 74fe618f6d1f4e7af433f78d26720d2318d315e5..87fe46d1d424999735f540478467d7ca863e8a05 100644 GIT binary patch delta 95 zcmaFxLGZx`!3hVM@68OHc*K?iNJUO&VqlnVRl=gYS%;CAl?^21#6Q{ap7`c4HihGC xrbgyQ#smHz?8R@@08^9qmRx?0085sCKmtz diff --git a/@AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_dev.bisign index 86a319dda030ef6c5830db3e38cf9441c8a87e94..ccaf17535ae26210db0771e098006f625606688e 100644 GIT binary patch delta 406 zcmV;H0crlV1hoW^sejW(;GM_D1bswm$|g6d%`@RCf>S_!VplD78SEUNkML~dnYskf z$K$)@rSrwImQ-4_&k8(J6Y8P-m?U@%YuOuR&|qeE4dEfku-P)`Fo_)u-_gM00>v4L zgDveu>&4c9hMP|xMCb9t(9|uV`UmA^gdw-g!{Jbu?rUy7Z+~6_0001h0001_KquwM zmPlRc@58y#H_j6W7S&v-P(dsmf*R2V!nAhr4^W&JYk4KlCw9Hg(1$GVWNX|?S>;v$ zLR~x^2?e@M;_on}gR^AIv*_!1B6$=z-D;jyW`lAOkN*^gtMS&1(C7YG6jlD$kQ zxRT1)r#`Tfwn_@@hZY~753U{0G3xt=0ZuI)VtLK;84u_jzeue;{PC>2&r>)+0XIL$ A-~a#s delta 406 zcmV;H0crlV1hoW^sek$g#{J59S2Z>39 z?TD*%*;zH|?Py*d-${olPEP4Kp)!T@d!fEJ)k`AE3S z_}pc2+K^}7EPs=44)I+YE&^M~fB*mh1+)lDXaBlS{gj74RAh{tP7^8I)6~K})-QzK z4KbP6HhclSG#PT(I}2&-PL%s728hP)=%nR}LutO!(COM$jvix;cXByuj=iUo{dD5^ zPdx*$82=AnALbxT5ejct*+pO7_Ik^8w17|wq?cyi&?TQm9gton7u+Orz~#|tP3 delta 105 zcmbO_QDy2xl?erGTl@kdT^J@OvT1ExpdrBwk0E7z4bC$$H2u4bhDq<^FW0001h0002oU1;~O zz$nD8B?hj4^6E;Zrz3esaS_Q!es$Q7opCq%ccs6*TX|}9`Z<0P1*Ddt3g#1k^A6XT z`E*2hmPrrmL>k7bqD0VE$=9`KU zKT}R9cWWaz{(tWkyBib-FPm8mfB*mhPO8n!ixTKbyjZZdl)bTa)lp(Af9Fe~7@Zp= z5e)ED;xmXh#*)5en1FgBL~ZOh0uQhT!+zhuX?s_yARJH1u)|DW5gIgxkVs4W2cYF AF#rGn delta 406 zcmV;H0crlV1hoW^segtj2Qpt?1&>mg1^#ZNgqhIq5Kf4TME>q(5K;nR%_%Ujw&b=l zsOwRRG@7UAO{R>v1xcch*iI^oay$`!5sUP1P#JX|A(%h!l}c4_7~SF!&iw>m(>>LS zU_^%i@L?)m3T;0EM5U<7&sr!R7t~bE^?@S@vIjg~oJvm^Y=1Zc0001h0001rSs7k~ zrhNtYha?;Y14cZ$Lu5}c)97|-fXp8#eC)aUiQ5NI}8&~Qa+C}H`4)vz;Pc$3=Rv!RQYUl?${zS6Z zi~V3gjU$x+cNWsNRnI@XvYg0&rhH%lKN$#qQU?)`v-U*e=_htr8tVsh=8=s1CvZc%njJ(FXnUU)vJDaJIxskC!^9{l6Hv}0U zrb;CxCTAA_u|j-lUS^4cqOF3Gl0sr$ibD1D+MA5hliwHfI-sesvr|xl2?b~7mgXdu zWaj57X)4$PH3uXXB_?N-mZS!kq^1@nCgr3m)lL_%V-!_S2B}hrR?06(&4a5_inZqD z;;dCj%_&X=GOBsGrt3dqw4H8S!Kg4jrh-v%dQAnR#`N4rjB<>%+xJ#5nlsYH$?Y;# ijN4_Zm{$K5X|aFyB}9Frs>SR=>)wuK+h@O%T?zo(_JRcf delta 228 zcmdn;miP8+-U*e=Tl@kh)}(=`jZeimCp$2)F#YA(%*b_-oz29=$i&pB`G(;38-k1v zQ$0)aee%mwixiR)ld}teSRuYNFSA6!)>c6&DZU`FC^0#sv?NtYQ=udyHBX_sC^a{~ zEY%4`aji8k7cbXz&c}?_)3;PGDono$BED5Hs!x}zWR%_RP|0Y_r~$Jm9%fT~a!z7# oF@{a;U#l3mf30F#{afVq!x*c}RhQ+MURzK7^?dF-okBil0Fm2P#Q*>R diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.achilles_dev.bisign index 4ab7ea197b3f2ddb1631054c956a4ae29635c51d..085fa5fcd8bdf29eedfa9e661344847a804b18db 100644 GIT binary patch delta 406 zcmV;H0crlV1hoW^see^fj_-J-77Qac67%&WpX_B~OFEs3X>CdtpO>bH7P#9ony!Fl zU`SaIq}BGj+9?v5rGV^jTcOo91=5h+kUP9!xng(~G+oO78b)!b^?C{T*!G&`)>`@p z6h|bMe=w81FHtPleC5dUd0E-o&_CFxU?Gfvv?49-Nfs{f>VFyn0001h0000#-FCxn!sf;av=@VoT;qfR2vA$8z zl$#VmaYF^(OGvjG_uta0pifJ-(Vr|sm_(1G*BDf~8}$=DuG>XB6 zz^*OLVKSf9&Jqv5A%@7h1ec*8!J;)UISqv4iwSBUYCZBBRDX~H0001h0001Lcwn&c zxNcPEaiysr!&Rd@i%MMbx3c#Nndh#9=jQA1rTQVHX{zyL;rlpV2NB6dvPxcdPw>LT z+SH<8z*fBFL@Jloyoa;S!;seFzi>jF7VRE1YMWZj$au}EwwhV;a5MBjqu3C=rVmuODt#sC>}+QyW{&HdRbhC^ AcmMzZ diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_chute.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_chute.sqf index d5a53cc6..7ed6da78 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_chute.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_chute.sqf @@ -33,13 +33,17 @@ if (!isPlayer _unit) then sleep 1; // if the unit already has a chute - if (toLower backpack _unit == "b_parachute") then {removeBackpack _unit}; - - _chute = "Steerable_Parachute_F" createVehicle [0,0,0]; - _chute setPos (getPos _unit); - _chute setDir (getDir _unit); - _chute setVelocity (velocity _unit); - _unit moveInDriver _chute; + if (backpack _unit != "" and {getText (configfile >> "CfgVehicles" >> backpack _unit >> "backpackSimulation") == "ParachuteSteerable"}) then + { + _unit action ["openParachute"]; + } else + { + _chute = "Steerable_Parachute_F" createVehicle [0,0,0]; + _chute setPos (getPos _unit); + _chute setDir (getDir _unit); + _chute setVelocity (velocity _unit); + _unit moveInDriver _chute; + }; // prevent AI to be killed by fall damage waitUntil {isTouchingGround _unit or (!alive _unit)}; _unit removeEventHandler ["HandleDamage",_id]; @@ -51,7 +55,7 @@ if (!isPlayer _unit) then _backpack_class = backpack _unit; // if the unit already have a chute - if (toLower _backpack_class == "b_parachute") then {_backpack_class = ""}; + if (backpack _unit != "" and {getText (configfile >> "CfgVehicles" >> backpack _unit >> "backpackSimulation") == "ParachuteSteerable"}) then {_backpack_class = ""}; if (_backpack_class != "") then { diff --git a/@AresModAchillesExpansion/addons/functions_f_ares.pbo b/@AresModAchillesExpansion/addons/functions_f_ares.pbo index 8d293aadf0755b62e61c3575df76eb621b8245b8..3a779e006cbf9f248f5f11cddbfcc326d81a1f99 100644 GIT binary patch delta 70 zcmcaPndRnWmIE$ku4JY zDoRB?@85tUhgekp)Xdl0-XgESzb?!deb-@;IL2}TEdlr~ucw7Ab~etGLUy9dNu&1J zTo34jB9IpICKvmr1H*qeF!L^KJ7dF{04bMvD+G&~whjtfqJJC$0001h0002YmEmQq z0H%Y&_ii2e$FswV9h=3(qPJpPTB#f^k|KOjF@U@w_7i>q#JhWrU;tgK7Qs&pT9v)D z{voVbmnRJIO(GMsfNQ4}_s)rs^&U^42V8`fsDsi2wXTwV%c&&iYUsKDGPEq@>Y7QH zH{oB_VlYvCLVun45>?t?x>=QvfB*mhY;)SwUq>dtedz1}xY1Wi7nBk`kzj0qn=8)g z&RX3k0>`_qwg(;mc(}}vIMHe)&8((>2rX1=xEhGAnVAGb*EQ(ngb^d;!5s+#x2%JA zr{MBl9mj-=tXqt$gl)hrX#Syglvj+(JmR6_5ao*R2M?27_zYMemr&Rk~UVv Ap#T5? delta 406 zcmV;H0crlV1hoW^sejiCIClH8?hT?bG!Hk}@a3h|;4Y>ZapN`7N?OrUd&Mh!pc65?FU3=w@~%a@lBvbzJ@18B7d6#0001h0000HWyXG1 z0nw2@^^?4E=9cu-5a>1S>0@LeyiEpO#wh{_c$;WZ^x8G1C(qv-8p9UY6cmFHQjzJ5 z#BgZ5$4@#Hny{_%?04)sV&6wOe$d63UoW64VYHA$Umhx;D^Ar*zG%5nVbWiN`%r^;9F zHp&lzV0GdPdqBJ`?Trs$d8%KSEt*jMP8>28YgY_@9fI@=9L#r zfc;52#iJJ+RY?ZGV7vOnX(9B`o|f&7ELymBB0Vq#=sYSb*p*e=J& hxLuBsiA7o@cy+%Z!)6!fk}LeNm6Oy0zI7bC0{}A78JhqA diff --git a/@AresModAchillesExpansion/addons/language_f.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/language_f.pbo.achilles_dev.bisign index 17ec9164f03752597163b23ddf191f611ca65251..7ca7a884c2b300047fa9d013ba9ce8fca8068478 100644 GIT binary patch delta 406 zcmV;H0crlV1hoW^seitq>1ghi`8sq$ELo0@5n#8%rDgddIy_I6@lpTpto!V0(CY`= z)%1U)yRLjja#$KqQMasyLK~cjlQ3hz=OJ6xPe@7_`;{hb|7EyMVm&TIjIJ!mGVP#U z@0P+_+RgM=%u~a|gtfY_KQ5_h2i88xf4}pGb;DjfS?VWm)PDs60001h0000T(e&9Q zhyP)}T@_ezX}uo`k4l-+6wY|vu}LNH{r0H}g+wo_?O8|DKc;OrKx4~Pg0CtDg&N{h z!y*hF>Iugxv`gWs)dFfZp=g;{OdNPy^vC|+`_zLOzM|O8j9zjH(I$A&3ZlQ-0K9E+ zIo$P?rP>Pk_J7qAb%TqX7~PCRfB*mhQqXlKHKFdL$BkEL)WQ%Fxd`FtcEVrY!2-l& z*c0(@kl59mf4Kw4t`+2FNbi#n;oqHs<8qKP48dJ^M`H8(_pMaY=d)J9p7og5UJtK(onRhB!G%vkV>Y;&a)6Z3 ADgXcg delta 406 zcmV;H0crlV1hoW^sej-91M=?H2>aNswN6=Fw9BzR&YF0?HRTn2PsAYF+3%#lS~U3Y zR(*gde?+1emOjhORCn$L{`U!;H0B8^*0bXPc?{&)~O!Kg79%0f2d$cDYO2Iv8(gCb~w1bTOA%R%2*p{<=VT8oe*@_=(;6`JP; zwHk4O=J0qu`5S**Q-q~+8%SN*x=zoq`yp9wn zCzs}ZHMu`{nMwJ2`n)(Px;l?JSm2>&{_d`g)birSHd%b)QgnYR2D9xgHMoua%hH@} z-5?DZ10*LpQexinNM;U<=4%tw_g3z4z6c-e`GV;g1rK$;0JYxPv?$RPGaB)e2nd+Q A9smFU diff --git a/@AresModAchillesExpansion/addons/modules_f_achilles.pbo b/@AresModAchillesExpansion/addons/modules_f_achilles.pbo index 3937f6457d937623f69c0aca7b2a703c0194da35..e351d8fce67825b6b15b400ff1f85b29e9952697 100644 GIT binary patch delta 77 zcmdn+hkFAMg)=kXn;Ez{iuo`jn4!RWAezn8$lS=-V0vK?llbHh$z09siS6u(jN920 enMCJ`i2K`E=$%@3cYW;95?|)GJ6}Bf>;eFYKOW2g delta 77 zcmdn+hkFAMg)=j6@e9}-#eA3%%urxG5Y1*{Vq{`!G`%p0Nqq8$WUglR#CG;X#_jBh dOrmo|mWV0zOK8Ld8Crj>iry-+aeK&&QUE)Y8)*Ol diff --git a/@AresModAchillesExpansion/addons/modules_f_achilles.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/modules_f_achilles.pbo.achilles_dev.bisign index fbef9405cf824866c515abf45fa29a16cbb36b00..9f5a00ac8aed86bc8a567dc5092f142e885ef3e4 100644 GIT binary patch delta 406 zcmV;H0crlV1hoW^sed8@$aQ4tl3JmT@nJv)#YbVrx+r17Ng?a7WmA&E@rn9C>Wiv~ z+eV%T)?`EL@%*XcY^LC`tktR&OH0~9yrPJ+BHox-&j8n)G_YsnVD{O1%fC z5?!4Tz(gUJcg?A}obflL=X%1F|KSgjza0dR>`BL=&<0*W-jb95GQa7PO-D$kQ&`o; z-GFKg9h|bXqcBK!MRhQ0N2zUrXe9s!I1S7G7ZrCMv=7D+CKect6J Ax&QzG delta 406 zcmV;H0crlV1hoW^seeWgJV=#21Nm7UAsfOZT^V*(T%mzB^t%cix@A4w1f( zv#+XXoNSmT9AaW<3!*dTg%6SpIjEpO*oJr_qS7(i&`kqP)I*r{4Kf(dmw=< zqnwjWo!IqF1AqKScXF#h>hktpfB*mh>BP})Xprl!G1n{tH(mNc5QBO!v~7)G>M*rV zoQP~@#y*Er$MM{e`-_M35f@;ReHy_s@sFZt0U!h#bha_OY@Kt@MG$EC>lstyWh(X< zH_0@w)f5Hg^F-c;`~t@d`{4hMsmNATdU>trg}I2(%?}saUt!@S1emm_u6sGo|`PBcPe)}u|NmU_$ delta 71 zcmex5f$Qr8t_@P_2MZ(`hb bRb)cE+WPfD`j1LBF_i4y(78@w%WDw;??@f} diff --git a/@AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_dev.bisign index 8641ac32f7bb57e88fc17f64b65fad6a698185d8..e86827610c830d0e9c5590f12cdf7b92a7947fd3 100644 GIT binary patch delta 406 zcmV;H0crlV1hoW^seeUZO79JYLIiP$=Gf&8!qpIUP0WK?-vaV!*xca!7xI)I$aqC1 zGAN(yP317s``|^58WORIfOQ#d#p|cr)q!viftCL={*K4W@}zZe zajKEva01_mn2~7n!|>kEC(zq%kSr=OZ_U`&{W=~Is+5zAhku>|0001h0001nJgr;- zxkGuJUa$M55Wte?>(w}EMGo{2J+y&OP8Y{qW^)Vjkss-2SZqj)F2|^m$5f_dEi9!! zS_8*0QlUD0L7oh&M;Y%RTWnP4qJLXpMN4V&%I`t)b(_zh+Uhx z`{;Jd$g3JRE4!iS6#V$9;ZtOQh!4i`6a)&lmyWhq0QNVo-K> z2)O|J+_*n-9iaMFQ1BS&Rz|sDV?4dBi<|ZIj5;1WAm$4-JB_~+lJs~Cow6vRydTDT z-}TS1a2NRzE=Xc<-(s2DHr-}P_1E&PVPF}HxMbFNZTHxumw!b90001h0001*|E;R+ zL(QNYjDN-5U25K@Pue?eiq`gsD3e1nGz%$YLdgf4#kGYw+M(!O{_@S zgfHSK7sot1kQT^m`L6INRbf@<0dwenoWRZ+5f2C$C__D`v3FK-a#n5+3r1`o`_iyC z8YM>|ki&NQVSi+r!^)dX6sOj@fB*mh)^!vU_ei8~Bd)g%Zm*dbya^a{X#$$*ld%qO z76ej8jYj`_yVsNKJWPsvqcS;xgyp4X%qq0v=Yn0jN#5X{!9p~~H+L4bA44Q6}`1Mh}Lv=HcYxy+8hD#3gvpa{ivf Ac>n+a diff --git a/@AresModAchillesExpansion/addons/settings_f.pbo b/@AresModAchillesExpansion/addons/settings_f.pbo index 50e7c285e5126b11f33920b297e53ae47af428e5..42368d1b749a93505e7b245a6b6f406e69240802 100644 GIT binary patch delta 54 zcmdlPw=-@+KJ&eqffI|;K-9+Dos4XzM&?Gw2Ai{(cI$}jc`NyLCkPuWnQ-?~50CUt@CVO1p<< IXkYaj09NuAA^-pY diff --git a/@AresModAchillesExpansion/addons/settings_f.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/settings_f.pbo.achilles_dev.bisign index 8eb9b8ede2d5a083628cd4e4be42f4781838cc9a..2a1493e6aef74ecd58651e3ee6e52707ce5cd789 100644 GIT binary patch delta 406 zcmV;H0crlV1hoW^sed+?CWp04U+^5gEDAraw~)cue89=(C!j3%jG-wr8KBjkiAa}S zuk~b8GkAQ0001h0002>0RLw; z_z7C(*edl9PTR`cD)JnYv?Cs13<6WCEa8HH@r=`|%cthSv5v*%y;#P<5}0giVhgSL zdLQW>yOMBpLb5lX#Alb8sIL(D3)$c^^GcY37HtN?Uoit&^ZPcMlKjDRUtsxz+SowM z$&-!s9S4+U=6}hsei->PH}d^afB*mhWf=?Cr2-=6M9tbtxlx#Up??lwutz^)vS>;P z2PAC}I(E;TU&>MTgRYpyO01NopVcW+|4<}v_h}ocP!&>dbCs8d{#7|XO7@qTh$$~Q z7KF*UCUP*q2>h6Vx_@0lU@t(i&HXR5rFTw}G*|(?rVp!)u$P;u;%6Z8)n*kJ5sN$Fk(nykyD=NN$A2vX0001h0001+GCy;a z{umjWER-$0%cMSm@L`c4W~*Sf8tr-f>||cHJVNevzfOTr+wJdFqYsALlxK)Pn?gv_ z&?a}xW^v;rl2Z+!(DU_5N{IC02i(V~{5e*3#fDX=2WCar2E-Vuy3b##xT;Ylfq=TD|C`j1ee*1W4iE@@yxez0~Ww6WwNgrE_w4pJ&6J zJH+}xuDcXi5CfDe9aK~?mD*93y0z-U-paPFToOvX(7#i@BI3gwAKd6{|X z3MKi|W$!a7Opm|MWXsOW#mQOC%QfBPFQfkSl)sGX(;xk1l$yTmFQX8LQaD7%bjeaC zX(phe`+phD7?q~`l`_dm|0E8NJ#=A24kXeZZV^Q)JTS3bVh;e|?i8mfCu4T#|J4K!`U0&~sn- delta 123 zcmV->0EGXJ_Y&3f5|C*Fv`$cwY^MgaPEc7C1Cx*f7Nai#3G&M4VnHPtd7Xi1K7Xqxrmq6$O1((R^0xp+Oasq6(h}{A+0=I5-0!smh8{z`D d8{z|B*%U;l&CLsio+D~dZ#4p&AYRS{r5E@vEolG% diff --git a/@AresModAchillesExpansion/addons/ui_f.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/ui_f.pbo.achilles_dev.bisign index 0163257f18843faacf6236e0e240101a93190239..4e5c1baec4bc611d2c169f102ab84c696397c1d4 100644 GIT binary patch delta 406 zcmV;H0crlV1hoW^sejlU+;JIo1j4!~QYIPN7LU_%Acx}Y2Z>6w5jadl&MD)3g?!-P z(h(bF@m5|6a4@V7o(v=_u`S&vL0oKm8v5u73OVYcvh|&)NxZ>ZfFHxo%9soP0pf)d z9)h@Fn}F6<(#}}Kilap$SIqI5Ks0603zqz;kG!<0Ue$togMYRH0001h0001ip%?{v z{hwA-8GVcb?3}>N;sYb|2n_}r@o{#8PwOHC3q}w=>zL5SZg)uP(}X5%g$?@fG9o9Q z_#MsaIJFE0uVfM-NeQ+c4@!}pj<`oumTMeH$$@3Rkv|7dQF^MwX1m&Y^J5jp@hcK> zSxJO*bx)v2Fn>8&93FAFCYZ@1fB*mh;Tm{3O4{kVQ;RLlxVssz4UGl;f?fSqz-1qC zGVabThU7W~0sZ6Vg8AhW-*_D45oSRWTL+g3r60y#`Kq-3UCs^ez+ol{#a#jm=9=-v zo=|uNJVpK_Ke;qdL#F!4JC1!NL6_X~Hg(xM)44sSt`A)!Idr46di#UQorFieMk@om AWdHyG delta 406 zcmV;H0crlV1hoW^seceKm?3IRNVg#;;`<2XrzMExWm$QpLzd6WCr@AHV|crCsM=!5 zk-uG5=CY68)%fcZYn2KPUQlZSIww~eUOyaWzj{%FGa0_h7}ukk!Of`%0WyP4xX4p_|ViD&!p1p*q0LPOJ!hbLV0001h0000?yM9rs zmoIO8XE94erW0dv(IIQvIC6Dv&=8Ca*ET@7O0%Q(t+F2irvt4UK-dHM5>cuZad;1> z!Mua-J4O46Nly5UHGQ3-gYW&~0{(8I`kPwRZbz)TcOM3_jh^`Sg#l0{+;?gEA+hQqsh`&;?lwx{pj}J&x{4NpuLz_gCzaaGAs4mXH ASO5S3 diff --git a/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_onDisplayCuratorLoad.sqf b/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_onDisplayCuratorLoad.sqf index 8d36eeae..4fb548bb 100644 --- a/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_onDisplayCuratorLoad.sqf +++ b/@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_onDisplayCuratorLoad.sqf @@ -15,6 +15,11 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #include "\A3\ui_f_curator\ui\defineResinclDesign.inc" +#define IDD_MESSAGE 999 +#define IDC_TITLE 235100 +#define IDC_TEXT_WARNING 235102 +#define IDC_CONFIRM_WARNING 235106 +#define IDC_CANCLE_WARNING 235107 // execute vanilla display curator function ["onLoad",_this,"RscDisplayCurator","CuratorDisplays"] call (uinamespace getvariable "BIS_fnc_initDisplay"); @@ -35,8 +40,16 @@ _this spawn _main_display = findDisplay 46; _main_display displayAddEventHandler ["KeyDown", { _this call Achilles_fnc_HandleRemoteKeyPressed; }]; - // reject player if both mods are running (protect players from themselves) - if (isClass (configfile >> "CfgPatches" >> "Ares")) then {while {true} do {sleep 1; hint "Error: Please unload Ares Mod!"; systemChat "Ares Mod and Ares Mod - Achilles Expansion are standalone add-ons and are NOT compatible with each other!"}}; + // send warning to player if both mods are running + if (isClass (configfile >> "CfgPatches" >> "Ares")) then + { + createDialog "RscDisplayCommonMessage"; + _dialog = findDisplay IDD_MESSAGE; + (_dialog displayCtrl IDC_TITLE) ctrlSetText "Warning: Please unload Ares Mod!"; + (_dialog displayCtrl IDC_TEXT_WARNING) ctrlSetText "Ares Mod - Achilles Expansion may not work properly!"; + (_dialog displayCtrl IDC_CONFIRM_WARNING) ctrlAddEventHandler ["ButtonClick","closeDialog 1;"]; + (_dialog displayCtrl IDC_CANCLE_WARNING) ctrlAddEventHandler ["ButtonClick", "closeDialog 2;"]; + }; // execute init _display_reload = [_tree_ctrl] call Achilles_fnc_onCuratorStart; diff --git a/@AresModAchillesExpansion/changelog.md b/@AresModAchillesExpansion/changelog.md index 943f4fa0..ad56c6ca 100644 --- a/@AresModAchillesExpansion/changelog.md +++ b/@AresModAchillesExpansion/changelog.md @@ -15,17 +15,20 @@ X.X.Xc
Change log
───────────────────────────────────
V.0.0.8c +* Change: If Ares is enabled at the same time, Achilles will just spawn a warning message and not block Zeus entirely. * Change: Skill slider range is no longer hard-coded. It takes the range as in 3den instead (see [BIS forum](https://forums.bistudio.com/forums/topic/191113-ares-mod-achilles-expansion/?do=findComment&comment=3204945)). * Change: Renamed vehicle attribute button "AMMO" to "LOADOUT" to make clear that ammo has to be adjusted with the slider. -* Change: Dynamic Loadout interface makes use of the new getCompatiblePylonMagazines command. -* Change: Faction whitelist option was temporarly removed due to instabilities (actually it was already removed in 0.0.8). +* Change: Dynamic Loadout interface makes use of the new getCompatiblePylonMagazines command (=> better preformance). +* Change: Faction whitelist option was temporarly removed due to instabilities (actually it was already removed in 0.0.8, but not mentioned). * Change: Swich Unit hotkey was changed due to conflict with MCC (new hotkey: Alt + 2xLMB). * Change: Improved Achilles initialization for Zeus Game Master missions. * Change: Replaced Achilles_fnc_addCuratorInterfaceEventHandler by CBA event handler system with "Achilles_onLoadCuratorInterface" and "Achilles_onUnloadCuratorInterface" as keywords. * Fix: "Switch Unit" module does not work properly for drones => introduced exception handling. * Fix: "Switch Unit" and "Remote Control" were triggered by 2xLMB without an additional key in certain cases. +* Fix: "Switch Unit": voice and face of the controlled unit were overwritten by the player's settings. * Fix: Debug logging was still present for the bomb strike module. * Fix: Achilles_fnc_arrayMean had no exception handling for empty arrays. +* Fix: Paradrop: Exception handling did not work for 3rd party add-on chutes (= unit had 2 chutes instead of one; see [Steam](http://steamcommunity.com/workshop/filedetails/discussion/723217262/1291817208487058671/)). V.0.0.8 * Change: Carrier base gets added automatically; Deletion will affect all carrier parts (the carrier is not movable though). diff --git a/@AresModAchillesExpansion/credits.txt b/@AresModAchillesExpansion/credits.txt index 7463e9a8..3cc58f32 100644 --- a/@AresModAchillesExpansion/credits.txt +++ b/@AresModAchillesExpansion/credits.txt @@ -33,6 +33,7 @@ Achilles integrates code from the following mods or scripts • AI HALO jump script (by cobra4v320) → http://www.armaholic.com/page.php?id=23113 • Kyle Kotowick's matrix transpose script + → http://www.armaholic.com/page.php?id=25964 • ACE3 fast-roping waypoint (by BaerMitUmlaut) • ACE3 change NVG brighness (by commy2) • Fast-roping waypoint integrates code from ACE3 (by ACE team) and Advanced Rappelling (by Duda) From b5497eee3d23587376efd0e6c6afce711806dc86 Mon Sep 17 00:00:00 2001 From: Kex Date: Fri, 7 Jul 2017 00:18:13 +0200 Subject: [PATCH 5/6] final changes --- .../addons/data_f_achilles.pbo | Bin 292960 -> 292960 bytes ...data_f_achilles.pbo.achilles_0.0.8c.bisign | Bin 0 -> 568 bytes .../data_f_achilles.pbo.achilles_dev.bisign | Bin 565 -> 0 bytes .../addons/data_f_ares.pbo | Bin 592021 -> 592021 bytes .../data_f_ares.pbo.achilles_0.0.8c.bisign | Bin 0 -> 568 bytes .../data_f_ares.pbo.achilles_dev.bisign | Bin 565 -> 0 bytes .../addons/functions_f_achilles.pbo | Bin 226996 -> 227072 bytes ...ions_f_achilles.pbo.achilles_0.0.8c.bisign | Bin 0 -> 568 bytes ...nctions_f_achilles.pbo.achilles_dev.bisign | Bin 565 -> 0 bytes .../selectUnit/fn_switchUnit_start.sqf | 2 ++ .../addons/functions_f_ares.pbo | Bin 68057 -> 68057 bytes ...unctions_f_ares.pbo.achilles_0.0.8c.bisign | Bin 0 -> 568 bytes .../functions_f_ares.pbo.achilles_dev.bisign | Bin 565 -> 0 bytes .../addons/language_f.pbo | Bin 138294 -> 138294 bytes .../language_f.pbo.achilles_0.0.8c.bisign | Bin 0 -> 568 bytes .../addons/language_f.pbo.achilles_dev.bisign | Bin 565 -> 0 bytes .../addons/modules_f_achilles.pbo | Bin 196144 -> 196030 bytes ...ules_f_achilles.pbo.achilles_0.0.8c.bisign | Bin 0 -> 568 bytes ...modules_f_achilles.pbo.achilles_dev.bisign | Bin 565 -> 0 bytes .../addons/modules_f_ares.pbo | Bin 166005 -> 166005 bytes .../modules_f_ares.pbo.achilles_0.0.8c.bisign | Bin 0 -> 568 bytes .../modules_f_ares.pbo.achilles_dev.bisign | Bin 565 -> 0 bytes .../addons/settings_f.pbo | Bin 12089 -> 12089 bytes .../settings_f.pbo.achilles_0.0.8c.bisign | Bin 0 -> 568 bytes .../addons/settings_f.pbo.achilles_dev.bisign | Bin 565 -> 0 bytes @AresModAchillesExpansion/addons/ui_f.pbo | Bin 310158 -> 310158 bytes .../addons/ui_f.pbo.achilles_0.0.8c.bisign | Bin 0 -> 568 bytes .../addons/ui_f.pbo.achilles_dev.bisign | Bin 565 -> 0 bytes @AresModAchillesExpansion/changelog.md | 3 ++- .../keys/Achilles_0.0.8c.bikey | Bin 0 -> 168 bytes @AresModAchillesExpansion/mod.cpp | 8 ++++---- README.md | 2 +- 32 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 @AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_0.0.8c.bisign delete mode 100644 @AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_dev.bisign create mode 100644 @AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_0.0.8c.bisign delete mode 100644 @AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_dev.bisign create mode 100644 @AresModAchillesExpansion/addons/functions_f_achilles.pbo.achilles_0.0.8c.bisign delete mode 100644 @AresModAchillesExpansion/addons/functions_f_achilles.pbo.achilles_dev.bisign create mode 100644 @AresModAchillesExpansion/addons/functions_f_ares.pbo.achilles_0.0.8c.bisign delete mode 100644 @AresModAchillesExpansion/addons/functions_f_ares.pbo.achilles_dev.bisign create mode 100644 @AresModAchillesExpansion/addons/language_f.pbo.achilles_0.0.8c.bisign delete mode 100644 @AresModAchillesExpansion/addons/language_f.pbo.achilles_dev.bisign create mode 100644 @AresModAchillesExpansion/addons/modules_f_achilles.pbo.achilles_0.0.8c.bisign delete mode 100644 @AresModAchillesExpansion/addons/modules_f_achilles.pbo.achilles_dev.bisign create mode 100644 @AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_0.0.8c.bisign delete mode 100644 @AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_dev.bisign create mode 100644 @AresModAchillesExpansion/addons/settings_f.pbo.achilles_0.0.8c.bisign delete mode 100644 @AresModAchillesExpansion/addons/settings_f.pbo.achilles_dev.bisign create mode 100644 @AresModAchillesExpansion/addons/ui_f.pbo.achilles_0.0.8c.bisign delete mode 100644 @AresModAchillesExpansion/addons/ui_f.pbo.achilles_dev.bisign create mode 100644 @AresModAchillesExpansion/keys/Achilles_0.0.8c.bikey diff --git a/@AresModAchillesExpansion/addons/data_f_achilles.pbo b/@AresModAchillesExpansion/addons/data_f_achilles.pbo index 87fe46d1d424999735f540478467d7ca863e8a05..46fae78f15690c945d53e2e1a0e80324241996ac 100644 GIT binary patch delta 95 zcmaFxLGZx`!3hVMe{GAKc*K?iNJUO&VqlnVRl=gYS%;CAl?^21#6Q{ap7`c4Hu>Xh xmc|xlW~R;6XWOgKG6FHv_Ug0D7gvec?YeZiR{m}OLZd?)muiI^XxaT+3;>~$Df<8b delta 95 zcmaFxLGZx`!3hVM@68OHc*K?iNJUO&VqlnVRl=gYS%;CAl?^21#6Q{ap7`c4Hu>Xh x7N$n#M#jz6XWOgKG6FHv_Ug0D7gvd>Y+tgcD4OHwB-vS|+6D(g7MvHC0{}~nCYJyJ diff --git a/@AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_0.0.8c.bisign b/@AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_0.0.8c.bisign new file mode 100644 index 0000000000000000000000000000000000000000..20849e183874bb6c441a219c6c98a259eb913a66 GIT binary patch literal 568 zcmV-80>}M9V`yn?Y-Mv_FfK4IIAZ{m000060ssI2Bme+XQ$aBR1ONa50096AiaHQ! zo56HZj>1(pwnN*5Y49x8l^Xw=5%5;TRby+wix<;l$ryjgcrK&zzEWiL4rmLQxq;hyFt9e71B zNQ6Uy2vY}w#Uvf^Rm&r}GYV)?@huZ``7{{<0001h z0002}V9`E(q?v3F^G5y`~QP;|Sp{=0F?M zKPmKYgjGZA_}UwIe(YIgN^P<=H8W zFBorca4r1s6HbHW&Vk5gCdFR=1J(5euwJsU`MaU@qv0IJ$-1dVzQLH*7z;=X1J2IQ Gx}k6301mkT literal 0 HcmV?d00001 diff --git a/@AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/data_f_achilles.pbo.achilles_dev.bisign deleted file mode 100644 index ccaf17535ae26210db0771e098006f625606688e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 565 zcmV-50?PeCV`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7u4t;VFVsKz(9YEp-{}9G{Qy zY~-1`1klIhyXB?x#j=)ETC~p!JW>F>k2(KpT$2Nu;_sZc>I9fBIs2Ew#<@efd(7i)PX&nI@h&d`S}?__J- zN?GMr076|n9SH@xP2%q`rGv9%%d_a~cp`ZeINfTVRc3>75s&{AhO6<`jL_%)SQJ(M z;J4VIj0D)-y~B?{vDK_)fL)LMfNeMcfB*mhZ$kQxRT1)r#`Tfwn_@@hZY~753U{0G3xt=0ZuI)VtLK;8R#6pNUc5m@vOVgQ#e2Y DqMQ!% diff --git a/@AresModAchillesExpansion/addons/data_f_ares.pbo b/@AresModAchillesExpansion/addons/data_f_ares.pbo index 4a1fad08b86615b9b8a2000204020b111229e2de..5b822b85a77efad31f209c11169ee257ac461f7d 100644 GIT binary patch delta 105 zcmbO_QDy2xl?erGzqZ9ix-d*mWYgNXKtqBV$lZKeLWzm__qMpnAEc7mER8M9%uJgj zrQ0K=8G)Dyh?#+y1&CRJm<@>8w?|5IXuK8Cu(q)3yIP{_v+~DNwWq~rSDldH0s!IL BCHVjV delta 105 zcmbO_QDy2xl?erG_htr0x-d*mWYgNXKtqBV$lZKeLWv2)nEXL1na#q~$lS=dIa0bk zQkoHnnShuXh*^M`6^Pk@n067pk^8w17|wq?cyi&?TQm9gton7u+Orz~$5bc> diff --git a/@AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_0.0.8c.bisign b/@AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_0.0.8c.bisign new file mode 100644 index 0000000000000000000000000000000000000000..83046f8bbd1c2c68aa13f7137ef8587d2915381b GIT binary patch literal 568 zcmV-80>}M9V`yn?Y-Mv_FfK4IIAZ{m000060ssI2Bme+XQ$aBR1ONa50096AiaHQ! zo56HZj>1(pwnN*5Y49x8l^Xw=5%c>vf8AvD${<0(2qITU;*oqIFVRxum` z*j7}|WsNew*G_Rhuq&gZLVWA2ch%0~(ySe3;ZW*uMtn|d!a~L0vBVihE=nKE$8M9Wgb7@WO&oqBRvA zZT|C!GPU-*rVOuNZBxnQbVQs^h%LLkzqY7=0000LTp{yCNFsI@d7)gKH2!w@&{-vs zNG6%BpiiWYx63AoPq-7M;A1_ItcGHm?9%;em>?tAo0~uNfeIl!K&zkJm)DE!|J<@f_(2|k GMK^Buh7bw> literal 0 HcmV?d00001 diff --git a/@AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/data_f_ares.pbo.achilles_dev.bisign deleted file mode 100644 index 3112c919265317476719edcdefd525c2909142dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 565 zcmV-50?PeCV`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7InCupy$-uobrCSeB*?*7WrF0zKgUm zZQh?C+~Lox$HwyOzwC_erB^h#*)5en1FgBL~ZOh0uQhT!+zhuX?s_yU!s7Fyi!M#27!hMIbt3 D2$c^+ diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles.pbo b/@AresModAchillesExpansion/addons/functions_f_achilles.pbo index da2e786a5f73591c577fb582995d6cc37ec1fb86..d321eb1e0465b216a3b30cd153b7e969c807b842 100644 GIT binary patch delta 150 zcmdn;mbc*@?}SR`U)$m))}(=`jZY8rvoaivij3R5RzQW3&C=My%*?d;x?uZtK}H~E z+J0S-+0s$EpeVB}u_RR?J}oghRl!yPOvRVxWtLb^=L=>Q=Zyw)bRY_*Pqbqc<|$4s paRaJW(oryo-L4eOT&FA|wzzY9w2|B&{0-{U@D#f diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.achilles_0.0.8c.bisign b/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.achilles_0.0.8c.bisign new file mode 100644 index 0000000000000000000000000000000000000000..78d4f9e17246726c0848fd64cd8596766966f1f2 GIT binary patch literal 568 zcmV-80>}M9V`yn?Y-Mv_FfK4IIAZ{m000060ssI2Bme+XQ$aBR1ONa50096AiaHQ! zo56HZj>1(pwnN*5Y49x8l^Xw=5%^TTgf_^DCTuWnmGTu+(Rm2$Cj5#C~We@N9N(1=j?+FKhfL?ey)bxk~0001h z0002vlRgjj_&?l&%1$j%v2PBahJnylY9fgHQQH@=!7m--Kwn=QsinVjt*s~oNBGmA z&j(bm>56;xKY^@HRH&j|a`$T&tBr}IrXFVN1Ih(#v%y62wufvc4C&EaFz~4}u#nI( zA$Z2la=Mm0Hz)V^eqI^`dnv%tEl?+b9md9h00026lG}QC&|Rl(_8nc=7$1Halo(n^ zAe@6#^WEp9#GEwL7nS(lP=})-h&ZBG-5Vk^Z^{7F>r&Ob^>JpChT_#QELp;CH+Q#l zNB8=?xbC1qj8g{gDMA=O-bi GBLGz{0SX2H literal 0 HcmV?d00001 diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.achilles_dev.bisign deleted file mode 100644 index 085fa5fcd8bdf29eedfa9e661344847a804b18db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 565 zcmV-50?PeCV`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7E$BQ_HA^(3F{WnxP@or-B~N*14&rid1} z+cKK2fMsAvSrDYv_Pg3C5}Bod>~CA4)iwpvklm0wykNOvcoj5V%KsWhaj5lr3HaFd zn&sA7`Uez8B$j_Llf5rdEZ2PH$ntqv+1k)Q*r#A2jDWNvE$vAbF7WCa0ssI2fB*mh zNuIS}XR(w}7`kZBTNSQl(k`qN0T#dO;&qHDlWl}e!*1H01}i0Yg}nQ|38bhp@mWgX zA;SHJ$$RdcApl7507}uu+}ld=1r1gTe{%ioUGZyH6L!NV=<@*dc{7>OJ5RE~{n#g! ziUw`-V1&6MdSslsFJp&GJQ7j?QQ?~-fB*mhhO}+(mk)~bOH&)#1{hVX%Is_mdP@Jd zDU@r4ePx3+)TV4!;N5?mLRer2{l-4;7jZ(8pas*&IzY9HRl%-AhG{_*iNAwe22YKT zwX*T&QWI88?fvZ5L%@+`uf-^5e<$lu0QO Ryk?ybMXT~O))`Iw4FL9o7$N`w diff --git a/@AresModAchillesExpansion/addons/functions_f_ares.pbo.achilles_0.0.8c.bisign b/@AresModAchillesExpansion/addons/functions_f_ares.pbo.achilles_0.0.8c.bisign new file mode 100644 index 0000000000000000000000000000000000000000..0b258dfcb09c8ce5eeeacd813b8d285f93fe90b5 GIT binary patch literal 568 zcmV-80>}M9V`yn?Y-Mv_FfK4IIAZ{m000060ssI2Bme+XQ$aBR1ONa50096AiaHQ! zo56HZj>1(pwnN*5Y49x8l^Xw=5%z65AJhCHOhXE~Mg1)aYejUvUpv?6jq1JNhC{A$SUd1~?4Ng~Zi{IVmZ#hcQGLpD_OnFMAC>ha2QQTZ0001h z0000mXtXu5-@L9E6tU+5yz1Zmndc94sIkhdgGzW~77-`g7TXdpFsv$EZ;e;-DWZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7X7mE^Iqv!G)?zSGeL|i25>?t?x>=QvfB*mhY;)SwUq>dtedz1}xY1Wi7nBk`kzj0q zn=8)g&RX3k0>`_qwg(;mc(}}vIMHe)&8((>2rX1=xEhGAnVAGb*EQ(ngb^d;!5s+# zx2%JAr{MBl9mj-=tXqt$gl)hrX#Syglvj+(JmR6_5ao*R2T^z2-fb=zvas)dJay`l DwjK(! diff --git a/@AresModAchillesExpansion/addons/language_f.pbo b/@AresModAchillesExpansion/addons/language_f.pbo index 538615c71fc90d65a063e871652b4fd64f7f549c..1aa252a3fe6d370f58336ed45100354c2b4379d0 100644 GIT binary patch delta 88 zcmdnCgJatcjtTinzqZ9ix-c*>Bi ik#V~mBNL0X$QFw`dW$)~`X%w}?~8islIyU6MHT?CL>g)U delta 88 zcmdnCgJatcjtTincV`Ahx-c*>Bi ik#V~mBNL0X2=lF6!{8Ka>!Y*2E=j50wD{%G+9?2!ryMB& diff --git a/@AresModAchillesExpansion/addons/language_f.pbo.achilles_0.0.8c.bisign b/@AresModAchillesExpansion/addons/language_f.pbo.achilles_0.0.8c.bisign new file mode 100644 index 0000000000000000000000000000000000000000..914c60898bf334a415eb6f2c85251b2e5ef2b2fe GIT binary patch literal 568 zcmV-80>}M9V`yn?Y-Mv_FfK4IIAZ{m000060ssI2Bme+XQ$aBR1ONa50096AiaHQ! zo56HZj>1(pwnN*5Y49x8l^Xw=5%62=IIt zxbx?bJAx#Q_80ctjIo^rH6d=Kp4ms;fQ?+zZVK@NfRiGvrh^bGh5PkXO_HWQ@U1Fg zs_7UuG|=G%>xr({$71EB9`XxO$zA0gX7M zD-7j(T7;X{F|i^NfGc>b=mMLMiy5I<>}wJBFmUx6)U-y8!4*jR$#?)7X!|T0XQwQg z6|8O7oY6Yog|RpHr&n2uv(!t}rll1emnp+7G8Q@?2_lp3_KL+)#ERK`;V$7tcC)Mf GT#>AUc@D<_ literal 0 HcmV?d00001 diff --git a/@AresModAchillesExpansion/addons/language_f.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/language_f.pbo.achilles_dev.bisign deleted file mode 100644 index 7ca7a884c2b300047fa9d013ba9ce8fca8068478..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 565 zcmV-50?PeCV`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7}t^K2iw*3f26yvd`5Cu8c$KTtcF4xoQRV!W5DMjTh>oVN*Mc3tL<4w(?6zdH$Y>{RD!Q6 z289~pQ^O(*9qI|kDzr=Csnr5%Hlb*lSWFyvTlB~N-}}^q8NQ;}&5T}h3DG8a(F&r! z+5o(5aXH-em8IGW`1aKkb%TqX7~PCRfB*mhQqXlKHKFdL$BkEL)WQ%Fxd`FtcEVrY z!2-l&*c0(@kl59mf4Kw4t`+2FNbi#n;oqHs<8qKP48dJ^M`H8(_pMaY=d)J9p7og5UaxzdU>-!lg-=3bHn^H{ D;zJfa diff --git a/@AresModAchillesExpansion/addons/modules_f_achilles.pbo b/@AresModAchillesExpansion/addons/modules_f_achilles.pbo index e351d8fce67825b6b15b400ff1f85b29e9952697..6c7cccbe8cfda551e0b74206040a57eb83f835ee 100644 GIT binary patch delta 106 zcmdn+hkM^|?hWD0%)hq9ZH{6-%m`*Eu%6^%YuXVNc}aZpd;Sjr?3TtBW@e@a(+h)` z#3z49=4xh7Y-dko+|HiJ^f!8Y#a^Zd0+Yj53T{t7$Fx;nWa_62ySU9hIB>_$EX(tq Kd#3F5etiH!ek}X| delta 234 zcmdn@n|s3_?hWD0%=cynZjNF;%m`*Eu%6^%EAa}5bdlKnp8rDtyM?KdxskEK^uiz} z@yQ>OxtiG%+u0Ktx3ecQ{f(~I*Von6RS3vQtW+q^%u7*7E=^S^$yZ3s$x$c(3Z@nn z^Kx-=az>}+7v(0FC`2oPRH+&&=_IFS<|q^;=B4E4DwxLVC?#bU$EW2b$Afeg=a=TC zD8(uygN%Vm}M9V`yn?Y-Mv_FfK4IIAZ{m000060ssI2Bme+XQ$aBR1ONa50096AiaHQ! zo56HZj>1(pwnN*5Y49x8l^Xw=5%#ZWRByzf@94o1q>{tRb&0dj*EhVbu}sJPiABTYk7|J4toG+b&Zu+0(*g! zkB2C+3st$p33iIl^$jcODP)Rm?@INd6#dc`;lj*o)~;|DE<=ux{vJ~{|LiXU0001h z0000GvSz+}+2(OqrQx&-Rxuo=Z0{Ol<)2?f!>IEouAgya2!qVAn7Y9SI^$&Y)E1-c zM9ud)rU2)pr$FN`>)jIlsHL~PtCsQH<1+X=G2=Yqq2uRbg70ALjdAqyYYnQx%F<$5 zU`sx<6JL%Krae?KuU0n3Eya70_GG=97)zRf0001c)0k%GGE&1=%3u|bc-~VNw-4ly zvZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7BVZuov>#${0lEU$c z`atT7s)*Z0o(I-sL+kPUsp4#=;IXXLsufF1+Csddh_fQzm{`vM*PJx4XXIe^*?Qy; zmfN;b1+c<-fF7llwRDU5H~leMS|FYM0h(hrwfi_#a)W?Gfb2cY-I-z_?GFC=n^0n*ju4@yx=;K=` z*21?^5TPszBWI><0FX_IotT!?;2}nWyl%fC5?!4Tz(gUJcg?A}obflL=X%1F|KSgjza0dR>`BL=&<0*W-jb95GQa7PO-D$k zQ&`o;-GFKg9h|bXqcBK!MRhQ0N2zUrXe9s!I1S7G7ZrCMw8jx878s2aWk0!uHi)Oj D(H0EN diff --git a/@AresModAchillesExpansion/addons/modules_f_ares.pbo b/@AresModAchillesExpansion/addons/modules_f_ares.pbo index 28df35a73398e5145b32ff5b428b9a6f8f15f50c..f02d2bcb6aa7e50f8477ed83315ae0c5e10e6af9 100644 GIT binary patch delta 63 zcmex5f$Qr8t_?P<%)hq9O}1y938FXOW<9xv&C=My%*?cT)u!#MHZg9$DsnH$uFtEU TbKBP&w_lyTIY%_%r*l65uA?6? delta 63 zcmex5f$Qr8t_?P<%=cynPPS*A38FXOW<9xv&BD~k+{n0j)u!#MHZg9$Dl&6-t6Rah T-%k4ug{eJgKK1{n-#$wKnr9yx diff --git a/@AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_0.0.8c.bisign b/@AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_0.0.8c.bisign new file mode 100644 index 0000000000000000000000000000000000000000..16ed201e5fe876cbf0a46ac4ef939d5705e74c18 GIT binary patch literal 568 zcmV-80>}M9V`yn?Y-Mv_FfK4IIAZ{m000060ssI2Bme+XQ$aBR1ONa50096AiaHQ! zo56HZj>1(pwnN*5Y49x8l^Xw=5%_XJ%WY|#>}V@T3uT7Fz!YzXO;!K-8^J0`%8I;}B)7pC@{~eHBRYk2n*F0Ru!E67lCH;}bue8-&pm& G`Y~$SA`Tw_ literal 0 HcmV?d00001 diff --git a/@AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_dev.bisign b/@AresModAchillesExpansion/addons/modules_f_ares.pbo.achilles_dev.bisign deleted file mode 100644 index e86827610c830d0e9c5590f12cdf7b92a7947fd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 565 zcmV-50?PeCV`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7GFw--wuzX!FDH-p?n{+ij36Dlu=(*w+0z9ucaPlZ=O+0ssI2fB*mh zhCHoY0l7nYoL;Z{r4Yc9=m`^ghx{zTP<~yUA8RKQ2m;b^ zQ1QOew7;7FgR6j_Sg8djCf|ZkkBG5NfB*mh`A5)}v<*cfAN^1h+Go1Z!U{h2#eU39 zydOv2Ik}A(6WxHA1DNOn0!+D$Ah|bE$>7oh&M;Y%RTWnP4qJLXpMN4V&%I`t)b(_z zh+Uhx`{;Jd$}M9V`yn?Y-Mv_FfK4IIAZ{m000060ssI2Bme+XQ$aBR1ONa50096AiaHQ! zo56HZj>1(pwnN*5Y49x8l^Xw=5%QEI+FxMHA3CF zdhz3Zru05N{NlC<&o6{T8q#yGf0&m3Gc+d@80$m45)rrJaRNR%gtuW5) zdE)u&pGh}^RWgZ?kn8CotNwiF%M)Xr5G0v^0002GdlZ0l-0{~2y7@t#%IPCNnF~s| z@1a1l)TJ2&cIn(rg!P@Ir5!$!8_KLH*6Pxrt}H%@AgLmZKEnZX=C}5nX%=Yfs3(M# zsK;Dr?{$=?2pgF!5#5DO1mZcBc!w5PE<#0IZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7{9K9?GKd!fs!PtDj$>t}ZEcc9|DKiU%{R$ou#rDn&$da-jP=uFfG4X)U>ftg34|NAR~Cf5mC(p!kQ1wG5d6Ttli(sdas0ssI2fB*mh z^#K28Huwoz=GZFr5Ki05+bZ%Lle8lqU`S5!Lg3T<-J(O!4jBk zYGMnm`FbDe9lMfnbV9N>pTuXEnW(Q2`3u?LGxJKAffj8B!e221S@Zignv(p%bYEck zgWA|Y%*m6D^&JP4W#-ASei->PH}d^afB*mhWf=?Cr2-=6M9tbtxlx#Up??lwutz^) zvS>;P2PAC}I(E;TU&>MTgRYpyO01NopVcW+|4<}v_h}ocP!&>dbCs8d{#7|XO7@qT zh$$~Q7KF*UCUP*q2>h6Vx_@0lU@t(i&HXR5rFTw}G*|(?rmKyxmz$~Lwf3QZfLNv* Dg0&AW diff --git a/@AresModAchillesExpansion/addons/ui_f.pbo b/@AresModAchillesExpansion/addons/ui_f.pbo index 234466c0101c31bc80c0b1e5b7c7bef7d2945121..392b4a426aa9853d03f63d05d2d5af8d5976c718 100644 GIT binary patch delta 80 zcmeDCF4Xs3XhJ6QuWfM?bC$CKsYns#$rG5wHtRDci?LZ6TbP-dHqQ`mpCQfscU hynTi^%cI32{|<}M9V`yn?Y-Mv_FfK4IIAZ{m000060ssI2Bme+XQ$aBR1ONa50096AiaHQ! zo56HZj>1(pwnN*5Y49x8l^Xw=5%PZUF4=5<5| zjn}DFZ&%j>BP%sMLnW4CS&8SNoaPLsv7D+)g!{JtomHbCJU5@xM48cH@7M-2=fU6B z_m8Hlic;%^GlIrO!AiAn>XZk%{TO`-5vPA%3jTa@w7;6C@Ct{ZrYiw~1>AQ60001h z0002}bP6^B4@5wY4Bo&e+kR-6X)}t6>WRw)Jy2+u;mFqS$~zC;HmFg_gx#H+W*MMG z6@)P+i?bL@x~0b>cDkvp0`bzxpXY&9_OZ|}L4n8{@U*@ssBSGZOL+Nl8t;Q5a(*Nh zadtr{qAMGYfZ&d`m3t+$iQP(7z8e6zAl!~V@a(8+x(e9d%)kD^we|)4_Wy>50$Ij&}ZRTOWbcwz!Jr2 zw7d(;twbL-C2Q<{-2@%Ge6NJt876XqnzVF7Wcd$Y7bU9R(aQ9EZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7Y}psov2B?!CQbI!_LZ> z3;zM)g%civxL})r)>hKaSj38>MIu+s@tHt0WzY+j{Hc$;w5eXzf_sCu0ssI2fB*mh zfuR@$di|ePQyG1X0_>c?%;Ezh^9T(F8u4*eGZKZG{c` z@G>GNp7NvFw2CrliAxR0g9S=&8osPIiRF-QTNXda^zmY!&Pf>cR!)CkMdh=ry z#_=l>aal=(b9GOkM=&{A93FAFCYZ@1fB*mh;Tm{3O4{kVQ;RLlxVssz4UGl;f?fSq zz-1qCGVabThU7W~0sZ6Vg8AhW-*_D45oSRWTL+g3r60y#`Kq-3UCs^ez+ol{#a#jm z=9=-vo=|uNJVpK_Ke;qdL#F!4JC1!NL6_X~Hg(xM)44sSu3aNJbfdI-`-94zgh#$c Dw~zsN diff --git a/@AresModAchillesExpansion/changelog.md b/@AresModAchillesExpansion/changelog.md index ad56c6ca..f890bf0f 100644 --- a/@AresModAchillesExpansion/changelog.md +++ b/@AresModAchillesExpansion/changelog.md @@ -15,6 +15,7 @@ X.X.Xc
Change log
───────────────────────────────────
V.0.0.8c +* Change: Removed Zeus wind sound effect for remote control (by @CreepPork). * Change: If Ares is enabled at the same time, Achilles will just spawn a warning message and not block Zeus entirely. * Change: Skill slider range is no longer hard-coded. It takes the range as in 3den instead (see [BIS forum](https://forums.bistudio.com/forums/topic/191113-ares-mod-achilles-expansion/?do=findComment&comment=3204945)). * Change: Renamed vehicle attribute button "AMMO" to "LOADOUT" to make clear that ammo has to be adjusted with the slider. @@ -25,7 +26,7 @@ V.0.0.8c * Change: Replaced Achilles_fnc_addCuratorInterfaceEventHandler by CBA event handler system with "Achilles_onLoadCuratorInterface" and "Achilles_onUnloadCuratorInterface" as keywords. * Fix: "Switch Unit" module does not work properly for drones => introduced exception handling. * Fix: "Switch Unit" and "Remote Control" were triggered by 2xLMB without an additional key in certain cases. -* Fix: "Switch Unit": voice and face of the controlled unit were overwritten by the player's settings. +* Fix: "Switch Unit": face of the controlled unit were overwritten by the player's settings. * Fix: Debug logging was still present for the bomb strike module. * Fix: Achilles_fnc_arrayMean had no exception handling for empty arrays. * Fix: Paradrop: Exception handling did not work for 3rd party add-on chutes (= unit had 2 chutes instead of one; see [Steam](http://steamcommunity.com/workshop/filedetails/discussion/723217262/1291817208487058671/)). diff --git a/@AresModAchillesExpansion/keys/Achilles_0.0.8c.bikey b/@AresModAchillesExpansion/keys/Achilles_0.0.8c.bikey new file mode 100644 index 0000000000000000000000000000000000000000..00dc8272c46bbf9c57a48a1d1f3235a8dfad57ff GIT binary patch literal 168 zcmV;Z09XG(V`yn?Y-Mv_FfK4IIAZ{m000060ssI2Bme+XQ$aBR1ONa50096AiaHQ! zo56HZj>1(pwnN*5Y49x8l^Xw=5%
[](http://steamcommunity.com/sharedfiles/filedetails/?id=723217262) [](http://withsix.com/p/Arma-3/mods/mc1X_8GXVEG0STlO_DWjNA/Ares-Mod-Achilles-Expansion) From fdbab3bc4ba2fb709bbcbbacc4fe6c62d9d59c25 Mon Sep 17 00:00:00 2001 From: Kex Date: Fri, 7 Jul 2017 00:30:17 +0200 Subject: [PATCH 6/6] removed dev key --- @AresModAchillesExpansion/keys/Achilles_dev.bikey | Bin 165 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 @AresModAchillesExpansion/keys/Achilles_dev.bikey diff --git a/@AresModAchillesExpansion/keys/Achilles_dev.bikey b/@AresModAchillesExpansion/keys/Achilles_dev.bikey deleted file mode 100644 index 974f07043063c1cc45c7f56925f8bd55fecc5cfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmV;W09yY+V`yn?Y-Mv_WMy^$lmGw#1_A&803-kaQd2=O00aO40RRC2^Uzg-CNbo% zoZG6pArt>A+(*;DNBrqM6f~(ANaGNTk#3LZzCv@9g0jGaHUqQ7