From 5744be50d301689d884ea828c4b54cb26e8fa287 Mon Sep 17 00:00:00 2001 From: vbawol Date: Sun, 24 Apr 2016 17:40:47 -0500 Subject: [PATCH 1/5] Move returnOnPack to CfgBaseBuilding --- Sources/epoch_config/Configs/CfgBaseBuilding.hpp | 9 +++++++++ .../compile/epoch_vehicle/EPOCH_server_packStorage.sqf | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp index a4cd962c..8c472f20 100644 --- a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp +++ b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp @@ -153,4 +153,13 @@ class CfgBaseBuilding { { removeParts[] = { { "PartPlankPack", 2 } }; }; + + class LockBox_EPOCH : Default + { + returnOnPack[] = { { "ItemLockbox", 1 } }; + } + class Safe_EPOCH : Default + { + returnOnPack[] = { { "ItemSafe", 1 } }; + } }; diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_packStorage.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_packStorage.sqf index f746c74b..f668ba8e 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_packStorage.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_packStorage.sqf @@ -51,7 +51,7 @@ if (_class isKindOf 'Constructions_lockedstatic_F') then { _gwh = createVehicle["groundWeaponHolder", _posWH, [], 0, "CAN_COLLIDE"]; _gwh setPosATL _posWH; - _returnItems = getArray(configFile >> "CfgVehicles" >> _class >> "returnOnPack"); + _returnItems = getArray(configFile >> "CfgBaseBuilding" >> _class >> "returnOnPack"); { _gwh addMagazineCargoGlobal _x; } forEach _returnItems; From 14ea6a44dc18712bc043651e1b5cb015ba3f7cf3 Mon Sep 17 00:00:00 2001 From: vbawol Date: Sun, 24 Apr 2016 17:44:11 -0500 Subject: [PATCH 2/5] item overflow support for spawning count of items or weapons --- .../functions/EPOCH_fnc_addItemOverflow.sqf | 43 +++++++++---------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/Sources/epoch_code/compile/functions/EPOCH_fnc_addItemOverflow.sqf b/Sources/epoch_code/compile/functions/EPOCH_fnc_addItemOverflow.sqf index dd2339f9..b7cd1940 100644 --- a/Sources/epoch_code/compile/functions/EPOCH_fnc_addItemOverflow.sqf +++ b/Sources/epoch_code/compile/functions/EPOCH_fnc_addItemOverflow.sqf @@ -23,31 +23,28 @@ BOOL */ private ["_wHPos","_wH","_nearByHolder"]; -params [["_item","",[""]],["_count",0]]; - -if (player canAdd _item) then { - if (_count >= 1) then { - player addMagazine [_item, _count]; - } else { +params [["_item","",[""]],["_count",1]]; +for "_i" from 1 to _count do +{ + if (player canAdd _item) then { player addItem _item; - }; -} else { - _wH = objNull; - _nearByHolder = nearestObjects [position player,["groundWeaponHolder"],3]; - if (_nearByHolder isEqualTo []) then { - _wHPos = player modelToWorld [0,1,0]; - if (surfaceIsWater _wHPos) then { - _wHPos = ASLToATL _wHPos; + } else { + _wH = objNull; + if (isNil "_nearByHolder") then { + _nearByHolder = nearestObjects [position player,["groundWeaponHolder"],3]; + }; + if (_nearByHolder isEqualTo []) then { + _wHPos = player modelToWorld [0,1,0]; + if (surfaceIsWater _wHPos) then { + _wHPos = ASLToATL _wHPos; + }; + _wH = createVehicle ["groundWeaponHolder",_wHPos, [], 0, "CAN_COLLIDE"]; + } else { + _wH = _nearByHolder select 0; + }; + if !(isNull _wh) then { + _wh addItemCargoGlobal [_item,1]; }; - _wH = createVehicle ["groundWeaponHolder",_wHPos, [], 0, "CAN_COLLIDE"]; - } else { - _wH = _nearByHolder select 0; - }; - - if (_count >= 1) then { - _wh addMagazineAmmoCargo[_item, 1, _count]; - } else { - _wh addItemCargoGlobal [_item,1]; }; }; true From b2cfa0e0bc3fc11b0058d1ad89e02c06ce4e04b2 Mon Sep 17 00:00:00 2001 From: vbawol Date: Sun, 24 Apr 2016 18:25:03 -0500 Subject: [PATCH 3/5] 0.3.8.0436 omit active simulSwap target from is build allowed check return items if object it removed --- .../@epochhive/addons/a3_epoch_server.pbo | Bin 387231 -> 387235 bytes .../addons/a3_epoch_server_settings.pbo | Bin 396544 -> 396544 bytes .../@epochhive/addons/epoch_server_core.pbo | Bin 12329 -> 12329 bytes Server_Install_Pack/MPMissions/epoch.Napf.pbo | Bin 910618 -> 911248 bytes .../mpmissions/epoch.Altis.pbo | Bin 910651 -> 911281 bytes .../mpmissions/epoch.Australia.pbo | Bin 908879 -> 909509 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 909966 -> 910596 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 909813 -> 910443 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 909787 -> 910417 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 909794 -> 910424 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 909939 -> 910569 bytes .../mpmissions/epoch.Esseker.pbo | Bin 909779 -> 910409 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 910206 -> 910836 bytes .../mpmissions/epoch.Porto.pbo | Bin 909930 -> 910560 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 909941 -> 910571 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 910203 -> 910833 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 910205 -> 910835 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 910208 -> 910838 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 909933 -> 910563 bytes .../mpmissions/epoch.Stratis.pbo | Bin 909787 -> 910417 bytes .../mpmissions/epoch.Takistan.pbo | Bin 909895 -> 910525 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 909779 -> 910409 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 910206 -> 910836 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 909863 -> 910493 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 909926 -> 910556 bytes .../compile/building/EPOCH_isBuildAllowed.sqf | 12 ++++++++++-- .../compile/building/EPOCH_simulSwap.sqf | 9 +++++++-- 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 +- 32 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 3855dcc3079d682d8e84b2cd1b167b6f6fd48d28..33ac1a5b2afdcd90afd32cf2e86cd83aab6df77f 100644 GIT binary patch delta 132 zcmV-~0DJ$R(HEo97m!Q>BTlhSvJwVJOC48950l^!9+RLH2eT^^h5`a5PP4NWcmV@8 zJ0O!GBUOWg7l(rv0k?w}0&s~8LSb`dLUn0uWNB_^xBH+1P*VZ4w@mZ`>IwxiFf%kU mhdciQhdciRw>$p?Q0WxW{;Mg6{lq_40a~(l)V9vJ#W91_S~{50l^!9+RLH2eT^^h5`cAHnX!8cmV@7 zJ0O!GBUOWg7l(rv0k?w}0&t0!V1@z?lZ;aew-2ELKvMy;w@~x~>IwxhG&46chd=)U ihd=)Vw?F>`Q0Wv%$s}JRzF@GxRP*B9Od$Cg0Cy>za4-J= diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo index 0a94f074b1afb4f386fa39afedf85155af4de60b..7743c0aa0d89d359660b8f3497f85ed32c9e3b9c 100644 GIT binary patch delta 149 zcmZpeCDAZTVnT?$x}R*g3j+f~QfX#Rie5%R0g#OVYCu_DAU8QbFD)}&FBwf*-EZUM zxol!a2F51FO4htwwLlCu$kxQztl5pd-Hn|Qh?#(x8Hibcn031wJKHi=k<@$kv0pPS Sz317*taF~*#uUr&@df~u79_I( delta 149 zcmZpeCDAZTVnT@hH8a_87X}7~q|(fs6upds0w5a!t^#Fwf!yT$ytK@8y<{}$Yi1iK z&t(%cG%+?eQL^Ucss&=OLAEBwrp<2b?QZOhK+FWh%s|Wn#H`!h*x8n`iY#fLeMWtv Tf~$ATi9CfD&u#Wscs~IEUbQD? diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo index c2bcb52cfb1beda4e62662fc16bcf06138fe3c85..628837bea84951f1c760bdc917df092f45c67db5 100644 GIT binary patch delta 74 zcmV-Q0JZYtUS-!q<0ojVu_QNFP5Cw}(F&{r~^~ delta 74 zcmV-Q0JZIfsA$C?%d7oUb(yT4|1tg zkfI0UJ{%~LdI)+cH%2T3-|Qh@s<)n^5EO}sA}}JMb6oc4p?mqAbMN>4zTfZr4(HBh z>+;LiPlBV-HDVS6~Okt2Y&ox3eZ8 z3TsJlcy^LUMKN%~&6;I|vaDE>`g7i^9LMYWD8bO3(R;pIJaHCw4Ro4hS14oHku#PwxvBa?NoUaXvk^(1X zX_A-YvoJ0s1Vs?XVNyt>;+(=q4%JA_;TTxGM@nJW&W`Mw`ohKZ`h7ipp?nXTU$$uv zSL-YOG?{M*a$*Fx9Zlg)Q20a=l}rPxmVRxfjM}}G2sSXz5gVfsxt>$)R{WvDs3iAt z;TR0%2ljKal3dtc&26tzi=*|fU=UA(InWUj9QpBGP?2CLe9&M-Vog{R;s?oQP>nvB z0YnQ|sS*SkP--U$GL?|@3URC<@|@f~+b6{%yzD^fx1bEU8Q@3dTZUq^$bbf9VF8QQ z8E_Kqy#wWFj{(QgWtGySqb#UIKfW-92yOueb+N#U9?eiT^nfIYKoNGTAXfNNz|eFo zuit0^H6+cT^ai6x&MN&el$NOerF9Fy&|&B?47qg+-4N5Yv_q76qYtBN^E8tSP1BD( z#rV*|aW0vJgHm{+Tbe=lpU}3mN=g=eqMr*-j0W+An!~T7AD=rRjY%_()6fM~sFK^D z{#LliMfrpBy8o3E#y_>_`g>jX(qNj#D8MMhFk+Z6%ot2=FwL&HOPflb?%!VV?~1pY OcjiB4>b~udZ2koHYB5^? delta 513 zcmbPm-h9?6^9g25f6O*o_%pGs(3K58Dmqz_QDyQ*rk9fim|2+YltA3gN0`|;S?jw# zhE3aif#;(-+YK|>a9)PV8?B@!>zhhW->1OKv6;zKn~{xQN;X_T1SGN9*X#>BtD%XB zq0weHy9kTTeC6$Ilc(1zOny)+I(c0+|MWaJMy|>Hbq0*qlk4ilHczcPX*gNovhVco zD;RkvpI*;3-64{hrFqZB?Rz#d)<<&~#Kv0la`AFaPvd1$<1au(MS# zoLcUy5eIdvFZIl8ATwkRv|T~I8~vVmrDT%;>$f0Y!&j8viwSO zazJYT^D>1@Pv&DXm_D74Nq_puM@%Bq@9{B7Pyfruq&$7iM^>KcCj3l((^Vfc2~D5F z&!jwgS}4CK!UdWNB^jxCFykRsWGE!2r1&PLCst+Vr8?&3<~t`ArRPV-XO^Vq>L?iM zD4@Ib3qO;3ySe}q5HkZY3lOtzR~KNLlEG|htuS3Nj>UQU218bb>3%J2Jll0E+16T2 zf7Qe2(0*tW8xXStF$WNH0x=g5a|1EY_CuR^cbSMh=ZMWtc>kI+Y3rOLf@?n?@N_yb F1pqKxt{MOU diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index af5ef41ff9fd0d7f2956613ef6bd649df252ff6f..8f9e8082c78e1ca1e3fcb2b6b792a076758cbf9d 100644 GIT binary patch delta 915 zcmZ`%Ur19?81J5KSGV0eHN@O%aGaW&#x`BL6eTr7L$^hefvt7DyK^`1cIEEQKggv& z3Q|wO4bDRp^$_$@+gPwDdu$RGz-tC5pkdS8t z$fp%WNUBiflu1E_F-1-gUx8Osdaq`u8ueqBs&z&4o`Cz|I8h5X5hpX27!4i{cEY5r z!f8dG78Ge7N@7A(#pEPRiHWqtsX}yHjnr(9fz|uvG_HDH z4*hnfx#mxk#fBi4jN-OqX}pQ5kVv75Szy<*udI|=zkVZ%4a^I~#%xC3Csdame`qi! zD+3%KhmqpIAx=?KiyN83Muu7%Z}x`6cpA)su88O=j_-x43?uwjgHf5aU`>c0q*y^c z`fLRdEuNz)5M)55lO)JgVk#g?SR*NLO5gmTEJX#yg|cr!74k74gsRs~lBbp9gE6e6?q zU4J<~G+yFTDL5?iQ+@Irx_OUw98}XvGMEf;{M2|DU#JEAx`yz%6Vik{=W2mos6ma~ z2JN@PaV{ool{fvboG|{WMHk*1`j&^YG)4(VDTW!tf?>sA3d33Ujj!_5=|MH(LB{*+ O)YZ(PwfNK5%Hy9>)-Njn delta 513 zcmdmZ-hB5d^9g25x6L+M_%pGs(3K58Dmqz_QDyQ*rk9fim|2+YltA3gN0`|;S?jw# zhE3aif#;(-+YK|>a9)PV8?B@!>zhhW->1OKv6;zKn~{xQN;X_T1SGN9*X#>BtD%Xp zx#eazy9kTTeC6$Ilc(1zOny)+I(c0+|MWaJMy|>Hbq0*qlk4ilHczcPX*gNovhVco zD;RkvpI*;3-64{hrFqZB?Rz#d)<<&~#Kv0la`AFaPvd1$<1au(MS# zoLcUy5eIdvFZIl8ATwkRv|T~I8~vVmrDT%;>$f0Y!&j8viwSO zazJYT^D>1@Pv&DXm_D74Nq_puM@%Bq@9{B7Pyfruq&$7iM^>KcCj3l((^Vfc2~D5F z&!jwgS}4CK!UdWNB^jxCFykRsWGE!2r1&PLCst+Vr8?&3<~t`ArRPV-XO^Vq>L?iM zD4@Ib3qO;3ySe}q5HkZY3lOtzR~KNLlEG|htuS3Nj>UQU218bb>3%J2Jll0E+16T2 zf7Qe2(0*tW8xXStF$WNH0x=g5a|1EY_CuR^Z<~k|%deaLXvNb_Uw&+ey4}>Of2l;? F5&)jkuSfs@ diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index 9b715cd608b9116bd0d541caf8c782505e788f91..f2143ccecaf1814f7dcff9456349ddc080db3ee0 100644 GIT binary patch delta 915 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 delta 513 zcmcb3!uYu_%pGs(3K58Dmqz_QDyQ*rk9fim|2+YltA3gN0`|;S?jw# zhE3aif#;(-+YK|>a9)PV8?B@!>zhhW->1OKv6;zKn~{xQN;X_T1SGN9*X#>BtD%Xp zrSWDry9kTTeC6$Ilc(1zOny)+I(c0+|MWaJMy|>Hbq0*qlk4ilHczcPX*gNovhVco zD;RkvpI*;3-64{hrFqZB?Rz#d)<<&~#Kv0la`AFaPvd1$<1au(MS# zoLcUy5eIdvFZIl8ATwkRv|T~I8~vVmrDT%;>$f0Y!&j8viwSO zazJYT^D>1@Pv&DXm_D74Nq_puM@%Bq@9{B7Pyfruq&$7iM^>KcCj3l((^Vfc2~D5F z&!jwgS}4CK!UdWNB^jxCFykRsWGE!2r1&PLCst+Vr8?&3<~t`ArRPV-XO^Vq>L?iM zD4@Ib3qO;3ySe}q5HkZY3lOtzR~KNLlEG|htuS3Nj>UQU218bb>3%J2Jll0E+16T2 zf7Qe2(0*tW8xXStF$WNH0x=g5a|1EY_CuR^s|`gCF0qvRo|k8SWr9Z6UZ?)gw+=27 F2LSnFt~CGv diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index 2f9b9b3a59d397b30de2492aa24af45b9dc73c73..e7de23c4c65b3954b56531539aa57c5771895e13 100644 GIT binary patch delta 915 zcmZ`%Ur19?81J5KSGV2kpAd7a!EtJ8R&zS1DGF+a3*8op3uLV8-JQF+?aJMqe~?S1 zg49!RiSrPJJp{d!8~0%m_z)RXPxTVM6q#T|P!xd>J#>!C{ycOqzjN;WzTfxzec$1{ zd)&V9wEdbFbo+B10YJYWc7#?cwQ8zX%YhGcrQZ?q)R13&-B4sU<$aEjroUjm)YC_B ziruH>I_;XP&8C0%v{LlP(~i)C3KG+Yz2AyVEzPaoHvLr3xeiA}8ovO$AzuBNM52qe zh%wkef+KTN0xFGzLmt**{>9phW7=+raB#7Lw?GX3l~wf{(^qM&Ms?P?Tu>I0(zF2i zj4TT&1uC38At*2=OG)A@@Jd?iRc%y*cIHZzCadmIcnppawQwVGGGmF6z{x--Oi2oy zlBFp@PRzlCm=qN;H38FNGLzsGA-bnVYWBv!>itp%yY_VJ57lRGW*`{oAB+@w(1NmE zyR+I<{in%7Ly${Faoe#B-b6)6rcwC}uxZ(sR?4j1ycNX;=6PacHY4{Fs>_ByR2Y-w z0gjKuNMYb0CoAd2?bZDDDz!A$)3hgl9AUdy7Mzo&=HR#7zrWnC3z@T0h_|e^2%8qW61Q963PSwN;UkVtR zi5K)+Nx7?G>icmQQ3%D22$0x%31MhsJat%Pol8@yc*a9)PV8?B@!>zhhW->1OKv6;zKn~{xQN;X_T1SGN9*X#>BtD%Xp zrTJzzy9kTTeC6$Ilc(1zOny)+I(c0+|MWaJMy|>Hbq0*qlk4ilHczcPX*gNovhVco zD;RkvpI*;3-64{hrFqZB?Rz#d)<<&~#Kv0la`AFaPvd1$<1au(MS# zoLcUy5eIdvFZIl8ATwkRv|T~I8~vVmrDT%;>$f0Y!&j8viwSO zazJYT^D>1@Pv&DXm_D74Nq_puM@%Bq@9{B7Pyfruq&$7iM^>KcCj3l((^Vfc2~D5F z&!jwgS}4CK!UdWNB^jxCFykRsWGE!2r1&PLCst+Vr8?&3<~t`ArRPV-XO^Vq>L?iM zD4@Ib3qO;3ySe}q5HkZY3lOtzR~KNLlEG|htuS3Nj>UQU218bb>3%J2Jll0E+16T2 zf7Qe2(0*tW8xXStF$WNH0x=g5a|1EY_CuR^n+!!{!x&2Pc9(D8w72qlc-D%Ii>2oN F000@kt_J`B diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index 14b1dcef964d926b8cdf30b435f75c4b28fc2a1d..589eff8ae15089706232b45ea67bdc50da0b5f3d 100644 GIT binary patch delta 915 zcmZ`%O-vI(6n3ZWLfc(_lvG-2G87OHO)1n;ArL8Iz(89gu_UCa%XUjw+Ai5{fre~Q zAt8D)*~1)+1`j4`qO|Fu#sp7z;HEcEMni%j9{f#+#)C6d{5iOrZ)W$s?|t8UllijI zwX@lE(*sWX^WFfU-;LTss}`-EYSi*zhqn0bA$J4$Eo|t@jE3T{J){+0FrS*~V>rbg z(DL0j&3V#V`0nnc==bOBp(iyYRv7hsEi-hqcY3^qvwh=UdqkSN40|D7{h36fhc$^Y z*g}G1*%<*<#zCE%H5q@g_T!kg7a|;7tl%vWgMVe!!mZgGwAP?Hnw(B33rT5KfP6-l zg_HsnPM#7J7?Y(W@fCO_t@W!`szp10y;hS|*F|^&P7t+lD{(SniLt<$KsQWD3Y?Lp z89`2DVM0ubikO;$X)&2eaEcJ!S0gq1V_@|GDT7`6dJ9k0O&2p53=9lKNu`wEv>p9h9#UCn+N%A1a z$6=&2aFCOg^wRcPaeIwgo@jH0!+09ZfsTmiD2?xeiUcG4UV~AIHDOJNA0(SW6Z&8V z5G^fI)d(`6#!eDsDlzRB6Idf9aI!BuBqgGP>_EBKz=GTi2%_38Lls(PKs%~n0gKid za1`yn0kvqC0Y}g!mC~bwENDPKJ~QPAZUF}Mv%rt;&r>#Zmn4WlC3dPOR`^oD$XvXn z-%$aYNt!{q4MvZgjrzkVCsD&I>lFY)hoQ$X6xS>0_PEZ|15y5!o<~=%(M&NiM?dmb z;X~sSTsjR$B!1c_&7;-FwC$9VkyC+GkmIK(!uUch;MXyX&z+DarFqA3=z=O#$!$=7 zD_r1W!d`jn|H=vDpIUVFtBE7$yue22&i#v4=WpzSa32Y*mkUEq?Sh MJ delta 513 zcmaEP(){xg^9g25AI&ye_%pGs(3K58Dmqz_QDyQ*rk9fim|2+YltA3gN0`|;S?jw# zhE3aif#;(-+YK|>a9)PV8?B@!>zhhW->1OKv6;zKn~{xQN;X_T1SGN9*X#>BtD%XB zf#GI1y9kTTeC6$Ilc(1zOny)+I(c0+|MWaJMy|>Hbq0*qlk4ilHczcPX*gNovhVco zD;RkvpI*;3-64{hrFqZB?Rz#d)<<&~#Kv0la`AFaPvd1$<1au(MS# zoLcUy5eIdvFZIl8ATwkRv|T~I8~vVmrDT%;>$f0Y!&j8viwSO zazJYT^D>1@Pv&DXm_D74Nq_puM@%Bq@9{B7Pyfruq&$7iM^>KcCj3l((^Vfc2~D5F z&!jwgS}4CK!UdWNB^jxCFykRsWGE!2r1&PLCst+Vr8?&3<~t`ArRPV-XO^Vq>L?iM zD4@Ib3qO;3ySe}q5HkZY3lOtzR~KNLlEG|htuS3Nj>UQU218bb>3%J2Jll0E+16T2 zf7Qe2(0*tW8xXStF$WNH0x=g5a|1EY_CuR^g^fh4<<5o|l)URsyzy`MU;8IZP!{spC{Yy1@!wNyZ=^&Rz=llS+Gf0cxHTli0>WYkp{Gi>h<(@O2>gYo_ z#qQCv9X8E*)SCP1YN6wB zl#*p3p+JR~#{>mNWGPO3g^-fedQ>Y_ubsM5smUsL1|ESUL@m%joQzmv*n8aD0TYq} zCuC_tkYh72CdNfYOpL*#7*EA`MF{Vzk(%8xuzH`A!miz2xn*^YWBPsGzJXw&2hAtj zv^(j>sy|H@8iITxjN6W+@FprkJc-JtfK|)9FjGeD#?3G`FwPPiqY-gWsZJ~YP+>%p z`}t551`7lGcv(pl8h!iB6eG9}7}Uc854tx^+0bp0AOa=Wsft+PO96vZ z(Sm-n1=Nu=gEFg(9yx3D`%p%r2A5VW07HkN$1vnqEOb*;*V+kD_LV+_<}cAqJ~%}` zXfMTw7K-u7By>xm@m^^f-FisdjwvZQ;Z6AX(D+CIU#MC9ItKB%6Vj+O?KliMs6v(8 z2KBeXX+9$ClsEjZoG|{WMHk=cdY9Z88lwoK7{iER!Z2end3T0Qa^>GI++D8U`jLKZ PzP#za@3udlpZo9=H>xp@ delta 513 zcmX?k!u;}K^9g25U(GgJ_%pGs(3K58Dmqz_QDyQ*rk9fim|2+YltA3gN0`|;S?jw# zhE3aif#;(-+YK|>a9)PV8?B@!>zhhW->1OKv6;zKn~{xQN;X_T1SGN9*X#>BtD%XB zf$3&9y9kTTeC6$Ilc(1zOny)+I(c0+|MWaJMy|>Hbq0*qlk4ilHczcPX*gNovhVco zD;RkvpI*;3-64{hrFqZB?Rz#d)<<&~#Kv0la`AFaPvd1$<1au(MS# zoLcUy5eIdvFZIl8ATwkRv|T~I8~vVmrDT%;>$f0Y!&j8viwSO zazJYT^D>1@Pv&DXm_D74Nq_puM@%Bq@9{B7Pyfruq&$7iM^>KcCj3l((^Vfc2~D5F z&!jwgS}4CK!UdWNB^jxCFykRsWGE!2r1&PLCst+Vr8?&3<~t`ArRPV-XO^Vq>L?iM zD4@Ib3qO;3ySe}q5HkZY3lOtzR~KNLlEG|htuS3Nj>UQU218bb>3%J2Jll0E+16T2 zf7Qe2(0*tW8xXStF$WNH0x=g5a|1EY_CuR^iw#9QP5Qlp9vMyQ)6SD)Om}qtbp6pm E0Ls6tSpWb4 diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index e27b1f3d1db9dcb30e3365d2f36c0a001a99d812..4d4ac472fa230b7465f762d2d24d2c32e0447394 100644 GIT binary patch delta 915 zcmZ`%OH30{6m?$PfoW$77=pA~^IAYaG^J2JLLh>o)IeJ!u_mO}p`Fr^wnL^9ZnT1v-fX)M&~FEAfu#z~PE~7J@Q$wV+5+w>@|#=L6)}dq#}?3X&)HA4^g*2B zc4^rTtLAL6Ti`)CiRA`cH;W8Sjm>Q>xf9*z+HE0es3ZpVxj7^Ai?tKSwCxb#;9>=Dz9{@FtL7Fb7HF+Xb<{YWP!gaE^7 zSr(ECRCsw*P+(M+62w;sD=DoFbr6th&y^!*H0W1?!0ugC&N1$9)|zDJgJV zmc|7+J`LkyLR7@$C`^fobeva&$c`GR*%k+nqRhR zca|IMf0`^b1o>nHw;fI6O;m(L3YAR)iz?8FLR3K*J< z74)0Tpq8Xrlv!o<$XTu5gEA83nO`vj3>}6Z!;oJw(~U7*YbQk6m-;Zee3fSNp-K8) zdnrD&aGX!2;D8h!>y@U^(tX-`L`lm@U((Nq$A*LWLe1dU;lbxlNF&me;}CQ~6{_Sm zsJ|7?@KIsAy#9aXgz--;y7ETXJ3o-2F^VvXF&GRZh6#hs4`jIg&EvkM-K(hx0!He}*rp delta 513 zcmexz+Wg-!^9g25Kg~8;_%pGs(3K58Dmqz_QDyQ*rk9fim|2+YltA3gN0`|;S?jw# zhE3aif#;(-+YK|>a9)PV8?B@!>zhhW->1OKv6;zKn~{xQN;X_T1SGN9*X#>BtD%XB zfyHJwy9kTTeC6$Ilc(1zOny)+I(c0+|MWaJMy|>Hbq0*qlk4ilHczcPX*gNovhVco zD;RkvpI*;3-64{hrFqZB?Rz#d)<<&~#Kv0la`AFaPvd1$<1au(MS# zoLcUy5eIdvFZIl8ATwkRv|T~I8~vVmrDT%;>$f0Y!&j8viwSO zazJYT^D>1@Pv&DXm_D74Nq_puM@%Bq@9{B7Pyfruq&$7iM^>KcCj3l((^Vfc2~D5F z&!jwgS}4CK!UdWNB^jxCFykRsWGE!2r1&PLCst+Vr8?&3<~t`ArRPV-XO^Vq>L?iM zD4@Ib3qO;3ySe}q5HkZY3lOtzR~KNLlEG|htuS3Nj>UQU218bb>3%J2Jll0E+16T2 zf7Qe2(0*tW8xXStF$WNH0x=g5a|1EY_CuR^<%~rd9EAVm#&`y|>TL0du$uH|(v6*# E0FZvH+W-In diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index 371dd86237231b837fe0dcd78574e3d9367465fd..2687ed0eba900d9b8754ac93ae3ba1dc82221898 100644 GIT binary patch delta 915 zcmZ`%Ur19?81J5KSGV0eHN@O%aGaW&)&972ITX|k4c!(=6V_PQ?atlYcIEEQKgcCb zLFy^E4+oOM9)e!VjX{gZHw&bfdh00+!KjER0wH?n9GCrh=w5#3-1~jM@Avz@!}+k$ zv9;N8vmFfk@*Y2+-wj)Xt2JsJ)u86Vd%DJF4Z7>eZ(&1Irq>k*twFW$lKIj^AHym3 zfST{LsP>awI9c{y%6ExVi|A#IQ%QC6jr8g&}zM6YqZ;;#HYk59!9g0 z#HVE_bJ933!?+}-h%X_&Z@*l;NZ# zPV!Q67AA$1APebnm=RLhBq#H+eKk_EKL%Fs6SLU0yQ}a-*>p1f0e{~>q|}2NkSyxG zwbr^nO_myhTsnr^j%V>E$b2e;s-}Ti&Al>GdiD057&g$)5gWZ8IiFEpGyYIuT$K8` zXaYt`0|z)s&MfY%6?fLCrBJIg9LCdN4zxuCTWNeJltmbc?ll+_Sp(LD_(75pG@{Q& z0MX)AstQ2{R9i`cOeJJ|LK17Fc~0t`9T1Z-Ub3Ow8&HGX3<#jwZCxc=Vt@mgSiqun z1{_7ZTc8&0GT<<}tWa8XkOlSV$5*Bt!EL~x9v1k}{Ta%F?vex%sK8Ej#0p;u7@1C# z^j#*IguJ%UN->@4Tcs&S6nyIj)bP&3sL^HHj3u2(M&NiO+WBd z;zNrjxl9HQiP4E(aR#kEq%EiAtd#br16*_>6vh{74!^cReC~uaCeGN7LnlGNp&X4-hEa~8$1q?RF__{|jy1Tdh0*5=w_fzP=2tE~ M^?rI}M<+v$pX9qP*Z=?k delta 513 zcmaEG()`sC^9g254CWgx{F&HR=*os46`ices4{sY)62;M%q&cHN+9m$Bh2iato2!UdgVq>j&xp=vzr|~kW@@J+gXv8Pym*$ly*x4!= zPOs%8g*Jgr?8o zXHuR#EtKCA;Q~#Cl8n?mnDG!RG87V1QhXEB6RR@wQXO-1^PLlm((|L^GfPr)brcMB z6wuxJg`Y{iU0r|)h?#+y1&CR diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index d3b2368c555235bf96bdab2cd08a4d5257c6e167..2bace8c3d0392770236a37c2cd8b0a450c3f6044 100644 GIT binary patch delta 915 zcmZ`%Ur19?81J5KSGV2kpD=T)#c^tC7Ta{{QWVq-4c#V5i)5_p-JQF+?aJMqe~?Rm z6r`Sl`*0qjsE44J+{PXjfe(Q_ND%c_1W^c!Fo>cMqM&nJ_UEB{`JHp`_x--#@B0qt z>w4$bM(6boFy_sAe1Lv8Y75-1)@rGGEeqb$)m~e`T}OU%>$(!7AwO&jXt`(1r$+h+ zPO*EmY?oDYv|DoD+-(%Sb;=faP(@<7(T*=AhE`{rr#*MF_pHYjk|r;}9*9?ODi-Tz zO=1K#k>L2kjDX6c;Gml|8Go^M#o)Q!ok)=5C6?i47^{E!BNgKObqsgl43_J!Wh+43jI2p0TxbK9o3nnB5 z&dAb?AjcM9OpJ?)n3#e|F`kNXiV)saBQ?8YVD$khg&sFnCiCR4;4lv zd646yFjO4a&&f)1sgTYW($w-qiz^t!(_jv?heUgEd>2$C7~*#t3`?vDYeM`W*$f)c zM>BwE=^|B$AOoswBtfPUlU^}~H4*|R_b&`dv9KW9QRX$MMs5c9QO%~I0xdJZiON{O zqBRB_M%!;d4ccbF0d!ua^k^>&>d^PkOeun!fI)pM@S=P3loj0}2_jIAooa~{z7#Mt z7cJ_ymVri+W>99G(IZE_em}}c)bPq$8NkqC=rIiWwKCcn)pc}3lzpM+(WNUilMl_& z_dON((D)daOu`X~pYE6D(d|{*dR$4#317m`@zWDQe4!TcYahnvPDqo|y!|M2K^3ax zHmJW9PID1qr@Z-p<%IE1ExPNWCJZwMlOM^j`&z43S03@HLi*{e Qmmi*ZoU<*3b3YFK1Z*NPkpKVy delta 513 zcmaET(){ZY^9g25%;p;{{F&HR=*os46`ices4{sY)62;M%q&cHN+9m$Bh2iato2!UdgVq>j&xp=vzr|~kW@@J+gXv8Pym*$ly*x4!= zPOs%8g*Jgr?8o zXHuR#EtKCA;Q~#Cl8n?mnDG!RG87V1QhXEB6RR@wQXO-1^PLlm((|L^GfPr)brcMB z6wuxJg`Y{iU0r|)h?#+y1&CRxKz(89gu_oBmp`Fr^wnL^N79vnRUGx@|#e>;mk9c=e=Wu};n? zMqoV&j?7L9s3-~!x;P{Ai?tWWwA~Ql;9>=D-U$3Ft7dObU8A*X)n4mxKv{@OQvwX7 zWLZckP~qiqL4grjiW6TUq$IT-)k4*4r><6Lvg$koo8Tx>3p5ZX21|^1k9#{{LQ>$Q zEKLe>Y!=4ExTuJUahMe2sTi*a;XO4{vo{7-?~_v4wYw|(SbgSX`+eTNfndG|%_m#6 zyQ_^=f11oU1o=c5w;f60O;m(<5|vB?i}6Z!;o7u)6G#`TPH-B*ZL5;bcJSf!D)KM zU5pPc6yuXgI3$H8dZih({E)UDQ&MumoAB|WiO~SQP;>aT58`ttq%mp6egrz93RQ9& z)ZYrH`G~Mv-tfP2!uY2aU4F0YT^dT$7zG%G7z~CH!-T=+hSFSRYw7(a>fV93FILWN Pm1n*#^tA9d=I4I`nYJ%} delta 513 zcmex(+Whx1^9g25?B*LS{F&HR=*os46`ices4{sY)62;M%q&cHN+9m$Bh2iato2!UdgVq>j&xp=vzr|~kW@@J+gXv8Pym*$ly*x4!= zPOs%8g*Jgr?8o zXHuR#EtKCA;Q~#Cl8n?mnDG!RG87V1QhXEB6RR@wQXO-1^PLlm((|L^GfPr)brcMB z6wuxJg`Y{iU0r|)h?#+y1&CRTYVGlts(Mvt)Qxt*`5zz&NNa!3lyF4_*ch1cJfB*OW|KV&u zYySG8`C1e3d(tglK))NX`xi>}a;j2KgZFf)$L@Dmkl)OzA&)U-`|N%_^OF5sO&`W7 zZjYXBv+2%b*35TzBSn8WW%n06$up}w)zl{wit)M5|HBj;fU#H%MMN$s3j zjKCTa9Go5(P+=4tbaQ6r7i%|;X*(gp!Nn@xyb<_UR?FO&xJv64nxo3;go+T8Cj=Nu zDvA(Sp~@?xf(j#w93#F$NKNQnnw6^2PhTn170q=P9)-h1El^9G7%Va9J??FTaao1q ziaahT(lnIBn5c^JQJ4^8Nr_j5@U9xE*&PF`_sB`?+S!qLq&;`BCw$(X-e9f=-KW^} zJBxMYf11oS1o?Ovw;f61O;m+g0u@gJtDbsgp&0$-HJan7?G6| zd?*Toxq*GWq9$fH7qgp-)ZB2LD-gibU=DNyMMrLY7gS{!4DB=+mN_%lg!n;<1yrF= z768%g1*#Z97L?dYf=neQJfeg(;sUR9Pxs1FSWp}&^%|5SHw%2IY{OK9=2%dV3OK-_ zWfmMlTW>%a+G4>0bWWp;XfFpU(2p-{K7t#7MO_^5pu1C)4c#UQB2b8(%83=e6fig$ z&FME3fNGLvQEHVnB4?#>KT63|-~4g`z%XDKF-+Oz0=hnGXljQjy>1MliTBO8XFGa3pImZM;|_SLK=~$97muFYEUD$ zLHn(6hK~q4<+cASCyak;(WSSB?)m-{jgg0ukHKJ=F)SEtwm-$$8%sW}T~9!UdgVq>j&xp=vzr|~kW@@J+gXv8Pym*$ly*x4!= zPOs%8g*Jgr?8o zXHuR#EtKCA;Q~#Cl8n?mnDG!RG87V1QhXEB6RR@wQXO-1^PLlm((|L^GfPr)brcMB z6wuxJg`Y{iU0r|)h?#+y1&CR$exJ*IK|?U#86u==a0U;O#QKf~wLp-~(Oea|XSYTp%38{ zyGPG-ICOWjJ^S6;MA2Kvox#;o63Y&^d@V3FHZ-++v&Xv6v^m4_*m>9m@#;%SQYUK> zqp+3)M`kAlR1^aTysX9ii?tiaw4D&);9?bT{wVw_t7UIYU8VI(%~kDoLq&+oQv&2u ziXtRbsB+4{J;TDQIiXsE4j@TYH_sQ6AIyJFbBHAqANeX2dXj*^E(YjWY&T;A%2iz1=Z-2 z6+pCbkt#uu0i{loAXAA+pD1CCgup4ivjege5fm3nzX4^)%YXnX-!K)UMFun=8w*&p z#(;xp`z@opgSZ%1d6az1+l`H0*0q! zdHqHks3B7Ai>X(&x&6krr$m@zCERtzRLlxAU5Y4gX2tNLT*!u;~7 Otvavc(fX6?8$SURV=%M; delta 513 zcmex%+PvYo`2;g2e)EkM{!DBubY;VjicVH!RGGYy>E&brW)>zpB@lP>5oUHy*7~lG zVbeBW;Q6S|cEe0IoR?wpMk}ew`lgc8_bKplY-TdmW@O`+k_{IS0ZDB3HT%NOYG`6& zY`EFYF2Z6nUwJ#*^uGY z3P#?^r`K~$cZg(WY2LGO`<{)A_0b##v9Z>?T)bS<(|DOw`7_fLG~$!}(Yb zr`Pf_$xMIhz$nNC5e2E8uK1WqYgTZR0jEWgs6 z9FW@oyi6g}llhnorcdW%(w~0v5tGRDdwfjN)Bo}@DNkSXk(Fn<2|ttHbk)a9LeuB) zGbvA=7Rv95aDk>mNk(cO%y@_u848IhDZYv6iB*|-sgAk1`Ob+&>G{#|nI);YItqq5 z3g~YA!q24Mt}eg?#LPg<0>rG_)dkq5WH6grD@<36V{x9o!H`v9x?c+$&vxBPwzU@1 zU-d9Lv>)2U2E^<@%mKulK+FZi+(68;{m>>}1!Ixt?cVOU-}QRli<$Cy&o!}2wzfUT E0PXXwz5oCK diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index 09a2a462c32f9a9e78349ab5691265774293ced9..a9ac6d4450da6a69ccf82d09c66887546792edac 100644 GIT binary patch delta 915 zcmZ`%OK1~O6m?#bX_L(KBc(Rcz-#)qN}4wIOABpnX{AjfEsan@oK7aq*h!{LCjC$b ztt}K?3A1>MqSS?;3)_S&QiSg6qJpTqu0#n`MMM;#ATE5bv3?fLaNe7__uO;teY{V* zZMnU+JFOt-O}G01{ch9|*eKU4scJn9KG5Y}N5E4>elxp<0<$SQ>$7-bJcnqxGFDJ2UPj}{tw&!LB{J#F7P`(G6vlgrg@q-jAs6n5t z0HT%aR4IZCD07emnMzD}MG0%f1y1Q(9FnE5pg2+LH7G|O2KZ4$&QyX{8PJ4^Siqtk z2GpX%H=qI?GT=12s!>LCk_A=h$5*Bh!5m;vFAKcr;R0nx_ep{X6l14KVuddS49!RL z`pre4j-(ls+GUK$Rc$ZcXQ+B6_Zi*UOyC6#M8+ml&Ce36+^Yr8P z5`1X9#3d4NMCNDub%7 delta 513 zcmaES(){fa^9g25LgpJS{F&HR=*os46`ices4{sY)62;M%q&cHN+9m$Bh2iato2!UdgVq>j&xp=vzr|~kW@@J+gXv8Pym*$ly*x4!= zPOs%8g*Jgr?8o zXHuR#EtKCA;Q~#Cl8n?mnDG!RG87V1QhXEB6RR@wQXO-1^PLlm((|L^GfPr)brcMB z6wuxJg`Y{iU0r|)h?#+y1&CR| diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 0b42750e3905aa6173c2aa66f545a6243a70ced6..379d9f2a8910658ef0072eba34bd982d83f90df5 100644 GIT binary patch delta 915 zcmZ`%OK1~O6m?#bX_L(KBc(Rcz-#)ql_WK$wWWo&R$6J3h{Y62h||fW89T|8$)q33 z;HQP6D`6IIAxd2cy3i&B8nJX`1>K034*@HRLz9VJI@2@`H|$o_ooBZJ>|h z6nj9=cGz{-30v;F_c%p=KH~^Isvxo4uy3cx)av%SJ-O4}qwS7}Jbn>&LA?6YlGMps z#29QO!I8Ns0hPwV5ie^o|6=XOF>NnIIJj8FTObDi%4)fr)7NReMswD=Tu>1b^0WZ? zw4w+}6{?&vA*e8>$O+;r@M=o$(QH(se)d|Gu4ta~@E9B;YT+j0WX2LBfm4AFn3PpG zrN~o)BF#ZbOo*zOoPa4Yk(M}Bi0-SAn*A}bdY_!euH9X^$J%ob(;p1<4MYk(=t0G< z-(6|0{?lZkA;=}8xb0XPZ=xzBQmA|e*!0Y%l``wMZbz|!d7jvq&B*hV>a^hx4aQ`p zpX1{&QW!YMDQaqAdnLcULM@Ipd%|Hn4dy^+M06I$_dr#K5q_`1sLWchCd3a?te_5k zu>yz|E>YzOGN8gi5@aedSqw8#KADq#VO z))`QbcHe_4w9A0Q=z>NW(Lol}pda6uVg$DUgL+utNB3qaJGw&>M4%KqRTC?GDPUwK zUeIqX0SzS0pv(qiM6O!nA(WA+!KL*QfMLKeVwm#lCA2$k@O46zeQo5?<*PK4kIc{y z+RN~v@e-Fx!6BKS?3HKH@T^h>J7)2Px7-kF$h82U!4`tYSPsQ3R-~Fzoo&Ngf OH_VIhXv^B_>fN8Mv@hfU delta 513 zcmcb3!u!UdgVq>j&xp=vzr|~kW@@J+gXv8Pym*$ly*x4!= zPOs%8g*Jgr?8o zXHuR#EtKCA;Q~#Cl8n?mnDG!RG87V1QhXEB6RR@wQXO-1^PLlm((|L^GfPr)brcMB z6wuxJg`Y{iU0r|)h?#+y1&CR3-^00 F1^{Qvtx*5~ diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index 19fcf5b9de9d55a518acf5a79bb9216cb15066cb..055c526a43e7a6902645aa4cd01c0cbd19920250 100644 GIT binary patch delta 915 zcmZ`%O-vI(6n3ZW!nV5w3_)6LG87OHOm+h9Wv|X~@0u9;t z0}0WSW)E{98azn6C~ay|W72rR7;bv=qS25*j0dAJ!59zDQ1R#BZoZk__rCXi?@i{# zMrU!e^Hv8CeYq|_pm)X`!POeQj%v_z-~(Oba|FHhKgY(L5L62{=L2LM_CJ!4l*C)BbLllvOyR z$TOl6&%n5pkW?u-1yfQY9p_asvad#J_Q$~LgK`?X_VwnUYMUN*DBvF)4wrh+1BzY0 zzusE+r^!-7kWWT%+tD=MBvnkLP}Ll;>DgBniqY@fjbH<2f!Ht%@;s+{Z1_WiQCS({ zg%}K%1`hCwnp)gmFKn+!UdgVq>j&xp=vzr|~kW@@J+gXv8Pym*$ly*x4!= zPOs%8g*Jgr?8o zXHuR#EtKCA;Q~#Cl8n?mnDG!RG87V1QhXEB6RR@wQXO-1^PLlm((|L^GfPr)brcMB z6wuxJg`Y{iU0r|)h?#+y1&CR`S|DRx@9x~qZCCE@{DWNj zqa^hd+=ufJg*^nllp8}9flnFaTM!C{ycOqzjN;WzTfxzec$1{ zebK)Ds{L*onDFO(0YHBqc7~R!^;)V<&w(#=wci=?y2)>T%}`=C6$YIlJ^z~7X`qke z6njX|bvSg-X?uRpdy1mJo_B_xRgqYJxb1t1skOz+artxImwnENJa!d!LA?4ii9{!B zkz%ls1V?5kMN}3CN4>1Y{EKxE$F%(r;oxEwZ-E&6E34)2P2Hh&x8|z%c%ULCA)fgX|s5h%k>wZsZv3K*G= z7xi0hpn;?rlwD(t$Wv!LjIuH{xVUNq7zPX@hN-Y>qg&#JwoZt0?~MYwev@Vjk!kvg zuN)tmkl@p4I3x=bz48oNdP+Oas2L>{NCkOeVl<2|)Es_YgZSJDX-uARoq!zFphj+k z_FLg19~1Y>oBmf$82{9w8=nlli$hr&qXeTA!;E3UuwpQUp)8x`sD OpSy2m<-@yMyFUS@m@%3F delta 513 zcmX?k!u;}K^9g25isl!UdgVq>j&xp=vzr|~kW@@J+gXv8Pym*$ly*x4!= zPOs%8g*Jgr?8o zXHuR#EtKCA;Q~#Cl8n?mnDG!RG87V1QhXEB6RR@wQXO-1^PLlm((|L^GfPr)brcMB z6wuxJg`Y{iU0r|)h?#+y1&CR8ZUdmneVI%M%upsK8-g@eSU`Rm}f*?_y<7StKX86vT`Ty_#zW+a* z?@wE|pSRv<0SQmK%?s!c!*>7eGQE2{m$JZa7Bx|=Eb;~BgEVJV4ahFiAtO-+q%mpjwnb)n53l*TW@PKZ}eG8XIL z%wh!Ak>JSOlz@t&;EiYi|zAydk2EK9(12< z)96yuG#HWO zK0XwM!Q8+;URITb&DHGYDz!M;;0grrG?)V&LD7*L-vw0(219!dh9%C7H6ebGYymas zvjsr3aEU5GkOif7k|0xwibsrLjfB9sS z&>9Plpq+Q10`0KiAR5ysBRar=D)j9uTY%sOU{N;*Jm}smWkYvJf(R60r%GalF9i(F zM05I0g`k$CS(I95jmTMTEJrDc8eCc{1Q-SkBZeuvR!BES4J{oIrC%FE=<-#X%?4-a z`)$Se&_Xd@QQ(jin(UEg(d`Gc?Ub676W)Z64^55+@P(SkuVWCOJ0XorvyNlX1vRLV z+o1hcILAkXz4H41l@rE4wdl%wL(kGsipI#tD8OJa%or97HanE!4mX$XzF2Nu+5J?0 QLUCXJ0k-lUkG<{x3H~fFdH?_b delta 513 zcmexz+Wg-!^9g25s^%Ll{F&HR=*os46`ices4{sY)62;M%q&cHN+9m$Bh2iato2!UdgVq>j&xp=vzr|~kW@@J+gXv8Pym*$ly*x4!= zPOs%8g*Jgr?8o zXHuR#EtKCA;Q~#Cl8n?mnDG!RG87V1QhXEB6RR@wQXO-1^PLlm((|L^GfPr)brcMB z6wuxJg`Y{iU0r|)h?#+y1&CRgRuZ^VCyWqK&?>y+oaefyO_&WbH7 E0r6X`E&u=k diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index d2a0a0f8e0c2f8d7d5fff7b19d285c716725f8f7..6c7b62b7a7c7c26720966c2251146ec587df7c4f 100644 GIT binary patch delta 915 zcmZ`%Ur19?81J5KSMPT3)DYX2gX7fHEaq(KQZ&>G4c!(=6J)IGcIR$xyLNZyALP;> z1*xatKAeXzEQoqZH%3eX>BR`4hoYBy=?{VuJwy>0(L?9B?9W5@@;m3=@B4kf-}fEP zy|vbb_0}6LK=x)mK0t2`*aM3dS`}5JWx)r!!fOw>tI2O}O;^Mi@_qJzmV3^AuA>j) z6t_pqw%Ii2QETqI`v^sUJZ%rGl#^I)pyg|kp}EQJ^5jl+4teY$Y2*UzfOz$$$C$7_4wd$yKI-x8iqzM6r z)3Pii6{zs?sGz{8EG3Aq5LQxJmujWzwKLZ&nyk9c!NYKvs0AB{6N4oNeJ6ZvFexc; zT$aWKIX(^JVnS5JGsy|H@8iIT>g4>R!@g^!lB8AE(fmO@AFj0)Qa4Uihm>FWjFv#_UYPaGK6-Fib zBp;5!P+?#{FDt3p&E@>&GBr2c=n4k$G?)V&A<60J#yCQ_o0kL_06xE0fr7kk73BKn(3yPuB9EK>??g3UA{`Q`OqZ& zz*CA3Ega`lDcCQC$GW8{w75jujwxw5=}Y?g@Yrw=U#J=UI{NUr6Viw@|!ab#b=d658p0* QdwfSHIm)(PuUKCG1ffkZR{#J2 delta 513 zcmbPx(tP<5^9g258s-}<{F&HR=*os46`ices4{sY)62;M%q&cHN+9m$Bh2iato2!UdgVq>j&xp=vzr|~kW@@J+gXv8Pym*$ly*x4!= zPOs%8g*Jgr?8o zXHuR#EtKCA;Q~#Cl8n?mnDG!RG87V1QhXEB6RR@wQXO-1^PLlm((|L^GfPr)brcMB z6wuxJg`Y{iU0r|)h?#+y1&CRz(89Au_mOc!*ohVrX4b!@(G#v zfrRMFWEO8>B)BkfBedzF#>m117c5M4r-|_s5{PkO{3ICT!uP27SvZsP-psw{o^$WZ z+gk5pAeAt_nEA-a7J|UpJJPO@#qxSkFIWJ~h&Z zaf;oi=Q}o>Av7|M&+?funXcfkdY)m zYZ2qHi3CSxCk0fN00+IS#r%u47ss^S5aHlr6>q^f{41;FZ%y5x^*YVf;C4erNXkTnt6UuML9~z9y z%4v>Iz-V#c5T~f=`K{H$)+)6y+Tw{s@HChMT~X0h9Nz;~8Akct24ga7!I}_1NU?$j z^wA0+n!ij{Ajp79CrOa0#B@NEutrMYl-}8XS&9jY3uRw}D&%EA2vu*I%FzM?T9J(f zELvm0A++-rRHGdR)S!zRWkmZ~P=|heW=av<1Ptn7K>*#Gp&aNANf3cD>{Lsv@TGv! z=|oY#%?27tnnBrh#)#bY#serTQv-`@Hh^KkFk+YrYc{$yVQBY5lzU<1(Uog7Q;1H} z_kHE~(0GYUr{SQ?PxQ(&XnBQpoKQ1LDwqm!{KRMkU#L0!x(4vM6VjMG<2nL8P=gw| z4cc#oVJsA3WHgeZmWEA(hoc!UdgVq>j&xp=vzr|~kW@@J+gXv8Pym*$ly*x4!= zPOs%8g*Jgr?8o zXHuR#EtKCA;Q~#Cl8n?mnDG!RG87V1QhXEB6RR@wQXO-1^PLlm((|L^GfPr)brcMB z6wuxJg`Y{iU0r|)h?#+y1&CRN- F0|1K-tHA&O diff --git a/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf b/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf index 65c251cf..1ea89712 100644 --- a/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf +++ b/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf @@ -40,6 +40,11 @@ if (_buildingCountLimit == 0) then { _buildingCountLimit = 200; }; // input params ["_objType"]; +_obj = objNull; +if (_objType isEqualType objNull) then { + _obj = _objType; + _objType = typeOf _objType; +}; _staticClass = getText(configfile >> "CfgVehicles" >> _objType >> "staticClass"); _simulClass = getText(configfile >> "CfgVehicles" >> _objType >> "simulClass"); @@ -83,9 +88,12 @@ if !(_buildingAllowed)exitWith{ false }; // Max object if (!_ownedJammerExists) then{ _limitNearby = getNumber(configfile >> "CfgVehicles" >> _staticClass >> "limitNearby"); + if (_limitNearby > 0) then{ - _objectCount = count nearestObjects[player, [_staticClass, _simulClass], _buildingJammerRange]; - if (_objectCount > _limitNearby) then{ + // remove current target from objects + _objectCount = count (nearestObjects[player, [_staticClass, _simulClass], _buildingJammerRange] - [_obj]); + // TODO: not properly limiting simulated objects + if (_objectCount >= _limitNearby) then{ _buildingAllowed = false; [format["Building Disallowed: Limit %1", _limitNearby], 5] call Epoch_dynamicText; }; diff --git a/Sources/epoch_code/compile/building/EPOCH_simulSwap.sqf b/Sources/epoch_code/compile/building/EPOCH_simulSwap.sqf index 6e4d4cdf..ad7c2177 100644 --- a/Sources/epoch_code/compile/building/EPOCH_simulSwap.sqf +++ b/Sources/epoch_code/compile/building/EPOCH_simulSwap.sqf @@ -93,10 +93,15 @@ if (isText(_config)) then { _rejectMove = false; if ((diag_tickTime - _lastCheckTime) > 10) then { _lastCheckTime = diag_tickTime; - _rejectMove = !(_objType call EPOCH_isBuildAllowed); + _rejectMove = !(EPOCH_target call EPOCH_isBuildAllowed); }; if (_rejectMove) exitWith{ - EPOCH_target = objNull; + // remove object and refund items + deleteVehicle EPOCH_target; + _removeParts = getArray(('CfgBaseBuilding' call EPOCH_returnConfig) >> _objType >> "removeParts"); + { + [_x select 0,_x select 1] call EPOCH_fnc_addItemOverflow; + } forEach _removeParts; }; _playerdistance = player distance EPOCH_target; if (_playerdistance < 10) then { diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index b9206d8e..557a4034 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=435; +build=436; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index b9206d8e..557a4034 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=435; +build=436; diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index b9206d8e..557a4034 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=435; +build=436; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index b9206d8e..557a4034 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=435; +build=436; diff --git a/build.txt b/build.txt index 2af1e534..aa2f78d4 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -435 +436 From 38fd40ec37739e56ad861299712bf62f729e4422 Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 25 Apr 2016 13:28:24 -0500 Subject: [PATCH 4/5] test new deletevehicle,txt filters --- Server_Install_Pack/sc/BattlEye/deleteVehicle.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Server_Install_Pack/sc/BattlEye/deleteVehicle.txt b/Server_Install_Pack/sc/BattlEye/deleteVehicle.txt index e4fd05cf..fbd50b20 100644 --- a/Server_Install_Pack/sc/BattlEye/deleteVehicle.txt +++ b/Server_Install_Pack/sc/BattlEye/deleteVehicle.txt @@ -1,2 +1 @@ -5 "" !="I_UAV_01_F" !="(I|B|O)_UAV_AI" !"_EPOCH" !="B_65x39_Minigun_Caseless_Red_splash" !="B_762x51_Minigun_Tracer_Yellow_splash" !="B_(Swing|Stick)" !"^SmokeShell" !"^G_40mm_" !"^F_40mm_" !"Sub_F_" !"^F_Signal_" !="mini_Grenade" !="GrenadeHand" !="LaserTarget(C|W|E)" !"^Chemlight_" !="(ClaymoreDirectionalMine|DemoCharge|SatchelCharge)_Remote_Ammo" !="SLAMDirectionalMine_Wire_Ammo" !="(CMflare_Chaff|Sapper_Charge|SapperB_Charge|ATMine_Range)_Ammo" !="APERS(TripMine_Wire|BoundingMine_Range|Mine_Range)_Ammo" !="Epoch_(Sapper|SapperB|Cloak)_F" !="GreatWhite_F" !="groundWeaponHolder" !="WeaponHolderSimulated" !="Epoch_(Male|Female)_F" !"Supply[0-9]" !"Steerable_Parachute_F" !="Epoch_Female_CamoRed_F" !="Land_Cages_F" !="(O|I|B)_UAV_01_backpack_F" !="I_(helipilot|helicrew)_F" -5 "_EPOCH" !="Epoch_(Sapper|Cloak)_F" !="(SapperHead|Jack|SolarGen)_SIM_EPOCH" !="Wood(Floor|LargeWall|Stairs|Ramp|Foundation|Ladder|Tower)_EPOCH" !="(Tipi|Workbench|StorageShelf|CinderWallHalf|Foundation|Wood(Floor|LargeWall|Stairs|Ramp|Foundation|Ladder|Tower))_Ghost_EPOCH" !="(Tipi|StorageShelf|Safe|LockBox|FirePlace|FirePlaceOn|PlotPole|SolarGen|Jack|Freezer|Tarp|CinderWallHalf|Bobber)_EPOCH" !="I_(Soldier[1-3]|Soldier)_EPOCH" !="(Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Shoebox|Bunk|Rabbit|Cabinet)_EPOCH" !="(Sheep|Goat|Snake|Snake2|Hen|Cock|Fin|Alsatian)_random_EPOCH" !="(Safe|Workbench|LockBox|CinderWall|CinderWallGarage|CinderWallHalf|PlotPole|Tipi|StorageShelf|Fireplace|TankTrap)_SIM_EPOCH" !="Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorL|LargeWallDoorway|Stairs|Stairs2|Ramp|Ladder|Tower)_SIM_EPOCH" !="(Hesco3|Metal)(_Ghost|_SIM|)_EPOCH" !="(Spike|Metal)_TRAP_SIM_EPOCH" !="(WoodFoundation|Foundation)_EPOCH" !="WoodWall[1-4](_SIM|_Ghost|)_EPOCH" +5 "" !" GroundWeaponHolder$" !" WeaponHolderSimulated$" !" Epoch_(Sapper|SapperB|Cloak|Female_CamoRed)_F$" !" (Land_MPS|Bobber|Rabbit)_EPOCH$" !" (Sheep|Goat|Snake|Snake2|Hen|Cock|Fin|Alsatian)_random_EPOCH$" !" (Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Shoebox|Bunk|Cabinet|Freezer|Tarp)_EPOCH$" !" (SapperHead|Jack|SolarGen)_SIM_EPOCH$" !" (Tipi|Workbench|StorageShelf|CinderWallHalf|Foundation|Wood(Floor|LargeWall|Stairs|Ramp|Foundation|Ladder|Tower))_Ghost_EPOCH$" !" Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorL|LargeWallDoorway|Stairs|Stairs2|Ramp|Ladder|Tower)_SIM_EPOCH$" !" (Safe|Workbench|LockBox|CinderWall|CinderWallGarage|CinderWallHalf|PlotPole|Tipi|StorageShelf|Fireplace|TankTrap)_SIM_EPOCH$" !" (Hesco3|Metal|WoodWall[1-4])_(Ghost|SIM)_EPOCH$" !" (Spike|Metal)_TRAP_SIM_EPOCH$" !" (WoodFoundation|Foundation)_Ghost_EPOCH$" !" I_(Soldier[1-3]|Soldier)_EPOCH$" !" I_(helipilot|helicrew)_F$" !" I_UAV_01_F$" !" (I|B|O)_UAV_AI$" !" I_Boat_Armed_01_minigun_F" !" B_Heli_Transport_01_F" !" Land_Cages_F$" From a24d9c08bf675ad744e2c336c18b5e854bea5d06 Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 25 Apr 2016 15:41:14 -0500 Subject: [PATCH 5/5] changelog --- Changelogs/0.3.8.0.txt | 5 ++++- Sources/epoch_code/compile/building/EPOCH_staticMove.sqf | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Changelogs/0.3.8.0.txt b/Changelogs/0.3.8.0.txt index c8cfa0ba..620d311a 100644 --- a/Changelogs/0.3.8.0.txt +++ b/Changelogs/0.3.8.0.txt @@ -43,8 +43,10 @@ [Info] Some AI Scripts Mods may not work with disableRemoteSensors enabled. You can disable with "disableRemoteSensors = false;" in CfgEpochClient. [Info] Removed old .bikey and added new one for 0380. -Build: 435 +Build: 436 [Added] Install batch for all CUP mods and CBA. https://github.com/EpochModTeam/Epoch/tree/master/Tools/Install +[Changed] The function EPOCH_fnc_addItemOverflow now supports spawning items and weapons types given a count. +[Changed] Moved the secure storage config variable 'returnOnPack' from cfgvehicles config to CfgBaseBuilding. [Changed] Make use of new getOutMan EH for vehicle epoch anti wall glitch checks. [Changed] Change last few uses of hintSilent to Epoch_dynamicText. Now only the debug monitor uses hintSilent. [Changed] 1.58 Difficulty Overhaul changes to enable 3rd person. Thanks to klinGiii on the forum: http://epochmod.com/forum/index.php?/topic/41922-158-difficulty-overhaul @@ -52,6 +54,7 @@ Build: 435 [Changed] Increased range for vehicle interactions to fix issues with access to larger vehicles. Thanks to Grahame for the report: http://epochmod.com/forum/index.php?/topic/41894-cannot-unlock-large-vehicles/ [Changed] Preloading sapper by spawning one on the map at server start. [Changed] Change to github markdown for credits and license. +[Fixed] Rewrote deleteVehicle.txt BE filter to correct filter syntax to fix false kicks. Thanks to BetterDeadThanZed for the report http://epochmod.com/forum/index.php?/topic/41933-players-kicked-for-moving-safes/#comment-275297 [Fixed] Fixed Arma install batch script not closing after update. [Fixed] Mission loot payout not working. Thanks to @He-Man for the fix: http://epochmod.com/forum/index.php?/topic/41892-payout-trader-mission-broken/ [Fixed] Crafting recipe for Vehicle Repair Kit had wrong part in usedIn array. Thanks to LeBarbare for the report: http://epochmod.com/forum/index.php?/topic/41896-wrong-recipe-place/ diff --git a/Sources/epoch_code/compile/building/EPOCH_staticMove.sqf b/Sources/epoch_code/compile/building/EPOCH_staticMove.sqf index 45118995..10ff602f 100644 --- a/Sources/epoch_code/compile/building/EPOCH_staticMove.sqf +++ b/Sources/epoch_code/compile/building/EPOCH_staticMove.sqf @@ -13,7 +13,7 @@ https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_code/compile/building/EPOCH_simulSwap.sqf Example: - [_object] spawn EPOCH_simulSwap; + [_object,_item] spawn EPOCH_staticMove; Parameter(s): _this select 0: OBJECT - Base building object