From ed75234adb8334e5653559a4a42af5d5b908225a Mon Sep 17 00:00:00 2001 From: vbawol Date: Sat, 25 Jun 2016 08:35:36 -0500 Subject: [PATCH] 0.3.9.0541 revert setVectorDirAndUp after setpos and use [0,0,0] --- .../@epochhive/addons/epoch_server.pbo | Bin 427706 -> 427718 bytes .../@epochhive/addons/epoch_server_core.pbo | Bin 21149 -> 21149 bytes .../addons/epoch_server_settings.pbo | Bin 445167 -> 445167 bytes .../mpmissions/epoch.Altis.pbo | Bin 1275598 -> 1275534 bytes .../mpmissions/epoch.Australia.pbo | Bin 1273834 -> 1273770 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 1274927 -> 1274863 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 1274766 -> 1274702 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 1274742 -> 1274678 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 1274763 -> 1274699 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 1274892 -> 1274828 bytes .../mpmissions/epoch.Esseker.pbo | Bin 1274730 -> 1274666 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 1275169 -> 1275105 bytes Server_Install_Pack/mpmissions/epoch.Napf.pbo | Bin 1275563 -> 1275499 bytes .../mpmissions/epoch.Porto.pbo | Bin 1274877 -> 1274813 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 1274914 -> 1274850 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 1275148 -> 1275084 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 1275158 -> 1275094 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 1275163 -> 1275099 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 1274890 -> 1274826 bytes .../mpmissions/epoch.Stratis.pbo | Bin 1274738 -> 1274674 bytes .../mpmissions/epoch.Takistan.pbo | Bin 1274848 -> 1274784 bytes .../mpmissions/epoch.Tanoa.pbo | Bin 1275370 -> 1275306 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 1274720 -> 1274656 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 1275167 -> 1275103 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 1274816 -> 1274752 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 1274871 -> 1274807 bytes .../compile/building/EPOCH_countdown.sqf | 3 ++- .../compile/building/EPOCH_simulSwap.sqf | 13 +++++-------- .../compile/building/EPOCH_staticMove.sqf | 7 ++++--- Sources/epoch_config/build.hpp | 2 +- Sources/epoch_server/build.hpp | 2 +- .../EPOCH_server_loadBuildings.sqf | 5 +++-- .../epoch_bases/EPOCH_server_saveBuilding.sqf | 2 +- .../epoch_bases/EPOCH_server_simToStatic.sqf | 4 ++-- .../epoch_bases/EPOCH_server_simulSwap.sqf | 4 ++-- .../epoch_bases/EPOCH_server_unsuppported.sqf | 4 ++-- .../epoch_bases/EPOCH_server_upgradeBUILD.sqf | 4 ++-- .../EPOCH_server_createTeleport.sqf | 3 +-- .../epoch_vehicle/EPOCH_load_storage.sqf | 4 ++-- .../epoch_vehicle/EPOCH_spawn_vehicle.sqf | 2 +- Sources/epoch_server_core/build.hpp | 2 +- Sources/epoch_server_settings/build.hpp | 2 +- build.txt | 2 +- 43 files changed, 32 insertions(+), 33 deletions(-) diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo index d701196a531895236ac83ef9b1e96e36035f49fc..b543470d97c8823908e2a21e36d832447f912446 100644 GIT binary patch delta 537 zcmdnhD|M__YJvxIYJ1*9Z)vvqc{$RbcLP2^(gf$;Qlr zY*%Z5=5b8cV^yA9w~&9cG;0GVYaCFW$L0lm_gUETfy`+#lNp8OrkBiN65PB+cn>q1 zbVFWvG(Sji@)U79kUKYD6<@>%cBzxnRJa@j#WP`b;lMCkyPfqBSntWlJ$Y$S`Kn|b*Zj&pW zg(ffUk(>OXnS1husqB;QIIB(e>E)ZedOjamQ_*}OpeB{cmwWf{Drl7El@_O_C^&}r zYECx1{e3e3Op(pA`X93bmGe*DFjanX?Nrsx7p5ArL-pHE{x?T)bM9P0CZK@xJf|5YroTJIXuVzgG~=H=)4e*FB&TO0b3IiEJ?Aw5@sN?zUI(dL>JxW!kHk`-K3s CoXQ3O delta 586 zcmXYtUr1AN6vzAh?%mz)&AYkoa(A15rc+R{b}KW|5}KJqD<*}@8V({^f5Zl2ZlG*Y z;e>nJ#$n!vSeq7PK|%f=7P^Qid|23s&`2H$+Z40AJmC+R zDy%*UU>;Vi2PzTCj&&7PLwZ`^woQPPt=E1;>XD@GmOh?a(DZZj&E?r^Q&)~3K6DhC zr7_ZLN9_>u2+-x}BJ&;&RUsue!LY{+*egPKgn?&a4*C><&?n_?co*3VGf@E+2TYKU zm~}kIvaH%%!mjmbk)taJqgf05mOJ2nj)xa=kLv$U*Am}dp8ip-wpk6Is3H zs)vt?9+q-@Do)62{f<&3tuYRfwd6M)Y-HNBJ4SerX#%HWfX#(=VqC_0ZM_lr>{&9O zHDe7J_?mOTw&qyM4S`h(+!@ao#`9>lQwZOjIdT59GpJSV2`n3&469NCJJdfVbPV&H z`t&_=6wZA>UyAC*1g=xBui*yuQwbT=@;zKzh$V17sd`1q!Z_LBt;wqp8?dTwk>VEv jBBhDeq$>nOW^CGWDfDAsr#Lvbj{09cPe&texDfga)Z@v^ diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo index b4e8d3f9c0d720cf56bd11a7a6dacbd53c83c4db..3ac2f95c23477d1a50815b576837f3ee65292551 100644 GIT binary patch delta 96 zcmbQclyUA-#tFX68SQx!1EiUkL-#eUy&aj=W}GM)!p#9Jnj=K*$YzuVnrdU delta 96 zcmbQclyUA-#tFX6%kpw221qjpJj>pgcZdnZoovh;1L9Af#2g@HZeV6$V5Vfv%T)`+ w?|1J{D$UGEu{AZeob0F?u{ngr)K8=#qOShyrS*{~xnArn`P!JKel(^70ISy}KmY&$ diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo index 37ee3730dcf68acb5d16cb1b7a704d83b20c657b..3d77a11a7f6ade49e22613c260ffa4cc4e0f4c69 100644 GIT binary patch delta 162 zcmaDqRr>u@=?Q@jS?zh@E({C|Nu`-NDS8u@=?Q@jEAn!}T^JY`l1ejkQuHzk3V>_`2zr(s&JW}!=jWwmrt2l6Ndq-+ zocMu_8K`V>3wwZ+xq+F1frXMaFIO!Pzu&zdY^trPv1Ri+_V#z|j6lo;#LPg<0>rG_ g-?6j3JtV@H;colW`EYq=-Rre;Gw-)cegn$5~6|_ zK4jT1IuO0}6ol@2kt>ohWs@k7h!_192X{W5^-R&4A|gfG&k1sBw!9gyZ6c$UUD4TY!}G+GvCMPjwD3E%mC`#2B|i?(%v>} z#81SCP|^?iE&=atX>Rc}E5{D&>L4K<0KZgEj%HaK+5E&|Wlj3r0aqmlRLD)Rnygp6 z@-8#Pa+S(NO5zOOuI|35x3`;z@r;waoTp#dnXZ95=`a6U%6KO0g5I1B9_E^9ZB$<6 z=8It=e-KXQ>@bnHlchC{mApP%hGFch1$Mu%Df_<_9U^QcSLu|3vEc9sf65hzhpxn3 zZdV{24-FTp6h80jhtp3x)nBcs_;^KNFghv@2+>$%z!wzD9(rDlYDvcoauClPXC>{=I6bk>pmoHP-!q7iY!V52x^uj+GjYqP zn@sm;jp{8KUB+fN-x-UFAvfO}l%!CM{7_M!dSV_0ixMl#h+-*@(ok9oQ#y5JS^xb$ zYDz2#2C9fMQpJ>sDxu7jg(_8-gtDy<_8}(Bj4>g`%f#u4(R7X(rMD1CHk7xji=OhI az6#$WYuWzx#`%V0s{Q~ODfeOk delta 634 zcmZY4Pe_wt90zcJ@B8}hkIrpsO}EirO>;YhbBIxM$jDgbM9SG4BwIN~t>*Sx3xZP2 z4jzh_{i^5WL99bD*5*sS)FH&QE*f?yA_zRy4k~pRLTU7D9edz&_&$GrJm0$;z3(@A zQypwN9?Knk4)^pNtYgl!8^=K}*D(`-29{&~G-3lZ;Ua4(#nt`AC~LTKhA$h4iDn0m zs4cUtJi{M46B8SZG+Ob5dWDW-_E?LDa+hYw#XpJ1M12`Tw;AU<>t#>pTm>Kac1e6S zhy|a>A8>X!+g$R=qbfT-mTY)j>La^SP(#iJfs@yy^)9TKtFZ*))^eV5j4fvDvnqLS>i7PI*POG77)Q#@N0)1hV zPcJErsLPx2a^8gce2;uP|DqBf7Hl-wF)Fo@^Ius5$(lih?LQ2-`L0g>RnQ($>9nC_ z&045qtr?FOfeyFoobR#MQ(_6=PmRa1~5@l%|I zyi9>kS)PK|R<+$8PF#&A1+tledfp*;JVHB}%fJ>_{5E;|3`nWr-eMJpkh~Cy3)lY@ z`>!eK$ifhr$wCiHA1fPKxXF_-1^Rh!JUVlu=jB&f(ho>FSR`#xVO~ PFg!Ds_%z~?vIBnsXddVU diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index 19e939e8874e61df5b7ef308f8c58426beaeeebf..7c30cd0bc79e295e1b5eb891a0f59512c41d4bc7 100644 GIT binary patch delta 649 zcmZ9{T}V@57zgn4?rg7{&Nkh2vnd`&g0zL7N!HAkhDDR4StlwRE2k{x+39$+NQekx zc+rPF1$%M=4xI7R9N%hVXg%HSdNhv<;S67oMT<<&IobOnQS3XNF?@ z>l(OVbUm!aI;_euzPpIVa-uyzg>c50#(6hm{99LUL}@cEH()6t@D>J8$5u%D%9K{$ zOaV>`F}}1HvYkBM)zsM3(4rhYm{$V{aUXPv9&#k3bCQh@ELPUU^)|RHy1<^QhZoZx z#h==40ZA)S#?m5d@^=P$;{ITOgVE(m@@$T-P`y+Ex0XKtYbm4488-wqC*0Q>X{}YB zYjb9p&+dm4S{aOG%gDl--a$5JiZP6ATA}W#Q`!A3{{YdIuqBmZSPBmgai`oNIdVyM zd)=X^92v}2F?!D33#T7-sK53g^D%pZW{t!#g+3vU{GLLDWTp{sq&LgCn~67t z0wmdOC{VAb&_!(Vavf4!h3RmOy#L7i^lJF zQGH^8H&OXi0cEBNsV$U+vQkCr0$=QWR jH|lIg^}WZIZMO&Ze(}Az_w!?D=hw-WW~`l@@XY@KzAXBp delta 639 zcmZY4T}V@57zc2lbB<>pIyarAZq|;bxe?(UqSPERG_2gPa(0Bm)rRD1ZpS)7&2Q13+;NChIXHV<`(D8#gG6a;U&5xvS0CUr4{vgn;%_QLPt|9(8Y|LHaV*EN5# zh0VmGnIo^@fsunv%v9{fQ7|f%%ow1F<(NOUSOax9&sulm^5J|`bX+0B7xYC%ivvfr z)~Ag;!yi2t6>Caqtj5#YB|47TU!6Zx+I0&qJ{60K#sY*+3(mGxDW0~OBEJ926>;u7 z=DI|_)!E`~YE{l0*Vys7WW$qE580ChGr2GToU$%$wqtpw5f{@wr7LsLsPT6B0&#CI z{@AEc#%3iJe|+pXNszAnZ`IU5ajj7Ux7(kg2rX$xqu`MU|XK2<6|bNXW%gFYw^ z-jK=fZN{c^(!s%qJUE<>b*vN#@9u*O2VQjI`Ylc!b%VB#EG40h?Fn5bCF77Hv9p|& zyh(yVT^xt^)mpnf9KRlu1+tZbD&8S@JVG;>Nx?Rk|2CO^31qk7fqWH*AP)`3gq#10 z{nwPVq#;Bm)6mV*$LhB<+~vs~6?%DZEHZpCsxGS#(lZSWiTXL97>cDhs*vI-jaoma z)jVXJZsOhH!el3?D^5&^I!aF!QTc43N+=^`qDs{Xv21FE_?>30I(f*P>nMM0Gx>)C SN{5_SNsPRG_hjGdsg1u?cj_4c diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index a411547c6d6125f2e8c3081aea38e4562304efbd..89b8e6722d77812bf2d7fffedc9a327d699d3e8e 100644 GIT binary patch delta 641 zcmZ9{Ur19?90%}wcDJ+5f15hn)@Hko0?CDcCQ+%Z<-&qV(pEPpla3D*q5z_JK3-QTJl&f?}m_SgNLe@)_QqW zoiBlftz&RbwZr6=oh+?utz>+l0>j96Gc>%i$w#(}juTB4TjdfX$;jXkci!ETie5{( zJ?@@ZDmqxGV(hZJ8!kKxD8E`z$r(#eUt(D3R6~4e zHA+jokt(8!sS>J`Dx*x4nJQP7_=@f|dp{FnMwlq$XHxVeX}ZJ=(_563*HyMCdm1W# bwp*UO+`bZ?X!*QTR*}=bkv871jy?SYYs~lQ delta 634 zcmZY4T}V@57zc2lbB<>pIyXORx{Y>bn%hNe4KZpPGE!DKky1NB;%YK#HRq`o1Xh?q zUUV~isJ8+yqPmHg+fH`qCd9P5nBZLz6uZh@sM*DkN~3pn*$cmm|NHUq{=YAGPZzqA zZS2c*M!HjVyj)7jTXT|{yEXVw5L>n~WJZs*LOM6RE)^OzvU)CQJO%A-M zHa~Il41e%cOte+gXu)IZMLLezWhouX?V1HQpN+>veHlWB31__xvd^2X;0L~45I+oH zF(C5$U2QJ6OFn*BWyfcd6^}|iWJeNe$>~AhejPpQ=gf9q?wi;1m3P!34b)6hhL-Ww%GC)zEd_gP!>!ePNYP zE+~ztE12+7!HD`omwc!2suJ%Ptu)v%D(xd@zpw_9Hh~IT*A2M#zFz)S)OMz*EnU&1L}UVm;^7|6FyI>CLu-QCpa^C zodlhdn}jzOwcS26awVP+$XW^-c!%Kg39TfXf(@?pZSs5?$acfsr78{~aV`=UM*kK2 zuPJFuLzp~HLl;XQE30X^$&(uj^z#0Abofk6SyCXZWm;M$n&*IGD3;==a*C%^O7omr zb&qj*h<}qCBAX#i<;0Yzp|n&5RmwW5iqcaCs#=*6YgRuhU!ApEhw2_a%B}a_{_J|- P_!*e#>9plXS1bPlYTW8w diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index 182879b51da0c49420f532c0115b8c0961ca5529..580853017827dbda1f492415efc623a887b964d2 100644 GIT binary patch delta 641 zcmZ9{Ur19?90%}wcDJ*C+NN%8Yl_!VAa1dA5|)}R4GT7sG;dHgW=>hmyW4eIIFblr z*n?@m=s@&VkKvpbxkDtTs6>GeJ}i3(B%(%?)Pp?~{W1+p+g`YdOtM{d3*jsDY0(8WXg{p7PCQTJ=D}i=^=gd@=SO1v zRxMoBIUjqm3M+{i-&ICqB`G{YrEp1?!`i7B|HfGyk=yiZ4LF$+coPGtV;|&N9CB;R zyb&uxjJNc`ZYPhM8hwqvCi(0sZ7rn4;}8_x=Cp&LhEN_b++hAODf+bTA8*^^i zpQ$r}RItjEIg!=-I|Ds&e|La`Zauv!IoS3mu0$;q|63%Uz-cv$e!>Xly> zvL&#%djifE95A`-Aj{io8_A8AV;K8lhC|Qo^3iXGlSE}@t<_>!3J;HP7hIu4px(`2Ux{Y=;&3O^7VT;;^3>T}Mj8Z#6;mk2=HRq|81btxZ z!XSv*L%mmCM0FFgHV<|1Cd9OEG`!QBz?*cCNnH%VkLcaH?1kUO|NVG)|6kX-pRRYO zUF>uso;&^?o*6jUz?^A6j)Fn1V^V-dmSg@jVgoec9BV1XrNhN2Yq)ZTFYAko=2pC+ zw!CWN8UDn@xY$rdqZQAp7wI_WfVFricWCCFypo8EhB5@d8D~88vez?J!H3tbi!+z7 z5D@ue4wu7uR6ch~Wyd#?4bMm+vM&uaWS}27c~#ozz}j3JE@XppAa}^1@&$su!@eH; zy>60IGZKqCpH370HB{rHl`4|?47|lDcm-c?FiEckg|IYy%jwo>HFVu~qkFDEU)bae z^GYM?@@Bl5H=!ZlB|pi3sKgfq8x3}hNk_<)Z>*7I&7i{eUq;;gQYUX0v?oP+F>jDrOy}rwo*ls!}Gz>fo~CZL8VqtXpiK?mHy?&p})S2=`sKS diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 5e60dd3e2d073d26764ed743e4fe025c6cd4b611..6494637d3b32da5c2c306baa00d24dbbb3d8ba6f 100644 GIT binary patch delta 649 zcmZ9{Ur1AN6bJD8+ueTdk2-amn@!nu6i6=CRH96=<-!G%q**sAla*5z^X@jU_D2XQ zV)#C5Rs%4&UE759e&HcfMZl zynleboe)xoW{@UyQ{XosWvzrUWRz{HTL@pKU$aiAMY|!x+VM1vEBgvj)~PiroE?ht zpX=a?*8bd$RalXtd{;S*)g<>6mB0n<94@*W2P!a(Y?i_P_cpnCOMi^0EUd*LhT@^YA?}>BR|;Q~ zoGxc?L<$cUsu;QC?1A$yeag;ZRD8_m}eamWzHHp3=j{Hs{Lb6kc*V3D%!p+2$ zLIE<_r7vT zA@U^Vc^##v3{){yLX}cRs*EaE=J|>jpR5B+gc)JNjF*w(G8D=E%tl8ut#2um&Hr%ugV$f}1lTc;f4Tbc$jTokEc*EX delta 639 zcmZY4T}V@57zc2lbB<>pI?v`bbsOzyn)4#IhAeCj85veiq|{DOIMasB<~-E`p%2V1 zyeMMpq24Pm?Bgb6Z65MaP>5;WC>R8F6Bx+ag-H=hD2v|NWiR|L{_n@b`=8Bp{K#~~ zJ?x8UB;E8B?g$*LW4dAoj)9<5GUI?omSg_ZU^Ud@0&CrlD|_-$(Q$J>u`e zZ=Wla@j02rU#|`m{vnj&jSnW0d=0$SE&4=%cOXWu1;n5{a?$NI=yh~m^`dtnM_<^L z6N_pM8nPC=kgY%=+pgTq&KBdnoSg;-hUL9v@FQy^DGO+@@v9Lx-c%|-bNYiCgFYAw zjmF6DO~$Ts(ZRuREHs>twX7T-*xm;>_D;9r>J?5M^MbaAEXSdl?d%^SB?(B9=yA?U zp2fkSE+yclP3v$Bj9iMwM6!{DD!xJV`NT#tlY~t!|84U436SlEyYf{U#Ms$TRJ{DJ z*ndrlCk6dvDh2H-!F8ToQ=yCZN5jLXBkGC@{d%Upexhz3D28Gwjw+;hN~6}z zYc+QnmzVgrxB;>i)D=%mN;*nU6;b(Yph_r#GEydWQYvkHPllalz3OzDzaJ?3WEO6% U4VAx}U3)tJh^HNygjlGY7OW#yE`yt~b-MM8!k zOQJt^qF+RB_898C*qsvjhs`1(B4YItNJNbY>193?RKN8S#E%b$@9&(4bFP2!Z+!OO z-p^i(3Go99NE5gs@LLeK?1ZbxC|gzI2%o24OAfFjCnQ-Lo~QB6o?MjmYK;n~hr;~( zD!8DtO}nuQD^i$mFQl=YWF8^|^ypTw_GXy>V9SljP5M+Vo`?y&kpa|P1}hDva%01M zK3*2Wyt5m!Ej+IG)OkGh@`+>GDu{`P!7o;mwzSGhwm!00-W0z!!DZ0~#qk<=HCHWr zvHr;!Ap|E z<>(Db!NFV=L+2dbaOQEd^6L;PI9c4=9~l<<_((L|=Zgsap#iRuyT_|5h#ruEuv5sV z`P(GNr_hY)|6!%_4tiFO?4)TH*+}gIYaxwKSsk&=qECn;zh@C4={dyf=*?2@X5xyY zRx;DB$yX-g=pr_{xaMd?2)ekAfG7r|*Hd{^K2<;&s2!A%GEs%fDqpnt&N9G+m=Pw(co~VlC{1UXVMZcjZDu=pU1csO jdp%~IGVV5KeZ?&(+wn&-~9Ws83RVJ7)W delta 639 zcmZY4T}V@57zgk@=N!*IbnZh--J~5&a}wd2vZ%RaWvt~yO6>%N%MHoZoTpk4^nuxh z7v9Vs>b)|E>PBL19`w+Sn7O)0VOQ2o;FXRtsf!_)Meppg7k(H2_v7LHe_ZPvU++w~ z*tfB0`sfTiGH|eg>59EL0tUH~83i=59P_6ZYoHDnS?g}h9x6mx%M~%asy8ZH8u7Zu z`n-u}_+uBNVvUK$YCNl1rsJ4>)rCX3O`CD@bFrvsP$9HiaK5!l_OwnH^Mh;G#Ox)^ z`$YbT!{umhmd~A5+wrAj!!uGB*^_`Wa=8yUc~#nI!}4?!E~NspFMYtE_WA-n!`^QE zxn3cU&Py!*dgmwn3ozru&nA+554_bWcm!`xAWp9ZgrGEh)9Kdhv~=BbqkAz=U)bae z8KoBWISby%RiGi)A&=)~OYlkFMuQzA(qVGt3u`1P3#hT>hY>eFRLa|V-6^$R7mN?w zj+5V8j7{sHgM*Ryz)&I9u~Hc@=3O}sl?nCt|#C1aDKmeNthR3YoBQp!LXDU&iOn*E>1W^KUuyK#)Ds1 SX3X2iCI7~^+5XH^v+6H?((4ca diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index b2f5ab41d8ae3639922cecc161f4f2faf65e5cdb..0938304d439f0c5f3877e0706de99bf36fd9e623 100644 GIT binary patch delta 638 zcmZ9{Ur1AN6bJD8+ueR{ZaV+Wwl!tfQ6RZk{wZ=PYq_vMNm9E)*;u*BV&2`ZSBr#* zAcm2Zo$v?IOVm?@Ixlj?A~sQpj2?OzzC;p2mk0@BJrq>G^%BI74~OsXoQHF6XSV)9O^( zTIbDpSxE4<0mygo_+WEW^Zq8~WlwQ~Vr&E20Z*=>~W^ zSFZ%qd#oU7Rmwz0WKF@2&fa9Or;~&6RX2IPNLSdsQUiBZzWi$`dMiM*3!H}!Us8L7Z9_O%T5y>cl2@5M)nu8OU4ixDX@Ji?v!gyraE z+2i$u<8pMkP{sIp&j6fx7E*s5LY6*TIF=k02Kl6v7;H}pvG@?z#!d738e#%eLf9$P zZur|I$EVOt+5f|;`yP5(jcQ3?7P&~{0&6F2FIXe7&!R2Fk>9h3klY;Njr3-@a5M3y zQ74({Hkj2LX>MGh4lrQAVEbuB=r*_$r+t Zo5P=959rw^&nHWtKI(6YN#FXm{s5eZ^!We) delta 639 zcmZY4Pe_wt90zcJ@B8}hkIqeJsoQ9;rnw!$wT4o2$jDgbWR%()6s{an%elSP1nD1U z2M=|a{mADK9-_KLt<9Hu@ls>Df|%f~E|I6)!K@BLD2tx0V-I`|-{;Sd=bK;ezgy@} zbh5cGS;JK_e8o^iG}-Zz z+We@4XZVAsBVuzcjTStvUZLZdU6#_J+@r}k`D`>I>MIa>O_=F!l0DrERs7hOF)?!n zi$0O>a&$WOcgZJ?sBHK|vf?o*Kz1a+NX`xeC$C8xJy@Uaz~INfsu=(W)_kpdXh7f z#RTY-{4Bh-sBN}TY$6&L$Yv6nc)Q^72rjaage|W0ZSwR5kaEM_r7CtIeql5!T>Dq- zzow)!1ta8P3i??3SoxZQTRgd`zyR-!hR4rElvM>rv`l;ZOj{NxhGHp>s-$>IrL<+$ zs{4$?O}yJ&h-?Qn)id*=hSE}1R4MDI8cI(Ys9I%Stb6}~#9T(TveaQL9;z4F>BXxv SeU@*}Cn5jl!9?J*ZtgFAPU=Gd diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index e83509a3648beea0ffef6502a6a0d995fe1a48b2..cdf524e121867d283c1dfc3c09ec36227ad8115d 100644 GIT binary patch delta 649 zcmZ9{Ur1AN6bJD8+ueR{&NX#g+nTbwQ6RZ6{}fi5tt~82l+xO%kGl z7`|llM8AmMe2Z|-i(HWiCv${>K@Y2!KqBNKA-$}JgzC3mg81>_@co_haL&$l=gaNR z$H&>(gpfY5gmj_10>2As`+m5G%(6rC0O6bTYsCv5bP%$v3op|6;Ycyc2CYtm^J7u| zQw`kGyXNY!1}jpO@2;S+il{G;2?q45xa3ik|LiJ`$Zdx820W7xcrybicmP&goN{Z+ zq7mnWC|}tRg?1h{H#IgLYnCsbFR6iqcm_JfTGEx*ILPi77Ry`WP8-}2U0_Yu!{$P* z>`xyyLtM4V)2kwD@V9sL#{4}U989gd$;L8W;ZU|3X0qS@wdASwycc>@2Rv6BX|0pr zsmo=sQaB5jRVPdroFucQwG;7LC5DOb<#6<^Lq7SV^c>OHSesi6#Y3ZG+!gPj6rPm4 zKJQ>e3Xc}67`fr?hpVrG%CA$Xtj{_)92*yg_*gtT6o?7KkrA$yd&+C8i2;y_ut^lq z{cVy9Ni<*n|FGhoMQ^H*hqR@Ti!>~;cGCKq)f0OPeMKDkokE1<7Z9(fH%rBvi7$;h z$b7fXs60%g+t}>mg7KIT_HjKSQ4Gh)o`QOnOUo!!n#ipoN<*=fmeNs}Dp7K4`kzlw zeImmfs8Y&El~E>YA7!S>sR|{-S3dh_A7LWQ1QTZbj6`3Yrt8c&BawkFi-)9YELFtR gWYH_3I!hs7eQyin&5cRpeKnTspSLNe=l1&k0ALjPF#rGn delta 639 zcmZY4T}V@57zc2lbB<>_)4Ay^bsOzyer!ZImn>=y85vg2q|{DOxN?kI&FxeRf-KAe zFT9yP)C++ZQQk~>_~u#oErd6S(De>u`=C^D=ELynQk;_e4YNjn6DSV zf38wS=Vcauy*WzwCs2WRKbDi^GVm6c=oNi^{y4qn7Xxzan#-ft33T1^pl2~pU)Yq> zOKKhJb7s7nt3pGrOBv6-D8&bP8x3|0%Pr)>C)P+(X3${kHzRJmtyX^Kb%!;2T_7I1 z5huSl8Jpmwg9G7sXs8hDSvefs-Uk;BJng`>VNM3|=B-6Obg)Q=Emo zN`PKnnSeQ~)@~2Ru1Dh{*+@bS?-0FSv6ajwVUsI-o6I}|vfXfZp^8I{UkpXXoBxXa z*Oa(ZFi0Mypo^uC)vqbI!;{-8^zy!Fc<6jYT~%RF$22vKH7o$dP%On!#S~9z)P@DE z=04-}5Z@LTBwGQYbZklzC>>Qo6|$ZxqYRXhDp#kZ3i}6=*=N$Kwaupdp~^|2(e(P> T@%KfMAA5$K3@8SF&Z+5-^ z)OD|wrwK9LHjgyH>mu2Lv}HHkKqlF$x{2^b_O$4LTC^83ydBT6_z#O z@}?dxY3)y4ScR2%g!GiKSVi-XkP*&nmvPaZ2zh5OjL05cwh2!sL}KCq`72?$-6p%+ z=k$18jF3J3u+u^Cp_b;B)@J$CiK2Q)NJpVdYM|XYm6dLN;IX_RZF=CEWQX!}BfOez zkiF@BCWz%L1|61~7Hs^pq-U<)%&8)iQ zm-z()EbbhGGkF_K?bztbhT1~62TL(bY@6ZW3#)wiTk&zKs^BYXq+l#KIwqWT48%iM z;tr={ARG^k7OE5;bo9fyXMW|^5o9=BJ}?{|7l%kR78&wI#o_RX;1(Vbbv4xiGEzQ? ze44*adNPS-%>NH7HTTi;DpX57DP*Tj^Sp(+mv}9;q|iqs(BCOUX>Jw~E!#O>*qJ)h zsFTk0X!OdhG`fsUPQf3GiXo>E2ue~YMt>-%SLs_o!Q#Z)Dq>U&&!`yj^{^o)TqGP@WPV`fT}6;j&$);_|8xd|@BdAT?{F_tcHR cEc@vze?sKSWZ!M=0n673mw&Ex@#@l-KRej=YybcN delta 634 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 delta 639 zcmZY4T}V@57zc2lbB<>pIyXN`-9|f_=5`TVLyg*oj0~$yq|{DOxS9-G&FxeRioVPO zFM^mo)C++ZW!*%q%|ji!2{Emk30@Qy6s(Bc#ge)hLRs`~UG~E7;{Sd;y#LQDz4vpy ziB5Jo8cFYX3b*tewZX?dR8)c7srh>on^`!Xb z2o`!oe!HX7(a|9v*rT%IL&<{sq&~7C0k!1l5O8u<%6DO1+K!o&U+zh7(W|^Y{(+dc zAAhXW%j2^Wi@#p(CHw=Z!E5iTN%9r&Ca2&LyaWC?z2+AJQtXV=rPFHYy5vIFe1X2O z$cGk`X4K`3csf^)`kYU`k$YB&cM297tQeNIk&%zAfuxL}!uIb5Tz%aj|14;Ct905x zJajHjey=eWje`yjgyW&nVr*fh@Nj7#oH+Ej8?zTVWy}TYL9&MpNumci z6M3EhosyY^7iP89IvhJ2jSFNo35~o>@OXrFGLwWguJ~>8=n0Tg!_CDiHX(jI6csM~ zEB0Sg(wTxFxt9VTOCKxWQgD?gmlf#ez0vUKv52yyKv2uHwN13n0mV=(#Zl!HPpOpF zIkoCG<8Tr0IyX$#1DeW-DN#ddsS2u?byO9lrwmlJG9}hzmr2Y~t5)9IYYV&TrbjaQ U)ZH(h!SmBW-}O(kH-!(8zpwP{%m4rY diff --git a/Server_Install_Pack/mpmissions/epoch.Sara.pbo b/Server_Install_Pack/mpmissions/epoch.Sara.pbo index a73bb3f4df2ec2bbee5ef55a13bd148e4226442c..7211857e81c03a658a9f71e27647e6e6323a9409 100644 GIT binary patch delta 638 zcmZ9{Ur1AN6bJD8+ueR{b2k6Xwl&4;Dv(_0ri7WpmMaT3vb1hcwpLDA%)8sX+8;q8 zh#^F!C;WjF1U*C$&Uvvb5;1L)s3_=R-SQ&S`D;>aYqcQiSg)p|OJGZlfYNsZHU6>kM|~TKQ8b_29S3Xq*|=9 zyJe;jFAEXg&<*SDJZ@@iXl!!IhxZrMKwR7nezBGu%&IJ8?E{PD6>+r{E{QfUC7tkU zx>oiiw;3UpE0;%8BCGSX`?{i@P9F!unJV&pj;^pZT?seRpZ~Sw;Y`*JojD6k<{D_N zlV9ZK3^2dG2ae^eFuHCf3oB|fsXtYUVdzUS)IYPx&ENHViK?6}uM&f?VE+Jj+#ZlZ z7bLsG9tcaJ{(Kd~XYAc@;-OdhwF?=Jm;$}gL7|6_#v(m!QK2{7$GN!)UR_CafQkq^ zhT1fLo8-V4nkxQ(Sg9IEPbyF~X-yy-am})3;(p9(i8+BjB98n{AVRX!h}Y7arTopr zkwiW+)uAa=t|rlWY;198}qM4TGa98AD9W&OQI0m9x$&3SFRnHYOd{JLiwz=?< zV1L-iGyH+mQMtxUV>O--R_HipS9Re~ZPPD$_-rgHi$w_SHk@s(QvIznCH%yvVfp15 z%m-zDzuW6>Zc)3B=$!aiao{nfi|j~(g`DjNPF+*h+pr?jh|B4a8qDkwb%9{0Hy-H0 zAD^x2_^iU>ulb{de+1V8xHA=hHzqN zG(moEG7i0)4h}~WLnDP)$10J*?S1fI|I>C{yUuB2J`noIN)lSxu7QiBYzk5&c9OG` zS4l8x%Tw^WT5viC<5yz|iEN~xig!tVztlu#Qn1MtzD=Gy1G3$4ccF?)N?aI!eSreT0QNJ9rpA8X&zaEm85HR$03vB=1|sJ5!XfPrafn5>@zilJDFqlzh>(rNW` zg6{Dpd3U>BHIgEN z7(!Hb!Vki?dMljsB3C3rMMVmF=wZ}@Ako8;kU;FALG`VdAU=K^{@*zd=S=T}vtPrH zo7vfvkU6n{bkREkzY7`r0l14yibHb`;p_Bk$qhB=5UjB-JWu0?qlKs#v^ovWjwJYx zwQxi4dR~t;Sd|leS2>N9BsYUf;fj747d=eyTdu;0(rQ?5z%Nq*Z(;xi55ls~srY^K zC3s6n@YX)q@8EGuQ)5$0vvU4yQ7xpzHVBJ#q%*5=kloKLR<^~RR=6d)z?$*G`?)$L zkU3%kDQ8nAmqpeP=m_;B1KlAGCf2LT+eNy<;k7DwwD#>^OPN^Dx}iJgfM>ZzTI-c} zxkV!^?VpBAIVVi+JITtn)=td*6&S|8o8j1|Lpk}Q_zcn5SX;Fim7>EVT(3JK$8O4Q zk2?~VW5b0i#;>~j;PR`W`s)-jUa&?6lcT}_pOg{~sf|@cX(*P`QaTD#Me4??{^wKV zO|9?-s+cOFj8rLAMwuuxRj#h^6~RyTAtug@F)=2<$n;4x^)sW4Oxk=FFG=@W%1Ecz gqE}5`%U-*6>ULflx8<)Hk0)j}_Z|$t2pgCF04(?T<^TWy delta 639 zcmZY4Pe_wt90zcJ@B8|0dv$J8OWmZsn&v!&+meNCLso{BGbyz(4uzQ3MbSfqhayk4!lZ~Hlu6Ilu?Ief@AK!!^L_WFed=p_ z+{1p1MN>^r;jW2;4NR5o#!)b-<;)nMndO+BYOI19TwravxVk?ZRRfpL@Oj-)$y$%Y zdfWX5p5YIji%L}%8Y}UXewmJA_EcsM)n>z@n|~jRN~S!77AwyADpbF3wt%1bbXl6~ z!Az^fA9Q-0o&)OXV>$;ulIHo_S&oB`?dZEiiY6gJVrMuT zc^(I&wloPZEA96aPk`ha?#))I7nO_Qn0Vt~ zvHzM9PZIjbOcL5y`dIsxgxfs1r9mejh(!i3M7327`UIw~ZlZP`D28Gwj>@NaN~hJ% z>vi`SrDk zhA)|&=m*tX1U-aqUgU~|I8lirA9@%?1QI!OlRiBPu)3!3eJ=S2BV|mfDnyE2HK+HV0egc;U5c{a$*2vB-|8g z)BbIe_9--7`2Vo#e25ku$VFObke$@eaTe0@n$r`@4Elz6vO9waNhgq?r#H*Fn~5ih zI>>aFHebD$MAxy&!~0@UG34R9gOU`Ak!=Ev_?X+e*$?@4S5fqW|i)fA^NNkF|`E^~pa#qWOpb delta 639 zcmZY4T}V@57zc2lbB^b1)4BOk(`~e)X>J$c8n&o8WMo)5ky1NB;mR>=HRq{T1eKUw z2z4`isFw&YqPmG#o2NQ;6SA~!CJnnWBoKmHp;8w^DvRFPWiR|L{_n@b`(OCddFN|q z+|7QBMp8SU!VLolOPDfk#1Swk)yycMk>!{_byy4aIL%ttV|HsHDq60X;fs1BlG%Z$ zHI{o#Jj3rg5|L`lX|&=2%`6?qY_b*(l~(PHi(iaJBtsEGn;EBCY7}qFWC?%m(_bOx4I_cm*I2IZ##Clc^2iNz(g?*3OaPbnSj(9-ROJ?KH!glqaBxU1}Akjmd zg}jJ^Ud@cdORL6i4-TD+#zeA`fEwN*dc9&ZnM}YcSNJx0_!!7~!_9>%4l#Bj6csQ2 zEB0Sg;!Z+8xtoLzmOfUOlW>J6!zy(1zG!&xctp*r(63_}8^;>bKrs|caa1wIQ-a!% z)(AHlr-%5~xFA^zXiLW?BrT<*N~l8CQ)QHaGE(L0gjDfdTy1(pl{txbCwq28ZZRy^VL2}FCI*miC#0H6<>scD zJiH-9cw0AQT6x^yu6H-O<&I-Hl@J#XLz`Gd0%?tnY<_03ye@uiff3OTmSiowPgKdC zGX3jx?Dk4=jaN%m&)Pp(zkytd2~7Lgih54lWIM!)$$v4 z&It3FBXCMBh4D-&Sy8lxRxWk_s^x3l0o&r=2}g=!)cY zIeWrVXdqj~@Ofu9oO$X~whtlW2}@63bV%ssqp?V@H!Adn`?+TBA+Ieb20;0Qoj_jQ z-zGUefu;)oA66>vqgQ3fL0YDfoz%^;R?_^E)f4M9+CUunJ&g!SClIfvH%r-@i7Scx zWU5`4r`$-Q%h=@Ne6gqya&etOQ4Gb%F9mfeC+AQwH@>onC=JC@T1rP@Do0sa)c<^d zYU2yMfy$-wC?l0m6;LLskSbCZ_~M2&Yd;fahM5rKVI=xuG@WCH7>R5L%nlORV=g1l i+-ALkYRnn0<<{GeS3Bwxwd(#K1@A^)ShgND-24OHnEFrv delta 639 zcmZY4T}V@57zc2lbB^ciOy`*&rEb!Wra3QSbBI#gkddLaiImz23RlXg)tslA5M*Tw z5(;AaQ16u&QQbt$%|jg`2s5n+1-q)7$cxZjnB>I}%A$96*$cmm|NHUq{y(gC-p+I; zn%R|TB)#t$Oh_E8VY+-Lj)J6BFmXUL%Q1gyuo`M{jwTkmD{#!JnNO=ft7M$@^YF^KD0e^SpyfSwZ zv+WAs;%s)dIJKi4f*l{LHax6$ksS#rC8zp;)0Wk>RxC?9a3K}Y+S7X^!Pg$>8S-`G z#%j41pHW%-_2v-aA3+J;{9H_uZ-KYEWUuV&3B>5NfE-kZF1g$$qe$0PH@fGt^o313 zKCjoHDPzHlnR1jee(g@?c_H4<+Gwz2SZyR{zOZJJvVee1Kg_uPu0s2nH69d9#$YUT zIYxeOGB(jk2M5Ek&|ogsvTAr>dmmib_p}X{M>u`d4TfH_m;evk)qjo@jYE<|k8xJ= zA^|3SVH{pn8SM6fq2XvuChJM4~ T>n+JI3d3z*uTQ;f{MhjqQ={rW diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index ee191f750fffbf08784876f1da763b8d344f8ac0..8c7e4ec28223d40e996003022bf561a8bc1b5bd2 100644 GIT binary patch delta 651 zcmZ9{Ur19?90%}wcDLiETbs_cttnoof#hQOhfq`2bYX##sC9#~HRl|Qd3T%BA|WD( z;Y((}=s@%k^cv22kt-6h$tF?ILl3K$K%(ptArh^Jg6yo9APygX=X-v?hx7ZkJ-D(x zc=sr~o)prZt4I^LA@Dnpw(f_U$SB!Vw-CNepVpmFj~XGzI`9gOZw{BDq*H5DxG){% z-!;J%t>cLstFWAi@0=1;(@7Y?!42V2wh7! zT~2=_5t=GhF%oo+!G)(j`S&rTKU3|WjLirWd@LTF=!*%HkucZ8J>b=~LWL?X9He!XwUVA^td>|)=p*9DUJ4OXSVp{-?wly?Ok8O+ zK$eCy74q#gx{8f1&KHjfAs06i5XDfO{F2eAe0B{5%9EQLh*D83rKU6#rpn~a4eihS zs3n=@byPW3LFp+2wU07VCaO}-@>P%D+QUqQnPozZmr2kQr)iv-p|=p(?J~Q`LW5aP h_S|Nz9C4eAebq{1kn<0J&or2Vn$1r$mwG+&_#acI`o#bM delta 639 zcmZY4T}V@57zc2lbB<>pZfhky1NB;c7!_HRq`o1X-9} zcoD?(p&;QZXP^e}d@_;jTi~r8!7l{*!zp?#EJUP{s~)djtD)39dyL$O&NqbnO*G5u9 z*Hh&87Gu}A>EK8_H8fm~Evyue?d*dG2cHFTZIn~Syr3Q+D{1htz0r%LdJ?iEd6Kh| zS832I%abr?Q#%~7k!#76KsK|`z&i!MUuY+@S=i#r-zHC=1KDY~r(DG;q%I64g&Y5h z{nwOq6G} Sc)0u|HkyggWbe)RbeX>s@#>lY diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index 36ad903c3f09b7ed5934b0afd0183c59eb55fcb8..fc8549f15b594c452460b7d3ddfe0b75abb4acd4 100644 GIT binary patch delta 643 zcmZ9{Ur19?90%}wcDLi^zxijj*%Ysa)*gHQHg?#9)>T0MBu29UhJW=I_o8f!-wDbp5O1`{MI)*o^Ev9 zKPb*e6|H^-nS9q3vI&}f2aF;sa~N(Qe2G8Jx}Y5Gh9%L7r+Iw0FCCf1XfojBV34d; zz-6;@q6!%_^>Iuq$^X3JdaW_cbJJTbq$+BFF=b{R+3V>R7!a_qaYiyX# z!k?8OvGu}M8^MS6*Bz*?WnITJDj=#hLx);PPbLixy7@uGY+e1-1lLq2*t8mWGgZkv z+FmP!Q$=iSK@}~Yw)UQor@LK(k>xV_D$c*KXQ>qKEq(ddVk65*7j&l_@Hkb+YZZH) zif6;@)=@Z%nZ^gUFEph1Nhlojw}h0wK)=)|JtD?ZY5|l(#c|YP z`rD)@#?fTn|HFFO12kWP%4t&!Ice>TXs3;HqM6!b=p&No?--&qIfaOs?;J_*Ox+r4 zr<0wgEd7>-u3)QMY7K`J*)4VZR8fI0GkgM$W`xE<;~gG=G1H zYN82Z;WD`_E}P5YaycuP$K~q@Qjojm>=y#UupkQ_A;M3XrwhUmzsbTNeY>l$USF*$ b+-|XTv2wX&dvxUX>hoUmGjWq?cV7GfIoA1b delta 634 zcmZY4T}V@57zc2lbB<>pIyXN`-9|f_=Dd*2AxdpSMuwFWDYX+6t~R7rbDnBZ&Cjg5Ft zZJM_648P}CNUSNP(Ts=Gi*y{b!<;{q+cgUg{zo_@>I)D$jF@y)%Wl_f5kK+$te8BG zxlWO9v$xvY+T_FgRaSf|S@59LL$*bsoSYZ{PEJe9?O2hpVJhyGI}^L~Do>}kZ`jj| zYne)UG%2z8`|Sb3KY=p5`K6S^-T`lN2yVgC=Z(;7Ucn~~UvM~eS`A&-oamg-(H9o^ z=z>yMLs?aU-a(<);Bx-&e`Ma@u_=oz@o_ zyc{8$>x@NXr-OaL$ly>u*0EABu(b~k9GL0A^i@t7ae}&^EJne__V~|`l5vQU@Da{L zUPVEtq{iWmS#7ljhA)OA0$GhgHQy+>-9ihQjlnvX|2BE{9LQF~o%t$_Lge&dSh(`9 z*ndq)YaIM!Dh^#NeXOj+;Ra8xE6~e(!oi`FA!SJczm{oe7^|NHilJDFqY5dWQYrOw zYSjc|cM{JA7a$uxP4U>IsG+n}5tYw6s)W*02C7t<6w4lcR_@u#H}_UFy#Ds-aG9) diff --git a/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo b/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo index fdfd2b8c083a464b7a237fe5d89d19690950b39e..14d93a4a45da278606873a4328e6f670c84076d2 100644 GIT binary patch delta 649 zcmZ9{Ur1AN6bJD8+ueR{ZaQ^an@!nu6i8e6uk4@0))rPMSz0$Jvz1dO^X@jU76}nS zj6L+nPV|H7&9@SDUhJAgZ0aNmdhlULP+0UZG_05PP+fqg! zOZFyq7$KUq$nm7e>bxzjoe^(GD+eQK2YE9~SJ=K-33nI2{%gr2>5LOPvNm{>ZJ@PA zew&>&z+CPSoXM6$JXcOqt7hos;@zKWqs&Mr7N?pHPsAj2thcW-1!=;0&LaE~t{^oII45BHE)R}vkdBEpU$ zpXP6q934dyCI1gAj{E3U1*#&=lgLi$XILxoykxb+I*Gm@j{KfPgk+`=ucbFj`J0J5 zfm+E#yGF0vN}wy)=;r*<41#ZqcYLt&~wS(?}W ze1Pg=DPBhvQhLfj6;Z{Mkt(4|l@woQdvEPyLd-A|WW0<-UzDbc%n&1yk0(r3q{d~c kAh#P$TIExnDd#iW77UhWgRZd`BahdfuWT-l_aBS@0h-MFRsaA1 delta 639 zcmZY4T}V@57zc2lbI#5_bZ&msbdz>8&3O@S!`8<(WMr&zCZ%?Q!qvv8)!a_DAgILb z!i#QZ5B1W87h*w(tj$9m3JNi;E)=}1i@=MhktTUDjI!w6y6lDD#sB?yc>hzYU0+wb zQZ9BQ9?R~33U>`0tYOx)9f!dn*Dxc1MwVm#G+;e6;yi09#^v3GC~G+t!tN6d4@l5Iwsav&{&7ZHA{3Hv!kwXD7R}Docww`CK^f*I?Oohsg=E+nNt42=S$*? zGnn^_{9e1uzRw|_IIOneBgu+KrEan<1y$s1KXCGjwAPN**;ZW41Z019mqG3G2YM5} z9^Ck1l1FAG7Jt1yLimSJiMQWZkn|hiEl$BJ_<93LdMzLXrNkAdTd&j7b<>UR`8<7L zl}{}w4XDqVaWH2>L#|W4lY3T%_w!a7Y#5astjXOk|*wrH_?w8MwuhAq9GPUpzW+E~YFi5YjQt&7)0oKrs|cag>VUDYeox zr%~Ty>~7-Q;=*Jrs4W{E7qyg*Dy0fpPnA;!%1Bix<6`CG52VXgrBNmvRr!O}szJSD U&rooZdua>T9vk?v^={?UUlWe%F#rGn diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index 14a779275840af62d50e907f439d66057fc2ad9a..ea652e79809d03ae497eca6bbd0ff1a2537d1a83 100644 GIT binary patch delta 643 zcmZ9{Ur19?90%}wcDJ)lU7J(eY}&4?z;ZGFlw`Wra$&)S(yUvQ*~)2)d3T%BA|WD( z;ftle=z#c8^cv3VMXpGMiW9TwA!79sScHrS=|vw3tFvB$IDGh>@A>^6&Tn-s@OUlo zpq_o56r_e}qzT;?_;rvh+u;r}%2w4~gs;)3SqD_0-LS~o@Dz=2_vfOlS8G%_(--AG zRKj(g?Wqf^u#$-KZG|+Jk?c4!z(w60)(%JckG9;1?9r!d@yn#Z8yP^p9Wd8aD!ZGe z^6{n+<#ipf(Zb_H2kH*i)XS$%Xe%Kp9)*BdMOrf|D_Q@{VtG~k>VaFL4T_~2cr#fg zd!>Cwh-XXWp*fM&dt3bNF>lb%!C=}>R%YlI_AHje{l#zpTJm5z`Vd7ZXAQN*-{wVC?)f&Y6}rBnK2A}H$nBXRX)6#cbuq7*b=)Kiidjpxbu$AMEGXH z;dFFH65-xl6(d(19dO~9Px;k|3QiYycE|dKEk<{t6ta-s)hAnXWg z*8FXflOt%t^#8D8A4M<9PzCX%kd4$%vlilh&gzIIg}xw;{7xZ4GLwkc(VY{yorzOI zelpRf$ye@4=ms`AIbS>`gq>V4B#PlU`Kh3G<;)BUKK_ zs3tkj>!~~{pDLgX)HcdUnW#c#o;MG_xAia)W`GGZUM4|LoTkf6KfQ&SKGL?Us6lCU d6>T*ad!(x?N1k}M4Cc|X<-OJKJ~i$<_Xn_N_Wu9? delta 634 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 delta 633 zcmZY4T}V@57zc2lbB<>pI=87g-9|f_=5`TVLlm1sMuwF$5w#N(t|p^qb34_7pc1nS zgKlPz^A#HYIb=rw5DZkvE-mh2ry8VMO-vIu| zn&ioh#Nw|v#|ZxzD)IKZktE*&Z*dD=!8hoS(`$YqAjPh@Jvyz1uA3h8EamA7n|x|n zX+T}hjF)pJ)aQESySbO;_#khi!H!|+AUXe;HIS4URM_&}fLrfs<)3-&5tU9Gh=;Dl z$?i5|)41s1KsX*6E5t@t3Xc@`!HvW7UAS?BQzks19wMs==wSPTqoiUQk|cVPvyfK_ z&?zg^@Y<@j+eczoqj7<3C83UY2wtzyLKc#+%@w{)o;?RrY`Cvb#UaEmgrdUrf5rZ5 zN?KD8Bo9;2!_vpfw-nss$+!Xoye}FaI~P&b6bNdW=H{uUMW7gpr8ugT;whEVw5V3y zXIviQ+u=sYPC!#WH7jZ;EmcMpvW}{t^pt@zDzjqc_(vt?tlB+XJvTFR!Zd1pI@I=c N{llG_F8Teyr@yOD=|lhk diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index 17252e65337cef1b856a19c54802b697efe86b4d..54a94ab62bab1500c4ed09cee2456190c7eb6a8b 100644 GIT binary patch delta 649 zcmZ9{Ur19?90%}wcDLiE)2Y+8HO1>lkeqDO3QLDAH4C&PtrL~4l~We;?l!OXM~Dbw z_)^+WIuH>=kA*rfaz!H4Hj#oJdKkVG5`iN^#8^Q=b=FG|hYvr#=l6T~{l0H>svDi- z`}ozE7~emKbb*^9*@U=d2i!s?#j3fD@MZS3;DAcB3lh8?&$9TgHX9X#R;R(Kp)gsi zhAVpeQy11?RSuJ`A{NVN`Vq>9^ZG@cb2m)h+p{A|vmsfBlQEH)I6$pCVX?`kc$;SP z@U|Ex#$L#@6Wp+;ey^uaIdLSX8e-Bx=#*;c@s!3&H$U=NS(iRH!wty}C2QdgM z=Z&zCIRvNEHWg1ox^{Iq)sFjcQ8y(h4aM4GazmXB~bycujUV z9sZCU9L!cJbji^R=bpE!zZ#M8WQo5&GA#CyNHpBn5)u1D1A_0%$rJ|Thro<@|WW)RV{o8|1y)EP$| zbgE02r{0O9tJvfeTB8v$=oGpGk`#>6pDOB6PtBu1Zfs>4F&c(vw2Y3yOpdy;tp72I zJh3HWU~-u}#>nI|1&oO)WQx=!Qe3rW8Q?MF=V-L;=S{Llr`>TFRg`G4X}C zVBw~CqBkyTVw8N?*4J0HkbYsFwx)C5 zn)zHLoZ6p;JE8z!(um`F z>mwK8$bpk#xwe!=8y?j!v2k3DEq|!C8Wud{TO=%t1qkgH%(PUizLwb{6905wesKzO zoif?$Zg%h6qaHh?bK;C*$0JG)-4=s#dU^l^bwycg#fp>*7n1?CGqqFH`8xxBWBy+J zx>~7DW)vQOy*^CIV<^L0A4+NB4G^nG@=5-_K$KkzNI_-nqQ`488rZt#Melr$y|Ak% z7PLAvWi5CiTZv+}OTC?aUX1s0b{3o%Qg+jkkGz>CEuh1uFJ@eSTc!TY89Q_)V=y{= zIZA(TaCU>64GxB)!=w4=;FZwO);@S};AuOqTotqlFX;Q}QVd%7p22gpWEv7Qa$K;| zmoYGDi_`GRrgu7r#x6yo5?xO~HEEQ5KBl?WO)rVTf)94aHM&*}xc?A|{_rObH`0W~Nk&%Vp{Jblp{M)RM09?*}X1b$D+$ TG95og+DOfKTD)Je`JnADhfwNs diff --git a/Sources/epoch_code/compile/building/EPOCH_countdown.sqf b/Sources/epoch_code/compile/building/EPOCH_countdown.sqf index 989b498a..963c0500 100644 --- a/Sources/epoch_code/compile/building/EPOCH_countdown.sqf +++ b/Sources/epoch_code/compile/building/EPOCH_countdown.sqf @@ -70,8 +70,9 @@ if (!isNull _this) then { _class = getText(_cfgBaseBuilding >> _objClass >> "staticClass"); if (_class != "") then { _newObj = createVehicle[_class, (_worldspace select 0), [], 0, "CAN_COLLIDE"]; - _newObj setposATL(_worldspace select 0); _newObj setVectorDirAndUp[_worldspace select 1, _worldspace select 2]; + _newObj setposATL(_worldspace select 0); + }; } else { if (_saveCheck) then { diff --git a/Sources/epoch_code/compile/building/EPOCH_simulSwap.sqf b/Sources/epoch_code/compile/building/EPOCH_simulSwap.sqf index 6a245f37..30385685 100644 --- a/Sources/epoch_code/compile/building/EPOCH_simulSwap.sqf +++ b/Sources/epoch_code/compile/building/EPOCH_simulSwap.sqf @@ -70,9 +70,9 @@ if (isText(_simulClassConfig)) then { if (_objSlot != -1) then { _newObj setVariable ["BUILD_SLOT",_objSlot,true]; }; - - _newObj setposATL (_worldspace select 0); _newObj setVectorDirAndUp [_worldspace select 1,_worldspace select 2]; + _newObj setposATL (_worldspace select 0); + if (_textureSlot != 0) then { [_newObj, _textureSlot, player, Epoch_personalToken] remoteExec ["EPOCH_server_paintBUILD",2]; }; @@ -174,7 +174,7 @@ if (isText(_simulClassConfig)) then { } forEach _snapArrayPerp; }; if (_isSnap && _distance < 5) then { - _pos2 = AGLToASL _snapPosition; + _pos2 = _snapPosition; _vel2 = (velocity _nearestObject); _direction = getDir _nearestObject; if (_snapType == "perp") then { @@ -201,19 +201,16 @@ if (isText(_simulClassConfig)) then { }; _dir2 = [vectorDir _nearestObject, _direction] call BIS_fnc_returnVector; _up2 = (vectorUp _nearestObject); - EP_velocityTransformation = [_pos2,_vel2,_dir2,_up2]; + EP_velocityTransformation = [AGLToASL _pos2,_vel2,_dir2,_up2]; }; }; if (!_isSnap) then { - if !(surfaceIsWater _pos2) then { - _pos2 = ATLtoASL _pos2; - }; if (EPOCH_doRotate) then { _vel2 = (velocity player); _dir2 = [vectorDir player, EPOCH_buildDirection] call BIS_fnc_returnVector; _up2 = (vectorUp player); EPOCH_doRotate = false; - EP_velocityTransformation = [_pos2,_vel2,_dir2,_up2]; + EP_velocityTransformation = [AGLToASL _pos2,_vel2,_dir2,_up2]; } else { EP_velocityTransformation = []; }; diff --git a/Sources/epoch_code/compile/building/EPOCH_staticMove.sqf b/Sources/epoch_code/compile/building/EPOCH_staticMove.sqf index 822f7406..7bb2fdfa 100644 --- a/Sources/epoch_code/compile/building/EPOCH_staticMove.sqf +++ b/Sources/epoch_code/compile/building/EPOCH_staticMove.sqf @@ -257,9 +257,9 @@ if (_class != "") then { _snapPosition = ASLtoATL _snapPosition; }; - - _currentTarget setposATL _snapPosition; _currentTarget setVectorDirAndUp[_dir2, (vectorUp _nearestObject)]; + _currentTarget setposATL _snapPosition; + if ((diag_tickTime - _EPOCH_2) > 2) then { _EPOCH_2 = diag_tickTime; @@ -354,8 +354,9 @@ if (_class != "") then { deleteVehicle _currentTarget; _currentTarget = createVehicle[_simulClass, (_worldspace select 0), [], 0, "CAN_COLLIDE"]; - _currentTarget setposATL(_worldspace select 0); _currentTarget setVectorDirAndUp[_worldspace select 1, _worldspace select 2]; + _currentTarget setposATL(_worldspace select 0); + }; }; }; diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index 6942aa37..fa5201f4 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=540; +build=541; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index 6942aa37..fa5201f4 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=540; +build=541; diff --git a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf index d5db62e7..70155baf 100644 --- a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf +++ b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf @@ -74,16 +74,17 @@ for "_i" from 0 to _this do { if (isClass (configFile >> "CfgVehicles" >> _class) && (_damage < 1) && !(_class isKindOf 'Constructions_lockedstatic_F')) then { _baseObj = createVehicle [_class, [0,0,0], [], 0, "CAN_COLLIDE"]; - _baseObj setposATL _location; _baseObj setVectorDirAndUp _worldspace; + _baseObj setposATL _location; + // spawn additional object for trap _ammoClass = (_cfgBaseBuilding >> _class >> "ammoClass"); if(isText _ammoClass) then { _ammoClass = getText _ammoClass; _ammoObj = createVehicle [_ammoClass, [0,0,0], [], 0, "CAN_COLLIDE"]; - _ammoObj setposATL _location; _ammoObj setVectorDirAndUp _worldspace; + _ammoObj setposATL _location; _baseObj setVariable ["EPOCH_TRAP_OBJ",_ammoObj]; }; diff --git a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_saveBuilding.sqf b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_saveBuilding.sqf index 92b06580..cb9e9cbb 100644 --- a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_saveBuilding.sqf +++ b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_saveBuilding.sqf @@ -41,8 +41,8 @@ if (isText _staticClassConfig) then { deleteVehicle _vehicle; _storageObj = createVehicle[_staticClass, [0,0,0], [], 0, "CAN_COLLIDE"]; - _storageObj setposATL _vehiclePos; _storageObj setVectorDirAndUp _vectorDirAndUp; + _storageObj setposATL _vehiclePos; if (getNumber(_cfgBaseBuilding >> _staticClass >> "isSecureStorage") == 1) then{ _storageObj setVariable["EPOCH_Locked", false, true]; diff --git a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_simToStatic.sqf b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_simToStatic.sqf index 2175d412..cca5c212 100644 --- a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_simToStatic.sqf +++ b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_simToStatic.sqf @@ -29,9 +29,9 @@ _entities = allMissionObjects "Constructions_modular_F"; _newObj = createVehicle [_class, [0,0,0], [], 0, "CAN_COLLIDE"]; _newObj setVariable ["BUILD_SLOT",_objSlot,true]; _newObj call EPOCH_server_buildingInit; - - _newObj setposATL (_worldspace select 0); _newObj setVectorDirAndUp [(_worldspace select 1),(_worldspace select 2)]; + _newObj setposATL (_worldspace select 0); + }; }; }; diff --git a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_simulSwap.sqf b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_simulSwap.sqf index df2fd70c..d30948b8 100644 --- a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_simulSwap.sqf +++ b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_simulSwap.sqf @@ -54,12 +54,12 @@ if (_objSlot != -1) then { if (isText _ammoClass) then { _ammoClass = getText _ammoClass; _ammoObj = createVehicle [_ammoClass, [0,0,0], [], 0, "CAN_COLLIDE"]; - _ammoObj setposATL (_worldspace select 0); _ammoObj setVectorDirAndUp [(_worldspace select 1),(_worldspace select 2)]; + _ammoObj setposATL (_worldspace select 0); _newObj setVariable ["EPOCH_TRAP_OBJ",_ammoObj]; }; - _newObj setposATL (_worldspace select 0); _newObj setVectorDirAndUp [(_worldspace select 1),(_worldspace select 2)]; + _newObj setposATL (_worldspace select 0); _newObj setDamage _damage; _return = _newObj; }; diff --git a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_unsuppported.sqf b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_unsuppported.sqf index 337e6301..31883022 100644 --- a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_unsuppported.sqf +++ b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_unsuppported.sqf @@ -4,7 +4,7 @@ Contributors: Description: - Building - Unsupported building check + Building - Unsupported building check (unused ATM) Licence: Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike @@ -45,8 +45,8 @@ _stableCount = 0; deleteVehicle _x; _newObj = createVehicle[_class, [0,0,0], [], 0, "CAN_COLLIDE"]; _newObj setVariable["BUILD_SLOT", _objSlot, true]; - _newObj setposASL _objectPos; _newObj setVectorDirAndUp[_vDir, _vUP]; + _newObj setposASL _objectPos; _newObj setVariable["BUILD_OWNER", _playerUID, true]; _newObj setVariable["EPOCH_secureStorage", _slot]; _newObj setVelocity[0, 0, -1]; diff --git a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_upgradeBUILD.sqf b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_upgradeBUILD.sqf index 202e1f45..681e99a8 100644 --- a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_upgradeBUILD.sqf +++ b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_upgradeBUILD.sqf @@ -31,8 +31,8 @@ if (_objSlot != -1) then { _newObj = createVehicle [_class, [0,0,0], [], 0, "CAN_COLLIDE"]; _newObj setVariable ["BUILD_SLOT",_objSlot,true]; _newObj call EPOCH_server_buildingInit; - _newObj setposATL _objectPos; _newObj setVectorDirAndUp [(_worldspace select 1),(_worldspace select 2)]; + _newObj setposATL _objectPos; _newObj call EPOCH_saveBuilding; }; } else { @@ -45,8 +45,8 @@ if (_objSlot != -1) then { deleteVehicle _object; _class = _upgrade select 0; _newObj = createVehicle[_class, [0,0,0], [], 0, "CAN_COLLIDE"]; - _newObj setposATL(_worldspace select 0); _newObj setVectorDirAndUp[(_worldspace select 1), (_worldspace select 2)]; + _newObj setposATL(_worldspace select 0); }; }; }; diff --git a/Sources/epoch_server/compile/epoch_server/EPOCH_server_createTeleport.sqf b/Sources/epoch_server/compile/epoch_server/EPOCH_server_createTeleport.sqf index 08386403..36579043 100644 --- a/Sources/epoch_server/compile/epoch_server/EPOCH_server_createTeleport.sqf +++ b/Sources/epoch_server/compile/epoch_server/EPOCH_server_createTeleport.sqf @@ -86,14 +86,13 @@ _config = configFile >> "CfgEpoch"; _ep allowDamage false; if (_dir isEqualType []) then{ - _ep setposATL _pos; _ep setVectorDirAndUp _dir; + _ep setposATL _pos; } else { _ep setDir _dir; _ep setposATL _pos; }; - if (_deSimulate) then{ _ep enableSimulationGlobal false; }; diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf index e059150a..a30434f6 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf @@ -65,11 +65,11 @@ for "_i" from 1 to _maxStorageLimit do { _location set [2, 0]; }; - _vehicle = createVehicle[_class, _location, [], 0, "CAN_COLLIDE"]; + _vehicle = createVehicle[_class, [0,0,0], [], 0, "CAN_COLLIDE"]; if (_dir isEqualType []) then { - _vehicle setposATL _location; _vehicle setVectorDirAndUp _dir; + _vehicle setposATL _location; } else { _vehicle setDir _dir; _vehicle setposATL _location; diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicle.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicle.sqf index 69fcab5a..2957198c 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicle.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicle.sqf @@ -20,8 +20,8 @@ if !(isNull _vehObj) then{ _vehObj call EPOCH_server_setVToken; // Set Direction and position if (_direction isEqualType []) then{ + _vehObj setVectorDirAndUp _direction; _vehObj setposATL _position; - _vehObj setVectorDirAndUp _direction; } else { _vehObj setdir _direction; _vehObj setposATL _position; diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index 6942aa37..fa5201f4 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=540; +build=541; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index 6942aa37..fa5201f4 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=540; +build=541; diff --git a/build.txt b/build.txt index c867de0b..9efd6771 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -540 +541