From 1da15073d8ce8d84fa862260ae29b9dfa48c3fbd Mon Sep 17 00:00:00 2001 From: vbawol Date: Wed, 6 Jul 2016 20:48:53 -0500 Subject: [PATCH] 0.3.9 b556 fixed unneeded message when suppressing forced AI spawn. fixed no message if player does not have energy for NVG. --- .../@epochhive/addons/epoch_server.pbo | Bin 428646 -> 429216 bytes .../@epochhive/addons/epoch_server_core.pbo | Bin 21149 -> 21149 bytes .../addons/epoch_server_settings.pbo | Bin 450767 -> 450767 bytes .../mpmissions/epoch.Altis.pbo | Bin 1333723 -> 1333593 bytes .../mpmissions/epoch.Australia.pbo | Bin 1331959 -> 1331829 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 1333052 -> 1332922 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 1332891 -> 1332761 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 1332867 -> 1332737 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 1332888 -> 1332758 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 1333017 -> 1332887 bytes .../mpmissions/epoch.Esseker.pbo | Bin 1332855 -> 1332725 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 1333294 -> 1333164 bytes Server_Install_Pack/mpmissions/epoch.Napf.pbo | Bin 1333688 -> 1333558 bytes .../mpmissions/epoch.Porto.pbo | Bin 1333002 -> 1332872 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 1333039 -> 1332909 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 1333273 -> 1333143 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 1333283 -> 1333153 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 1333288 -> 1333158 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 1333015 -> 1332885 bytes .../mpmissions/epoch.Stratis.pbo | Bin 1332863 -> 1332733 bytes .../mpmissions/epoch.Takistan.pbo | Bin 1332973 -> 1332843 bytes .../mpmissions/epoch.Tanoa.pbo | Bin 1333495 -> 1333365 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 1332845 -> 1332715 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 1333292 -> 1333162 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 1332941 -> 1332811 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 1332996 -> 1332866 bytes .../epoch_code/compile/EPOCH_unitSpawn.sqf | 8 ++------ .../EPOCH_KeyDown.sqf | 1 + Sources/epoch_config/build.hpp | 2 +- Sources/epoch_server/build.hpp | 2 +- Sources/epoch_server_core/build.hpp | 2 +- Sources/epoch_server_settings/build.hpp | 2 +- build.txt | 2 +- 33 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo index 6a159ec59fdeda4f4e588994d517cb2eed4c33e9..15d999c92eca4e082d09a36f7a2e996a002a10cd 100644 GIT binary patch delta 273 zcmaDhMQXuJsRmOx$ZU`G7Rf##K)R*f`2-!?lzq`w6OU-X$2$ z22{6MSYk0FGf?H^osxl)MkWSkCQ8=4T(v;_e)s;Q(#)I`TT@fh>4w!zVa=6N?UhoD z+bgA*g!x%HdAT?_r|U>Dc~38uVzQWiO`1t&`f({HF%U~(`fn*F`RSspOd`{@q?xRz zCrdMFPVbUt@&n1nPS1JEB*4lE0@DS$7^U0iX)*yZGZ3=?G3)kunrxYN`~eI_4EYRM z455^THLhU!SnShuXh*^M`b^8r%woE&IcZN)cbcRHRJcbg6e1@Xw z0a*O+ z_a~KR=A_t~nwm~_RE^ji!qVW$AHYz=kk63CkjjwEP{L3=`LVCNpe2JVg8_pXgB61l kkTzg2-E8gW$0D+NLpz7z{Rq_?-`>vcx;&#-Dqy=k0I^*xH~;_u delta 136 zcmbQclyUA-#tFVmKf@>b%P`Mpt=X7&hzZD>Y{VQ3;!d8#94KjMVr*!vWX;P}3&iht z?@ubt%t^5|H8q*+s2Z_3gr&ig-<=_oA)O(SA&;SiA)ldW@?&3jK{Eye22%!C1}g>= m21^D<2ItMzets+>bH(DnU&(&-`oC^!-0T_0>L X_R4~DUWOZN5*~Q1{@o_r^|BuTZR9@; delta 205 zcmX?qQ2P8q=?Q`Mf5L0ST^JY`l1ejkQuHzk3V>_`Sj1Wr&JW}!=jWwmrt2l6N&gAo zIN>83Gf>s!7WP0%Lla{|GbL+Yu38{|zk5H}Oj}b^lje8q?eEwbftU%1nSq!Eh*`J4 zV`sZ@j^CXjlOdfUks*(vgdv}yX!_M_Z0>?)3Yg42}%W+jXzA^>K=EB_(m9Vc}!0sxY@K4Jg> diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index d0d48ad698bc1ac23d35319634d052e1d69568b7..e0955512b5e3168fd2852a9b89c46bce91241490 100644 GIT binary patch delta 265 zcmcb;Iq>GDzzJqdQgs_GM7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUp6RWEY=VzF_(LrkSa@##T%>Tk`C#QKuvl^Kgn42^o^V)vQi!pB9^p>BDJGRgJ z#h7`2dgE$l`{~X%nPl3PZZQEdGZ3=?F)I+W0Wmueb8J_-#ktp&(QNv|ldP%JH)wEi zw+AS20WpZ?0b*Vt<^y7WAQk{(K_C{|9-tsxag#rQp@<=$A&ViEA(^3sp?LcBpTh2f wmJF^81`K8lRt!!++JM1yyZ$fX8Sx_i;(t0PPk4AgU!*nivWVQNsO(o#0C+83ga7~l delta 411 zcmcb)De(5@zzJqdOc5I`M7Y`3&L|B(AU3&>LwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwI_BXsXoS$LxMhB_Q%We1YFfU`RnVjYo&1z_3Y-H4Y%xn8GFUGia&b(ZlnQ0pF zDfwZEMVX07IjNc@8L4^I(Mo>#B?^f-Ir-(ODGGV1iA4&D3Q38@sS3IZ0XeB4Mp0^U zL1KBHg5qSs>9W&RelqTGCB?9kqQsQcA{@qTzw?tZ^L~5lO(q~_24WT{%i=Qqff*~$^n|;NBGYv>xOm#n$#VfQHxPr^yg7hS`-384U3>ZuqTp6qwOc*Q~92uOqul*@J cBVJ_og(WNcXLK^x1tc;{)@G+iUpR9S0C)(MEdT%j diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index 7363ee09c03af664d77da19306720fc73148bfdd..e1f4f9a4f16e7eb9133950b60ca726ab6fa4025c 100644 GIT binary patch delta 265 zcmeyqH1O+^zzJqd3UwPTM7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUplc}o>=VzF_(LrkSa@##T%q$VLlheGSS&d8#%q^Rbd2K)D#Td74ddpA79oy&q zV$8fhy>T_O{dDJ>Ofv0Cx0ryK8Hibcm=%cGfS4VKIkqd^;@s=XXg2-fN!HZq8#K7M z+XEE1fEYyc05LBR^8qnG5DNgYAP@^}4^R;9xx^p9P{feWkj0S7kjzlRP(1zhCt-I% wO9od40|qk&D+VVZZNOl<-TAZdf_Rbh_l{dypN)AD$D49KqAKHko}`p80Q2))lmGw# delta 411 zcmeymB=GyvzzJqd91$BWM7Y`3&L|B(AU3&>LwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwI#u8B*&d)G;ql47u<+gixnAft_OiuHPW;HZ1HnM0w=C%Ep7h~KyXI?JO%ruSo zl>D&7qRhmkoK(${jMTj9XeGb=5{1N^oc!|C6otIh#3F@6g`~vdR0UmyfSgniqbRkw zAhA48L2Jk=dcs{sk?Fb`Ts-aP%^vqAf?t*3v1`MVQt_)TTCJdGgjttJ*4}KC} c5HHejpsvD{;r@ari+m@t%~rajv>C=VzF_(LrkSa@##T%v=$*lheGSS&d8#EKHk^d2K)D#Td74ddpA79oy&q zV$8fhy>T_O{dDJ>Ofv0Cx0ryK8Hibcm=%cGfS4VKIkqd^;@s=XXg2-fN!HZq8#K7M z+XEE1fEYyc05LBR^8qnG5DNgYAP@^}4^R+3eT_eWp@<=$A&ViEA(^3sp?JF1cVTxy wO9od40|qk&D+VVZZNOl9=LgyLwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwI#u-r?&d)G;ql47u<+gixm^ZW5OiuHPW;HZ1Ha2cP=C%Ep7h~KyXI?JO%ruSo zl>D&7qRhmkoK(${jMTj9XeGb=5{1N^oc!|C6otIh#3F@6g`~vdR0UmyfSgniqbRkw zAhA48L2Jk=dcs{sk?Fb`Ts-aP&{D=VzF_(LrkSa@##T%={6xlheGSS&d8#EDf5Ed2K)D#Td74ddpA79oy&q zV$8fhy>T_O{dDJ>Ofv0Cx0ryK8Hibcm=%cGfS4VKIkqd^;@s=XXg2-fN!HZq8#K7M z+XEE1fEYyc05LBR^8qnG5DNgYAP@^}4^R*`y2c;CP{feWkj0S7kjzlRP&|F&H(_@{ xO9od40|qk&D+VVZZNOl<{pB~|dGR9qHtv4EUOg)@@srJh%PH<9k9!x`002*tU9tcG delta 411 zcmbQaCUExJzzJqdLJ=D+M7Y`3&L|B(AU3&>LwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwI#vf4|&d)G;ql47u<+gixn0K<)OiuHPW;HZ1HnwO!=C%Ep7h~KyXI?JO%ruSo zl>D&7qRhmkoK(${jMTj9XeGb=5{1N^oc!|C6otIh#3F@6g`~vdR0UmyfSgniqbRkw zAhA48L2Jk=dcs{sk?Fb`Ts-aP%bpCI`?t*3v1`MVQt_)TTCJdGgjttJ*)4vJN cix;_isO@ua{~6!46M1)<^j+Xf6qPdo0CF&r>Hq)$ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 7e090158845a72c1eb484d2918cea2bb98e9eb57..dcb7dd2f54814aa8722a2f3f069e377ad823cfaa 100644 GIT binary patch delta 265 zcmZo(8`!ueaDo|=e%(e35pK2zDYfDML?;(=NKf9t&AGXZ`yMBocv)@u0fotmjG~+K zMI|)YwCifa`57i}bdcJ-+;$HSvq(hkNBr}vS6i+YzChRU~ w$>7Rhz+lE;#oz>_4H!(fpZ_MjAYO#8#pvu&TFEcJL?JOJC%-&3MIkRWu}C3NAt|vqRY6xFASV^XC`v6Z zNG#7&P@F6{U3R+4PsSatq!?CGl$erQgu}S)cYZQv-fwTc$ppmAK+FQftU$~L#Oy%K zvAy*s=M7gz)9D{=SzM++Fk|JJo^Y2@WV)^f7f<^+c`hL424WDK7l`?Qm>-A*fLIWS zg|?rQ7nZoj@6M3Pkj{|EkjGHMkk3#w{p(j@cR@1-0|rwDR|YEv69!8LM+WEZzTbow c#EZwV@N6zIrg{$6i|UFW>Ap09AFBIRF3v diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index 2c1dafe73993c169127f8eda4a080be1045fb667..fcb0c8c2d5d51065b1217dac14ba541372fe6ce6 100644 GIT binary patch delta 264 zcmbQSHgMXSzzJqdCUqMvM7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUpGpMT#=VzF_(LrkSa@##T%u*4xlheGSS&U2!ESrydZ9nS87{6|M%TLA~+voja z%)CFnaW%93bmyB)GVMyYn1GlWh*^M`6^Pk@m>q~YwkzG@-0R9{HvQpA*3{`6G`P6i z0~EM`7)0{`F)tAF0Wm)i3jnbo5DRS&P!N{C#vi~?#E{RB#gNL7%uvEmJiYFlu)Clo vgDZmpgBgPrgALwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwICK*v1&d)G;ql47u<+gixn2)g5OiuHPW-&A|HfcWUwf(3UWBfX2UM|keG>!O_ z{IJBL%*3ReRLzo%)V%6wCBOU1zm-JoKz5_D7CmC zu{=*fakAia+36}j8F#pnVpvI0VoGWe4&%1p`N^1hzrFP)6A&{4F$)m00x=s9vjZ{5 z_ST!6H(VJ_r+>6%ahd+WjFo44!d*s@>AD(RJniS?xqz4(h(T;#Am#&NejpYAVnHAl z+I~)6SpFKnJ3}TzIzu8u9zzL3K10#;KVOC21VnlheGSS&U2!4VsU7Z9nS87{6|M%TLA~+voja z%)CFnaW%93bmyB)GVMyYn1GlWh*^M`6^Pk@m>q~YwkzG@-0R9{HvQpA*3{`6G`P6i z0~EM`7)0{`F)tAF0Wm)i3jnbo5DRS&P!Qg5jX!{)h#{XLiy@UEnW2QCcsl=gVRu1G v23H0H1~UdL1}7kGz+k#P{k!nIc#%RupTx_2k-De5YI@W{=g7|eshb1<0ZLj# delta 410 zcmbQfHgM*;zzJqdN)a0^M7Y`3&L|B(AU3&>LwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwICLd87&d)G;ql47u<+gixm`}0ROiuHPW-&A|Hf=uYwf(3UWBfX2UM|keG>!O_ z{IJBL%*3ReRLzo%)V%6wCBOU1zm-JoKz5_D7CmC zu{=*fakAia+36}j8F#pnVpvI0VoGWe4&%1p`N^1hzrFP)6A&{4F$)m00x=s9vjZ{5 z_ST!6H(VJ_r+>6%ahd+WjFo44!d*s@>AD(RJniS?xqz4(h(T;#Am#&NejpYAVnHAl z+I~)6c*8Y*cZN)cbcRHRJcbg6e1@Xwz2Ai01q~YwkzG@-0R9{HvQpA*3{`6G`P6i z0~EM`7)0{`F)tAF0Wm)i3jnbo5DRS&P!JZl#vi~?#E{RB#gNL7%uvEmJU#!Lu)Clo vgDZmpgBgPrgAJb|)M7Y`3&L|B(AU3&>LwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwIrV>#b&d)G;ql47u<+gixm@lx_OiuHPW-&A|Hf=uYwf(3UWBfX2UM|keG>!O_ z{IJBL%*3ReRLzo%)V%6wCBOU1zm-JoKz5_D7CmC zu{=*fakAia+36}j8F#pnVpvI0VoGWe4&%1p`N^1hzrFP)6A&{4F$)m00x=s9vjZ{5 z_ST!6H(VJ_r+>6%ahd+WjFo44!d*s@>AD(RJniS?xqz4(h(T;#Am#&NejpYAVnHAl z+I~)6Sl}AJJ3}TzIzu8u9zzL3K10#;w_kq~YwkzG@-0R9{HvQpA*3{`6G`P6i z0~EM`7)0{`F)tAF0Wm)i3jnbo5DRS&P!QgIoj-t~h#{XLiy@UEnW2QCc)HXNVRu1G v23H0H1~UdL1}7kGz+k$)=!fu%coFtLwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwIrWsKi&d)G;ql47u<+gixn6I+dOiuHPW-&A|HfuiWwf(3UWBfX2UM|keG>!O_ z{IJBL%*3ReRLzo%)V%6wCBOU1zm-JoKz5_D7CmC zu{=*fakAia+36}j8F#pnVpvI0VoGWe4&%1p`N^1hzrFP)6A&{4F$)m00x=s9vjZ{5 z_ST!6H(VJ_r+>6%ahd+WjFo44!d*s@>AD(RJniS?xqz4(h(T;#Am#&NejpYAVnHAl z+I~)6c=vUFcZN)cbcRHRJcbg6e1@XwGrkME3z{()Fqks9GFUN~Fjz7;GB|Jl@LhOC byvV}^jh)|9a^_|HJfhh3ey`X{kz@4$91fPQ diff --git a/Server_Install_Pack/mpmissions/epoch.Napf.pbo b/Server_Install_Pack/mpmissions/epoch.Napf.pbo index ae812bf5cbb03fcb71c1ac58d380028f9854c099..ddc40a75f32d4b79d9b5af4dbc3dd6df9ce74a80 100644 GIT binary patch delta 264 zcmdn7IdI#izzJqd?sXe2M7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUpbE&Hh=VzF_(LrkSa@##T%=!_vlheGSS&U2!4V#a8Z9nS87{6|M%TLA~+voja z%)CFnaW%93bmyB)GVMyYn1GlWh*^M`6^Pk@m>q~YwkzG@-0R9{HvQpA*3{`6G`P6i z0~EM`7)0{`F)tAF0Wm)i3jnbo5DRS&P!JBk$sfQ_#E{RB#gNL7%uvEmJbl|wVRu1G v23H0H1~UdL1}7kGz+k$a@0akjc#$|+4}s?=6?$2+@`b|fnFSIg_xuC^X5Cp@ delta 410 zcmdnCDR9T;zzJqdMiCn=M7Y`3&L|B(AU3&>LwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwIrWa8g&d)G;ql47u<+gixm~XSzOiuHPW-&A|HfuiWwf(3UWBfX2UM|keG>!O_ z{IJBL%*3ReRLzo%)V%6wCBOU1zm-JoKz5_D7CmC zu{=*fakAia+36}j8F#pnVpvI0VoGWe4&%1p`N^1hzrFP)6A&{4F$)m00x=s9vjZ{5 z_ST!6H(VJ_r+>6%ahd+WjFo44!d*s@>AD(RJniS?xqz4(h(T;#Am#&NejpYAVnHAl z+I~)6IQ%BRJ3}TzIzu8u9zzL3K10!Tlb^!wf@TZ`45kdO3|0+-Rz49?qoehN>E a7fII^yH^t}>DK_61>yo7a diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index c3ae6cd557c983b1ce28e0e2302e74368234eb79..7970884e8f26edb703f5b0edb77e43f9ff0c4081 100644 GIT binary patch delta 264 zcmeBL7uc~jaDo|=Pu)ff5pK2zDYfDML?;(=NKf9t&AGXZ`yMBocv)@u0fotmjG~+K zMI|)YJnL%1`57i}bdcJ-+;$HSvq?nl+@{@7L_IbY; zGw)AtT+M7h-T5YyOuN!8CLm@8Viq7~1!6WJW(Q)9?Mk;e_qsBgO@DZjHFf$14KD8X z00k}}2GKk~%nQVPK+F%s0zfPX#6sHx6oi*w;}2jcV#sI6Vn}63W+-7Op3e4N*j><) v!Ii;)!HmI*!3jtkFqm$S`z|~qUgToEl$}S3aAx+u^;;SnLic~UEmjQxBcWUw delta 410 zcmeBJ8`!ljaDo|=S;R&Q5pK4%GfKk`h)pi!kezdSWXAulztNFh-nDX}#vQJt7*Z*RTH1jNih%mT!$K+Fcj>_E)1 zz4a#N4Od3f=^t%bT&6!TW96BiaFKnPy0D}E+FOxVi21bi1~n+ABY8jSP+PX zwx5$1UVe?=ogtGUogtASkD-JipP^`a%Qs=21^D<2IuW}z6sBW b7ja9w7PmiPQR2?Pt@Hk_Ha_|F^Ysq^x+Irk diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index 5a400c27db179ebca5e23b93b608d0d1e9a5ef2e..e770fe7e6f5a22c43e5aa050222df1fe157e4e43 100644 GIT binary patch delta 264 zcmZ3#E^zJIzzJqdfpr@#M7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUp^Q)^3=VzF_(LrkSa@##T%oY)~lheGSS&U2!jhc^oZ9nS87{6|M%TLA~+voja z%)CFnaW%93bmyB)GVMyYn1GlWh*^M`6^Pk@m>q~YwkzG@-0R9{HvQpA*3{`6G`P6i z0~EM`7)0{`F)tAF0Wm)i3jnbo5DRS&P!Qg9jX!{)h#{XLiy@UEnW2QCc)H+sVRu1G v23H0H1~UdL1}7kGz+k#P^Skh-c#-UDQ^f2FHoS4*6wtShGe2YX_nAHbddXWb delta 410 zcmZ3xHgNsAzzJqd))5;mM7Y`3&L|B(AU3&>LwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwIW)V>v&d)G;ql47u<+gixn4h!OOiuHPW-&A|Hg7)awf(3UWBfX2UM|keG>!O_ z{IJBL%*3ReRLzo%)V%6wCBOU1zm-JoKz5_D7CmC zu{=*fakAia+36}j8F#pnVpvI0VoGWe4&%1p`N^1hzrFP)6A&{4F$)m00x=s9vjZ{5 z_ST!6H(VJ_r+>6%ahd+WjFo44!d*s@>AD(RJniS?xqz4(h(T;#Am#&NejpYAVnHAl z+I~)6c+)k0cZN)cbcRHRJcbg6e1@Xw{ojP$1P33)*OcD-%$ze-*2QzlzDZ{RO_P=b diff --git a/Server_Install_Pack/mpmissions/epoch.Sara.pbo b/Server_Install_Pack/mpmissions/epoch.Sara.pbo index 0ad0fb1ebdf7b21d03f48048770f3ad18525e853..e7402167b270bcced8985fd165424a7a921c568f 100644 GIT binary patch delta 264 zcmbQaA#nQozzJqdVRaiVM7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUp3$CjT=VzF_(LrkSa@##T%(fA=lheGSS&U2!jhl~pZ9nS87{6|M%TLA~+voja z%)CFnaW%93bmyB)GVMyYn1GlWh*^M`6^Pk@m>q~YwkzG@-0R9{HvQpA*3{`6G`P6i z0~EM`7)0{`F)tAF0Wm)i3jnbo5DRS&P!Qg6oj-t~h#{XLiy@UEnW2QCc)IuxVRu1G v23H0H1~UdL1}7kGz+k#P|A+9jcoD_I%RX$sCtA;0n!2$?{8NcZ&-ZNrYN=eW delta 410 zcmbQfK5*uSzzJqd4iOtIM7Y`3&L|B(AU3&>LwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwIW*bo(&d)G;ql47u<+gixnBTJ2OiuHPW-&A|wrD=;wf(3UWBfX2UM|keG>!O_ z{IJBL%*3ReRLzo%)V%6wCBOU1zm-JoKz5_D7CmC zu{=*fakAia+36}j8F#pnVpvI0VoGWe4&%1p`N^1hzrFP)6A&{4F$)m00x=s9vjZ{5 z_ST!6H(VJ_r+>6%ahd+WjFo44!d*s@>AD(RJniS?xqz4(h(T;#Am#&NejpYAVnHAl z+I~)6c*k{qcZN)cbcRHRJcbg6e1@XwQ@;zl3z{()Fqks9GFUN~Fjz7;GB|I4`(1ci byokn0&z{GpO!dFq$eC;I8srw7m|qG29JiEz diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo index 93066ad17eb92c25f30342c361df8c1c3c11f3d7..f8df12018c798bdcc5a402b307dc58762152f8c6 100644 GIT binary patch delta 264 zcmZ3yA#maPzzJqd(RCXwM7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUpi>Rv&=VzF_(LrkSa@##T%uW%tlheGSS&U2!jhl~pZ9nS87{6|M%TLA~+voja z%)CFnaW%93bmyB)GVMyYn1GlWh*^M`6^Pk@m>q~YwkzG@-0R9{HvQpA*3{`6G`P6i z0~EM`7)0{`F)tAF0Wm)i3jnbo5DRS&P!QgAoj-t~h#{XLiy@UEnW2QCc)H{dVRu1G v23H0H1~UdL1}7kGz+k$)@Q3icc#)&)l6*2s+x5<@k{0hj8nvD0`?qrdk|SLt delta 410 zcmZ3uK5+4dzzJqdt`Qq8M7Y`3&L|B(AU3&>LwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwI<`hvI&d)G;ql47u<+gixm_M`DOiuHPW-&A|wrD=;wf(3UWBfX2UM|keG>!O_ z{IJBL%*3ReRLzo%)V%6wCBOU1zm-JoKz5_D7CmC zu{=*fakAia+36}j8F#pnVpvI0VoGWe4&%1p`N^1hzrFP)6A&{4F$)m00x=s9vjZ{5 z_ST!6H(VJ_r+>6%ahd+WjFo44!d*s@>AD(RJniS?xqz4(h(T;#Am#&NejpYAVnHAl z+I~)6c-M7)cZN)cbcRHRJcbg6e1@Xw)4vP53z{()Fqks9GFUN~Fjz7;GB|I4|6O=q byokBc@tczj8NRG!@V1bha$NP}nVxU}NA{G0 diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index 58c4c46fc5862554989a04bd5cec25d5159b7609..8ad3573fb2982d8fde6a8571a0bffc5f4100be06 100644 GIT binary patch delta 264 zcmZ3nA#mCHzzJqd33VGSM7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUpi><2-=VzF_(LrkSa@##T%q~YwkzG@-0R9{HvQpA*3{`6G`P6i z0~EM`7)0{`F)tAF0Wm)i3jnbo5DRS&P!QgGoj-t~h#{XLiy@UEnW2QCc)H9FVRu1G v23H0H1~UdL1}7kGz+k$)LwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwI<{nWS&d)G;ql47u<+gixn18a?OiuHPW-&A|wroD?wf(3UWBfX2UM|keG>!O_ z{IJBL%*3ReRLzo%)V%6wCBOU1zm-JoKz5_D7CmC zu{=*fakAia+36}j8F#pnVpvI0VoGWe4&%1p`N^1hzrFP)6A&{4F$)m00x=s9vjZ{5 z_ST!6H(VJ_r+>6%ahd+WjFo44!d*s@>AD(RJniS?xqz4(h(T;#Am#&NejpYAVnHAl z+I~)6c<*(7cZN)cbcRHRJcbg6e1@Xwv%U+v3z{()Fqks9GFUN~Fjz7;GB|Jl^j&yC byvU{xmgjre{>2o9Kb_L}X)WinbHbVcj_j5& diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index 11007bfa6be9cb06fb1b84ae87778332a1ced17e..ceccf5ce4de2d9a4fcf6ec7e694c4f08260e33c1 100644 GIT binary patch delta 264 zcmbQfE^zAFzzJqdsdXDIM7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUpORTF6=VzF_(LrkSa@##T%svsdlheGSS&U2!O`4B-Z9nS87{6|M%TLA~+voja z%)CFnaW%93bmyB)GVMyYn1GlWh*^M`6^Pk@m>q~YwkzG@-0R9{HvQpA*3{`6G`P6i z0~EM`7)0{`F)tAF0Wm)i3jnbo5DRS&P!L{qjX!{)h#{XLiy@UEnW2QCcsl2IVRu1G v23H0H1~UdL1}7kGz+k#P@w@P%c#*PYCxj#|wsr6J2(tdX_uITBy99Cog=k!+ delta 410 zcmbQbHgNj7zzJqd{t+83M7Y`3&L|B(AU3&>LwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwI<`YpH&d)G;ql47u<+gixnE$cXOiuHPW-&A|wroD?wf(3UWBfX2UM|keG>!O_ z{IJBL%*3ReRLzo%)V%6wCBOU1zm-JoKz5_D7CmC zu{=*fakAia+36}j8F#pnVpvI0VoGWe4&%1p`N^1hzrFP)6A&{4F$)m00x=s9vjZ{5 z_ST!6H(VJ_r+>6%ahd+WjFo44!d*s@>AD(RJniS?xqz4(h(T;#Am#&NejpYAVnHAl z+I~)6c-1w2cZN)cbcRHRJcbg6e1@Xw?capm1#QE7(2*0AYcbcmMzZ diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 5adac5afad662a14b333ce1477c944d6cfd951c3..de7e79d749d8f18bb873230ccd7c1c32cd48759e 100644 GIT binary patch delta 265 zcmeyrCh+g-zzJqdS#=vNM7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUpORK95=VzF_(LrkSa@##T%z+WLlheGSS&d8#O^ut6d2K)D#Td74ddpA79oy&q zV$8fhy>T_O{dDJ>Ofv0Cx0ryK8Hibcm=%cGfS4VKIkqd^;@s=XXg2-fN!HZq8#K7M z+XEE1fEYyc05LBR^8qnG5DNgYAP@^}4^R-6xW*sAP{feWkj0S7kjzlRP&~c-o3Oi} wC4(!20fQNX6@wFyHefK_e*T;AoOqFWH)pj8INw?#bALwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwI78p?*&d)G;ql47u<+gixm|56rCZ~Btvl^P17??C4^V)vQi!pAUGcOlsW|~HP zN`6>kQD$ONPO4@}MrvMlw31(bi9%vdPJVf6ib7s$Vv$0kLQ-OJs)DXUKu#)%QIuL- zkXW9lpg37@y6kk7pNulL?5KftUq|S%H`hh}nUd zV|(jO&Ks_brqe&#vbaotV8+TbJ>f2+$aGx|E}r&t@?1d74a6WeFA(zqF+UIs0I?tt z3vE9qFD!A5-<=_oA)O(SA&;SiA)ldW`q!_*?t*3v1`MVQt_)TTCJdGgjttJ*eZL9M ci5F32+Vl7Bom}DhsgHFU&&~h$)9l>`0F&L8p#T5? diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index 76afd578af8ec64105b7edaa0420380099c18c9b..8b20e397a157b77867f4e31be5d5ed4a6c61b0de 100644 GIT binary patch delta 265 zcmaF6Ht_YDzzJqdd375tM7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUp%dV>p=VzF_(LrkSa@##T%wZ9=lheGSS&d8#O)Z*_d2K)D#Td74ddpA79oy&q zV$8fhy>T_O{dDJ>Ofv0Cx0ryK8Hibcm=%cGfS4VKIkqd^;@s=XXg2-fN!HZq8#K7M z+XEE1fEYyc05LBR^8qnG5DNgYAP@^}4^R+pxyB#BP{feWkj0S7kjzlRP(1zdH(_@{ wO9od40|qk&D+VVZZNOl<-TJ%mym%3-V%EGLr+;2J{YbhLwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwI78X$(&d)G;ql47u<+gixn7P<$CZ~Btvl^P17+5wR^V)vQi!pAUGcOlsW|~HP zN`6>kQD$ONPO4@}MrvMlw31(bi9%vdPJVf6ib7s$Vv$0kLQ-OJs)DXUKu#)%QIuL- zkXW9lpg37@y6kk7pNulL?5KftUq|S%H`hh}nUd zV|(jO&Ks_brqe&#vbaotV8+TbJ>f2+$aGx|E}r&t@?1d74a6WeFA(zqF+UIs0I?tt z3vE9qFWhpC-<=_oA)O(SA&;SiA)ldWdg3=>cR@1-0|rwDR|YEv69!8LM+WEZJHH9f cix<&jDt_6Mep^UQY~p_IN9E7fZQ6VR0B+ut+W-In diff --git a/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo b/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo index 9149a69cda6f15d1f40af7f9a576ec59fb8c7910..a3e25fd935fb6f6774f90bb0d1c7007ce485dd18 100644 GIT binary patch delta 265 zcmeyqG4Sh#zzJqd#dRAkM7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUpE2ygt=VzF_(LrkSa@##T%+V3GlheGSS&d8#&5WCmd2K)D#Td74ddpA79oy&q zV$8fhy>T_O{dDJ>Ofv0Cx0ryK8Hibcm=%cGfS4VKIkqd^;@s=XXg2-fN!HZq8#K7M z+XEE1fEYyc05LBR^8qnG5DNgYAP@^}4^R-Ea)UpBp@<=$A&ViEA(^3sp?Lb|AHwc} wmJF^81`K8lRt!!++JM1yyZ2Aw8Sx^X=birEWV;h#lXvD9+reC&w~@Vz0qHDX0ssI2 delta 411 zcmeymA@KXgzzJqdaSLwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwI79CL=&d)G;ql47u<+gixm<8BsCZ~Btvl^P17@9O6^V)vQi!pAUGcOlsW|~HP zN`6>kQD$ONPO4@}MrvMlw31(bi9%vdPJVf6ib7s$Vv$0kLQ-OJs)DXUKu#)%QIuL- zkXW9lpg37@y6kk7pNulL?5KftUq|S%H`hh}nUd zV|(jO&Ks_brqe&#vbaotV8+TbJ>f2+$aGx|E}r&t@?1d74a6WeFA(zqF+UIs0I?tt z3vE9qFFfT2zdJ)FLpnnuLmop3Lq0>%^uiy)?t*3v1`MVQt_)TTCJdGgjttJ*PyP^| c5iipDHTs)m$*xlWf8CLbxVAmu`?*^c0MYQ3^8f$< diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index 46bd420b1c279a14abf88ec12cc73409403388a1..4dd5c537310a266fb8d5547938ffd79a8f199c7b 100644 GIT binary patch delta 264 zcmaF6Ch+y@zzJqdb#)spM7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUptE#IF=VzF_(LrkSa@##T%xMv|lheGSS&U2!&6|&UZ9nS87{6|M%TLA~+voja z%)CFnaW%93bmyB)GVMyYn1GlWh*^M`6^Pk@m>q~YwkzG@-0R9{HvQpA*3{`6G`P6i z0~EM`7)0{`F)tAF0Wm)i3jnbo5DRS&P!JZl#vi~?#E{RB#gNL7%uvEmJU#!Lu)Clo vgDZmpgBgPrgA1 delta 410 zcmaF8I`Hk9zzJqd84(*TM7Y`3&L|B(AU3&>LwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwImKsqT&d)G;ql47u<+gixm}S^%CZ~BtvlyC~7&RaD+J4lFF@BvhFBfNKnnrv| zepq5rW@1uKs%A+>YF>4;l3#v_LSjx%etBw&LSAZOkwT(EQettcg04b9PAZ5|lv-Sn zSe~b#I9YJI>~xi%j5}OOF|4F0F(tJKhjH8Q{AA3$-`;wY35c12m<5PgftU@5*@2j2 zd+SZk8?KC|(?8m>xJ-Xw#>z82;Vz@dbX^TDp7wL{TtLhX#2_{=5c2^sKM)H5u^q~YwkzG@-0R9{HvQpA*3{`6G`P6i z0~EM`7)0{`F)tAF0Wm)i3jnbo5DRS&P!QgIoj-t~h#{XLiy@UEnW2QCc)HXNVRu1G v23H0H1~UdL1}7kGz+k$)=!fvKcoDtohkv!#FgW)x+&wJ6LwDvfqsKJ>4AflM delta 410 zcmZ3rK5)&3zzJqdxe*&JM7Y`3&L|B(AU3&>LwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwImK9MO&d)G;ql47u<+gixn3dRSCZ~BtvlyC~7&RaD+J4lFF@BvhFBfNKnnrv| zepq5rW@1uKs%A+>YF>4;l3#v_LSjx%etBw&LSAZOkwT(EQettcg04b9PAZ5|lv-Sn zSe~b#I9YJI>~xi%j5}OOF|4F0F(tJKhjH8Q{AA3$-`;wY35c12m<5PgftU@5*@2j2 zd+SZk8?KC|(?8m>xJ-Xw#>z82;Vz@dbX^TDp7wL{TtLhX#2_{=5c2^sKM)H5u^t*B8FEiQASJ=I2g|r|5z(A8v diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index 11a230844755292241f156d3808370986f702024..96245153d602953958479e554fec524db8012b4b 100644 GIT binary patch delta 264 zcmX@RHt_VCzzJqd9d#QmM7Y@=q|}E06P;YhAw78mH|ORu?t7eU;$^kr2NWhNGKy}_ z7nRUpYptsd=VzF_(LrkSa@##T%mop(lheGSS&U2!Et-#dZ9nS87{6|M%TLA~+voja z%)CFnaW%93bmyB)GVMyYn1GlWh*^M`6^Pk@m>q~YwkzG@-0R9{HvQpA*3{`6G`P6i z0~EM`7)0{`F)tAF0Wm)i3jnbo5DRS&P!LYJ#vi~?#E{RB#gNL7%uvEmJpJ%DVRu1G v23H0H1~UdL1}7kGz+k#v`n&MFcoAmy&6?K|_8nq0yA+>#YT~Rbt2=lAPOeLwfQCZqChR-1j)y#4c2aHz-V2WE9<; zFDjwImLE|Y&d)G;ql47u<+gixm^IjHCZ~BtvlyC~7&jmF+J4lFF@BvhFBfNKnnrv| zepq5rW@1uKs%A+>YF>4;l3#v_LSjx%etBw&LSAZOkwT(EQettcg04b9PAZ5|lv-Sn zSe~b#I9YJI>~xi%j5}OOF|4F0F(tJKhjH8Q{AA3$-`;wY35c12m<5PgftU@5*@2j2 zd+SZk8?KC|(?8m>xJ-Xw#>z82;Vz@dbX^TDp7wL{TtLhX#2_{=5c2^sKM)H5u^=21^D<2IuWFzX{Ka b7r9(uSH9!s{Wppywy?cF{9i*|sZsJ+Vd5`+9ubCNOb3*Z3c)+w80N~$USpWb4 delta 411 zcmZo#8`!cgaDo|Aa>Pap5pK4%GfKk`h)pi!kel$n^6ld4&gk(yT>t>l+qqL7%AlV6^iqL7!GSfr4skd#=Qs-UY7kdq2x6r~my zB$nqXC{7lfE<0W2C*uxRQVc68N=!*D!eQL@J3kpS@3*(!WCCJlAZ7t#Rv=~rVs;?r z*xq`R^M)&<>GY4bEH2X@n6dIqPq@n{GF?}Li>LjZJQomi12Krr3&eat%n!r@Kr9Hv zLfg;D3opLL@6M3Pkj{|EkjGHMkk3#wz2Td%yPz3^0fQ-nD}xn-34~8qw<4um#ME?qRLqe0CO0WJ^%m! diff --git a/Sources/epoch_code/compile/EPOCH_unitSpawn.sqf b/Sources/epoch_code/compile/EPOCH_unitSpawn.sqf index 9b6a11af..22f12146 100644 --- a/Sources/epoch_code/compile/EPOCH_unitSpawn.sqf +++ b/Sources/epoch_code/compile/EPOCH_unitSpawn.sqf @@ -43,15 +43,11 @@ _jammers = []; _config = 'CfgEpochClient' call EPOCH_returnConfig; _jammerRange = getNumber(_config >> "buildingJammerRange"); _jammers = nearestObjects[_targetPos, ["PlotPole_EPOCH"], _jammerRange]; -if(count _jammers > 0 && (_unitClass in _nonJammer))exitWith{ - if(_doVariable)then{["Not allowed near a base - Please respawn !", 5] call Epoch_message;}; -}; +if(count _jammers > 0 && (_unitClass in _nonJammer))exitWith{}; _restricted = []; _restricted = nearestObjects [_targetPos, ["ProtectionZone_Invisible_F"], _nonTraderAIRange]; -if(count _restricted > 0 && (_unitClass in _nonTrader))exitWith{ - if(_doVariable)then{["Not allowed near a trader - Please respawn !", 5] call Epoch_message;}; -}; +if(count _restricted > 0 && (_unitClass in _nonTrader))exitWith{}; _disableAI = { {_this disableAI _x}forEach["TARGET","AUTOTARGET","FSM"]; diff --git a/Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf b/Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf index 9be22c49..a963444f 100644 --- a/Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf +++ b/Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf @@ -261,6 +261,7 @@ if (_dikCode in (actionKeys "TacticalView")) then { }; if (_dikCode in (actionKeys "NightVision")) then { if (EPOCH_playerEnergy == 0) then { + ["Night Vision Goggles: Need Energy", 5] call Epoch_message; _handled = true; }; }; diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index 62469604..7e14e2af 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=555; +build=556; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index 62469604..7e14e2af 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=555; +build=556; diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index 62469604..7e14e2af 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=555; +build=556; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index 62469604..7e14e2af 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=555; +build=556; diff --git a/build.txt b/build.txt index c374155a..fc35a587 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -555 +556