From 6711ff3e8833748182d87ed6ebb3511093063b92 Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 1 Feb 2016 09:43:50 -0600 Subject: [PATCH] take 2 on login wait for playerobject to be ready code --- .../mpmissions/epoch.Altis.pbo | Bin 89558 -> 89607 bytes .../mpmissions/epoch.Australia.pbo | Bin 89639 -> 89659 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 89751 -> 89771 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 89604 -> 89624 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 89705 -> 89725 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 89761 -> 89781 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 89719 -> 89739 bytes .../mpmissions/epoch.Esseker.pbo | Bin 89593 -> 89613 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 89908 -> 89928 bytes .../mpmissions/epoch.Porto.pbo | Bin 89711 -> 89731 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 89799 -> 89819 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 89870 -> 89890 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 89885 -> 89905 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 89893 -> 89913 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 89735 -> 89755 bytes .../mpmissions/epoch.Stratis.pbo | Bin 89627 -> 89647 bytes .../mpmissions/epoch.Takistan.pbo | Bin 89650 -> 89670 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 89563 -> 89583 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 89847 -> 89867 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 89788 -> 89808 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 89687 -> 89707 bytes Sources/epoch_code/System/player_login.fsm | 12 +++++++----- .../epoch.Australia/System/player_login.fsm | 18 ++++++++---------- .../System/player_login.fsm | 18 ++++++++---------- .../epoch.Bornholm/System/player_login.fsm | 18 ++++++++---------- .../epoch.Chernarus/System/player_login.fsm | 18 ++++++++---------- .../System/player_login.fsm | 18 ++++++++---------- .../epoch.Desert_E/System/player_login.fsm | 18 ++++++++---------- .../epoch.Esseker/System/player_login.fsm | 18 ++++++++---------- .../System/player_login.fsm | 18 ++++++++---------- .../epoch.Porto/System/player_login.fsm | 18 ++++++++---------- .../System/player_login.fsm | 18 ++++++++---------- .../epoch.Sara/System/player_login.fsm | 18 ++++++++---------- .../epoch.SaraLite/System/player_login.fsm | 18 ++++++++---------- .../epoch.Sara_dbe1/System/player_login.fsm | 18 ++++++++---------- .../epoch.Shapur_BAF/System/player_login.fsm | 18 ++++++++---------- .../epoch.Stratis/System/player_login.fsm | 18 ++++++++---------- .../epoch.Takistan/System/player_login.fsm | 18 ++++++++---------- .../epoch.VR/System/player_login.fsm | 18 ++++++++---------- .../System/player_login.fsm | 18 ++++++++---------- .../epoch.Zargabad/System/player_login.fsm | 18 ++++++++---------- .../epoch.utes/System/player_login.fsm | 18 ++++++++---------- 42 files changed, 167 insertions(+), 205 deletions(-) diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index ac59372482f0e044210f15003bfaee41d7c46654..e9d475e98c8465922321f7192bfe1700568452e2 100644 GIT binary patch delta 239 zcmcb%o3(up>x8Y$w`V7Y>zp@E5+j*+p6j-ja$n6df8@@ge!eSL+^*{1}Q!Hnv+(bifDYHAAA@wtiV z&iSQzB?`8-3dtab22doiDl;#&SfL;%u`;ztvvzu;DC4B*zk(R+C*QxrHT|^#W8Lx8Y$c{kQf+@Z*8^^^e&bZ@K)v)cGMv5DE{?#k#VP;kK5C47lLc-p w+T8Un*lK!#EaRlfYj4$Wm(XIoZ7d@8_^)@llkB+f3C+G04n%N6#xJL diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index 997bc2ebba5dc21033c9f4689b7b977936bbae58..7669585bc6454d273fe3aaf5e90eb0ba7fef80f4 100644 GIT binary patch delta 255 zcmZ3!hjsTJ)(Kmg@6@cHxI>XQ`zZq$9KXCSEPLa#YZc5!rUsi2R9=^4F)=nY**t5q znuv*^g^8Y-siBd%nU0x(sh**^p@EU1j-i>Mv7WK9g_)7Dj=7nMo{^!kfuXUEsfC%2 zg@wW7FUu7K4Gm1pbc~EmbPP?6z>Li*D?&IXi=3W3x$~sS=9rBMlFa)03Y+(w5>N&+ z&b*Db)>2SYQ>c#5O-y&rFU>1au(ef41~D{%B8gR*d8x$;1v!b8sYRN#lRv(1p6+5AJAe9HWvA7zXQ{3!z%B;QyQ7QXS>wF(v!V-vH@`zxG`R}io;w$L#&H!#yNvb40&F*4h%x*~*Qx|ca4?_~c+e2fayA4)S$nZB2e(PXp3 z#stafcg+|%C+~mjKUwa@qRn$piz$IcHt&BMWIeg?XY=F>|M({#c)>CG<*oAVK3a^o cjYSN41URJkO%%!9^j2?$(LvXH2VAxR0N|oiXQ`zZq$9KXCSEPLZKw@PLsQ-jS0Ro5k1OpFapHgio; z6EQKgFwrwJH8e6e(=jtJ)iX3VG%zyMF*GwY)-yJ?Ff%gNF*h^OGcq(bFf`UNwJ_7M zurQdMvO+=7(7?n@$H>@3$I#RW%-B3-MF_{_meZ3b|2%23`OL-yNoIY0h0Qvr1(d-I zn|IOHS_*1v3f1wsiRsSyrFkU^wzdk%Ach7|B(W+pFSS^qASbahwMesea^i>P=^MBh w`KRv=W~`sQ;4atX*Ej378)!2I8;gif6IIAL@~cVjpZo6Wmk delta 228 zcmZ3zmv#DH)(Kmg^KYz~xI>XQ{3!z%B;QyQ7QXSBTP2H$v5DDc{i^GdlU=3?Y!;s) zDPm$|V6JCsW@2DurekVhq-SJmZfanzV`yn?q-Sn!XkuZaV{T!nXAab8XbDtdrek4h zGC5_1f`Emwg^r=QftikxrKN?Ak=f>{D?&J??=olPoxJ}MAEUzbKpDm<({@ab*PM}avi>{&$$c*tZRR~ArUVw*tp6^^dh)}c&66Ge^G`N-$uT+dcKP-_T8y`i aMc(b3$z>#)=_CIkD=B%^lM)Y$2q6HDT}|)+ diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index d7fa0b9ef2b937d1fefe695f054a573c5ecf866c..05aa80905ff15cdaa7a7516d101813ca304c0574 100644 GIT binary patch delta 251 zcmZqK!#ZOR>x8Y$cWTy8+@Z*u{geR=j$d9Emc8-W<_cybQ-jTOE3Zqkm>3(HY%ZUy zCSqb}VWMYdYG`C`rekJcs%L0!XkcWhV`ye*tY>U&VP<5kV{T@mXJlw>U}&skYGI~h zVPP=&;&KH+Ljw~t9V25C9Ya$iFk>_0iV%*;A}=OS-@wLbve|NDf+VxPzQX32rv#M2 zjFoSrt+f=?)D)`Ya}(2@^Gowe6l`r3l0gg&ph#j>W?pKsLP1VqWonUT?c|GBnx8Y$`8U=~+@Z)D{*(a>l5eaD3*Y!`a|Mfuv5DE{IhEHXCx7h~*xWK% zQpCi_z+BJN%*4RROvlv1NYBXB+|tmPMW;$R{eHOEyml%B8BVH X@^-8`689y-`K-;>McXQ`zZq$9KXCSEPLZKiAq5uQv)4cBU3#CFwikHnY?kT z$YzzQt&%Jz#)c-F?@U$`F)_3-(K9nOG%`2SF*7jLGc-3eFf!CJG&3~TGd8v`GcwjO zH#5;QGBh?YG}bY-Fw?QHFqmw%LP5~bz{E_)$k;^3(9{Ub*qpW^gk$pMdy_Y3ZJZ*> ztgo-I`QIr4WiW&9U9`29f|{B_b$o7Ox^sSMUWtOOtwJ)0p#c<0tjf$wEmkPVNvupQ y(yX1XsLj|seZCi?*yO#xE4Ei@G2S*7xg(m*@LA%)t3P7CD*LA^**s#(mInYViBXQ{3!z%B;QyQ7QXSBL?w%fv5DDc#;WU*lU1t)Hou%K zDPm$|V6JCsW@2DurekVhq-SJmZfanzV`yn?q-Sn!XkuZaV{T!nXAab8XbDtdrek4h zGTCf}f`Emwg^r=QftikxrKN?Ak=f?-6(JmxPp#ygtZXQ`zZq$9KXCSEPLa#fJ$Z~Q-jS`Ro5k1OpFapHj7MA z6EQKgFwrwJH8e6e(=jtJ)iX3VG%zyMF*GwY)-yJ?Ff%gNF*h^OGcq(bFf`UNwJ_7M zurQdMw?aYC(7?n@$H>@3$I#RW%-B3{MF_|AWIo2p(|y?)O*UWKm>|iludlG#?6iO~ znBn#=+FDaVO--RXJ~uJlIlnZoM8VcpAsNKb0E#45W#*+8D-`4;R;CtdZeO6u_|`;3 Z=}z(UsBr&D;Y}^~+qW52=9}!!1OWNeOLYJM delta 221 zcmdnGmv!M@)(Kmg3vR5LxI>XQ{3!z%B;QyQ7QXRWKqZTbv5DDc%c|>=%tnS5n?6ls==^2@tn;Mww7+M+|>6x1wnpl|Vm|Ga?nFBQ%S^`y==~$SW zOwL=OAYfr^p<`%nV5VbaX=$NjWVU(!iV%+JyOx8Y$cWc&9+@Z*u{geR=j$d9Emc8+rS|ziQsljG}s_T+0CdP&)n_o>< z6EQKgFwrwJH8e6e(=jtJ)iX3VG%zyMF*GwY)-yJ?Ff%gNF*h^OGcq(bFf`UNwJ_7M zurQeHvO+=7(7?n@$H>@3$I#RW%-CGAB7|dd%IV3IZ=N*Syk=v9B(uK0!e*Y+0?J^9 z%)4l7Ed@0-h3fd+#B}HU(!3G{TU&)>5JLkfl310Qms+e)kds)MTBKP!+3`d3^a)&y w{L^O#GuBUTxXU&9^v$~M0@{qh#v)FSXEdxmeR<}N8o86Pb~^prx8Y$1vl1A+@Z)D{*(a>l5eaD3*Y!mt&+vW*u-ozf7Nx#$tqI?Hh-Ti zDPm$|V6JCsW@2DurekVhq-SJmZfanzV`yn?q-Sn!XkuZaV{T!nXAab8XbDtdrek4h zGTCK?f`Emwg^r=QftikxrKN?Ak=f?b6(JncXPGndPM-gWk5OT|p$y}c>AdWWCYvX0 zOpu(eYtG0yng5;tORPdh)@a&65@W^G_Cd$uZgTcKP->T8y`i aMQ+aS-pu09?^X2ktlW)8k(4c**E;~n#!iv| diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index 45dcddd395383236520f742646081d241a253b84..d6e0e69f9ddc69c6a457af2dd80b7863679fccdc 100644 GIT binary patch delta 261 zcmeylo3(cj>x8Y$_iENp+@Z*u{geR=j$d9Emc8-WiV8s^Qv)4cBU3#CFwikHnd~@K zWb>BFt&%Jz#)c-Fb0({am>61^=$V-s8kw8vm>HPr8JZg!7#Zpqni(4F85>)e85!%C zo0;et85$cH8ta%^nCVzp7)(C4TtU##z{E_)$k;^3(9{Ub*!*pI2*>2)dy_Z++Au|u zSzljabKfZeWiVsj+h}Vo1vNE=>iFEmbm#oiyb=XlTZLp0Ljx$1Se2QVTC7lzlUSKr xq**(CqZVWHbbT*IvB|!_E4FiKG2S*7X^e~$lvL9>oWJ`^&$}ll3oLBo`2msORx8Y$1vl1A+@Z)D{*(a>l5eaD3*Y!`MFoqAv5DE{iIvwSCvUA1*jzbT zQpCi_z+BJN%*4RROvlv1NYBXB+|XQ`zZq$9KXCSEPLa#$Cb=RrUskOR$Z55F)=nY*}Qy; znuv*^g^8Y-siBd%nU0x(sh**^p@EU1j-i>Mv7WK9g_)7Dj=7nMo{^!kfuXUEsfC%2 zg@wUn#+3?!h6W~PI!4AOI)XQ{3!z%B;QyQ7QXS><4P72V-vH@XR5ACPFC#~*t}(m zq=<=;fw`WknTdgsnU1N2k)DyMxv7D_Wd z*F=Cht7$KfPC-k#D-T2IHd5r{4!#P2VWTIBD{`+x6QcwHa?4i?C@$ Wx8Y$_iENp+@Z*u{geR=j$d9Emc8+rTqU!SsljHBs_T+MCdP&)I=Y6Y z26_fypkq0?uu60@>l9`Y6GICVJu_27BXctyGXqmSLvup|BSRfSGecuNV`B?5BV!$N zGZQ@{Lt_I&V;xfqGaU;HgUL246a)iFEmbm#oiyb=XlTZLp0Ljx$1Se2QVTC7lzlUSKr sq**)J@XMshdw$n%Z_r}AZ7gD`BmBXkZ06x-eBWYch5NmEULRc#0B}Q6+yDRo delta 226 zcmZqP%ldu~>x8Y$g*Vnr+@Z)D{*(a>l5eaD3*Y!mu9C&X*u-ozd)0Nx$u127lYiE8 zZ~irzPsGH?z+BJN%*4RROvlv1NYBXB+|X#1cWg|M zoP6&X=VbPG{?q;38965By_mK6>1i<~kmzRicR|+EH`*{xnyh)descU>uI=-*7%v)& aJU<-A`24MQmClQa8}e1XCMCA&)BynK^HM_q diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index 1b65a2016d4c2037cf8df59fa861f96cb66f0530..d7a3fe3da07f90a61ef497bb8ca65f5c97064da8 100644 GIT binary patch delta 255 zcmX@Um-Y5u)(Kmg@7JuKxI>XQ`zZq$9KXCSEPLa#vPxznQ-jS3Ro5k1OpFapHd{?m z6EQKgFwrwJH8e6e(=jtJ)iX3VG%zyMF*GwY)-yJ?Ff%gNF*h^OGcq(bFf`UNwJ_7M zurQcBWrc#Ep@E5+j*+p6j-ja$n6dfDiV%*;TTV}&ta-|0^Pi0glFa)03Y%k23n+sb zIq#yawG`CU6sqHM6VsjZOY=$;Y;6^iK@1I`NMcoHUTU#IK~7?2YLRB`XQ{3!z%B;QyQ7QXRWStW~!v5DE{_^RuYlS`%wY<8a_ zDPm$|V6JCsW@2DurekVhq-SJmZfanzV`yn?q-Sn!XkuZaV{T!nXAab8XbDtdrek4h zGI`1h1py0V3mrpq12Y{XOG^tKBeTs%SA=j(e`U_dJNf-1K1PM&b$@nkN_h=bxPLl4Ek`?egt!v>0z2 bix_3G*&nP)tp9DRwENzXw10E=RVxDkBMwst diff --git a/Server_Install_Pack/mpmissions/epoch.Sara.pbo b/Server_Install_Pack/mpmissions/epoch.Sara.pbo index 217c147247ab93287957d3aa55b6c35317a97324..9dd3e162c3ebd639b75555867a4e5ec91852d6df 100644 GIT binary patch delta 239 zcmeC%$GT`A>x8Y$_iNTq+@Z*u{geR=j$d9Emc8-W-b!X8Q-jURtFBA3m>3(HY;K&Q zCSqb}VWMYdYG`C`rekJcs%L0!XkcWhV`ye*tY>U&VP<5kV{T@mXJlw>U}&skYGI~h zVPP=&_6h|-Ljw~t9V25C9Ya$iFk>_K$`Fpp!WSlQ=HE0$l38D0Ve{hC0?J^<=6BK7 zS_*1v3f1wsiRsSyrFkU^wzdk%Ach7|B(W+pFSS^qASbahwMese`av(onbR#p7%R5R fYct+97I~Hs%TOf$sNhv-MsSUHx8Y$MK{(=+@Z)D{*(a>l5eaD3*Y!`ZzYR~v5DE{WmVTDnT-rBHaAXD z6EQI|FxN9RGchnS(=oL$(latOH#IQVF|;%`(la+VG_f$zF}E<(GY4ukv;?X!)3Go$ znS6VNf`Emwg^r=QftikxrKN?Ak=bURl_4CHUmfS2{=l4(k5OUr!_!kHYo0UNtiCBh za&ql)&dJN(`A>iA&d4#D_vNh3Eoa1(K%$$My$iD5uB65I#ze%xm^r_}Ah7$Xsgp}k LyhF2mw>dumR6j_= diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo index c3aeae3464a69682e5ccba558b3adf3292dc044b..173559e3c5945e4804c140d88734f976f22a5181 100644 GIT binary patch delta 239 zcmbQck9Ffd)(Kmg@7JuKxI>XQ`zZq$9KXCSEPLa#GnLFnrUsk0Rb7{4F)=nY**sy2 znuv*^g^8Y-siBd%nU0x(sh**^p@EU1j-i>Mv7WK9g_)7Dj=7nMo{^!kfuXUEsfC%2 zg@wW7S1S|*4Gm1pbc~EmbPP?6z>LjOD?>OYPd+qxv)raBlFa)03Y#~b7ElH=4!w)E z)>2SYQ>c#5O-y&rFU>1au(ef41~D{%B8gR*d8x$;1v!b8sYRN#(=T{2&YbQM!dS6g fPn+?!v53l7sm^b~hdP7XQ{3!z%B;QyQ7QXS>nMxKDV-vH@TdS^1G8-9MY@RSh zO~k~=z+BJN%*4RROvlv1NYBXB+|E8bMuo|O@25=u`ORdr*`@@^ z$s6u*PTu;?fBGMHMvlocFK2C@d`3(OB)WO)yCCcBhFXkoOhl6Ag|4>ESTT8C#*Wjw L)hami95iGA)?Q5T diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index 5d47e288d2c00ff0024d71d5acde7064730a3dfc..e3277df134fb713a6b0f8fa8b0819c28204c55ea 100644 GIT binary patch delta 309 zcmZ3wk9Frh)(KmgAJnX$xI>XQ`zZq$9KXCSEPLa#E0xSfrUsk$Rb7|lG%+?b(a|+D zHJEHTMR@auDSRUJh88AzW~PQl=4Lu(2Bvz3=7t7FhB}63hQ@lv#ujEq#yaL^CVEDO z#s-GQI;Iw8Iu;fNI)=5@yjXQ{3!z%B;QyQ7QXS>l}Z*9V-vH@d#kQXPCim2uzBee zNs)RZ19Lr7GZOK5#4qwnGB=whd(zu9i3CC7AWM@HVs8;$df&jZ?Ysy?(mx8Y$4{Fv=+@Z*u{geR=j$d9Emc8+rStYZPsljH2s_T+0CdP&)n}1DK z6EQKgFwrwJH8e6e(=jtJ)iX3VG%zyMF*GwY)-yJ?Ff%gNF*h^OGcq(bFf`UNwJ_7M zurQb$vO+=7(7?n@$H>@3$I#RW%-GzrB7|dd$?3_HU!FACyk}#AB(uK0!e*J%0?J^9 z&bw%9Ed@0-h3fd+#B}HU(!3G{TU&)>5JLkfl310Qms+e)kds)MTBKP!Iq*aC^aWgu v{L@zlGuBU@aF=WH?VEMm6|@x8Y$#W&VW+@Z)D{*(a>l5eaD3*Y$6tdhmV*u-qJeARWy$tF_;HnUHW z6frR}FxN9RGchnS(=oL$(latOH#IQVF|;%`(la+VG_f$zF}E<(GY4ukv;?X!)3Go$ znH;i0LBPV;LdVeDz)Z);($Yf5$ZT`#iV%+JtIQdBC$E3R$EYyfQHF8KbXj&rlg$e@ zCP+@VHD~0UEdS1ba@~tXoBy5`Qv!=@mVXyyJ^A9#=E(;C`6ny9 diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 83283f99b1df975c8311fd57c23f4dc3c862eaf7..6a6df672a8e5cab4a753ca3f0bc763126194cf1b 100644 GIT binary patch delta 252 zcmbQehjslP)(KmgAJnX$xI>XQ`zZq$9KXCSEPLa#Qx)t+rUp8?My8WLwu)>%Q@LM~ z#l+aqWOLtSH4zg-3llvvQ$r(jGaWMnQ$0g-Ljxm29YZriV?ASI3o|2Q9dk1iJtIS7 z14CmSQwuX43k!qEFP19^8XB0G=@=QC=op$Bff<`6R)la&4|ZUjyjf=B6iH@%eTB^% zP6;T383*1*TWcw(sVP*)=O(5*=a=S{DA?L6B!d_lK#|0%%)HcMg@T;K%G4sw+UXlP s87ECo@M2`2od3IGyN(v)ZDSGE-71#xDVDKMwZji`P1EAl`0#B#05{H44gdfE delta 223 zcmZ3#hjsQI)(Kmgi*Kx%xI>XQ{3!z%B;QyQ7QXS>sR|AgV-qtST_e-UA6i8=pRU|5 z$!uh3vAJ)unuv*!fw`WknTdgsnU1N2k)DyMxv7DIU z;}prs>+W(+-u%{odVnhcZ+;tOJ=yW!q{&xr)o*vuV!UlEvUZkP WYUjS#L*1{R1TE{1%x@`4O8@}!_EL`k diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index c82ddf889d5c4fa02e502a4a0d555a25e3f98f09..6535ba04e6f00a0e81ef161806bf3b24ca548c8a 100644 GIT binary patch delta 234 zcmdnAhxOPV)(KmgAJnX$xI>XQ`zZq$9KXCSEPLa#hZW35rUsi&S6-K7F)=nY*}QbJ znuv*^g^8Y-siBd%nU0x(sh**^p@EU1j-i>Mv7WK9g_)7Dj=7nMo{^!kfuXUEsfC%2 zg@wW7|H~Bw4Gm1pbc~EmbPP?6z>LlMD?&J?Gs`eeo_>#w(PVS_#so=beSL+^$4?0; zgBjP~Mq6ttsHrJb$LA)dJLi|?l_=QSDkOs#8bFc6s?5C9Vuga7#LCnn&FzMojBiau aDpq{?!}WJ2&-(i>{1e&dyeRASm<9mMGf!dw delta 211 zcmX@Mhjr5))(Kmgi*Kx%xI>XQ{3!z%B;QyQ7QXS>!wMD?V-vH@rz)>YG8-9MY+gE9 zO~k~=z+BJN%*4RROvlv1NYBXB+|{?+*Gx8hZ%mM!TyTza z@~OA}lQmx~+Pvblm=Z`}^QpH%){`gxnKb#$t@`cZT8y`iMby6DFn$pB?#=G0_m?H@ LpSWyI>yZoq2x(F% diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index fa3f6ef8362558155ff057eeb4d153fa516977a2..c6eeb597bedf777b0ca67ba8e3bc2b3a20312249 100644 GIT binary patch delta 252 zcmcb;oAv!})(KmgAJ(j&xI>XQ`zZq$9KXCSEPLa#t_pS|Qv)4cBh$$nTSYeaRPL8# zF)=nY+3Yu2O~k~|!bH!^)X>P>OvlW?RL{`d(7?!0$I#5sSkKtl!pz86$K1?B&&bf& zz|dI7)WS^1!opzkiscG|h6W~PI!4AOI);Z`Y6{iyxryn{`K5U!3bwWi$smRXP$aP`GcUDRp&%!*GPOvvc6uQv sXQ{3!z%B;QyQ7QXRWR|SWOv5A?Eu94~F4Xq-ZyDRrg zG8-9MZ1$V1CSqb_V6JCsW@2DurekVhq-SJmZfanzV`yn?q-Sn!XkuZaV{T!nXAU&L z&=RP^Ovl31Wb%sT3IZ0!7CMIJ24*@&mX;PeMrNCDE)U_DeCsan2aqt@>?RjJJ(NDkPWx W57~5__1bBXOooIvyF%qQ+W`OyPf_mx diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index 55f6e61c0cf884be5a5c71bc251375e1ce15df88..4fd715a78162b909bd582e16d2b6f1687c01e043 100644 GIT binary patch delta 254 zcmeyqm$iEz>x8Y$4{O#>+@Z*u{geR=j$d9Emc8-WvPxznQ-jSDs;*12m>3(HY|fgZ zCSqb}VWMYdYG`C`rekJcs%L0!XkcWhV`ye*tY>U&VP<5kV{T@mXJlw>U}&skYGI~h zVPP=&$O;8PLjw~t9V25C9Ya$iFk|zV6(JmxpPZgNIr5arW}Qt5lFa)03Y&XQ3n+sb zbKXT;YbmIyDOAVjCZ;>*m*$ly*xD*2gBTh>k;JOZywqZaf}F(4)FRE=$p=3)PZ!{3 ux8Y$B{$Yg+@Z)D{*(a>l5eaD3*Y!`StW~!v5DE{{;KPelb1{t*jzqE zQpCi_z+BJN%*4RROvlv1NYBXB+|UJ6ZlQAEUzbjWUc=ruVWlnrs%> zlpr~MtvMs-Tm=aiIbN{;_>&cG4nkO&#&p&y>OODAqZXQ`zZq$9KXCSEPLa#>`G=MQ-jT+Ro5k1OpFapHtSDO z6EQKgFwrwJH8e6e(=jtJ)iX3VG%zyMF*GwY)-yJ?Ff%gNF*h^OGcq(bFf`UNwJ_7M zurQe1xk5qE(7?n@$H>@3$I#RW%-FnhMF_{_#g8X%-n(&%B(uK0!sfu!0?J@U;=5>T zEd@0-h3fd+#B}HU(!3G{TU&)>5JLkfl310Qms+e)kds)MTBKP!+3@eA=?{V#>$jiP eV!UlE;+1X{{p-zo5f^{2YkXn*_Q%dSdK3W4y;0u) delta 224 zcmcbxmvzrx)(KmgOK+^1xI>XQ{3!z%B;QyQ7QXRWb|r_2v5A?Eu94~FiESdAbE@`B zG8-9MY}TKmCSqb_V6JCsW@2DurekVhq-SJmZfanzV`yn?q-Sn!XkuZaV{T!nXAU&L z&=RP^Ovl31WOC;U1py0V3mrpq12Y{XOG^tKBeTuBR)la&@AhHjnf!kxKcm9riJzuS z?)+u4`Rc|5$;tlrI46g^^WQw-^bREuXLHEAAnVBw4^Nt0cDsJ^n!8-vUu!X5G#1$t Ydp>nV;O$b4a~&Z&{S9{JRUFm=0Owy*cmMzZ diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index a508732f7327370cab14332492a7ab1524ea2d20..d8b6ac41ed68539ea7c1c98ef3c9f02c619b2bd4 100644 GIT binary patch delta 255 zcmcbXQ`zZq$9KXCSEPLZKwn}CrQ-jSPDz8hjm>3(HY(6zv zO~k~|!bH!^)X>P>OvlW?RL{`d(7?!0$I#5sSkKtl!pz86$K1?B&&bf&z|dI7)WS^1 z!opy($_fQRLjw~t9V25C9Ya$iFk^GbiV%*;E~h6?-g(kwbI-;ENoIY0h0SkH2`GaZ zf8Iu0YbmIyDOAVjCZ;>*m*$ly*xD*2gBTh>k;JOZywqZaf}F(4)FRE=$%-GErx$QB w@=vc0W~`r_aF=WH>YH`jKWH%q8;c~L=g2Fw+p_CGtJ-I~N~Vx+SAX;Y02AU_(f|Me delta 227 zcmaF8hxPg%)(KmgOKz;0xI>XQ{3!z%B;QyQ7QXQrTP2H$v5DE{_m$TrC$mfy*nEAm zq=<=;fw`WknTdgsnU1N2k)DyMxv7D2KK>O*R*7 zOpu(;YtG0y`Tbk}$$l>uZ9aQiObINq`Tg4<>&Xj$Hc$G`Kl#H8j>(d@%eU8PG2S*7 ZnI7)d#Ax@{qQdK3vPp3<%h9<*/ class FSM { @@ -249,6 +249,8 @@ class FSM " diag_log ""EPOCH-LOGIN: Finish!"";" \n "};" \n "" \n + "" \n + "" \n "player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n @@ -404,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -640,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1037,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Australia/System/player_login.fsm b/Sources/mpmissions/epoch.Australia/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Australia/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Australia/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Porto/System/player_login.fsm b/Sources/mpmissions/epoch.Porto/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Porto/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Porto/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm +++ b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Sara/System/player_login.fsm b/Sources/mpmissions/epoch.Sara/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Sara/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm +++ b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.VR/System/player_login.fsm b/Sources/mpmissions/epoch.VR/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.VR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.VR/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.utes/System/player_login.fsm b/Sources/mpmissions/epoch.utes/System/player_login.fsm index d9c106e5..51e595cd 100644 --- a/Sources/mpmissions/epoch.utes/System/player_login.fsm +++ b/Sources/mpmissions/epoch.utes/System/player_login.fsm @@ -2,7 +2,7 @@ /*%FSM*/ /* item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; -item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; +item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-207.564026,582.257507,1932.771484,781.734619,586,854,1}; -window[] = {2,-1,-1,-1,-1,838,1706,2998,26,3,604}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-184.651276,605.171021,1613.338623,764.213013,586,880,1}; +window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,604}; *//*%FSM*/ class FSM { @@ -259,9 +259,7 @@ class FSM "progressLoadingScreen 1.0;" \n "" \n "endLoadingScreen;" \n - "EPOCH_loadingScreenDone = true;" \n - "" \n - " "/*%FSM*/; + "EPOCH_loadingScreenDone = true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -408,7 +406,7 @@ class FSM "1338 cutText [_msg,""PLAIN"",0]; " \n "deleteVehicle player;" \n "call _rejectPlayer;" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -644,7 +642,7 @@ class FSM " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyUp"",""true""];" \n "};" \n - "diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n + "// diag_log format [""(%1) %2"",diag_tickTime,_msg];" \n "_myTime = diag_tickTime;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1041,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines player)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/