From 6a01291440ea62aaaf9e75ba1d171792e327bbdf Mon Sep 17 00:00:00 2001 From: vbawol Date: Wed, 29 Jun 2016 13:35:37 -0500 Subject: [PATCH] 0.3.9.0546 add server invoked looting text based feedback --- .../@epochhive/addons/epoch_server.pbo | Bin 427536 -> 428040 bytes .../@epochhive/addons/epoch_server_core.pbo | Bin 21149 -> 21149 bytes .../addons/epoch_server_settings.pbo | Bin 450901 -> 450901 bytes .../mpmissions/epoch.Altis.pbo | Bin 1275415 -> 1275219 bytes .../mpmissions/epoch.Australia.pbo | Bin 1273651 -> 1273455 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 1274744 -> 1274548 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 1274583 -> 1274387 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 1274559 -> 1274363 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 1274580 -> 1274384 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 1274709 -> 1274513 bytes .../mpmissions/epoch.Esseker.pbo | Bin 1274547 -> 1274351 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 1274986 -> 1274790 bytes Server_Install_Pack/mpmissions/epoch.Napf.pbo | Bin 1275380 -> 1275184 bytes .../mpmissions/epoch.Porto.pbo | Bin 1274694 -> 1274498 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 1274731 -> 1274535 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 1274965 -> 1274769 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 1274975 -> 1274779 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 1274980 -> 1274784 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 1274707 -> 1274511 bytes .../mpmissions/epoch.Stratis.pbo | Bin 1274555 -> 1274359 bytes .../mpmissions/epoch.Takistan.pbo | Bin 1274665 -> 1274469 bytes .../mpmissions/epoch.Tanoa.pbo | Bin 1275187 -> 1274991 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 1274537 -> 1274341 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 1274984 -> 1274788 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 1274633 -> 1274437 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 1274688 -> 1274492 bytes Server_Install_Pack/sc/BattlEye/scripts.txt | 2 +- .../epoch_code/compile/EPOCH_lootTrash.sqf | 6 +----- .../compile/setup/masterLoop/Event4.sqf | 2 +- Sources/epoch_config/build.hpp | 2 +- Sources/epoch_server/build.hpp | 2 +- .../epoch_bases/EPOCH_server_upgradeBUILD.sqf | 3 +-- .../EPOCH_server_destroyTrash.sqf | 2 ++ .../epoch_looting/EPOCH_server_lootAnimal.sqf | 3 +++ .../EPOCH_server_lootContainer.sqf | 4 ++++ .../EPOCH_server_makeNPCTrade.sqf | 5 ++++- Sources/epoch_server/treeView.txt | Bin 8842 -> 8842 bytes Sources/epoch_server_core/build.hpp | 2 +- Sources/epoch_server_core/treeView.txt | Bin 1268 -> 1268 bytes Sources/epoch_server_settings/build.hpp | 2 +- Sources/epoch_server_settings/treeView.txt | Bin 2612 -> 2612 bytes Sources/mpmissions/epoch.Altis/treeView.txt | Bin 23822 -> 23822 bytes .../mpmissions/epoch.Australia/treeView.txt | Bin 23830 -> 23830 bytes .../epoch.Bootcamp_ACR/treeView.txt | Bin 23836 -> 23836 bytes .../mpmissions/epoch.Bornholm/treeView.txt | Bin 23828 -> 23828 bytes .../mpmissions/epoch.Chernarus/treeView.txt | Bin 23830 -> 23830 bytes .../epoch.Chernarus_Summer/treeView.txt | Bin 23844 -> 23844 bytes .../mpmissions/epoch.Desert_E/treeView.txt | Bin 23828 -> 23828 bytes Sources/mpmissions/epoch.Esseker/treeView.txt | Bin 23826 -> 23826 bytes .../epoch.Mountains_ACR/treeView.txt | Bin 23838 -> 23838 bytes Sources/mpmissions/epoch.Napf/treeView.txt | Bin 23820 -> 23820 bytes Sources/mpmissions/epoch.Porto/treeView.txt | Bin 23822 -> 23822 bytes .../epoch.ProvingGrounds_PMC/treeView.txt | Bin 23848 -> 23848 bytes Sources/mpmissions/epoch.Sara/treeView.txt | Bin 23820 -> 23820 bytes .../mpmissions/epoch.SaraLite/treeView.txt | Bin 23828 -> 23828 bytes .../mpmissions/epoch.Sara_dbe1/treeView.txt | Bin 23830 -> 23830 bytes .../mpmissions/epoch.Shapur_BAF/treeView.txt | Bin 23832 -> 23832 bytes Sources/mpmissions/epoch.Stratis/treeView.txt | Bin 23826 -> 23826 bytes .../mpmissions/epoch.Takistan/treeView.txt | Bin 23828 -> 23828 bytes Sources/mpmissions/epoch.Tanoa/treeView.txt | Bin 23822 -> 23822 bytes Sources/mpmissions/epoch.VR/treeView.txt | Bin 23816 -> 23816 bytes .../epoch.Woodland_ACR/treeView.txt | Bin 23836 -> 23836 bytes .../mpmissions/epoch.Zargabad/treeView.txt | Bin 23828 -> 23828 bytes Sources/mpmissions/epoch.utes/treeView.txt | Bin 23820 -> 23820 bytes build.txt | 2 +- 65 files changed, 22 insertions(+), 15 deletions(-) diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo index 8dda742bf306d5999f1b8a98ccb1b8915b99c788..3fe34e6a19d8ee3627a5c89536ecc79f747172c3 100644 GIT binary patch delta 928 zcmbQxBh@iMYJvx|-@oFC-qLJy{uYPxGfdoTH2Huu&&E}jENr}|i^C<^CigSTZf0XW z%E;OTRPl831vVG98X#)|>*R}Us*~;6rP+S`E)IXp0_L`|%dxrsD-Pey0pe~x$3Byb zZ8cE3PHl6p&=OXVWt&AL7BMmdt(&}4GC<16z|hp#M9G?$s}_jg@7|wOnwgVgYieRP z-Ecc&*yc*9tu>4allh{=t#T5Jix^=1j-Dl zEC7o_6-@qkO?C6x>DL)2FPLq)`Tk5F;~38P)S{yNBH!Y41zQEB$ox`;wEWV%6ouma z+|-hc%)E3(kefJxAR4YxN5M2!p(r&sza-VQA~jhdTHUoEKRF{lH?_DpF+EjXC%zyj zu`;!2y1+_C(an};D|upoM!>b>wTN_EVkbX*p1E1#))CfdBJCid_j>u`TR@K$=+whnmrzD_jtglUCXSmuQ0thmdU1`6Uag{IXN*WM*$_= zq45NYD^!QNC1&QNrYMx;D-@I#C1)fSrz(`CW@IMkr0T&U7pw`*21E=?;*R2j)0vc} zzdyvn*?umT35c12m<5Pgx1Wn;d(6u3&XCEF&XCBE$56tM&rme|Kr)-Vpc#V!gDHb6 qgB61bgC&C_gY$NY6t*XdBC&$4UwWQz>*&Z>lH(dZSJVO%z delta 409 zcmeB}AT^;!YJvx|%$uT#-qLKVUKfS)GfdoTH2Huu&&E}jENlm#7lk{sP3~uw-OR>% zlyR~F6ANS0ALFXT%jebAj>w3NGxJx23j|Hr(}SXp|PQ{iGh+eFIO!Pzu&z-sWdYu#n#ls zbo#~*jA5HArMA{g=8F=OFV8Q^NhvN!OioqOQBaCc&PgmT2D9=~%l(tGCMQLy%a<0U z7bT`Z6yzsm1?S|KfRzB*A(aKGn;WP9W@O>z;^dsXf41r7%`^RsH>aF!=b7#x$;dMK zQ*G#EgA2TyH{3eHI{ESgTNaRmCM&!ao!oL(ta;|c?K2-TYS&Ib9>-)eT|0_VtbK1h z6A&{4F$)m0Zr>Zv_J)-|fT4&XpCOAOl_8m-grRu)j#M^xK}!Z#1_K5&1}g?9AZ@^4 ix?LcR?TMnu>psED^?A;RX3w9qZ0EZ#i5V{)CIA2@;*$aZ diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo index dce2c6d7b8aa4cc5d04ed68ac17bd296adf950f9..094f480af2da92693a5f8807e9c80e84d85dc201 100644 GIT binary patch delta 139 zcmbQclyUA-#tFX6f&Ypp21ql{|69BnYk1Eh=$3{8#Am8^NW zYJvFu?)^!nnK>!8rY2^S9aSSXhp;qw^1Cx+GNdykGUPFoFyu27O@8d_E@;MJz+lSY q%3#G{!eGhZ$l$!$+Ru+g#Q6J@Q)$N!v#mbd5VZGx`1kA+r`Z8YI54LG delta 139 zcmbQclyUA-#tFX6@^6YJ21qk+cwMwH?+_D+JK2~y2E?B{i8(;Z(Adz}#8}Cim#Y?t z-|ya^RGOKSVryz*I@wV*Vsi*fgC~CgLlHwhLl#3SLo!1NL-FLtzV3pS46Y0Y3}y^g m3{F7WfWdULwVxl0$dtCXf=b;!N~NpAQXM%==f$x6ECm4DDJ%#8 diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo index b30814503db6bd9cee64fbdefb6805c6723c1cc9..8c7049481edffd24a487207d6acf68c499db44a2 100644 GIT binary patch delta 207 zcmcb5Nc!p_=?Q@jA^(cQT^JY`l1ejkQuHzk3V>_`SoF6zoFB+d&d*EBOxH_BlLl(u zIPn7;Gf>&&7WM!sBLhQI69Xk{Uandoe!qJ^*i>6n6SL-b?CtN^8G)Dyh?#+y1&CR< zzhh^MJJ0XVkjaqFkjRk7P{NSUP&7UII-9$o8G`|XDT6D66@v+bC4(b_^Y+cx+4?v| aqF6uNn0@Gci8)u*!vibj6&REDbpZhUqd*@3 delta 207 zcmcb5Nc!p_=?Q@jN^gq7T^JY`l1ejkQuHzk3V>_`*z~$6oFB+d&d*EBOxH_BlLl(u zIPn7;Gf>&&7WM!sLt{f@6Eh`iUandoe!qJ^*i>6n6Vv8*?CtN^8G)Dyh?#+y1&CR< zzhh^MJI^1$P{feWkj0S7kjzlRP&_^QI-9$oC4(!20fQNX6@wFyHefK_zWF*^AE(H( YszxSj3%;h+^Lu4hpS6otn0&1p0FsM7)c^nh diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 30e59737fd191e213cafacba37ccca0bf97fe2cb..dc11b03bae0d8ae7aabfbee0744505d7de525d06 100644 GIT binary patch delta 356 zcmbRK#`p3o-w9^S5&w!eS{`F#TilRS{`GYEWpgd^p<;aA&2y41$KT$w(TW3;Q@j`zRc!8j*}8> z&2y~7Z5SsT%1KYwR}k3jt+-Q)P5DhxI6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`ZBw&o7y5 zxI}h(;#9`j)4%mIY4T_*7-}lyX67jv8W>FfIFnHvi}H4pX^cS3wB2MHv!h&l*%oFX zW&vVWAZ7z%_U&a`IJg%vnOaYuxRu3udckT|#p&mgIl0?Eg>eEg7Z8KkJV49~#C+R7 zh4CA8PoHpvpN+F1CowO(INrc;`oTy13e(p<;^&=i{D}VsZ%JluQfg5_W=<+pQf|84 zV}71?@yGl?EC9rU+r=LXMVj&lFcdN5Gh{KOG9)vUFceR(mk@Rrv}AB)Fkmoauwrlm l(gqBs+pkLqXT*qnxp~d)ORom|`;9A(oV~2}H!F@M7XU3EnQs69 diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index 37ac59792ed6160758fef233086eaa04a3dbe0ef..03246a1495d89c6e9522eb2d8160e3eec7121316 100644 GIT binary patch delta 356 zcmdmd&-eWu-w9^SG5?A;S{`F#R)j z&2y~7Z5SsT%1KYwR}k3jt+-Q)P2){bI6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`HTd2A2zU=;G@ZBw&o7y5 zxI}h(;#9`j)4%mIY4T_*7-}lyX67jv8W>FfIFnHvi}H4pX^cS3wB2MHv!h&l*%oFX zW&vVWAZ7z%_U&a`IJg%vnOaYuxRu3udckT|#p&mgIl0?Eg>eEg7Z8KkJV49~#C+R7 zh4CA8PoHpvpN+F1CowO(INrc;`oTy13e(p<;^&=i{D}VsZ%JluQfg5_W=<+pQf|84 zV}71?@yGl?EC9rU+r=LXWS{`F#7M~y#1Y+a9NDVp)I<0ckVc5@5uNvE6+p6O#E8uBmmO+eggmi delta 429 zcmdn;)c40T-w9^ShHr{CS{`GYEWpgd^p<;aA&2y41$KT$w(TW3;Q@j`zRc!8j*}8> z&2y~7Z5SsT%1KYwR}k3jt+-Q)P47)nI6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`ZBw&o7y5 zxI}h(;#9`j)4%mIY4T_*7-}lyX67jv8W>FfIFnHvi}H4pX^cS3wB2MHv!h&l*%oFX zW&vVWAZ7z%_U&a`IJg%vnOaYuxRu3udckT|#p&mgIl0?Eg>eEg7Z8KkJV49~#C+R7 zh4CA8PoHpvpN+F1CowO(INrc;`oTy13e(p<;^&=i{D}VsZ%JluQfg5_W=<+pQf|84 zV}71?@yGl?EC9rU+r=LXtuf*cU?^h9XUJkmWk_ZyVJMz{NmSTf(2~KG!GOVx!HU5N kNE8fJrofi^KK=d=0F^P8nE(I) diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index c06d8efeb80c348280fd6bcfc50138067246803a..6adace97da3557622e01698486e3bccee22aa3fc 100644 GIT binary patch delta 355 zcmccq)OYd|-w9^SDgTN$S{`F#0fa;Kf`237pchyY$P|^+BC4SX`Uz!cTEM01vv3c z=L_fO+5FY%7Yp;|zr~Y3xks@Y85o+HHV1la5A3icjdD`Q`If0l9h`E6n#ODQKzU^`0{6^i=_deo( z-hTcuKM)H5vEcUekA>uo_}v*Y8PXXN8S)rP81fm4rvDWcb{8~bFkmocaAmM!Fk!G{ kaAa`a9x5iB7bC*UJu#SLeU0Vv`x)CC!&O#2TXp|90O!AauK)l5 delta 428 zcmbRI#P|AB-w9^SW^al%S{`GYEWpgd^p<;aA&2y41$KT$w(TW3;Q@j`zRc!8j*}8> z&2y~7Z5SsT%1KYwR}k3jt+-Q)&G=1GI6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`7b|Y!CEc6!zugj8^hb%1TWxQSiynFPUt( zM0R@ORL0rUzx6X|@@OjjO?PXgyxEC>*T2G(2mBo2_!D?2;>F1I;x!XU5aRMT z@f&qdpKyeqjk6#pF)zC~-oSAB!AJZG)7L)Y=bdi+i2nv}NoHNBr}vS6i>Gl6?PZ2WN>9LU@&8_VsHY| k1`MX#CyEN^#fb2+zf4NJQB{2Ye1sp{?wa+o+YfdD0H)NIzW@LL diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 3523cf72d15c9787b80c502e0ea9b639dcdedb93..6761c2ee4bce067afb7038b9161d39172804276e 100644 GIT binary patch delta 356 zcmdo0)c5ye-w9^Sng5D6S{`F#6~-fk@>To5C2H6~Cj&BW?>#Zi?Q#@+q3e` z&2y~7Z5SsT%1KYwR}k3jt+-Q)&Eic_I6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`=KeZBw&o7y5 zxI}h(;#9`j)4%mIY4T_*7-}lyX67jv8W>FfIFnHvi}H4pX^cS3wB2MHv!h&l*%oFX zW&vVWAZ7z%_U&a`IJg%vnOaYuxRu3udckT|#p&mgIl0?Eg>eEg7Z8KkJV49~#C+R7 zh4CA8PoHpvpN+F1CowO(INrc;`oTy13e(p<;^&=i{D}VsZ%JluQfg5_W=<+pQf|84 zV}71?@yGl?EC9rU+r=LX{WRncU?^h9XUJkmWk_ZyVJMz1FDmRVXvyHpV8CF;V8!4B kqzxEMx0j0w7sQA(dKK_IdsKYvki*Vovyvp4eQz^V0O|0T_5c6? diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index 7cf032733b3d08be130c80e6bef9a8b83cced8a7..122b8c1c61b7f2b56f866f0d5dde22f33bbbc953 100644 GIT binary patch delta 356 zcmcce)OW%Y-w9^SdH;$xS{`F#6~-tHtOTo)s@V%Kh(W*#iKSpnwqo delta 428 zcmbR6#P`Zm-w9^Sj&F)KS{`GYEWpgd^p<;aA&2y41$KT$w(TW3;Q@j`zRc!8j*}8> z&2y~7Z5SsT%1KYwR}k3jt+-Q)&Gt=EI6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`ZBw&o7y5 zxI}h(;#9`j)4%mIY4T_*7-}lyX67jv8W>FfIFnHvi}H4pX^cS3wB2MHv!h&l*%oFX zW&vVWAZ7z%_U&a`IJg%vnOaYuxRu3udckT|#p&mgIl0?Eg>eEg7Z8KkJV49~#C+R7 zh4CA8PoHpvpN+F1CowO(INrc;`oTy13e(p<;^&=i{D}VsZ%JluQfg5_W=<+pQf|84 zV}71?@yGl?EC9rU%f%lH8Sw`&6fxv8WHF>NBr}vS6i-(Z6?PZ2WN>9LU@&8_VsHY| k1`MX#>qLd?Vnn`7udyj=J7p+&Y!OGxin@s})}GS_0JHd)i~s-t diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index 95733b5b5eb0c2be054f8b6d5f0f3894d41b09bd..f0b96fb2008067b84be65f43bb10b458ca559fec 100644 GIT binary patch delta 356 zcmccm%y;5b-w9^SMgNL7S{`F#6~-hNq3I4?$I-o(%o|6KU{xCK=-uG;cEzLPwM0RWH0d<*~p delta 429 zcmbRE)c5K$-w9^S?r(}VS{`GYEWpgd^p<;aA&2y41$KT$w(TW3;Q@j`zRc!8j*}8> z&2y~7Z5SsT%1KYwR}k3jt+-Q)&FM{1I6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`ZBw&o7y5 zxI}h(;#9`j)4%mIY4T_*7-}lyX67jv8W>FfIFnHvi}H4pX^cS3wB2MHv!h&l*%oFX zW&vVWAZ7z%_U&a`IJg%vnOaYuxRu3udckT|#p&mgIl0?Eg>eEg7Z8KkJV49~#C+R7 zh4CA8PoHpvpN+F1CowO(INrc;`oTy13e(p<;^&=i{D}VsZ%JluQfg5_W=<+pQf|84 zV}71?@yGl?EC9rU+r=LXO*G;UU?^h9XUJkmWk_ZyVJM!yT~ydz(2~KG!GOVx!HU5N lNEGw75NAiv{PgDH12mpxmm`MNt diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index ca52b330cbb4de274969fb2d68a04feaa3dbe436..24815c335ca4e53156641590f1976c7743571fc5 100644 GIT binary patch delta 356 zcmdn|)c5^k-w9^SW&esdS{`F#7M~yxmw#I44G=q(1H*@2Obj_HwD&KX|#>FQ1-j0RRcYe7yhw delta 429 zcmaF=*mv_&-w9^SK5vRPS{`GYEWpgd^p<;aA&2y41$KT$w(TW3;Q@j`zRc!8j*}8> z&2y~7Z5SsT%1KYwR}k3jt+-Q)&Eri`I6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`ZBw&o7y5 zxI}h(;#9`j)4%mIY4T_*7-}lyX67jv8W>FfIFnHvi}H4pX^cS3wB2MHv!h&l*%oFX zW&vVWAZ7z%_U&a`IJg%vnOaYuxRu3udckT|#p&mgIl0?Eg>eEg7Z8KkJV49~#C+R7 zh4CA8PoHpvpN+F1CowO(INrc;`oTy13e(p<;^&=i{D}VsZ%JluQfg5_W=<+pQf|84 zV}71?@yGl?EC9rU+r=LXeKh0`U?^h9XUJkmWk_ZyVJMz1E-LIUXvyHpV8CF;V8!4B kqzxEMx95ur=fsHQzRTg-x^SXVt52|1kBQdJ=RWW90Rg6$&Hw-a diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index e24211a4240b6f78ada0a91f08d606bb45d9a781..2e714a9d156aa274cad53c58f7bde61d3f35cce4 100644 GIT binary patch delta 356 zcmaF$!gtwo-w9^SRsV`NS{`F#6~-hNM9xFSY`D@4j>zv!CQ&Wmddj}@OezQ{;D0RZ+FeKG(5 delta 429 zcmZ4X-1pTB-w9^Sfp3a7S{`GYEWpgd^p<;aA&2y41$KT$w(TW3;Q@j`zRc!8j*}8> z&2y~7Z5SsT%1KYwR}k3jt+-Q)&G$`FI6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`ZBw&o7y5 zxI}h(;#9`j)4%mIY4T_*7-}lyX67jv8W>FfIFnHvi}H4pX^cS3wB2MHv!h&l*%oFX zW&vVWAZ7z%_U&a`IJg%vnOaYuxRu3udckT|#p&mgIl0?Eg>eEg7Z8KkJV49~#C+R7 zh4CA8PoHpvpN+F1CowO(INrc;`oTy13e(p<;^&=i{D}VsZ%JluQfg5_W=<+pQf|84 zV}71?@yGl?EC9rU+r=LX%`xT=U?^h9XUJkmWk_ZyVJMz{NKDvW(2~KG!GOVx!HU5N lNEK*dS{`GYEWpgd^p<;aA&2y41$KT$w(TW3;Q@j`zRc!8j*}8> z&2y~7Z5SsT%1KYwR}k3jt+-Q)E$B^AI6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`ZBw&o7y5 zxI}h(;#9`j)4%mIY4T_*7-}lyX67jv8W>FfIFnHvi}H4pX^cS3wB2MHv!h&l*%oFX zW&vVWAZ7z%_U&a`IJg%vnOaYuxRu3udckT|#p&mgIl0?Eg>eEg7Z8KkJV49~#C+R7 zh4CA8PoHpvpN+F1CowO(INrc;`oTy13e(p<;^&=i{D}VsZ%JluQfg5_W=<+pQf|84 zV}71?@yGl?EC9rU+r=LXS(x$%FcdN5Gh{KOG9)vUFceRZlMr?nv}AB)Fkmoauwrlm l(gqBs+qX#wr^Sf8`P)>iR@N_j(@*m6(uqeJ7qQmF0RTOtn3@0p diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index ecd8847f8381cb4f578ccd28b95b33bda2f372e4..bb82adaedbdf9b91eef294e5797b49eb435aac18 100644 GIT binary patch delta 356 zcmX^1%(v;O?*udErhmm7EswFW@%<_ef6G0&kVAU20y{q=+u1+G;g1D?e3{LG9495% z)PVA~jFS!Jq$leu2yFIN+$qIY|F1ZlpJ6hii`3);Hji-q~p-{Q%i+@six3=B;z%$kEdwg-7I3i(c-G?j72^aLA5F}~<%rQrO` zoYWL09mCkz>G9JTCEAxxV+3NR?MtUI+saMXuV!Rr;^dq@yPQ#`on3bjX zKW{((m>-A*fLL(*`Nu+2jQHIdG8xht5*hLsN*MAPil!Hd3A+oLF&HqIGPp8WF_U->&?*udEs5eC$EswEH7GP#!ddoezkVAU20y{q=+xC*2@Bl#|UuJV4$4Lpc z<~i2kHjI-E<)kO;D+p}%R@^DY7XGFvoS$Jbql?t!12&S=?*#~PY<9J&U}KADEefBT z3YG|P;@SMtiH(){?dzh+pWLI^42=y<42+tCJhlgUFbetdaYifoCuOB3mnit;=a)=2 zTp~L?aVq2N>EHU9G`}VRe9NdeTOs%I++{)rSyXG38L}8s8Il=F7>cK_6BTwBv}AB)Fkmoauwrlm l(gqBs+u6i~Gh#$e?%r{HL2tn<6~-hNd~xG6?NFF&zb?!cb*x?W*0Ak+FaRwTe@*}Z delta 429 zcmZ4f)c5r>-w9^S@o$PYS{`GYEWpgd^p<;aA&2y41$KT$w(TW3;Q@j`zRc!8j*}8> z&2y~7Z5SsT%1KYwR}k3jt+-Q)E#^&8I6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`ZBw&o7y5 zxI}h(;#9`j)4%mIY4T_*7-}lyX67jv8W>FfIFnHvi}H4pX^cS3wB2MHv!h&l*%oFX zW&vVWAZ7z%_U&a`IJg%vnOaYuxRu3udckT|#p&mgIl0?Eg>eEg7Z8KkJV49~#C+R7 zh4CA8PoHpvpN+F1CowO(INrc;`oTy13e(p<;^&=i{D}VsZ%JluQfg5_W=<+pQf|84 zV}71?@yGl?EC9rU+r=LXO*Y~WU?^h9XUJkmWk_ZyVJM!yQ&iYp(2~KG!GOVx!HU5N lNE6~-hNwLI4wq`$z{1)!8Vgujeg6#FF)?&GdcV47XbPWe&7HA delta 429 zcmbRE-1q7W-w9^SDQ}84S{`GYEWpgd^p<;aA&2y41$KT$w(TW3;Q@j`zRc!8j*}8> z&2y~7Z5SsT%1KYwR}k3jt+-Q)E%8lJI6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`ZBw&o7y5 zxI}h(;#9`j)4%mIY4T_*7-}lyX67jv8W>FfIFnHvi}H4pX^cS3wB2MHv!h&l*%oFX zW&vVWAZ7z%_U&a`IJg%vnOaYuxRu3udckT|#p&mgIl0?Eg>eEg7Z8KkJV49~#C+R7 zh4CA8PoHpvpN+F1CowO(INrc;`oTy13e(p<;^&=i{D}VsZ%JluQfg5_W=<+pQf|84 zV}71?@yGl?EC9rU+r=LX%{1l@U?^h9XUJkmWk_ZyVJM!yUrg9t(2~KG!GOVx!HU5N lNE3icjdD`Q`If0l9h`E6n#ODQKzU^`0{6^i=_deo( z-hTcuKM)H5vEcUekA;>S^Sd)-GNdykGUPFoFyu27O>Y$!b{8~bFkmocaAmM!Fk!G{ kaAa`aepg&LFGi&O+uO{S>Th&ix9!o+oE0%I+;2KB0N4 z&2y~7Z5SsT%1KYwR}k3jt+-Q)E$vNFI6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`jO?PXgyxEC>*T2G(2mBo2_!D?2;>F1I;x!XU5aRMT z@f&qdpKyeqjk6#pF)zC~-oSAB!AJZG)7L)Y=bdi+i2nv}NoH$OxRt}lEIb1fWeHxiopp; k8!(t|mlPMyixH`;NGndz<6h3O^?dl8w;%Ss|FwH10N7fYqyPW_ diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index 62e3e5b8abe53a964266ef1fcfbdd81143bbdbeb..1e01a769708a9a275202269429f0a62773ffa9b5 100644 GIT binary patch delta 355 zcmaFz!gs-Q-w9^Sll~QNv^>Vf#`mi@{4Mw7LJsN83hexhY-j%zhd&ko@?|y$a-5W4 zQv=G|GEO#>lb)=vAh6k6aie>Z*hp@+wP|2u(>zfe?wSe~3vl9@ z&KJ(lv-zvjFBay^ptZRK^+86Koj8_@bkgg7Y(T zQd5+43}a)b$4_IFXkR*w5r~<#FP+A0D>q%gnvs=>lXLp)az>eUmaWV{%mT!$K+Fcj z?Auwka=cu~Xg2-e1QwU+4w@H}=V8CF?;L2ddV8UR@ l;K<;-{eie}L5#@q(+@*F*b6 z&2y~7Z5SsT%1KYwR}k3jt+-Q)E&EMTI6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`(mrOQX zB0D{CD&y?w-};#}d9)P_H5GC*^ArpX45oja$taFRdArFpMj&R|ZZeJ8QLepg3o{V2 z05K~NvjH*t_OdM;+>4k@t*1}i%Hlk|U^T1a^mECa-0h#jIDwc8h(T-~Am#;PzU`mF z_>H=!PdLKQ##xY)n3r7~Z(un6;3Iy8>1!YH^G-K@#D9agBr`WDwWuI7Clx9wH{I?r zKTo^(V}2kO0Aj)I;*W*q8S@7)6fxv8WHF>NBr}vS6i+`QChRU~$>7Rhz+lE;#oz>_ k4H!(f%ZLjX#E3A)wcX@C_2zBW<#%f@`FeclS6JT<0FoM+h5!Hn diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index f1f7c241d541dc582f140de1b29878dae35efb6f..e828cdad510446ea74d55155b422b7640869e8e2 100644 GIT binary patch delta 356 zcmcco%(wrk?*udEY5$5hS{`F#e>Z*hp@+wP|2u(>zfe?wSe~3vl9@ z&KJ(lv-zvjFBaw(e~Tx7a*tv&GB7kVFl!F-*dFA;DC9eR(p1J7(-UkM#rUG5m4fp# zb5c{3bPQu-r^ioYlxSZ%jS+~MwlAH=Y%4ciznYPiiIa2s>~cn#c9yNoK+FQftU$~L z#O&KywsO2&$Y?hG-~<+z=?wQi7Z7s;F^JC##C+T1!ugH5r|*5l z|GfSDV}2kO0Aj)I=N}7AH{y3^$Ye-oNMy)kC}GHFD4Jd>ChRU~#$do;%HYai#bCl< l$>7M~y#1`0a8ZoNa@IqgvuuvM=nC3d95v}i;Wg&3rT`bDezE`n delta 429 zcmeBw>U;T_?*udE;x|PbEswEH7GP#!ddoezkVAU20y{q=+xC*2@Bl#|UuJV4$4Lpc z<~i2kHjI-E<)kO;D+p}%R@^DYR`8}MoS$Jbql?t!12&S=?*#~PY<9J&U}KADEefBT z3YG|P;@SMtiH(){XMf@3Pwr7{hQ@{_M&`{y9@~RF7=?WKIHQ&Pld@8iOB8(a^GhZh zE|Hy{IF)hs^l$x4nmpPHhMEewnRyC^1_skV&SVtFqP*Q?8Y2)hZ8w?5>?qe>wuKpp zS%8=oh}nRceS6s!4(>%vrqVf#`mi@{4Mw7LJsN83hexhY-j%zhd&ko@?|y$a-5W4 zQv=G|GEO#>lb)=vAh6k6aicid`QzPv8whw6qSa(jQxI|l%Qdw@Lv delta 429 zcmezV*mw6+-w9^S6>o|*S{`GYEWpgd^p<;aA&2y41$KT$w(TW3;Q@j`zRc!8j*}8> z&2y~7Z5SsT%1KYwR}k3jt+-Q)t>jHnI6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`pWLI^42=yEHU9G`}VRe9NdeTOs%I++{)rSy09Wajy8r+H diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index a3a032e41ecaebc5a319683f2aa2803d5e4b902c..e047184d2ad605ac2694ba5850400a5689f5b0ae 100644 GIT binary patch delta 356 zcmZ4a%=hUN-w9^SbN>}@v^>Vf#`mi@{4Mw7LJsN83hexhY-j%zhd&ko@?|y$a-5W4 zQv=G|GEO#>lb)=vAh6k6ai$Ye-oNMy)kC}GHFD4OmsChRU~#$do;%HYai#bCl< l$>7M~ynVTta9)hamgra?N0Z~F)<0+eTPl6MJ7#gxR{%@OesKT* delta 429 zcmaF*#CPR0-w9^SHE)VGS{`GYEWpgd^p<;aA&2y41$KT$w(TW3;Q@j`zRc!8j*}8> z&2y~7Z5SsT%1KYwR}k3jt+-Q)t@2G#I6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`EHU9G`}VRe9NdeTOs%I++{)rSyXG38L}8s8Il=F7>cKNiwe67S~9pY7%-SISTQ&O lX#)n+?TVf#`mi@{4Mw7LJsN83hexhY-j%zhd&ko@?|y$a-5W4 zQv=G|GEO#>lb)=vAh6k6ai7M~ynVZba7K*CL5s6)1`{lc%~Kz(jgmZl#Mb4G8vutueP{px delta 429 zcmaF=!gup4-w9^Sjc z&2y~7Z5SsT%1KYwR}k3jt+-Q)t?o@xI6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`EHU9G`}VRe9NdeTOs%I++{)rSyXG38L}8s8Il=F7>cLQ78iCGv}AB)Fkmoauwrlm l(gqBs+dqp7XT*pcdJ%fO!|Fum2O)n+zxYXE-0PpE0su$_m)ZaT diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index 0f4fb7ec4826ea0a54548df16bba70211687086c..fa8444672dd6010b54c779da857ae376f63c00e9 100644 GIT binary patch delta 356 zcmZ4a)c5IQ-w9^StNs;lv^>Vf#`mi@{4Mw7LJsN83hexhY-j%zhd&ko@?|y$a-5W4 zQv=G|GEO#>lb)=vAh6k6ai z&2y~7Z5SsT%1KYwR}k3jt+-Q)t>aBmI6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`EHU9G`}VRe9NdeTOs%I++{)rSy;4sQv^>Vf#`mi@{4Mw7LJsN83hexhY-j%zhd&ko@?|y$a-5W4 zQv=G|GEO#>lb)=vAh6k6ai~cn#c9yNoK+FQftU$~L z#O&KywsO2&$Y?hG-~<+z=?wQi7Z7s;F^JC##C+T1!ugH5r|*5l z|GfSDV}2kO0Aj)I=N}8LFy?n>$Ye-oNMy)kC}GHFD4O0TF6=I7#$do;%HYai#bCl< m$>7M~y#1cIa9NDVvpLDX7bxw`+9!Sc`ZS$G8-1e^<^llF>VDY( delta 429 zcmZ4T-1o%`-w9^S6W$bUv^>T(S%8^^=`Hue3{LG9495% zn&()D+b~Wxl#`yUuOP75TXClpTko5qaDIl#j4o1>57Qd2A2zU=;G@ZBw&o7y5 zxI}h(;#9`j)4%mIY4T_*7-}lyX67jv8W>FfIFnHvi}H4pX^cS3wB2MHv!h&l*%oFX zW&vVWAZ7z%_U&a`IJg%vnOaYuxRu3udckT|#p&mgIl0?Eg>eEg7Z8KkJV49~#C+R7 zh4CA8PoHpvpN+F1CowO(INrc;`oTy13e(p<;^&=i{D}VsZ%JluQfg5_W=<+pQf|84 zV}71?@yGl?EC9rU+r=LX%`xT=U?^h9XUJkmWk_ZyVJMz{NKDvW(2~KG!GOVx!HU5N lNEe>Z*hp@+wP|2u(>zfe?wSe~3vl9@ z&KJ(lv-zvjFBWEwf5nqOxks@X85o)wn>Gh|Y!C8a6!M)uX)5E4=?ONBVtmojO2PS= zIjJd1I)<^a)8nTxO0+MX#t6hr+m}vbww0T%U(LwM#K}2*b~&R=JIhvPAZ7t#Rv=~r zV)pGUTRC1XWHg(8Z~}|Vbcak z&2y~7Z5SsT%1KYwR}k3jt+-Q)ZPJ^faDIl#j4o1>57D()d2A2zU=;G@ZBw&o7y5 zxI}h(;#9`j)4%mIY4T_*7-}lyX67jv8W>FfIFnHvi}H4pX^cS3wB2MHv!h&l*%oFX zW&vVWAZ7z%_U&a`IJg%vnOaYuxRu3udckT|#p&mgIl0?Eg>eEg7Z8KkJV49~#C+R7 zh4CA8PoHpvpN+F1CowO(INrc;`oTy13e(p<;^&=i{D}VsZ%JluQfg5_W=<+pQf|84 zV}71?@yGl?EC9rU+r=LXxf<~YFcdN5Gh{KOG9)vUFceSE78Q0Ev}AB)Fkmoauwrlm k(gqBs+YgHh=f#Ljt+}J`qZ=63YnkODpmyiZMxp1M0n_W2O8@`> diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index 2ddb6cbfd423451cea6e684ef0d768ef8d614a6b..4b28ddc854fb66555774899d8cc68a808e587cfe 100644 GIT binary patch delta 356 zcmX@`%=ga|-w9^SOaB#bv^>Vf#`mi@{4Mw7LJsN83hexhY-j%zhd&ko@?|y$a-5W4 zQv=G|GEO#>lb)=vAh6k6ai z&2y~7Z5SsT%1KYwR}k3jt+-Q)t@%w+I6uQ=Mi;5c2W%v#-wP1p*z9Uk!NwNRS`EHU9G`}VRe9NdeTOs%I++{)rSyXG38L}8s8Il=F7>cK_5*2nAv}AB)Fkmoauwrlm l(gqBs+nL0K(_%zkODakq?I_;z$^Ylt<2;>ju6xEM0sw6Lm^ diff --git a/Server_Install_Pack/sc/BattlEye/scripts.txt b/Server_Install_Pack/sc/BattlEye/scripts.txt index 76eeefdc..023ccf07 100644 --- a/Server_Install_Pack/sc/BattlEye/scripts.txt +++ b/Server_Install_Pack/sc/BattlEye/scripts.txt @@ -13,7 +13,7 @@ 7 attachTo !="EP_light attachTo [player,[0,8.11,_nlZ]];" !="_bomb attachTo [_unit, [0,0,0],\"Pelvis\"];" !="_dogHolder attachTo [_dog, [-0.2,1.2,0.7]];" !="EPOCH_target attachTo[player];" !="_sapperSmoke attachTo [_sapper,[0,0,-0.4]];"" !="_cage attachTo [_cage2,[0,1.3,0]];" 7 enableCollisionWith 7 hideObject !="_dogHolder hideobject true;" !="_dogHolder hideobject false;" !="player hideobject true;" !="_ship hideobject true;\n_ship hideobjectglobal true;" -7 setvelocity !="setVelocityTarget" !="_bolt setPosATL _pos;\n_bolt setVelocity [0, 0, -10];" !="EPOCH_target setvelocitytransformation" !="_currentTarget setVelocity [0,0,-0.01];" !="_head setVelocity [\n(sin _dir * _speed), \n(cos _dir * _speed)" !="_vel = velocity this; _dir = getDir player; this setVelocity[(_vel select 0)+(sin _dir * 2),(_vel select 1)+(cos _dir * 2),(_vel select 2)];" !="_head setVelocity [random 2,random 2,10];" !="_bobber setVelocity [0,-1,-1];" !="_bobber setVelocity [0,-1,-10];" !="_x setvelocity [0,0,0.1];" !="_veh setVelocity [0,0,0];" !="_this select 0 setvelocity (_this select 1)" !="_zombie setVelocityTransformation [_aslPos,_aslPos,_unitV,_unitV,_unitvDir,_vDir,_unitvUp,_unitvUp,2];" +7 setvelocity !="setVelocityTarget" !="_bolt setPosATL _pos;\n_bolt setVelocity [0, 0, -10];" !="EPOCH_target setvelocitytransformation" !="_currentTarget setVelocity [0,0,-0.01];" !="_head setVelocity [\n(sin _dir * _speed), \n(cos _dir * _speed)" !="_vel = velocity this; _dir = getDir player; this setVelocity[(_vel select 0)+(sin _dir * 2),(_vel select 1)+(cos _dir * 2),(_vel select 2)];" !="_head setVelocity [random 2,random 2,10];" !="_bobber setVelocity [0,-1,-10];" !="_x setvelocity [0,0,0.1];" !="_veh setVelocity [0,0,0];" !="_this select 0 setvelocity (_this select 1)" !="_zombie setVelocityTransformation [_aslPos,_aslPos,_unitV,_unitV,_unitvDir,_vDir,_unitvUp,_unitvUp,2];" 7 assignAs !="assignAsCargo" !="_unit assignAsGunner _axeCopter;" !="_driver assignAsDriver _axeCopter;" !="axeVIP assignAsDriver vehicle axeVIP;" 7 assignAsCargo !="_x assignAsCargo axeGeneralsBoat;" !="axeVIP assignAsCargo vehicle player;" !="axeVIP assignAsCargo vehicle axeVIP;" 7 allowDamage !="_unit allowDamage false;" !="_unit allowDamage true;" !="player allowDamage true;" !="vehicle player allowDamage true;" !="player allowDamage false;" !="_target allowDamage true;" !="_cargo allowDamage false;" diff --git a/Sources/epoch_code/compile/EPOCH_lootTrash.sqf b/Sources/epoch_code/compile/EPOCH_lootTrash.sqf index 06e2d257..e3856953 100644 --- a/Sources/epoch_code/compile/EPOCH_lootTrash.sqf +++ b/Sources/epoch_code/compile/EPOCH_lootTrash.sqf @@ -76,15 +76,11 @@ if (diag_tickTime - EPOCH_lastTrash > 2) then { // send [_lootAnimalObj, player, Epoch_personalToken] remoteExec ["EPOCH_server_lootAnimal",2]; _return = true; - ["Object Looted", 5] call Epoch_message; - }; if (!isNull _destroyTrashObj) then { [_destroyTrashObj, _trashType, player, Epoch_personalToken] remoteExec ["EPOCH_server_destroyTrash",2]; - EPOCH_playerSoiled = (EPOCH_playerSoiled + 1) min 100; + _interactAttributes = [["Soiled",1]]; _return = true; - ["Object Looted", 5] call Epoch_message; - // Snake Den if (random 1 < 0.04) then { _animalPos = getposATL _destroyTrashObj; diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event4.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event4.sqf index 450c9f5e..3a47f886 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/Event4.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/Event4.sqf @@ -2,7 +2,7 @@ _nearByBobbersLocal = (player nearEntities[["Bobber_EPOCH"], 12]) select {local if !(_nearByBobbersLocal isEqualTo []) then { if ((random 100) < 50) then { _bobber = selectRandom _nearByBobbersLocal; - _bobber setVelocity [0,-1,-1]; + _bobber setVelocity [0,-1,-10]; _bobber setVariable ["EPOCH_fishOnLine" , diag_tickTime]; }; }; diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index 134963bd..3eada8b6 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=545; +build=546; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index 134963bd..3eada8b6 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=545; +build=546; 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 dfbf07f3..5af9fc9c 100644 --- a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_upgradeBUILD.sqf +++ b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_upgradeBUILD.sqf @@ -12,7 +12,7 @@ Github: https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_bases/EPOCH_server_upgradeBUILD.sqf */ -private["_cfgBaseBuilding","_worldspace", "_class", "_newObj", "_objHiveKey", "_VAL", "_return", "_upgrade", "_objSlot", "_objType"]; +private ["_cfgBaseBuilding","_class","_newObj","_upgrade","_objSlot","_objType","_upgrades"]; params ["_object","_player",["_index",0],["_token","",[""]]]; if (isNull _object) exitWith{}; @@ -25,7 +25,6 @@ if (_objSlot != -1) then { if !(_upgrades isEqualTo []) then { _upgrade = _upgrades param [_index,[]]; _class = _upgrade select 0; - _newObj = [_class,_object] call EPOCH_swapBuilding; _newObj setVariable ["BUILD_SLOT",_objSlot,true]; _newObj call EPOCH_server_buildingInit; 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 7bc78174..5c725e2f 100644 --- a/Sources/epoch_server/compile/epoch_looting/EPOCH_server_destroyTrash.sqf +++ b/Sources/epoch_server/compile/epoch_looting/EPOCH_server_destroyTrash.sqf @@ -35,6 +35,8 @@ if (!(_object isKindOf "All")) then { if (isClass _config) then { if (random 1 < getNumber(_config >> "chance")) then { [_item, _payout] call EPOCH_serverLootObject; + _errorMsg = "You found something!"; + [_errorMsg, 5] remoteExec ['Epoch_message',_player]; }; }; diff --git a/Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootAnimal.sqf b/Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootAnimal.sqf index 202c0270..331460bd 100644 --- a/Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootAnimal.sqf +++ b/Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootAnimal.sqf @@ -32,5 +32,8 @@ if !(isNull _object) then { _class = _objectClass; }; [_item, _class, true] call EPOCH_serverLootObject; + + _errorMsg = "You found something!"; + [_errorMsg, 5] remoteExec ['Epoch_message',_player]; }; true diff --git a/Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootContainer.sqf b/Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootContainer.sqf index a67bc0ad..563558c0 100644 --- a/Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootContainer.sqf +++ b/Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootContainer.sqf @@ -45,8 +45,12 @@ if !(_object in EPOCH_cleanupQueue) then { }; [_object, _type] call EPOCH_serverLootObject; + _errorMsg = "You found something!"; + [_errorMsg, 5] remoteExec ['Epoch_message',_player]; } else { [_object, "Food"] call EPOCH_serverLootObject; + _errorMsg = "You found Food!"; + [_errorMsg, 5] remoteExec ['Epoch_message',_player]; }; if ((random 1) <= EPOCH_antagonistChanceLoot) then{ diff --git a/Sources/epoch_server/compile/epoch_trading/EPOCH_server_makeNPCTrade.sqf b/Sources/epoch_server/compile/epoch_trading/EPOCH_server_makeNPCTrade.sqf index af3ab3e5..36cf0845 100644 --- a/Sources/epoch_server/compile/epoch_trading/EPOCH_server_makeNPCTrade.sqf +++ b/Sources/epoch_server/compile/epoch_trading/EPOCH_server_makeNPCTrade.sqf @@ -223,7 +223,10 @@ if (_slot != -1) then { _current_crypto = _current_crypto - _itemWorth; _tradeQtyTotal = _tradeQtyTotal + _itemQty; } else { - diag_log "DEBUG: no slots found to spawn vehicle"; + // diag_log "DEBUG: no slots found to spawn vehicle"; + // [_errorMsg, 5] call Epoch_message; + _errorMsg = "Failed to purchase vehicle."; + [_errorMsg, 5] remoteExec ['Epoch_message',_player]; }; }; } else { diff --git a/Sources/epoch_server/treeView.txt b/Sources/epoch_server/treeView.txt index 40dc3888ce3862d0dc1524e6524e7f474fbe593a..f6b284286cb9110a21749564bd986f50a88d7043 100644 GIT binary patch delta 47 zcmeBj?Q)&q!0*nG$&k*F$dJcS!jR8UG|}H((2T)=!IZ(3!HU6z!IHs|!Fl8I$BF(2~KG!GOVx!HU5NNE=21^D<2Iq~-eOUk{ C-3tK# delta 47 zcmeyu`Gs?W1AhQR5ko#h7DFmSGD8VN@kD=jK}!Z#1_K5&1}g?9AZ@^4x^cNL3jipY B3i<#5 diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index 134963bd..3eada8b6 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=545; +build=546; diff --git a/Sources/epoch_server_settings/treeView.txt b/Sources/epoch_server_settings/treeView.txt index 302204a0e3637b9757870c57ee781f87879188e0..76a931a6738d6b6de1b6bdea8721130193b25ee5 100644 GIT binary patch delta 47 zcmdlYvPEQq1HU^%CPO+yB10ZS2}3?Z(L{fDK{Eye22%!C1}g>=21^D<2Iq~-dpQ9U CKnmOd delta 47 zcmdlYvPEQq1AhQR5ko#h7DFmSGD8VN@kD=jK}!Z#1_K5&1}g?9AZ@^4x^a0gCjb@v B3e^Ar diff --git a/Sources/mpmissions/epoch.Altis/treeView.txt b/Sources/mpmissions/epoch.Altis/treeView.txt index 1fb1c4322593d93dc2d0b3630a8df026ba4a52b4..c08e9789af5b7a675a305fc5def299b1e8cf6fae 100644 GIT binary patch delta 49 zcmeC%#n`utae@QCJ3}TzIzu8u9zzL3K10z&e|JGM1_K6D23H0v1``HL21f?xjmy(x E07Nhh3jhEB delta 49 zcmeC%#n`utae@PX07DT&K0_8mDnl|u2}AKje|JGk23H0H1~UdL1}7kGz+k#@d3p>0 DM(hj( diff --git a/Sources/mpmissions/epoch.Australia/treeView.txt b/Sources/mpmissions/epoch.Australia/treeView.txt index 5e99f5a009c78434da88380f02759492b5689fec..f94ed9b6c4e77d63727a8775b89e5d21783091de 100644 GIT binary patch delta 49 zcmbQXi*ed6#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!jbQ F0RTrh3?l#l delta 49 zcmbQXi*ed6#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<@qrH DN%RaH diff --git a/Sources/mpmissions/epoch.Bootcamp_ACR/treeView.txt b/Sources/mpmissions/epoch.Bootcamp_ACR/treeView.txt index 7ffc21bfea6f39d5f13050612175e8d5f0bc13e2..70634c00837a57dc2273871dc9cdaa6232f33f52 100644 GIT binary patch delta 49 zcmbQUi*e2_#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!d%Y F0RTyU3^f1% delta 49 zcmbQUi*e2_#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<)twI DOgaoM diff --git a/Sources/mpmissions/epoch.Bornholm/treeView.txt b/Sources/mpmissions/epoch.Bornholm/treeView.txt index b67fa994f00b243b64c0950b4e6f0d13a7da4008..e9bdfd5d9c229d45385a10c46a38a0cf3a5b913a 100644 GIT binary patch delta 49 zcmbQTi*d>>#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!jbO F0RTpJ3>^Rf delta 49 zcmbQTi*d>>#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<+(8c DNiqx; diff --git a/Sources/mpmissions/epoch.Chernarus/treeView.txt b/Sources/mpmissions/epoch.Chernarus/treeView.txt index 5b4cd25ac3519b490370b0eae0252ee93d72fb81..406ea7a2dae43315eb7a1f9dbf779453f0b45ae4 100644 GIT binary patch delta 49 zcmbQXi*ed6#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!jbQ F0RTrh3?l#l delta 49 zcmbQXi*ed6#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<@qrH DN%RaH diff --git a/Sources/mpmissions/epoch.Chernarus_Summer/treeView.txt b/Sources/mpmissions/epoch.Chernarus_Summer/treeView.txt index e73dd53b4f60c263005941813b63c715ac4db949..e2e9db4804c28d6211d74ce63e538bccb83d0569 100644 GIT binary patch delta 49 zcmZ3oi*d;=#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!iP@ F0RT*f3{3z4 delta 49 zcmZ3oi*d;=#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<+U*Y DPeKev diff --git a/Sources/mpmissions/epoch.Desert_E/treeView.txt b/Sources/mpmissions/epoch.Desert_E/treeView.txt index 0a213eda8c651ab7711063ffa9bb6fbf0bd7db80..f5d1ed19d3909cf939ca43fdddc447061e24edf4 100644 GIT binary patch delta 49 zcmbQTi*d>>#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!jbO F0RTpJ3>^Rf delta 49 zcmbQTi*d>>#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<+(8c DNiqx; diff --git a/Sources/mpmissions/epoch.Esseker/treeView.txt b/Sources/mpmissions/epoch.Esseker/treeView.txt index 3572910ebe02479d91c0e5408108dc6341d9353d..da4292d6d8047970de2ab426ffefce66818cd014 100644 GIT binary patch delta 49 zcmbQVi*eE}#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!jbP F0RTm`3>N?Z delta 49 zcmbQVi*eE}#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<=HU+ DNN@}g diff --git a/Sources/mpmissions/epoch.Mountains_ACR/treeView.txt b/Sources/mpmissions/epoch.Mountains_ACR/treeView.txt index 79a49dfd3348928c36cbc14ebb2770fcdf644a90..c8d76e9340246b4d74458a563617871dfef155bc 100644 GIT binary patch delta 49 zcmbQYi*epA#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!d%a F0RT!s3_Ab- delta 49 zcmbQYi*epA#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<>fH| DO#BQq diff --git a/Sources/mpmissions/epoch.Napf/treeView.txt b/Sources/mpmissions/epoch.Napf/treeView.txt index db57842fda1037c889abc47587662728287daf61..d3f658edf51a1f702c1ad4e5800c26d24fffc0e6 100644 GIT binary patch delta 49 zcmeC##n`ipae@QCJ3}TzIzu8u9zzL3K10z&e|JGM1_K6D23H0v1``HL21f?xjmuMG E07GsJ1poj5 delta 49 zcmeC##n`ipae@PX07DT&K0_8mDnl|u2}AKje|JGk23H0H1~UdL1}7kGz+k#@d1?#* DMk)*b diff --git a/Sources/mpmissions/epoch.Porto/treeView.txt b/Sources/mpmissions/epoch.Porto/treeView.txt index e0b29aaf7ec98e35356671fb0a5e36f5a8780674..a18ba8bf9c1fe5898c67c5dd52bf2200250fd5d6 100644 GIT binary patch delta 49 zcmeC%#n`utae@QCJ3}TzIzu8u9zzL3K10z&e|JGM1_K6D23H0v1``HL21f?xjmy(x E07Nhh3jhEB delta 49 zcmeC%#n`utae@PX07DT&K0_8mDnl|u2}AKje|JGk23H0H1~UdL1}7kGz+k#@d3p>0 DM(hj( diff --git a/Sources/mpmissions/epoch.ProvingGrounds_PMC/treeView.txt b/Sources/mpmissions/epoch.ProvingGrounds_PMC/treeView.txt index 0a5c4c8f89a90d7ba91677df2ec3c5dabf9b46cd..0c10669c5d7918d995f923ac5fd70b41a8107637 100644 GIT binary patch delta 49 zcmZ3ni*dy+#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!g3C F0RT=43|RmG delta 49 zcmZ3ni*dy+#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<&7}_ DP{s^W diff --git a/Sources/mpmissions/epoch.Sara/treeView.txt b/Sources/mpmissions/epoch.Sara/treeView.txt index a2c01be2ab27ddf5af2629df5cc2d209bfdc1cfd..266a8a900716272be2328b425c3012c1c7df6a07 100644 GIT binary patch delta 49 zcmeC##n`ipae@QCJ3}TzIzu8u9zzL3K10z&e|JGM1_K6D23H0v1``HL21f?xjmuMG E07GsJ1poj5 delta 49 zcmeC##n`ipae@PX07DT&K0_8mDnl|u2}AKje|JGk23H0H1~UdL1}7kGz+k#@d1?#* DMk)*b diff --git a/Sources/mpmissions/epoch.SaraLite/treeView.txt b/Sources/mpmissions/epoch.SaraLite/treeView.txt index b97f491b2aee2095339ca1b512dadd88d1d2b058..94f1ab0671b8473b53acc002c0366f387cb9360e 100644 GIT binary patch delta 49 zcmbQTi*d>>#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!jbO F0RTpJ3>^Rf delta 49 zcmbQTi*d>>#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<+(8c DNiqx; diff --git a/Sources/mpmissions/epoch.Sara_dbe1/treeView.txt b/Sources/mpmissions/epoch.Sara_dbe1/treeView.txt index b49bd3edaa6b2ca3a18acaee152ac89ce3897648..ddc54d9f600e2d5a008151b82ea708f65b0f1d8f 100644 GIT binary patch delta 49 zcmbQXi*ed6#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!jbQ F0RTrh3?l#l delta 49 zcmbQXi*ed6#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<@qrH DN%RaH diff --git a/Sources/mpmissions/epoch.Shapur_BAF/treeView.txt b/Sources/mpmissions/epoch.Shapur_BAF/treeView.txt index 7040decf68ba9c8f00823118eaeb7117d22ef3e5..77d65abeaed3195164c56c7a19fee3f1e3500c3b 100644 GIT binary patch delta 49 zcmbQSi*d#-#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!d%X F0RTt(3@HEr delta 49 zcmbQSi*d#-#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<%KZ- DO12Cl diff --git a/Sources/mpmissions/epoch.Stratis/treeView.txt b/Sources/mpmissions/epoch.Stratis/treeView.txt index 8027ccf1fdbd32a20d1beb51579657e314abe3d6..635da2de14a19e3192ffc6184c78ce0786b83bfc 100644 GIT binary patch delta 49 zcmbQVi*eE}#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!jbP F0RTm`3>N?Z delta 49 zcmbQVi*eE}#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<=HU+ DNN@}g diff --git a/Sources/mpmissions/epoch.Takistan/treeView.txt b/Sources/mpmissions/epoch.Takistan/treeView.txt index 06ec9b2a0ac5eb6f07cbb0c821bbdf481903a2d7..2ae025d15dd39acd4cc408f30ef47a9595c913f5 100644 GIT binary patch delta 49 zcmbQTi*d>>#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!jbO F0RTpJ3>^Rf delta 49 zcmbQTi*d>>#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<+(8c DNiqx; diff --git a/Sources/mpmissions/epoch.Tanoa/treeView.txt b/Sources/mpmissions/epoch.Tanoa/treeView.txt index 753f51fa86dbac9a780c348e94efbe9cfc045333..122e8e9d191c3f4f1689a6d3594dd90c3870521a 100644 GIT binary patch delta 49 zcmeC%#n`utae@QCJ3}TzIzu8u9zzL3K10z&e|JGM1_K6D23H0v1``HL21f?xjmy(x E07Nhh3jhEB delta 49 zcmeC%#n`utae@PX07DT&K0_8mDnl|u2}AKje|JGk23H0H1~UdL1}7kGz+k#@d3p>0 DM(hj( diff --git a/Sources/mpmissions/epoch.VR/treeView.txt b/Sources/mpmissions/epoch.VR/treeView.txt index 3825e029f33aead384cef0eb12eb5ae646996ff3..83ff50b27556388779f7f9a9f3d1ef1a07c34ff0 100644 GIT binary patch delta 49 zcmeC!#n`cnae@QCJ3}TzIzu8u9zzL3K10z&e|JGM1_K6D23H0v1``HL21f?xjmr~b E072>t`2YX_ delta 49 zcmeC!#n`cnae@PX07DT&K0_8mDnl|u2}AKje|JGk23H0H1~UdL1}7kGz+k#@d14Fz DM5YV! diff --git a/Sources/mpmissions/epoch.Woodland_ACR/treeView.txt b/Sources/mpmissions/epoch.Woodland_ACR/treeView.txt index 6fad7c39e0c052f427c1a301d3a4cbd0ede0d919..3f91b51cf70f479ce9a7d35d03974c2792c017a6 100644 GIT binary patch delta 49 zcmbQUi*e2_#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!d%Y F0RTyU3^f1% delta 49 zcmbQUi*e2_#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<)twI DOgaoM diff --git a/Sources/mpmissions/epoch.Zargabad/treeView.txt b/Sources/mpmissions/epoch.Zargabad/treeView.txt index 6c45be398988f02d6d2803ef770033b5a4ee94a8..e41b1918818620bcad9b18346ad0ef8ebee327ca 100644 GIT binary patch delta 49 zcmbQTi*d>>#t9Dm?hKg>=?sYsc?=~C`3yx9{oMu47z`Lp8C)5x7)%%}85|j$H!jbO F0RTpJ3>^Rf delta 49 zcmbQTi*d>>#t9Dm0SrY9`3zYMsSL>sB@D$A{oMsE8C)3*7|a-~7@UB#0fXtr<+(8c DNiqx; diff --git a/Sources/mpmissions/epoch.utes/treeView.txt b/Sources/mpmissions/epoch.utes/treeView.txt index 41a95e1d9c6ce47adaa7a9ff7f5be52151eef8f3..6650a75898201ebd38e2d232a066d8eaa48e14d8 100644 GIT binary patch delta 49 zcmeC##n`ipae@QCJ3}TzIzu8u9zzL3K10z&e|JGM1_K6D23H0v1``HL21f?xjmuMG E07GsJ1poj5 delta 49 zcmeC##n`ipae@PX07DT&K0_8mDnl|u2}AKje|JGk23H0H1~UdL1}7kGz+k#@d1?#* DMk)*b diff --git a/build.txt b/build.txt index 5853b977..d2cfc9ee 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -545 +546