From a8ed5dda28e712855b033dde0db936f8f98f25ba Mon Sep 17 00:00:00 2001
From: vbawol <vbawol@veteranbastards.com>
Date: Wed, 3 Feb 2016 10:45:18 -0600
Subject: [PATCH] further improve wait logic for player object propagation.
use loadAbs instead, thanks to norukid on the forums!
---
.../@epochhive/addons/a3_epoch_server.pbo | Bin 389074 -> 389065 bytes
.../mpmissions/epoch.Altis.pbo | Bin 89670 -> 89655 bytes
.../mpmissions/epoch.Australia.pbo | Bin 89722 -> 89707 bytes
.../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 89834 -> 89819 bytes
.../mpmissions/epoch.Bornholm.pbo | Bin 89687 -> 89672 bytes
.../mpmissions/epoch.Chernarus.pbo | Bin 89788 -> 89773 bytes
.../mpmissions/epoch.Chernarus_Summer.pbo | Bin 89844 -> 89829 bytes
.../mpmissions/epoch.Desert_E.pbo | Bin 89802 -> 89787 bytes
.../mpmissions/epoch.Esseker.pbo | Bin 89676 -> 89661 bytes
.../mpmissions/epoch.Mountains_ACR.pbo | Bin 89991 -> 89976 bytes
.../mpmissions/epoch.Porto.pbo | Bin 89794 -> 89779 bytes
.../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 89882 -> 89867 bytes
Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 89953 -> 89938 bytes
.../mpmissions/epoch.SaraLite.pbo | Bin 89968 -> 89953 bytes
.../mpmissions/epoch.Sara_dbe1.pbo | Bin 89976 -> 89961 bytes
.../mpmissions/epoch.Shapur_BAF.pbo | Bin 89818 -> 89803 bytes
.../mpmissions/epoch.Stratis.pbo | Bin 89710 -> 89695 bytes
.../mpmissions/epoch.Takistan.pbo | Bin 89733 -> 89718 bytes
Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 89646 -> 89631 bytes
.../mpmissions/epoch.Woodland_ACR.pbo | Bin 89930 -> 89915 bytes
.../mpmissions/epoch.Zargabad.pbo | Bin 89871 -> 89856 bytes
Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 89770 -> 89755 bytes
Sources/epoch_code/System/player_login.fsm | 4 ++--
.../epoch_player/EPOCH_server_loadPlayer.sqf | 2 +-
.../epoch.Altis/System/player_login.fsm | 4 ++--
.../epoch.Australia/System/player_login.fsm | 4 ++--
.../System/player_login.fsm | 4 ++--
.../epoch.Bornholm/System/player_login.fsm | 4 ++--
.../epoch.Chernarus/System/player_login.fsm | 4 ++--
.../System/player_login.fsm | 4 ++--
.../epoch.Desert_E/System/player_login.fsm | 4 ++--
.../epoch.Esseker/System/player_login.fsm | 4 ++--
.../System/player_login.fsm | 4 ++--
.../epoch.Porto/System/player_login.fsm | 4 ++--
.../System/player_login.fsm | 4 ++--
.../epoch.Sara/System/player_login.fsm | 4 ++--
.../epoch.SaraLite/System/player_login.fsm | 4 ++--
.../epoch.Sara_dbe1/System/player_login.fsm | 4 ++--
.../epoch.Shapur_BAF/System/player_login.fsm | 4 ++--
.../epoch.Stratis/System/player_login.fsm | 4 ++--
.../epoch.Takistan/System/player_login.fsm | 4 ++--
.../epoch.VR/System/player_login.fsm | 4 ++--
.../System/player_login.fsm | 4 ++--
.../epoch.Zargabad/System/player_login.fsm | 4 ++--
.../epoch.utes/System/player_login.fsm | 4 ++--
45 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo
index 587319a858532324aa6fe327bd892fd47960b527..7fa7cd33b589a0d3c6b34766c2dc2248f994642c 100644
GIT binary patch
delta 116
zcmca~U;N~K@eS`e+0ryOg)P^fe346KI`2^?vCaBi+qjtdv^F)r5ZV4hgmFHvKu&&Q
ziepl-LVR9oc|cBOQTqZV#_bD~m}>giOe{?eO%2+WHZlP*GZ3?ESK7!r$4;c&(kb>u
U`TjM3_~Y0ej;xp%Ar-g_05)hWL;wH)
delta 125
zcmX?kU;NU2@eS`e+2T&G3EQAO`68Ff^sXaJLYuX@c5yLFoLSTSLS*|35yttvlF9j{
zc_kXTiRp<|nR%(j3h{ZV<pDXBMVjr?l^C~AS7NH^V>2`{HZe47m)yt%#LPg<vR!f`
d>l{0gf~4%8MLBZnex0rTFWqfCBORV!0RV=YF&zK^
diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo
index 7a1f66960076b5c967ea30c8086b9e2eb45807f7..ec50e14e50f92429cf75abcf7a62ba0d9a05fd40 100644
GIT binary patch
delta 91
zcmX@MhjsfN)(Kmg4{2_ixI>Y5_EQEh*r2&7Y<A<bt<M<$sq+>WE7;m9XyoK4rZ^^T
u|D(Z}tjAPbJY6u7QGI()IO8%lk-k#@Cp&Mr<gNVl@wbijmM(VJaBBdNoh1YS
delta 111
zcmdnKhxOPV)(Kmg7ad<eafc%Bs;3NKF!T8OuvLxEwmxJ0r!JB1oL`z(qF`&QkPKpI
z<R+#kR%Pa;ZvUvkn5@SJk)F;N!Kgm{T{t7#_U3TL1#BV>8)scS+G`g*OQlum>)*{h
JY-hvw0stPPE*}5@
diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo
index a1ffb1e87725fd0e8e98a7c5b43835f8062848e2..a2cadf53aea0a478085b93c116c9765cc730512f 100644
GIT binary patch
delta 95
zcmeyhhxPRy)(Kmg4{2_ixI>Y5_EQEh*r2&7Y<A<bt<M;ZG<b`P6>M!4G;;D2Qyi1F
z8)z~n>oFA<Prn$>s5{y2I>+{N;fyobMD7Z+y-L@L)N9|k^O<DV-Kigsp4$Kb0Bk1%
delta 109
zcmaF8hxOMU)(Kmg7ad<eafc%Bs;3NKF!T8OuvLxEwmxGt(vV1Z&M(a?QLwdDNCq)9
zaud@Nt1|Oax2tM0ChM_+rKf)kW7L>zah-4b{&2<_Y$6$kDWA{9_g9s0pIrXGw&Ba`
HlCFCIw~j8f
diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo
index 62746bbfc73543c251baef032f224e74b56ebc49..7081e073b2834c52ad0236860edc34fb30d8e212 100644
GIT binary patch
delta 95
zcmaF0m-Y5u)(Kmg4{L6kxI>Y5_EQEh*r2&7Y<A<bt<M-2Y48>oE7;m9XyoK4rZ^^T
yU!cjDtjAPbJl!#ZQFrpX>m1wdA{b||iEMnnviUd5n{avWDRI3$_Se#7n1TTufhA}F
delta 109
zcmcb;m-W?N)(Kmg7aw0gafc%Bs;3NKF!T8OuvLxEwmxHAq#=>+oL`z(qF`&QkPKpI
z<R+#kR%Pa;Zl9{jn5@SNmY$v%&ZseY#dW^z`VovX*hD^_yUzSur;2mt<djqF)&K4Z
IevUH*0MFblj{pDw
diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo
index f7b104b9b62362ec92f8262ee9d884fd1c78f408..c353e845b4e6d1f3ce4c31a70e003508df73e2bc 100644
GIT binary patch
delta 95
zcmcb<hxNoB)(Kmg4{L6kxI>Y5_EQEh*r2&7Y<A<bt<M<wHF%4Q6>M!4G;;D2Qyi1F
y^J+3C>oFEj7YJw6n9di$$hLiPIO75~k&wol+q^m^?pbwO+2*fI{x+Yp3k3nBP$Rbh
delta 106
zcmX@HhxPg%)(Kmg7aw0gafc%Bs;3NKF!T8OuvLxEwmxIz*N{ke&M(a?QLwdDNCq)9
zaud@Nt1|Oaw=-!nChM_5q^HjhXVl$3C7f{qo5)es&}sjR0&jg~?)2>2IZsP0At@dJ
D_+~0J
diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo
index 25c21eb62dcecd4363c3b220f5f2d4af3f34df04..4eba012f4a2208715a3ea9a9ec590bf497c56f8b 100644
GIT binary patch
delta 91
zcmdn9mv!x4)(Kmg4{L6kxI>Y5_EQEh*r2&7Y<A<bt<M-sG<b`P6>M!4G;;D2Qyi1F
u7ilsk>oFA<Pqz<eRNu}N!MKb~glpP?SKT~}Q{A_&o%^?%@%ol6k75BkJtL(6
delta 106
zcmZ3xmvzrx)(Kmg7aw0gafc%Bs;3NKF!T8OuvLxEwmxGl(U3@Y&M(a?QLwdDNCq)9
zaud@Nt1|Oax2J0|ChM_5q^B<kXH?(*Ih=7Bn~2awt#4)wnq2AmKa-DJwO4v9%2Njb
D0L&@J
diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo
index 7958b5854139412d849cea9abff56d6b15c8efeb..a28fd9d8bb48c0b831656de4c367feee154f5ecc 100644
GIT binary patch
delta 91
zcmeyem-Xph)(Kmgk7#b1xI>Y5_EQEh*r2&7Y<A<bt<M<OXz&&nE7;m9XyoK4rZ^^T
uU!}>ItjAPbJbiy8qxyEM2*zb>B0g>0EsLzT^tIgFF=@w!D~-)J<hlTm!X<M6
delta 106
zcmaF5m-WkD)(KmgmmFU|afc%Bs;3NKF!T8OuvLxEwmxHAqal&*oL`z(qF`&QkPKpI
z<R+#kR%Pa;ZlABon5@SJk)FOGl2LuTb_C-xHj&1AJ(k74Q+%0@)*9_kTDqz*=IBHK
DPbw@S
diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo
index a924913140fd09b107bbe8388cce455a3617b90f..a0ab759b86ee42ea62ff8e95fd9b4a1b55741ab7 100644
GIT binary patch
delta 95
zcmX@Lmv#4E)(Kmgk7#b1xI>Y5_EQEh*r2&7Y<A<bt<M;nG<b`P6>M!4G;;D2Qyi1F
yH)t{@>oFA<Pgjg!)ScXSonyOP1mg@g5trSiS|1-woA52WB%<*$`@YIayr%)~10~-8
delta 109
zcmdnJm-W<M)(KmgmmFU|afc%Bs;3NKF!T8OuvLxEwmxHQ(vV1Z&M(a?QLwdDNCq)9
zaud@Nt1|Oax0h-%ChM_+rKdZFGiprkxX!noKZ0=vn+UV{?J4=p(Y}i&INZ9udwKcJ
H^<s_yf{iPn
diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo
index 00f9c82e1d1b465455e75ebfbc3a2c9627898e86..aadd13c115be3f942079d392245e637a3b704079 100644
GIT binary patch
delta 91
zcmX@Jhjs5B)(Kmgk7#b1xI>Y5_EQEh*r2&7Y<A<bt<M-)G<b`P6>M!4G;;D2Qyi1F
uGifp=>oFA<Pd^{VsJ?wtIO8%l5!0N@3oc9lPLh)i=I5JzRpZVKKNSEmfg#oa
delta 106
zcmdnHhxN=J)(KmgmmXg~afc%Bs;3NKF!T8OuvLxEwmxHI(U3@Y&M(a?QLwdDNCq)9
zaud@Nt1|Oaw}01QOx9zANKZEiXH?(b9L~6mO=QNh;ymwQ&a@vQ=EwhjGMaXD;zn}-
D0OKn&
diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo
index 05b103f977e756ec01affc558a399f7bda7940a5..be716b52a0bd2ab1456e9a02bb6e8588e5ba79c9 100644
GIT binary patch
delta 95
zcmZqQ&-!B@>x8Y$M>RK1+@Z)j`zZq$Y|z{kHoNiJ)@O|Nn!Lru3bwWi8aeriDUM0o
yZM7Ja^%#q%J47&QOt*_<WZQl@f^h+x2>Z0sg^_Xd0~k*TF)-~D40kDhuM7a1Q6X3W
delta 106
zcmeydkF|Y2>x8Y$OOLOgxI>Y5)l&vAn0b7C*s8{7Tc0u7Yf7X$=a=S{DA?L6B!d_l
zxrynCRhfCI+l{msll9mj($mjJFzRkU62Z8DO~n6LV3=InW4&DrqP0#c;gZG+4jKUf
D^gbxJ
diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo
index 8c3ce62f4d2bd2d7e56439bd38d422e2e9aa1070..a9e6327b8335e1f77364e7b62a9a3ab1f5d909a4 100644
GIT binary patch
delta 86
zcmX@Kmv!@A)(Kmgk7{n3xI>Y5_EQEh*r2&7Y<A<bt<M;%G<b`P6>M!4G;;D2Qyi1F
pS7<UO>oFA<Z+{rhc$Q5h$>Z1|yZv7+d6%xA9mW}R?(gBrsQ}6MBUJzZ
delta 106
zcmdnIm-WzI)(KmgmmXg~afc%Bs;3NKF!T8OuvLxEwmxI5(vV1Z&M(a?QLwdDNCq)9
zaud@Nt1|Oax94gyChM_5q^B2#GpcX@8P2$jP2`c(N;j@Mo2O)Ev3q;QKb*dqnZX<Y
D5f3Tk
diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo
index 0ef74dde625660c9144885944e01482f69443c7c..175e49cb894deeda410a604a8d4780cafcdb48e8 100644
GIT binary patch
delta 95
zcmbQWkF|Rr>x8Y$$22!h+@Z)j`zZq$Y|z{kHoNiJ)@O{DG<b`P6>M!4G;;D2Qyi1F
zU(jSs)?+Fzo?aNis5|-Ib&l<M5sWj~L<%Y%J9XL3`g393N~5FSrfino-jx9W4$mjy
delta 109
zcmeC)$2w~t>x8Y$%Z{&~xI>Y5)l&vAn0b7C*s8{7Tc0sr(vV1Z&M(a?QLwdDNCq)9
zaud@Nt1|Oaw;$DHOx9xsOHZE|&Zsf@#&y2!@ezzO*hFHAx&?|~&dxYIYvYH-PgZ)V
IykC0=0JFm{6aWAK
diff --git a/Server_Install_Pack/mpmissions/epoch.Sara.pbo b/Server_Install_Pack/mpmissions/epoch.Sara.pbo
index 0e09cb9786b3ea23d06f7d1a25a935a153a4864e..04ac89f7c3c647105017b23e3096a62a417edaac 100644
GIT binary patch
delta 91
zcmaF3kM+_%)(Kmgk7;h2xI>Y5_EQEh*r2&7Y<A<bt<M-GHF=AR6>M!4G;;D2Qyi1F
ui)%3^>oFA<PyZOfsJne_1mglWk*M!|3qQTjUw-Xvw3sg6x4OGKgW3Rg`z5jf
delta 101
zcmcb#kM-d`)(KmgmmOa}afc%Bs;3NKF!T8OuvLxEwmxH&)Rahf&M(a?QLwdDNCq)9
yaud@Nt1|OaxASN*ChM_5q_-DFFrH--@h#%pD-kBVqVvc7nNM9liF?&_-30(PDk(nz
diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo
index 90588c7acd778cf879f37fcd67450b1e5a975247..da9dfb3656855de69959643ec87efe87cdcc3d88 100644
GIT binary patch
delta 90
zcmeyckM-d`)(Kmgk7;h2xI>Y5_EQEh*r2&7Y<A<bt<M-WG<l1Q6>M!4G;;D2Qyi1F
tt7$PN>oFA<Pm5&K-M%M+aRHmip^kIbUL`BehFz@`Rdk<J)mu?L0{}gEBM$%o
delta 106
zcmaF3kM+Yo)(KmgmmOa}afc%Bs;3NKF!T8OuvLxEwmxIj(3D7b&M(a?QLwdDNCq)9
zaud@Nt1|Oaw@Yg=ChM_5q^Ez3VAS2dHiB^ho5)H5r#fw4`8{ji+4|N69(?+9-fJ!Z
D7q=^Z
diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo
index a82f4059e282711b0ddaca243f95016475fa01ca..f832d703173e7d1d240074a2613b5214eb9b81bc 100644
GIT binary patch
delta 99
zcmeydkM-p~)(Kmgk85t4xI>Y5_EQEh*r2&7Y<A<bt<M+@G<l1Q6>M!4G;;D2Qyi1F
z>uE72>oFEjH;iD^n64km$Tr#L2FLa@5sWj~M7YCZe@tJ$*IMMYZnj0icI{7A(PjWx
CbtKFH
delta 110
zcmaF4kM+ks)(Kmgmmgn0afc%Bs;3NKF!T8OuvLxEwmxGt(3D7b&M(a?QLwdDNCq)9
zaud@Nt1|Oaw<~KgChM_5q^BQ<VAP##bAx01-U!ASY$C_M+}-Xk5yE7>qFTV8Im+eY
HQFRLd(^V^z
diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo
index 0f7145ab759de45b7a1accdea018905aba247425..a7644b285d7e0f21dd560d81227b4917d9ade1a2 100644
GIT binary patch
delta 95
zcmcb$m-X~s)(Kmgk85t4xI>Y5_EQEh*r2&7Y<A<bt<M-IY48>oE7;m9XyoK4rZ^^T
zpP<Q@tjAPbJl!yYQFrpZ>m1wlA{b||iG)50*d4V$NnDpTLFd@DoTe!nvrhm3@slLc
delta 109
zcmX@Tm-W_O)(Kmgmmgn0afc%Bs;3NKF!T8OuvLxEwmxH=q#=>+oL`z(qF`&QkPKpI
z<R+#kR%Pa;Zg16OOx9xsOHU6BXVjQH<2v7V`3S}tY$8_#MPA(gu2a4)#M4#%+T7R$
ID>)tj0IRYrp8x;=
diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo
index 136e28719e4e07626796a0d8868dcb647f2e448f..8676ae443d09cb02b1e597f45ae5f4d15235fc82 100644
GIT binary patch
delta 91
zcmaF2hxPs*)(Kmgk85t4xI>Y5_EQEh*r2&7Y<A<bt<M<MG<b`P6>M!4G;;D2Qyi1F
vt7tMN>oFA<PyZOksJ?wmIO8%lk^A2QR8KG3e6n}y$A}|x%V!$+I86iqfXXE-
delta 106
zcmcb=hxOea)(Kmgmmgn0afc%Bs;3NKF!T8OuvLxEwmxH2(~wAa&M(a?QLwdDNCq)9
zaud@Nt1|Oaw@Yd=ChM_5q^G|RXVl%kI-GF<n~40M3qiInb7r>sRlIFm{Zu?4i`g3h
DAUrDC
diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo
index 53af8db1281ce4a585e45ef769535875f64fb18c..94e761ec2103a2e32cebd51b3331f1b3f19c5b18 100644
GIT binary patch
delta 91
zcmZqO%ld5(>x8Y$Cp0%r+@Z)j`zZq$Y|z{kHoNiJ)@O{i8ob5D3bwWi8aeriDUM0o
utu+~w^_Yr_rw2qbs&79X&bW+Cgfm=0<jeCf=k_%I&wf=9V*h5Jupt0TC?qEU
delta 106
zcmeyihqZMt>x8Y$D~_+9xI>Y5)l&vAn0b7C*s8{7Tc0u7YDlCz=a=S{DA?L6B!d_l
zxrynCRhfCI+YK}sll9mj($gIy8P&J%31?i!Cc?2*q{m?L1k3lD(-?y~7A`J)R8Ru|
D;|?jZ
diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo
index 1c95de1a43c76977f58bf8b269dd36b4e3894229..670dfe721431b9347de980c84cc915d498130bad 100644
GIT binary patch
delta 91
zcmZ3thjsoQ)(KmgPiStMxI>Y5_EQEh*r2&7Y<A<bt<M;rsq+>WE7;m9XyoK4rZ^^T
vf1<&dtjAPbJbhyrqx$xeaK>e9BAO8w7tP&c{$lsLeXCCjEcx{K%UUA<jPEBu
delta 106
zcmbQghjrZ^)(KmgR~%nIafc%Bs;3NKF!T8OuvLxEwmxHgrY@20oL`z(qF`&QkPKpI
z<R+#kR%Pa;ZojF)n5@SJk)FOjoKbgsb~xh#HWA~qXDiBuoDwZuev6&oc0Xj(^_~I%
DFDWcE
diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo
index aede22aa07941c63fde49117953e49445058ffe5..cb94e9eed3adce4658299632f0bec013384213c4 100644
GIT binary patch
delta 94
zcmX@Lk9GGx)(KmgPik(OxI>Y5_EQEh*r2&7Y<A<bt<M;lG<l1Q6>M!4G;;D2Qyi1F
yX)z}2F%=h2Ul_rtJDKkW$M$&<j5F9o+zU!;lBbsanI*(~bei>*#5?=8$N~VU$0Vx&
delta 109
zcmdnJkM-0()(KmgR~}zKafc%Bs;3NKF!T8OuvLxEwmxHI(v(Pd&M(a?QLwdDNCq)9
zaud@Nt1|Oaw|~`SOx9xsOHV%-&Zse&;|AaM{s_hyY$8|k7C0O#4zpV2YMwJ`owop^
HtmJ<HioPoG
diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo
index 380efbca7cda4b9cd8591009d8f082f35215dfc3..c945ac02edac47b1e93c53fdd3f9e749318ecbb2 100644
GIT binary patch
delta 91
zcmeC*$J(%ub;4HWlbV|*?oi~N{geR=HfU}No89<q>odmV8ob5D3bwWi8aeriDUM0o
uk7_a|>oFA<PoE#bsJlHnf^h+xNY$~m*S>kHZEaSFlzH;-YVx_P^eF&hf+Z#Z
delta 106
zcmZqJ$J)P-b;4HWmB-gl+@Z+3>L~*l%sjq6Y*pj4t<M;bYe=L!=a=S{DA?L6B!d_l
zxrynCRhfCI+jnU)ChM_5q^D1aVAS326T!HEO=M%R5%1wY_Q8jW)L&kDVm#5z^1(>}
D2R$pY
diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo
index 3a5c0124bb104b500aac211f6846ad694ad0e31f..945270ea1a54c9cd38d4dfd40b8fa37e5518920c 100644
GIT binary patch
delta 95
zcmZ3rmv#1D)(KmgPiStMxI>Y5_EQEh*r2&7Y<A<bt<M;fG<b`P6>M!4G;;D2Qyi1F
yCulMz>oFA<PiKr^)SaAnon!mIaK;&IBEes?)^w`(6t);e)~2lDUL~;I;vE3UrzDF2
delta 109
zcmbQemvz-%)(KmgR~%nIafc%Bs;3NKF!T8OuvLxEwmxG_(vV1Z&M(a?QLwdDNCq)9
zaud@Nt1|Oaw})ynChM_+rKc-~GiprExX!ozeK_L`Hj#zBC#_dB$QegZE@Tir`Kj^K
HhWi=-Z{I9M
diff --git a/Sources/epoch_code/System/player_login.fsm b/Sources/epoch_code/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/epoch_code/System/player_login.fsm
+++ b/Sources/epoch_code/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf
index 8de17f0e..2bc674d4 100644
--- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf
+++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf
@@ -319,7 +319,7 @@ if (typename _this == "ARRAY") then {
if (!_canBeRevived) then {
_newPlyr setVariable["REVIVE", _canBeRevived]
};
- [_plyrNetID, _plyrUID, [_newPlyr, _vars, _currWeap, count(magazines _newPlyr), _plyrGroup, _canBeRevived, _newPlyr call EPOCH_server_setPToken]] call EPOCH_server_pushPlayer;
+ [_plyrNetID, _plyrUID, [_newPlyr, _vars, _currWeap, loadAbs _newPlyr, _plyrGroup, _canBeRevived, _newPlyr call EPOCH_server_setPToken]] call EPOCH_server_pushPlayer;
_newPlyr setVariable["SETUP", true, true];
};
diff --git a/Sources/mpmissions/epoch.Altis/System/player_login.fsm b/Sources/mpmissions/epoch.Altis/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Altis/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Altis/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Australia/System/player_login.fsm b/Sources/mpmissions/epoch.Australia/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Australia/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Australia/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Porto/System/player_login.fsm b/Sources/mpmissions/epoch.Porto/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Porto/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Porto/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Sara/System/player_login.fsm b/Sources/mpmissions/epoch.Sara/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Sara/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Sara/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.VR/System/player_login.fsm b/Sources/mpmissions/epoch.VR/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.VR/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.VR/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n
diff --git a/Sources/mpmissions/epoch.utes/System/player_login.fsm b/Sources/mpmissions/epoch.utes/System/player_login.fsm
index d929174b..31647855 100644
--- a/Sources/mpmissions/epoch.utes/System/player_login.fsm
+++ b/Sources/mpmissions/epoch.utes/System/player_login.fsm
@@ -1039,7 +1039,7 @@ class FSM
priority = 0.000000;
to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1342,7 +1342,7 @@ class FSM
"_playerObject = _array deleteAt 0;" \n
"_playerVariables = _array deleteAt 0;" \n
"_currentWeapon = _array deleteAt 0;" \n
- "_magCount = _array deleteAt 0;" \n
+ "_mass = _array deleteAt 0;" \n
"Epoch_my_GroupUID = _array deleteAt 0;" \n
"Epoch_canBeRevived = _array deleteAt 0;" \n
"Epoch_personalToken = _array deleteAt 0;" \n