From 443c6e90bc54b3036ab83c394a87e45ef4ac0ac8 Mon Sep 17 00:00:00 2001 From: vbawol Date: Sun, 10 Jul 2016 08:54:27 -0500 Subject: [PATCH] 0.3.9 b566 fixed incorrect index in weighted array fnc when zombies not used added 3 additional water sources fixed BE kick when base building since b564 removed allowdamage false on player revive, that caused player immunity to server side AI. trade request text feedback changed --- .../@epochhive/addons/epoch_server.pbo | Bin 438831 -> 438982 bytes .../@epochhive/addons/epoch_server_core.pbo | Bin 21149 -> 21149 bytes .../addons/epoch_server_settings.pbo | Bin 451335 -> 451335 bytes .../mpmissions/epoch.Altis.pbo | Bin 1337911 -> 1338118 bytes .../mpmissions/epoch.Australia.pbo | Bin 1336147 -> 1336354 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 1337240 -> 1337447 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 1337079 -> 1337286 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 1337055 -> 1337262 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 1337076 -> 1337283 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 1337205 -> 1337412 bytes .../mpmissions/epoch.Esseker.pbo | Bin 1337043 -> 1337250 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 1337482 -> 1337689 bytes Server_Install_Pack/mpmissions/epoch.Napf.pbo | Bin 1337876 -> 1338083 bytes .../mpmissions/epoch.Porto.pbo | Bin 1337190 -> 1337397 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 1337227 -> 1337434 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 1337461 -> 1337668 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 1337471 -> 1337678 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 1337476 -> 1337683 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 1337203 -> 1337410 bytes .../mpmissions/epoch.Stratis.pbo | Bin 1337051 -> 1337258 bytes .../mpmissions/epoch.Takistan.pbo | Bin 1337161 -> 1337368 bytes .../mpmissions/epoch.Tanoa.pbo | Bin 1337683 -> 1337890 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 1337033 -> 1337240 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 1337480 -> 1337687 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 1337129 -> 1337336 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 1337184 -> 1337391 bytes Server_Install_Pack/sc/BattlEye/scripts.txt | 2 +- .../compile/building/EPOCH_isBuildAllowed.sqf | 5 +++-- .../Configs/CfgBuildingLootPos.hpp | 2 +- .../CfgEpochClient/WorldInteractions.hpp | 2 ++ Sources/epoch_config/build.hpp | 2 +- Sources/epoch_server/build.hpp | 2 +- .../EPOCH_server_triggerEvent.sqf | 2 +- .../EPOCH_server_destroyTrash.sqf | 2 +- .../epoch_server/EPOCH_weightedArray.sqf | 7 +++++-- Sources/epoch_server_core/build.hpp | 2 +- Sources/epoch_server_settings/build.hpp | 2 +- build.txt | 2 +- 38 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo index 3588141696941b8b7dbe26e90dfd66448c1f3f88..433c16eef4d79dc744d20874f2882596abc4fd6e 100644 GIT binary patch delta 386 zcmZ4gMC#a6sR^)r zaq>UOKq*5L12Z#IC2L-;S|EPEdw)`CW=@K&shR2Yz&DIxoA*l<2~WRpmyv}fu_!%t za(|ncm_oEtd`V?Ns*;Y9l1{XeQfzE2Q0w&WC9HCrQ}sU1nS481X!6W9eqM+o1D$At z*jSy(da8<>OHXgvIsKJCqw4m8R>qIbeDOK?`6ZrtDXA3-wh9K@qd1x38CgJL(+_Yl zX~-)80g4hNj<$l~^z+UmRj2>WVC3BViYJbRZD&Ji_${{0euA9rAQLx7Ni1Sy zvXGekPcl%-z|6?R)JVyim#Y?t-|ya^RGOKSVryzzuYA;cY1>ZtK|0jRz|*->6%9vxwo(7Wb$R4eny9he>xjClfvW+^LeKy zax%mm_1HfD|iawkt@4wN!9F)%Z;P_pLbss-Zr vyZ0xRX6B^WnwptTc2ten9KvGiC-U&!Yj;CN-5Cqk?Gb%{a9iX{D38JU=xC|UDz)dKPR v-TRYDGjmdGP0dUuJE}%(4q-9%6S0(^?eEyxSZ|B0d9VI4 V)4b60?DCGhh&^{Q=A86D4FD^yFP#7Y delta 136 zcmZoaCf$BadP1Orhhk&63j+f~QfX#Rie5%R0g#OVLgEt(Wto9$HctG&#v~*@xtTps z%D~LX#MDg5nwP5j=lXIJ0lP?0WmWWvj8#c_IK=TthYrn9n1G~ UERCG0`M+1`OVGnhmn@2H08~IMZ2$lO diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 4e5261705fd4ca74610d5ed3c07debeabca6bc06..876cb5283a71ed2f970194ca9fd59baa723294ca 100644 GIT binary patch delta 461 zcmdmfC9v&U-~=<~%Rx;WE&Z6-;;ov(XUa`hWK`L_k*SWA?YL!A_+x>|g&Z=Q137Mq zvL1_U4Bs@_QA}*|dIh%03i3RgBjohu+0F+wh4V8^-sm8;dAV&5Bl{JIJ;X44gFSzM-1Fk)4hUT4b1 z(=M;e1;pGy%(Goymp46$(XhR}pBISvwzv25zxptp_qQOIkWXS>N_==?NotW(Vo_0Q zPQ2UnhYbP}5OIhQSQaWSfKVTjn3oL|ZLe(*0AfKP7TR9hAiV6QNXCm<55-a&7vEaG OLV=-dhRw0_&kO;M4XT9z delta 319 zcmZp>7P$RN-~=;fU&Y3amVQiZLH`@VGvy{LGOBFe$W+J5cJ@zk_+x>|g&Z=Q137Mq zP8MKhVeFmkC?+;}y#m{01$mz7(e=!{n^WbKzthkE>O;FjqW};K0l3g>5-ywO2w^K#oBM)oUyP2tb(uuMMS zDmgvVNmzJun!PA1E30)=`2NieE{|E6{1qpsdPTDtni!awTW&t)6>7IxuG52gb7s#f zMk9TFg%E!ie=CKe)bjkIY=yl15{1l^)WjTxl6-~I;#7sioSfXu;^NHwy!@oB)Z~)l zX8yi*{yxU-{C!O9?-kSXi*gf76rzEzVRveXnEh3PZ*G8#@V zn$0OOc|$MD^aJOa*xFNTnSq!Eh*^Oc#AgR$j_s+noSy3$&892Vvbap2V8p60z0Q=2 zr(Ir`3y8Uam}k4ZE^m4gqhWh{KQ9pTZEx@AfAwKH?{7gaA)my&l=$$(lGGxn#G<0q zoOrkC4;us|AmR`quq;$u0HHo4F)te`+Fsir0K|eoEVRA0LHN)kk%{Vp>dUufE!>XSE delta 319 zcmZ2b)e$+P(@Hiq*vOy1}qwRyR14QS zmhSXm1~Za-Rxvg^_q99sF>ZJ6V`6?k-LIBeQn;WfwYXS8Jw#ohBwryhIXShUWb(vb z+36q7GqJVrs$~XZ79eH?Vi2Dlh&i_Js^#=t&uBV5-;}GMy+oG_h`E87XM2e*Z+a4= zQTv^KULfY%ey5-R)rWS6Mgbre1Y)7>4voU+9*JlcKaMp`oGiZF`NH4+ZJw_!Hr$#I E02YUJkpKVy diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index a0e45975933f9a45edb389c7785027a3892885c7..f897369ba73316aaddd4f54660e15b1c8867d0dc 100644 GIT binary patch delta 461 zcmbPnKJfX4zzJr|cY~TXTKX}u#alIn&y<_2$f&Y;BU2qK+i}aL@W%p^3pr#q2XfpJ zWjz+z7`|z;qnOy_^$Kj0736s~N66{Rv)u}63g>5-ywO2w^K#oBM)oUyP2tb(uuMMS zDmgvVNmzJun!PA1E30)=`2NieE{|E6LKG*bdPTDtni!Z_m~KAi6>7IxuG52gb7s#f zMk9TFg%E!ie=CKe)bjkIY=yl15{1l^)WjTxl6-~I;#7sioSfXu;^NHwy!@oB)Z~)l zX8yi*{yxU-{C!O9?-kSXi*gf76rzEzVRveXnEh3PZ*G8#@V zn$0OOc|$MD^aJOa*xFNTnSq!Eh*^Oc#AgR$j_s+noSy3$&892Vvbap2V8p60z0Q=2 zr(Ir`3y8Uam}k4ZE^m4gqhWh{KQ9pTZEx@AfAwKH?{7gaA)my&l=$$(lGGxn#G<0q zoOrkC4;us|AmR`quq;$u0HHo4F)te`+Fsir0K|eoEVRA0L74ry$n6!3<=c(aJPO)& Oag@Kd+i>K>jl%!~YpN3f delta 319 zcmaEUA#ld|zzJr|VTz3#E&Z6-g8nyzXUa`hWK`L_k*SWA?d+f8@W%p^3pr#q2XfpJ zoh-o2!q_|6QA}*|dIh%03i3SDqwAS@H>b)e$+HD3Hiq*vOy1}qwRyR14QS zmhSXm1~Za-Rxvg^_q99sF>ZJ6V`6?k-LIBeQn;WfwYXS8Jw#ohBwryhIXShUWb(vb z+36q7GqJVrs$~XZ79eH?Vi2Dlh&i_Js^#=t&uBV5-;}GMy+oG_h`E87XM2e*Z+a4= zQTv^KULfY%ey5-R)rWS6Mgbre1Y)7>4voUX&qb8AWDAeaYTMbn!740cn?t@-smLk- DCDL-W diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index e7db397789ee36d847637d656bdd8a2b5b917940..d60365b02f3f0b27be6b2b2396199cf8c4afe42a 100644 GIT binary patch delta 461 zcmex5-ywO2w^K#oBM)oUyP2tb(uuMMS zDmgvVNmzJun!PA1E30)=`2NieE{|E6A{8g6dPTDtni!Z_8f-r16>7IxuG52gb7s#f zMk9TFg%E!ie=CKe)bjkIY=yl15{1l^)WjTxl6-~I;#7sioSfXu;^NHwy!@oB)Z~)l zX8yi*{yxU-{C!O9?-kSXi*gf76rzEzVRveXnEh3PZ*G8#@V zn$0OOc|$MD^aJOa*xFNTnSq!Eh*^Oc#AgR$j_s+noSy3$&892Vvbap2V8p60z0Q=2 zr(Ir`3y8Uam}k4ZE^m4gqhWh{KQ9pTZEx@AfAwKH?{7gaA)my&l=$$(lGGxn#G<0q zoOrkC4;us|AmR`quq;$u0HHo4F)te`+Fsir0K|eoEVRA0K{)N1NR~)|_Z3G*XEjw1 Oj{ru`6{kA@ delta 319 zcmX?hKJfe5zzJr|(Ta^5E&Z6-g8nyzXUa`hWK`L_k*SWA?d+f8@W%p^3pr#q2XfpJ zoh-o2!q_|6QA}*|dIh%03i3SDqwAS@H>b)e$+JZ$Hiq*vOy1}qwRyR14QS zmhSXm1~Za-Rxvg^_q99sF>ZJ6V`6?k-LIBeQn;WfwYXS8Jw#ohBwryhIXShUWb(vb z+36q7GqJVrs$~XZ79eH?Vi2Dlh&i_Js^#=t&uBV5-;}GMy+oG_h`E87XM2e*Z+a4= zQTv^KULfY%ey5-R)rWS6Mgbre1Y)7>4voS^&qQhqrp%1Hzm<9Qn-`(dCp%uLY%7@o E0HtSk9{>OV diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index e0b957ac5ea706b9e623a646da6863ec98fd93d5..274acafe4f1cd8f15cf6c1d02710ea5ca2203818 100644 GIT binary patch delta 461 zcmcbAHgMhfzzJr|&x4vaTKX}u#alIn&y<_2$f&Y;BU2qK+i}aL@W%p^3pr#q2XfpJ zWjz+z7`|z;qnOy_^$Kj0736s~N66{RvporF3g>5-ywO2w^K#oBM)oUyP2tb(uuMMS zDmgvVNmzJun!PA1E30)=`2NieE{|E6VihN+dPTDtni!Z_nr=Sk6>7IxuG52gb7s#f zMk9TFg%E!ie=CKe)bjkIY=yl15{1l^)WjTxl6-~I;#7sioSfXu;^NHwy!@oB)Z~)l zX8yi*{yxU-{C!O9?-kSXi*gf76rzEzVRveXnEh3PZ*G8#@V zn$0OOc|$MD^aJOa*xFNTnSq!Eh*^Oc#AgR$j_s+noSy3$&892Vvbap2V8p60z0Q=2 zr(Ir`3y8Uam}k4ZE^m4gqhWh{KQ9pTZEx@AfAwKH?{7gaA)my&l=$$(lGGxn#G<0q zoOrkC4;us|AmR`quq;$u0HHo4F)te`+Fsir0K|eoEVRA0LD=t^i2ZWO1=VMCZ0B08 OyinM=Rq0u1=XC%|bgByg delta 319 zcmZ2?KJfn8zzJr|35tyyE&Z6-g8nyzXUa`hWK`L_k*SWA?d+f8@W%p^3pr#q2XfpJ zoh-o2!q_|6QA}*|dIh%03i3SDqwAS@H>b)e$+N{OHiq*vOy1}qwRyR14QS zmhSXm1~Za-Rxvg^_q99sF>ZJ6V`6?k-LIBeQn;WfwYXS8Jw#ohBwryhIXShUWb(vb z+36q7GqJVrs$~XZ79eH?Vi2Dlh&i_Js^#=t&uBV5-;}GMy+oG_h`E87XM2e*Z+a4= zQTv^KULfY%ey5-R)rWS6Mgbre1Y)7>4voT5&qP?l7IHl*x}lYvcHUS^iHZB6&;w@x DPvLS{ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index 7fb674bb1cdaa1e624df349b1f2e57d70d05c3bb..1c2bc5538f59f9fcc4a0f2f7da6857db175e81fe 100644 GIT binary patch delta 461 zcmexzHt_KIzzJr|Z-SaOTKX}u#alIn&y<_2$f&Y;BU2qK+i}aL@W%p^3pr#q2XfpJ zWjz+z7`|z;qnOy_^$Kj0736s~N66{Rv%L&z3g>5-ywO2w^K#oBM)oUyP2tb(uuMMS zDmgvVNmzJun!PA1E30)=`2NieE{|E6k`yPWdPTDtni!ZH7;HY~6>7IxuG52gb7s#f zMk9TFg%E!ie=CKe)bjkIY=yl15{1l^)WjTxl6-~I;#7sioSfXu;^NHwy!@oB)Z~)l zX8yi*{yxU-{C!O9?-kSXi*gf76rzEzVRveXnEh3PZ*G8#@V zn$0OOc|$MD^aJOa*xFNTnSq!Eh*^Oc#AgR$j_s+noSy3$&892Vvbap2V8p60z0Q=2 zr(Ir`3y8Uam}k4ZE^m4gqhWh{KQ9pTZEx@AfAwKH?{7gaA)my&l=$$(lGGxn#G<0q zoOrkC4;us|AmR`quq;$u0HHo4F)te`+Fsir0K|eoEVRA0K{)xD$eIZWPA6_lPVP{8 O!Z!1m_?5h`Ne=<2SgP{? delta 319 zcmX?nKJd%gzzJr|sfvvoE&Z6-g8nyzXUa`hWK`L_k*SWA?d+f8@W%p^3pr#q2XfpJ zoh-o2!q_|6QA}*|dIh%03i3SDqwAS@H>b)e$+IOXHiq*vOy1}qwRyR14QS zmhSXm1~Za-Rxvg^_q99sF>ZJ6V`6?k-LIBeQn;WfwYXS8Jw#ohBwryhIXShUWb(vb z+36q7GqJVrs$~XZ79eH?Vi2Dlh&i_Js^#=t&uBV5-;}GMy+oG_h`E87XM2e*Z+a4= zQTv^KULfY%ey5-R)rWS6Mgbre1Y)7>4voV3&qP);MY=B6t(6g!6E%BPAk&=Jcf1Dx DjO}ue diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index f224a7baa7232fffa24726d73e7aff203edee76b..b3c7770ee44712bf4150ad55483dec998f2627b0 100644 GIT binary patch delta 461 zcmex*F7U{OzzJr|AA_1UTKX}u#alIn&y<_2$f&Y;BU2qK+i}aL@W%p^3pr#q2XfpJ zWjz+z7`|z;qnOy_^$Kj0736s~N66{Rv%L#y3g>5-ywO2w^K#oBM)oUyP2tb(uuMMS zDmgvVNmzJun!PA1E30)=`2NieE{|E6(iJDCdPTDtni!ZHm~KAi6>7IxuG52gb7s#f zMk9TFg%E!ie=CKe)bjkIY=yl15{1l^)WjTxl6-~I;#7sioSfXu;^NHwy!@oB)Z~)l zX8yi*{yxU-{C!O9?-kSXi*gf76rzEzVRveXnEh3PZ*G8#@V zn$0OOc|$MD^aJOa*xFNTnSq!Eh*^Oc#AgR$j_s+noSy3$&892Vvbap2V8p60z0Q=2 zr(Ir`3y8Uam}k4ZE^m4gqhWh{KQ9pTZEx@AfAwKH?{7gaA)my&l=$$(lGGxn#G<0q zoOrkC4;us|AmR`quq;$u0HHo4F)te`+Fsir0K|eoEVRA0LHNltk+Zv84htKYhAm{g O9Q-d$=%m;EuWb)e$+M*^Hiq*vOy1}qwRyR14QS zmhSXm1~Za-Rxvg^_q99sF>ZJ6V`6?k-LIBeQn;WfwYXS8Jw#ohBwryhIXShUWb(vb z+36q7GqJVrs$~XZ79eH?Vi2Dlh&i_Js^#=t&uBV5-;}GMy+oG_h`E87XM2e*Z+a4= zQTv^KULfY%ey5-R)rWS6Mgbre1Y)7>4voSeo{6vqOjZ1y$d~kK?Z(|#ye6HE675L^ E0L40WWdHyG diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index d185a1e0fb3ace1e858d8ac9a5d17457e1c680ab..20b54f3e80539c8f8358fd35be79d914e40005be 100644 GIT binary patch delta 461 zcmcb7HgM7TzzJr|UxJ!8TKX}u#alIn&y<_2$f&Y;BU2qK+i}aL@W%p^3pr#q2XfpJ zWjz+z7`|z;qnOy_^$Kj0736s~N66{RvwaF`3g>5-ywO2w^K#oBM)oUyP2tb(uuMMS zDmgvVNmzJun!PA1E30)=`2NieE{|E6aug@0dPTDtni!ZHSZqG#6>7IxuG52gb7s#f zMk9TFg%E!ie=CKe)bjkIY=yl15{1l^)WjTxl6-~I;#7sioSfXu;^NHwy!@oB)Z~)l zX8yi*{yxU-{C!O9?-kSXi*gf76rzEzVRveXnEh3PZ*G8#@V zn$0OOc|$MD^aJOa*xFNTnSq!Eh*^Oc#AgR$j_s+noSy3$&892Vvbap2V8p60z0Q=2 zr(Ir`3y8Uam}k4ZE^m4gqhWh{KQ9pTZEx@AfAwKH?{7gaA)my&l=$$(lGGxn#G<0q zoOrkC4;us|AmR`quq;$u0HHo4F)te`+Fsir0K|eoEVRA0LD=b;2=@c_gc~-0OM8=T O=f8a8E_rqKRUH6boT^L! delta 319 zcmZ2b)e$+P7sHiq*vOy1}qwRyR14QS zmhSXm1~Za-Rxvg^_q99sF>ZJ6V`6?k-LIBeQn;WfwYXS8Jw#ohBwryhIXShUWb(vb z+36q7GqJVrs$~XZ79eH?Vi2Dlh&i_Js^#=t&uBV5-;}GMy+oG_h`E87XM2e*Z+a4= zQTv^KULfY%ey5-R)rWS6Mgbre1Y)7>4voTo&qQi0&MbJowl#Hs`zo`Y+il-oT*Si; E0Ev=ywg3PC diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index 9f5365e8bc48b1f68b48dc4ab7dbfac8750cf07b..c0f2f4741880f573b8b696ae2b9b2cdfc06cad54 100644 GIT binary patch delta 461 zcmeCW7|g&Z=Q137Mq zvL1_U4Bs@_QA}*|dIh%03i3RgBjohu*}eufh4V8^-sm8;dAV&5Bl{JIJ;X44gFSzM-1Fk)4hUT4b1 z(=M;e1;pGy%(Goymp46$(XhR}pBISvwzv25zxptp_qQOIkWXS>N_==?NotW(Vo_0Q zPQ2UnhYbP}5OIhQSQaWSfKVTjn3oL|ZLe(*0AfKP7TR9hApG;W$fwD(j>_)7-@Es0 PWu4X4lo``x6Fva|fTOH$ delta 319 zcmcb4DX{Be-~=<~V#UUdmVQiZLH`@VGvy{LGOBFe$W+J5cJ@zk_+x>|g&Z=Q137Mq zP8MKhVeFmkC?+;}y#m{01$mz7(e=!{n^WbKzthkE>O;FjqW};K0OV diff --git a/Server_Install_Pack/mpmissions/epoch.Napf.pbo b/Server_Install_Pack/mpmissions/epoch.Napf.pbo index 9ac6b445132c548339290df2fa28e6d3a0e7e2c1..206d1b413faf691c8c15b66c9f3818e4d0c7ef06 100644 GIT binary patch delta 461 zcmbPoCGhdpzzJr|e}kGfTKX}u#alIn&y<_2$f&Y;BU2qK+i}aL@W%p^3pr#q2XfpJ zWjz+z7`|z;qnOy_^$Kj0736s~N66{Rv;7Kc3g>5-ywO2w^K#oBM)oUyP2tb(uuMMS zDmgvVNmzJun!PA1E30)=`2NieE{|E6$`mK3dPTDtni!ZHnr}Yl6>7IxuG52gb7s#f zMk9TFg%E!ie=CKe)bjkIY=yl15{1l^)WjTxl6-~I;#7sioSfXu;^NHwy!@oB)Z~)l zX8yi*{yxU-{C!O9?-kSXi*gf76rzEzVRveXnEh3PZ*G8#@V zn$0OOc|$MD^aJOa*xFNTnSq!Eh*^Oc#AgR$j_s+noSy3$&892Vvbap2V8p60z0Q=2 zr(Ir`3y8Uam}k4ZE^m4gqhWh{KQ9pTZEx@AfAwKH?{7gaA)my&l=$$(lGGxn#G<0q zoOrkC4;us|AmR`quq;$u0HHo4F)te`+Fsir0K|eoEVRA0LAd#)$Qky3&1sUhi?`}J O`Nez8QgWUAJsAL;+o>u5 delta 319 zcmaESHE_z6zzJr|6^e};E&Z6-g8nyzXUa`hWK`L_k*SWA?d+f8@W%p^3pr#q2XfpJ zoh-o2!q_|6QA}*|dIh%03i3SDqwAS@H>b)e$+MLzHiq*vOy1}qwRyR14QS zmhSXm1~Za-Rxvg^_q99sF>ZJ6V`6?k-LIBeQn;WfwYXS8Jw#ohBwryhIXShUWb(vb z+36q7GqJVrs$~XZ79eH?Vi2Dlh&i_Js^#=t&uBV5-;}GMy+oG_h`E87XM2e*Z+a4= zQTv^KULfY%ey5-R)rWS6Mgbre1Y)7>4voV7FGa5V_O0byFOqorzE`DMJ|g&Z=Q137Mq zvL1_U4Bs@_QA}*|dIh%03i3RgBjohu+5QJLh4V8^-sm8;dAV&5Bl{JIJ;X44gFSzM-1Fk)4hUT4b1 z(=M;e1;pGy%(Goymp46$(XhR}pBISvwzv25zxptp_qQOIkWXS>N_==?NotW(Vo_0Q zPQ2UnhYbP}5OIhQSQaWSfKVTjn3oL|ZLe(*0AfKP7TR9hAbjb)e$+J}{Hiq*vOy1}qwRyR14QS zmhSXm1~Za-Rxvg^_q99sF>ZJ6V`6?k-LIBeQn;WfwYXS8Jw#ohBwryhIXShUWb(vb z+36q7GqJVrs$~XZ79eH?Vi2Dlh&i_Js^#=t&uBV5-;}GMy+oG_h`E87XM2e*Z+a4= zQTv^KULfY%ey5-R)rWS6Mgbre1Y)7>4voSOpNW*+WUAKi*w=e=#d)_AAHFmOGiX!* E0OH4W@c;k- diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index f826ebcba5eaa38344c9e400ae6e2b0b6726e303..118c89d7daa45123409c9a5b5c48db9a69da9c61 100644 GIT binary patch delta 461 zcmeA^A9(9R-~=;f_TZ+CmVQiZ@m5XYGvy{LGOBFe$W+J5cHFWl{IS5~LJpbDfgHC) zS&v0FhHskeC?+;}y#m{01$my$5pw$SY%IY|;rtAfH#$gdUT)jN$bQAIDg43O_TAp8&t&o>rqL7)AnwXr_k7MJN0j93+>*O_wh zw9D&q0Wmia^K6&biuRcuY{Vm8PwXnmW7H7Ak>E>=4C@g+iM#HfLIWSg|^o=2>*H}BBk?(QQ-BDV?I%b OMK}8$ns{KhV?6+5oT%~u delta 319 zcmcb0A+Y;=-~=<~CdI~$mVQiZLH`@VGvy{LGOBFe$W+J5cJ@zk_+x>|g&Z=Q137Mq zP8MKhVeFmkC?+;}y#m{01$mz7(e=!{n^WbKzthkE>O;FjqW};K0|g&Z=Q137Mq zvL1_U4Bs@_QA}*|dIh%03i3RgBjohu**Jrn!uc5{Z*-8_yxg{jk^PEaQ~0wxERzqo zN>0yo5*FT^W-rRh%4*#dzJGIr%VSoi7RAY_UeRoZCI;rlMw^d$h1zYF>-1pWoY}LA z(MVrkA;jOs-%6nXE&Z6-g8nyzXUa`hWK`L_k*SWA?d+f8@W%p^3pr#q2XfpJ zoh-o2!q_|6QA}*|dIh%03i3SDqwAS@H>b)e$+NX6Hiq*vOy1}qwRyR14QS zmhSXm1~Za-Rxvg^_q99sF>ZJ6V`6?k-LIBeQn;WfwYXS8Jw#ohBwryhIXShUWb(vb z+36q7GqJVrs$~XZ79eH?Vi2Dlh&i_Js^#=t&uBV5-;}GMy+oG_h`E87XM2e*Z+a4= zQTv^KULfY%ey5-R)rWS6Mgbre1Y)7>4voSeo{KnLN}S-ZujB&|g&Z=Q137Mq zvL1_U4Bs@_QA}*|dIh%03i3RgBjohu+4zE+!uc5{Z*-8_yxg{jk^PEaQ~0wxERzqo zN>0yo5*FT^W-rRh%4*#dzJGIr%VSoiPQ}ToUeRoZCI;rl=9`ash1zYF>-1pWoY}LA z(MVrkA;jOs-%6nb)e$+LATHiq*vOy1}qwRyR14QS zmhSXm1~Za-Rxvg^_q99sF>ZJ6V`6?k-LIBeQn;WfwYXS8Jw#ohBwryhIXShUWb(vb z+36q7GqJVrs$~XZ79eH?Vi2Dlh&i_Js^#=t&uBV5-;}GMy+oG_h`E87XM2e*Z+a4= zQTv^KULfY%ey5-R)rWS6Mgbre1Y)7>4voUUo{OyP>NB~t{qb~FYd+2BgXedx<7}%3 E08qVl9smFU diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index 72e41c34294cc8f6226f2bd0ce1f0c912ab3ad3b..53ac005249fe78299ce9a57cd3de26fa105ab7a7 100644 GIT binary patch delta 461 zcmZp<7LhUxob$T#w&g@ym zXr!;N5aRFRZ>3O_TAp8&t&o>rqL7)AnwXr_k7MJN0j93+>*O_wh zw9D&q0Wmia^K6&biuRcuY{Vm8PwXnmW7H7Ak>E>=4C@g+iM#HfLIWSg|^o=2!DPqBKK|`7psMf>c%q@ Oip0L|*j!oT?*aga%%|x9 delta 319 zcmcb7DX`^Y-~=<~35tyyE&Z6-g8nyzXUa`hWK`L_k*SWA?d+f8@W%p^3pr#q2XfpJ zoh-o2!q_|6QA}*|dIh%03i3SDqwAS@H>b)e$+Pt-Hiq*vOy1}qwRyR14QS zmhSXm1~Za-Rxvg^_q99sF>ZJ6V`6?k-LIBeQn;WfwYXS8Jw#ohBwryhIXShUWb(vb z+36q7GqJVrs$~XZ79eH?Vi2Dlh&i_Js^#=t&uBV5-;}GMy+oG_h`E87XM2e*Z+a4= zQTv^KULfY%ey5-R)rWS6Mgbre1Y)7>4voV9pNm}BILoh=J3;E|KZ}`@y<`uCvh9@t E0L$2P&j0`b diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index fd17fb6fcb5b065c6af7b57576d77019d2daaf7e..01619f8f0b18a7aec744682df7210cac84759f5b 100644 GIT binary patch delta 461 zcmex-F7VKWzzJr|(!os|E&Z6-;;ov(XUa`hWK`L_k*SWA?YL!A_+x>|g&Z=Q137Mq zvL1_U4Bs@_QA}*|dIh%03i3RgBjohu*(8FS!uc5{Z*-8_yxg{jk^PEaQ~0wxERzqo zN>0yo5*FT^W-rRh%4*#dzJGIr%VSoi$%>Oxy`tF+O$^LU%r_tN3borT*XhB$IkRUK zqmjP8LWsYMzm-B!YI%N9wnAQhi9%*dYGRH;Nxnj9ajHUMPEKxSadBpTUVc(mYH~?& zGk;$@e;?y^{yrx5_ljxxMY)M33eid-MTse?KvN1!Q;SQ0baHBDS!#-o!t|MY84afw z&E}MtyrGw6`hoLIZ0)JF%s|Wn#H>IJ;X44gFSzM-1Fk)4hUT4b1 z(=M;e1;pGy%(Goymp46$(XhR}pBISvwzv25zxptp_qQOIkWXS>N_==?NotW(Vo_0Q zPQ2UnhYbP}5OIhQSQaWSfKVTjn3oL|ZLe(*0AfKP7TR9hApGc=h%!s%oLx3J&f$qDH-9< z?yyWg;3_%Y!dX~&bDF&N1l6-~4Qp6w;Nyy;1d zM(ua{d4ZU3`<;INS0CCP8U=t@5Qv4gJ2VQvdnRJ5xnss+K1BtS{HNDGnQS^($MV_| E05te@WdHyG diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index fb42f7ca4ff024d8acb10c0b96b4bd9aaed9268c..90eacb0a5e81af9c937bb9465fe1b91f6dec0da0 100644 GIT binary patch delta 461 zcmcb8HgMJXzzJr|^1)3TE&Z6-;;ov(XUa`hWK`L_k*SWA?YL!A_+x>|g&Z=Q137Mq zvL1_U4Bs@_QA}*|dIh%03i3RgBjohu*<^y7!uc5{Z*-8_yxg{jk^PEaQ~0wxERzqo zN>0yo5*FT^W-rRh%4*#dzJGIr%VSoi8H$rry`tF+O$^LU4L2Y23borT*XhB$IkRUK zqmjP8LWsYMzm-B!YI%N9wnAQhi9%*dYGRH;Nxnj9ajHUMPEKxSadBpTUVc(mYH~?& zGk;$@e;?y^{yrx5_ljxxMY)M33eid-MTse?KvN1!Q;SQ0baHBDS!#-o!t|MY84afw z&E}MtyrGw6`hoLIZ0)JF%s|Wn#H>IJ;X44gFSzM-1Fk)4hUT4b1 z(=M;e1;pGy%(Goymp46$(XhR}pBISvwzv25zxptp_qQOIkWXS>N_==?NotW(Vo_0Q zPQ2UnhYbP}5OIhQSQaWSfKVTjn3oL|ZLe(*0AfKP7TR9hAnf%_q)+8=?VO9;Z>QLO Ozi?Jvg=tZWjvN60Zm0DC delta 319 zcmZ2=KJfP0zzJr|vlJUQTKX}u1^sUb&y<_2$f&Y;BU2qK+u1+G;g1C-7jnpK4&=Bc zI$403g|T3J&f$qDH-9< z?yyWg;3_%Y!dX~&bDF&N1l6-~4Qp6w;Nyy;1d zM(ua{d4ZU3`<;INS0CCP8U=t@5Qv4gJ2VQ1JrnU;f4QY6ICyi^{|g&Z=Q137Mq zvL1_U4Bs@_QA}*|dIh%03i3RgBjohu*%X7D!uc5{Z*-8_yxg{jk^PEaQ~0wxERzqo zN>0yo5*FT^W-rRh%4*#dzJGIr%VSoiIf|20y`tF+O$^LU%{CwN3borT*XhB$IkRUK zqmjP8LWsYMzm-B!YI%N9wnAQhi9%*dYGRH;Nxnj9ajHUMPEKxSadBpTUVc(mYH~?& zGk;$@e;?y^{yrx5_ljxxMY)M33eid-MTse?KvN1!Q;SQ0baHBDS!#-o!t|MY84afw z&E}MtyrGw6`hoLIZ0)JF%s|Wn#H>IJ;X44gFSzM-1Fk)4hUT4b1 z(=M;e1;pGy%(Goymp46$(XhR}pBISvwzv25zxptp_qQOIkWXS>N_==?NotW(Vo_0Q zPQ2UnhYbP}5OIhQSQaWSfKVTjn3oL|ZLe(*0AfKP7TR9hAiU$5$S?N`)$QjyzZ|#w ODN!gD*XI6S-5mh;7pZ~( delta 319 zcmbPnA@Jn6zzJr|^A#I6TKX}u1^sUb&y<_2$f&Y;BU2qK+u1+G;g1C-7jnpK4&=Bc zI$403g|T3J&f$qDH-9< z?yyWg;3_%Y!dX~&bDF&N1l6-~4Qp6w;Nyy;1d zM(ua{d4ZU3`<;INS0CCP8U=t@5Qv4gJ2VO(c_xxNB{|A|g&Z=Q137Mq zvL1_U4Bs@_QA}*|dIh%03i3RgBjohu+0=rY!uc5{Z*-8_yxg{jk^PEaQ~0wxERzqo zN>0yo5*FT^W-rRh%4*#dzJGIr%VSoig^H6?y`tF+O$^M<3^yP13borT*XhB$IkRUK zqmjP8LWsYMzm-B!YI%N9wnAQhi9%*dYGRH;Nxnj9ajHUMPEKxSadBpTUVc(mYH~?& zGk;$@e;?y^{yrx5_ljxxMY)M33eid-MTse?KvN1!Q;SQ0baHBDS!#-o!t|MY84afw z&E}MtyrGw6`hoLIZ0)JF%s|Wn#H>IJ;X44gFSzM-1Fk)4hUT4b1 z(=M;e1;pGy%(Goymp46$(XhR}pBISvwzv25zxptp_qQOIkWXS>N_==?NotW(Vo_0Q zPQ2UnhYbP}5OIhQSQaWSfKVTjn3oL|ZLe(*0AfKP7TR9hAbjYB$gax*kAJajbV@j- O^H#^cM3uR0*3J&f$qDH-9< z?yyWg;3_%Y!dX~&bDF&N1l6-~4Qp6w;Nyy;1d zM(ua{d4ZU3`<;INS0CCP8U=t@5Qv4gJ2VQPdm+*#`L9`GxxJHSWUluo@#*gxBG1nQ E03J|g&Z=Q137Mq zvL1_U4Bs@_QA}*|dIh%03i3RgBjohu+4O^(!uc5{Z*-8_yxg{jk^PEaQ~0wxERzqo zN>0yo5*FT^W-rRh%4*#dzJGIr%VSoiHHwo{y`tF+O$^MIJ;X44gFSzM-1Fk)4hUT4b1 z(=M;e1;pGy%(Goymp46$(XhR}pBISvwzv25zxptp_qQOIkWXS>N_==?NotW(Vo_0Q zPQ2UnhYbP}5OIhQSQaWSfKVTjn3oL|ZLe(*0AfKP7TR9hAZ+nWB(a)T-6w8dObmB4 N4@26V29XN3TmbSSq^bY_ delta 319 zcmbPnKJet(zzJr|>l7O|TKX}u1^sUb&y<_2$f&Y;BU2qK+u1+G;g1C-7jnpK4&=Bc zI$403g|T3J&f$qDH-9< z?yyWg;3_%Y!dX~&bDF&N1l6-~4Qp6w;Nyy;1d zM(ua{d4ZU3`<;INS0CCP8U=t@5Qv4gJ2VQrJQGpuKXShz*L=gZ#|e{en5lj=wraTp E03g72H2?qr diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index 0be303f8ed6d38ae24ad870bb014522ef4828fd9..aad1f715699947afc36a370e0ce375b990b85c32 100644 GIT binary patch delta 461 zcmeCU7-1pWoY}LA z(MVrkA;jOs-%6nKB&e3 delta 319 zcmcb9DX`;W-~=<~&5Dg1E&Z6-g8nyzXUa`hWK`L_k*SWA?d+f8@W%p^3pr#q2XfpJ zoh-o2!q_|6QA}*|dIh%03i3SDqwAS@H>b)e$+K-xYz*gTn7q+JYV&g29!7TQl#K9a zcUUGLaFv{H;Vdk?In7>_l~waZak%T|2A9XIOts>ZQ@x_u49tv7&5So6^9r?N=H%qu zEZynB3}z(vtYU0-?rV4MW8CiC$He@8x?e4`q;Nq|YH_iGdWgD0Nxnj2a&l@x$>fQ> zveQ4DXJTvLRm%*-EI`Z(#2`L95OZwbRmE+ZXos6<4Y_w(*?> E039xLrvLx| diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index 8dcc59ab697ddaaf64230d3f9e93e7f6977afda5..e1cc9e42d8b9b96da64f06252937ffccba24a2dc 100644 GIT binary patch delta 461 zcmZ2^F7U_szzJr|*1=61E&Z6-;;ov(XUa`hWK`L_k*SWA?YL!A_+x>|g&Z=Q137Mq zvL1_U4Bs@_QA}*|dIh%03i3RgBjohu*(`#a!uc5{Z*-8_yxg{jk^PEaQ~0wxERzqo zN>0yo5*FT^W-rRh%4*#dzJGIr%VSoit%{RVy`tF+O$^MIJ;X44gFSzM-1Fk)4hUT4b1 z(=M;e1;pGy%(Goymp46$(XhR}pBISvwzv25zxptp_qQOIkWXS>N_==?NotW(Vo_0Q zPQ2UnhYbP}5OIhQSQaWSfKVTjn3oL|ZLe(*0AfKP7TR9hAUxxl$hR4DE+uQbWZCXq O$$QGks(AO&R}%oqpsDNt delta 319 zcmexyK5*r^zzJr|I}{r?TKX}u1^sUb&y<_2$f&Y;BU2qK+u1+G;g1C-7jnpK4&=Bc zI$403g|T3J&f$qDH-9< z?yyWg;3_%Y!dX~&bDF&N1l6-~4Qp6w;Nyy;1d zM(ua{d4ZU3`<;INS0CCP8U=t@5Qv4gJ2VO}c_wn!D{cOJ(F0P!Niq-L&R(FkFRQ-; E0FeN8ZvX%Q diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index d2f12009a73f14ceb557f2dd9ebf43494b22b832..2e845455bfaa4e15d51dc5bf94b3fb1a938cebc1 100644 GIT binary patch delta 461 zcmaEGE^z&YzzJr|y1`8wE&Z6-;;ov(XUa`hWK`L_k*SWA?YL!A_+x>|g&Z=Q137Mq zvL1_U4Bs@_QA}*|dIh%03i3RgBjohu*|dV2!uc5{Z*-8_yxg{jk^PEaQ~0wxERzqo zN>0yo5*FT^W-rRh%4*#dzJGIr%VSoiWr~wiy`tF+O$^MIJ;X44gFSzM-1Fk)4hUT4b1 z(=M;e1;pGy%(Goymp46$(XhR}pBISvwzv25zxptp_qQOIkWXS>N_==?NotW(Vo_0Q zPQ2UnhYbP}5OIhQSQaWSfKVTjn3oL|ZLe(*0AfKP7TR9hAbkFrNPmza_rB{N_nIWi OE;ek`GW}Urc>w@gyr|g# delta 319 zcmZ2~A@ISuzzJr|D-|0zTKX}u1^sUb&y<_2$f&Y;BU2qK+u1+G;g1C-7jnpK4&=Bc zI$403g|T3J&f$qDH-9< z?yyWg;3_%Y!dX~&bDF&N1l6-~4Qp6w;Nyy;1d zM(ua{d4ZU3`<;INS0CCP8U=t@5Qv4gJ2VR4ekKyR_3f*lpO;;JQ}&5BetX5TC`r9d E0Cv!LR{#J2 diff --git a/Server_Install_Pack/sc/BattlEye/scripts.txt b/Server_Install_Pack/sc/BattlEye/scripts.txt index 720a5b30..e2977d5f 100644 --- a/Server_Install_Pack/sc/BattlEye/scripts.txt +++ b/Server_Install_Pack/sc/BattlEye/scripts.txt @@ -6,7 +6,7 @@ 7 enableFatigue 7 setUnitRecoilCoefficient 7 setWeaponReloadingTime -7 allMissionObjects +7 allMissionObjects !="_alljammer = allmissionobjects 'PlotPole_EPOCH';" 7 callExtension 7 showCommandingMenu !="showCommandingMenu '';" !"showCommandingMenu '#USER:" 7 moveIn !="\"A3\functions_f\Misc\fn_moveIn.sqf\"" !="\"A3\functions_f\arrays\fn_removeIndex.sqf\"" !="player moveInAny _vehicle;\nEPOCH_antiWallCount = EPOCH_antiWallCount + 1;" !="[\"I_UAV_AI\", position _unit, [], 0, \"CAN_COLLIDE\"];\n_driver moveInAny _unit;" !="_driver moveInAny Epoch_mission_uav;" !="axeVIP moveInDriver vehicle axeVIP;" !="axeVIP moveInCargo vehicle axeVIP; !="_driver moveInDriver _axeCopter;" !="_unit moveInGunner _axeCopter;" !="axeVIP moveInDriver vehicle axeVIP;" !="axeVIP moveInCargo vehicle axeVIP;" diff --git a/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf b/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf index 16a16d2a..c36d8913 100644 --- a/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf +++ b/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf @@ -91,7 +91,7 @@ if !(_jammer isEqualTo []) then { ["Building Disallowed: Frequency Blocked", 5] call Epoch_message; }; _objectCount = count nearestObjects[_nearestJammer, ["Constructions_static_F"], _buildingJammerRange]; - + _membercount = 0; if (count Epoch_my_Group > 0) then { _membercount = count (Epoch_my_Group select 3) + count (Epoch_my_Group select 4); @@ -104,7 +104,7 @@ if !(_jammer isEqualTo []) then { _buildingCountLimit = _buildingCountLeader + _buildingCountPerMember*_membercount; _objectCount = count nearestObjects[_nearestJammer, ["Constructions_static_F","Constructions_foundation_F"], _buildingJammerRange]; }; - + if (_objectCount >= _buildingCountLimit) then { _buildingAllowed = false; [format["Building Disallowed: Frequency Overloaded: Limit %1", _buildingCountLimit], 5] call Epoch_message; @@ -119,6 +119,7 @@ if !(_jammer isEqualTo []) then { } else { if (_objType in ["PlotPole_EPOCH", "PlotPole_SIM_EPOCH"]) then { + // TODO: rework not ideal to use allmissionobjects _alljammer = allmissionobjects 'PlotPole_EPOCH'; _c = 0; { diff --git a/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp b/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp index e6c63fc4..87e5a7b4 100644 --- a/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp +++ b/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp @@ -6213,7 +6213,7 @@ class CfgBuildingLootPos pelicanPos[] = { { { -0.840332, 1.09473, -10 }, 269.861 } }; }; class Carnival_Tent : Default { - limit = 2; + limit = 1; lootBias = 50; shelfPos[] = { { { -1, -1, -10 }, 178.014 } }; chairPos[] = { { { 1, 1, -10 }, 152.678 } }; diff --git a/Sources/epoch_config/Configs/CfgEpochClient/WorldInteractions.hpp b/Sources/epoch_config/Configs/CfgEpochClient/WorldInteractions.hpp index 736c5779..9003c6b4 100644 --- a/Sources/epoch_config/Configs/CfgEpochClient/WorldInteractions.hpp +++ b/Sources/epoch_config/Configs/CfgEpochClient/WorldInteractions.hpp @@ -34,6 +34,8 @@ class CfgWorldInteractions { }; class Land_WaterBarrel_F : Water {}; + class Land_BarrelWater_F : Water {}; + class Land_WaterTank_F : Water {}; class barrelwater_f_p3d : Water {}; class water_source_f_p3d : Water {}; class waterbarrel_f_p3d : Water {}; diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index aa3a96e6..cb5f19fe 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=565; +build=566; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index aa3a96e6..cb5f19fe 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=565; +build=566; diff --git a/Sources/epoch_server/compile/epoch_antagonists/EPOCH_server_triggerEvent.sqf b/Sources/epoch_server/compile/epoch_antagonists/EPOCH_server_triggerEvent.sqf index 597b4bad..cd7e9466 100644 --- a/Sources/epoch_server/compile/epoch_antagonists/EPOCH_server_triggerEvent.sqf +++ b/Sources/epoch_server/compile/epoch_antagonists/EPOCH_server_triggerEvent.sqf @@ -12,7 +12,7 @@ Github: https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_antagonists/EPOCH_server_triggerEvent.sqf */ -params ["_target", "_type"]; +params [["_target",objNull,[objNull]], ["_type","",[""]]]; if (!isNull _target) then { switch (_type) do { case "UAV": { diff --git a/Sources/epoch_server/compile/epoch_looting/EPOCH_server_destroyTrash.sqf b/Sources/epoch_server/compile/epoch_looting/EPOCH_server_destroyTrash.sqf index 5c725e2f..043bcaf8 100644 --- a/Sources/epoch_server/compile/epoch_looting/EPOCH_server_destroyTrash.sqf +++ b/Sources/epoch_server/compile/epoch_looting/EPOCH_server_destroyTrash.sqf @@ -13,7 +13,7 @@ https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_looting/EPOCH_server_destroyTrash.sqf */ private["_target", "_eventArray", "_triggerType", "_nearPlayers", "_posWH", "_item", "_config", "_object", "_player", "_payout", "_type"]; -params ["_object","_type","_player",["_token","",[""]]]; +params [["_object",objNull,[objNull]],["_type",0,[0]],["_player",objNull,[objNull]],["_token","",[""]]]; if (isNull _object) exitWith{}; if !([_player, _token] call EPOCH_server_getPToken) exitWith{}; diff --git a/Sources/epoch_server/compile/epoch_server/EPOCH_weightedArray.sqf b/Sources/epoch_server/compile/epoch_server/EPOCH_weightedArray.sqf index 3cbc00f0..7b42b57b 100644 --- a/Sources/epoch_server/compile/epoch_server/EPOCH_weightedArray.sqf +++ b/Sources/epoch_server/compile/epoch_server/EPOCH_weightedArray.sqf @@ -18,19 +18,22 @@ _return = missionNamespace getVariable[format["EPOCH_LT_%1_%2_%3",_configName,_k if(_return isEqualTo[]) then { _lootTableArray = []; _weightedArray = []; + _lootIndex = 0; { if(_x isEqualType []) then { _x params ["_tname","_tqty"]; if (!(_tname isEqualTo "Zombie") || (_tname isEqualTo "Zombie") && EPOCH_mod_Ryanzombies_Enabled) then { _lootTableArray pushBack _tname; for "_i" from 1 to _tqty do { - _weightedArray pushBack _forEachIndex; + _weightedArray pushBack _lootIndex; }; + _lootIndex = _lootIndex + 1; }; } else { if (!(_x isEqualTo "Zombie") || (_x isEqualTo "Zombie") && EPOCH_mod_Ryanzombies_Enabled) then { _lootTableArray pushBack _x; - _weightedArray pushBack _forEachIndex; + _weightedArray pushBack _lootIndex; + _lootIndex = _lootIndex + 1; }; }; }forEach getArray(configFile >> _configName >> _keyName >> _arrayName); diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index aa3a96e6..cb5f19fe 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=565; +build=566; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index aa3a96e6..cb5f19fe 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=565; +build=566; diff --git a/build.txt b/build.txt index c16e25cc..88afc46e 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -565 +566