From c1826a168f5cc3445c67e1b0f8d13732642520c1 Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 9 Feb 2016 14:47:23 -0600 Subject: [PATCH] 0.3.7.0107 comment out enableSimulation and attempt to make use of nearObjectsReady. Revel player object earlier Change getposATL to getpos as preloadCamera uses AGL --- .../mpmissions/epoch.Altis.pbo | Bin 89689 -> 89625 bytes .../mpmissions/epoch.Australia.pbo | Bin 89741 -> 89677 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 89853 -> 89789 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 89706 -> 89642 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 89807 -> 89743 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 89863 -> 89799 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 89821 -> 89757 bytes .../mpmissions/epoch.Esseker.pbo | Bin 89695 -> 89631 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 90010 -> 89946 bytes .../mpmissions/epoch.Porto.pbo | Bin 89813 -> 89749 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 89901 -> 89837 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 89972 -> 89908 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 89987 -> 89923 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 89995 -> 89931 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 89837 -> 89773 bytes .../mpmissions/epoch.Stratis.pbo | Bin 89729 -> 89665 bytes .../mpmissions/epoch.Takistan.pbo | Bin 89752 -> 89688 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 89665 -> 89601 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 89949 -> 89885 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 89890 -> 89826 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 89789 -> 89725 bytes Sources/epoch_code/System/player_login.fsm | 23 +++++++++--------- .../epoch.Altis/System/player_login.fsm | 23 +++++++++--------- .../epoch.Australia/System/player_login.fsm | 23 +++++++++--------- .../System/player_login.fsm | 23 +++++++++--------- .../epoch.Bornholm/System/player_login.fsm | 23 +++++++++--------- .../epoch.Chernarus/System/player_login.fsm | 23 +++++++++--------- .../System/player_login.fsm | 23 +++++++++--------- .../epoch.Desert_E/System/player_login.fsm | 23 +++++++++--------- .../epoch.Esseker/System/player_login.fsm | 23 +++++++++--------- .../System/player_login.fsm | 23 +++++++++--------- .../epoch.Porto/System/player_login.fsm | 23 +++++++++--------- .../System/player_login.fsm | 23 +++++++++--------- .../epoch.Sara/System/player_login.fsm | 23 +++++++++--------- .../epoch.SaraLite/System/player_login.fsm | 23 +++++++++--------- .../epoch.Sara_dbe1/System/player_login.fsm | 23 +++++++++--------- .../epoch.Shapur_BAF/System/player_login.fsm | 23 +++++++++--------- .../epoch.Stratis/System/player_login.fsm | 23 +++++++++--------- .../epoch.Takistan/System/player_login.fsm | 23 +++++++++--------- .../epoch.VR/System/player_login.fsm | 23 +++++++++--------- .../System/player_login.fsm | 23 +++++++++--------- .../epoch.Zargabad/System/player_login.fsm | 23 +++++++++--------- .../epoch.utes/System/player_login.fsm | 23 +++++++++--------- 43 files changed, 264 insertions(+), 242 deletions(-) diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 58f11356d868e85f5d4706cc82e6e64a848e3f0c..5237e29d9c99af69fca737eef89012a88297452f 100644 GIT binary patch delta 267 zcmcb)hjr#2)(KmgG<_y+SK_UG$^Zrzy?2GxZhYoZ!D3=;Vz$|^(okyhlU{+%#gnB( zvlN(D9$t+9Tc*=EOQ$_|sSJ=L0g;5olgK~7?2YEeLb zv4X8adTL2Qe(_}AXWEnd*YQp6zb?4FRE;rnB=II|~8Tlu#x>Y~RYF&43lERIx6^o`F*XNbRgKu6ceRL=kmbaW>N_KR)~ zspOYpF)=nY*_<|6T|~>wT+h_P$js1C$IQY)&(Ofg$k;^3$iUo0&%)Tq)W|@`%-B-T z%-qD(VDk3mn!Faq7CJ^|I)=uEKzj50<wGKGZ0H_ zy15#oFtcNb&vYI&M(xdao+>*`|0Bf6IeFf7j_p&_7_*pEHR5vvG!<%U6ebs*k!3c}tew2^@1)5aZq;ws(_&23QA^28OpnjW zPgh9GFUn0UiB?i_adirHw^C3wR8UgViBBvlO00~Xyz#&A_Q_$4MeHKV8*c=OW<7KJ Qak={#W0#x8XLnm!Y^EAiGoWdMVV-n+tTH$JPWU@<; rzIUsBd!`m+s?K)yaK<8bkqPftoNRlRylAD<^$TnahDK9Qb~*q6efL&5 delta 274 zcmV+t0qy?HyakQD1(3A@B_xrzA`QLe00000000;yx>mih=6rYqGBq%>W_d9h1T-@- zG_#tMClo3+H!d|eGBzmNt`Y*9n(ACIKOrYbF5`13^?w zmp~=~E3**hBS4oh69Eagz$O850wpM4ZDDhBAU!=GC~R+GWIb8Phx6i zV{|DXe0(62QRy55GB7E(P$>a-EtBBU7Y{lhB{3i(A}n8Fa&lpLU6=7!0TZ{!RsnJc Y6hQcbnl8Od(#plr9k;ZmO3170je0s+$p8QV diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index d5ef92c169b02186f1af5bfdb741225e58ec1c9f..c1fca264e8e5c864d1e8ac9b1532b1e19c2d0a75 100644 GIT binary patch delta 244 zcmeynmv!%6)(Kmgw0tIRSK_UG$^Zrzy?2GxZhZEpg2lwx#BB4`N<*p1E>i_Ii%*df z(K0mFvoJ9+HZ#yMF*4ONvoy6dHP$gPx74#VvM@EW(9t!qFw!$LG_kat9KAx5-_p!N z$I#SF$I!$C#MnG>g)}3RzW(MlD;3y4^qKYR%r-xLrtC1e>Y3K$1-tkrFL@?B`QtO~ z$s5-5PtJWVuw7D}F^fq)z91*DGPNimzgQtJHL=J)DJwO(q&O%wF{M($(4cm@pd90* r$$q!%x8KxaOx4+59?n?AE~4D^a`Tb<4G!`?|K1fQw6saC^mYLNiTGF! delta 274 zcmV+t0qy?1y#@Wf1(3A@CM1!!A`QLe00000000;yx>mih=InR_GBq%>)_E}+1T-@- zG_wknClo3+H!d|eGBz`M13^?w zm#`)QE3<&+BS4p+69EagFed?W0wpM4ZDDhBAU!=GC~R+GWIb8Phx6i zV{|DXe0(62!RZ_WGB7E(z$pQDEt62v7Y{lhB{3i(A}n8Fa&lpLU6)~40TZ`3R{?Sd Y6in~MZMts}r*89@t2owiEbY&(H|Q)}5C8xG diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index 02527f003b81dbdb2270528cbcbdecf2d0fd3781..f05d8d4aea0e3d02594bdefb4f1fce0a1655a417 100644 GIT binary patch delta 264 zcmaF0hjrB+)(Kmgw0tIRSK_UG$^Zrzy?2GxZhRJ5A!uT3Vy2^OWU6NX20FTv6Z=Ic z|Cr3PxuB9+YVy}!fz2(Gr9`w0jrA-{OpMJ8bWDJX%`8nVO^tO-%q{gSjVw%!EOc~D zER6IF4NWX9C!biZ$!}?9p<`%jrekPg0%C0bw_KW$Nnd}n delta 308 zcmZ3rhxOGS)(Kmg)Kn&JSK{6KlmQGRRCa~!-S{lBLcqw>Ku6ceRL=kmbaW>>_KHsa zF_~xb=}NB6)s;UbSxk%#O*WTLRu|DSGuJb=&YXPfSH*UFEyh%x z$$Kw~^IIvX8Y(C$>BJ`%6(v^2Zl4&&*vc-lE;w^vC!dysm}{<&`R?Ltsa16c08C|K A`2YX_ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 00c06a44ee8607580a50bf6ed62c29fbe3cf3f63..a5f9518b2281d40a6b0641509c607a76c4b193e5 100644 GIT binary patch delta 258 zcmX@Vm$iQ{>x8XLT0RrEEAiGoWdMVV-n+tTH$K}}!D3=;VzzmCrJ>Yh)oOvwFDFZh zXc-#oS(um@n;Gbs7@6vsS(;j!8ta&tTk2UFS(qAG=;)eQ80i@rnpj#+)?J~=Z)s+s zV`yroV`yRmVr))cAp0|FT+2-xflpQA5tz@4Z{7iZBfph$m%by8N z?s=v?dBS?W$#%~Lx4%|n%wm#{FUU!(Of3q?FILD)O)Tx8XLYAO@AEAj4q$^ZruD!an=ZhW?{g4xK_VDpMfLn#&$V?&e8cP6Wg zXqlPonOYc`85-)CSy<>98Wa+UW}Lk4I{W6%m6B{=#_ILU&43Kf>2+$1ij(sWvhxSz7c1B*q^Fh? znF$D<=VbZi!oYfveG4Sek%o4Lj@%z zo%qC}qQuJB>51WtBGc`{8QHcAgfnKdi>y_&TwfwK&u`}))kkepo*SlK|8W%ndaP)( diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index dea4716ee359a1c01288cf93cbe23050c13a7dde..62fb533bf354508e7e2f532b66750990dfdebae9 100644 GIT binary patch delta 245 zcmZqQ$9jA(>x8XL+CCGvEAiGoWdMVV-n+tTH$MAT!D3=;Vz&8yrJ)qFk)g$AktymT zT874Y7A7XfW(GPYMy7gZmZp}b#yTeEmU@;(7N$lPI=UtnMtX*ZCYF|yQ&(v6Tbfzu z7@C^t7@C-X7@KFWkY;4k*WbKtr2-p>zP5gy+2;4plpQ8NxXwAb_nG4K3FeIalh;2J znmqBDEQrH5S^tLoc4c+OEGD`5f}F(4)S`g=Vuifa#3KKstkmR^;-J*Tlu89dgY6eJ p8OwF2ABbdR-`)|d002fFR3-ob delta 307 zcmX@Um$iK#>x8XLYAO@AEAj4q$^ZruD!an=ZhZEwg4xK_VDp1YLn#&$V?&e8B2&~w zw9L%)Of8Je3=MV6EG+a44UCM8O>~S5%uVzxjEzi<40OzlE%nUIO-v0Yr>@ZCwJ^5O zF*4IJG&Tg%o9C{OW}LoOjgfuw3h{;VvsfoARWgO-fVll^b^ZNH<%n5v_ml9`wupOc@ikd|MRn^+R9q~zl26zXoJ zplYa~q@)v{SX7i)8EZXx;~wGdPT`D&>>`^(zR!#M;dt1nvRTR_`d>FOH*QEW}A;bQ+Ajf^-ODW!!EwbEzg7}Uwo!L zdBS@B$-d78w*ORP%wm#{FUU!(Of3q?FILD)O)TJi rWWC$<+jnX)rs`}D4`(c57fJj2q^DSz`+aLd_Vb#bUsEsy#?L91(3A@CnS-#A`QLe00000000;yx>mih=FE5lGBq%>ws|oc1T-@- zG_&fHClo3+H!d|eGBz13^?w zmyjj_E3;tcBS4pc69Eag5GMh00wpM4ZDDhBAU!=GC~R+GWIb8Phx6i zV{|DXe0(62q3Ik0GB7E(peX@&Et4?P7Y{lhB{3i(A}n8Fa&lpLU6(;v0TZ_uR{?Sd Y6b}z$eRvRYoO7vOHT*5cHD7EV?H3?dP5=M^ diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index b98ea125a88451802de24cb020f098c0abcb5866..4c1392d3fc101451364f952b8338a5246bb21796 100644 GIT binary patch delta 258 zcmcb=hjsoQ)(Kmgw0$OSSK_UG$^Zrzy?2GxZhYof!D3=;Vz$}5(okyh)+&L`m6N4J zv4rT$+(dUw<>-N(D9$t+#%i*=F}=$_|tHRvii1)UQz{h<4Qi(! zG-Pa^p5VnOHhKH4itW}~jHx=)dBYjmw?7DD%w`wSZP}LL!y)*+S-AAX>+b087qh=i F0swmGSBJ`%6(v^2PX8FjC^G$A7$e*E1!0WY>>`)iEiB8H{XE`&>f_tuMD9~Zzi>VW0P>P+ A`2YX_ diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index da1027c95eb7ea032d5cfe5dd44fa8c7c6ae9463..a6212826ed6876cf407c85b70f745f7300be792e 100644 GIT binary patch delta 264 zcmbQWpY_&0)(Kmgw0$OSSK_UG$^Zrzy?2GxZhY2RDQIGBVy2^OWU6NX20FTvCr%KZ ztTB~m^MWd7smZGS0-Lu?krL4|G}f~)F)=nX&@lljHnTLfG&R;SF}KvSG_o)?ve3~r zu`tpzG&Hfaocv>jCcmYbg^r=AnU0}}35c;-Z>2ONlfM3D&s7R+AUboyId_K8l` zn94KxcNN#>)m1+wSxk%#O*Su|qAsFkX0B&yVPs}#sAFbfp=W4dWMpijV`N}%qGw@j zWNKufV`glrXJ&3h0MMa5~vD*)ZGq$pe%snV&yMEW-kX_0Rp7-4RW-Pkt#sdIK CE@cD& diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index 0e4d82fd0c50fd6237e444a432304f8365bbf834..77bbf9a5576be13644fa62082c25c6c44a1f5dc8 100644 GIT binary patch delta 269 zcmcb*mv!o1)(KmgbbKamSK_UG$^Zrzy?2GxZhUs6g2lwx#BB50N<*p1E)4>cf7Wwv z{xz9jM9a`v&%(sS*vvr3#K=_7%+l1-)L6&F+)~fd$imdfLPyuc!bs21(8SVmvhfN{ zeoHe89Ya$y9YYfn5My)Z3TZ|ref`ZXD;3y4^pf@K%r@_RrtC0z-F42%(a#hoCma;z z3CJ&2uvJJ;Eh)$^o*e&7cJhXmeACYhGm204ea^A{qZ(rtlYD$ZPGV(h5lCrXYGRRp zQdVkmNpVnWVoIfgp+W8BiH9dmR=Zt4Ip!|c_T5^H(K_4x!x@X%McljQZtO5oKfw~R ONHlxR)j4}|!ioSU*I=Ch delta 314 zcmbQbm-Xsi)(KmgG*l*TSK{6KlmQGRRCa~!-T3TC1+$T!97N^~>p6c!OJGjlyt3nMc_Lme{<3q3;vBO_xI9U}vC6Fm!KBU2*-9W!G~ zJu`C?Q-jIID>Qj6j4gDG%ybNm4T1FL>=n|Cn>$u2ux(zoex2F$YBff!>6_IUg_#{g ze5QA(F=}s)c&6;I{l6MxHIu4Fd~RZKv4X9wf<{h$Vv1u@u|j-7PGV(hk$+NFYI2FD zLQRdrckoa7=dlUA}#l7GtW8T1sYOdVEfPxd}2{iVrA@fgK$Qv?PB4K+3X^(j$GYwYr`*Q5svef|NkVF JDXB150RXhBXnOzv diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index 62f6e751f4734c23c09501c717552c3d35bfee89..7d06135fa9a2b1664e37ff4b9b632d483415689f 100644 GIT binary patch delta 244 zcmZ3xkM-?d)(KmgbbKamSK_UG$^Zrzy?2GxZhR(F$zoz`Vz!yJ%1~-@$y9;O?o*^h zvX`ZD19Zj3XiZ8R~G)4mebe~nN delta 274 zcmV+t0qy?ny#=kl1(3A@C?t`$A`QLe00000000;yx>mih<{WtgGBq%>26{0X1T-@- zG_yLCClo3+H!d|eGBzAhpv*4*929w~a7_%C%mNt_N*a?^1CIKOr3nu{+13^?w zm*6G=E3>fXBS4qX69EagU?%}`0wpM4ZDDhBAU!=GC~R+GWIb8Phx6i zV{|DXe0(62@#!1`GB7E(@F@XzEt7!K7Y{lhB{3i(A}n8Fa&lpLU6+wq0TZ`pR{?Sd Y6#WQXLu*+GrN9QFoj0sA+Z^*;*mih=3{vSGBq%>O?ojJ1T-@- zG_!$}Clo3+H!d|eGBzVrpe$bSWTwe3S9g z8V4XgATls1eUp*VgOgAH50gLX2$SXecehC^0c9*EWNBe%Uux8XLx;_)PEAiGoWdMVV-n+tTH$E$>WHB)|G20wnWhljLWN5K@!W4B8 zEkk2H3lkG#GXotHBU3#yOH)fzV;vK7OFc^?3sWNt9bFR(BRxYy6HCj<4_9dNTbfzu z7@C^t7@C-X7@NgcN;5L)>u)w%rN9QFgEp))+noJe*U7oP0!Tzhi= zdcMi`FAHv;ug;joBp+XplUSKr6p&x6ke8ZRmih=5l!hGBq%>TzWAY1T-@- zG_#PDClo3+H!d|eGBzE3*dY zBS4eC*b%qBCjn{#Bq(2PVRLgJJv|^OY;R#?L1J?tUvO+;d1Z1>Vrpe$bSWTwe3H`| z2OvHmGB7E9lVS9dlTPUfll1#{lMvntlUv$;x8N%Q-76+!X<=tyY;R{EW^ZzBVRTy} zB1A<(RYy7?B{3i(A}n8Fa&lpLU6&zQ0TZ{qR{?Sd6a@ui8lIO_HgjBEA7+!JgMt#} E0Q_NNiU0rr diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index bee3ebd3e26b6d9f8f20ea06084c5df41c460692..eee24b1fa0cb43c39f6214a92cead31178a56cef 100644 GIT binary patch delta 269 zcmeC)&w6?v>x8XLx;_)PEAiGoWdMVV-n+tTH$JPX6f`k5G1JjCGSxEx10CJTiG8Az zC8zRCeqF`2d3M!L$;n4*1U4_7A|;|_Xsl;pVq$D&pko5mU}kA*X=Wo=T^6>>ZiIu5E0r|xWd8vs- z{z+M>$tA@>sfj6-3Wf%?lN>}wNtEL!kJNtXq-&3~L M8W(n+KB%!30JLXdKL7v# delta 296 zcmV+@0oVS^z6FcF1(3A@DI}4%A`QLe00000000;yx>mih=6ZPpGBq%>WO^|g2{bb? zG%PJKH87JgloPYCln)dtHa9LcI5IXdF)TJXI4&_TGBPtXEHW@RG%h$ZGBq+VEH*Pa zE;ctbH87Lus3{FNGdL_VHY_nSF*qzTvmvP)0h3^`7_(NY2nMrYu&y?jF(&~kmuV*f z69Yk1OqV_<0V}f(=OaLuE))R?lhD`*x5g&{Y62xFUu|J?b09rEASi5aVPrvKb0A-E zY+-q2a!+DvWn*+HAbflvlTYd#1TruweUowUgOkw250mu!f45*O0c9+c-qIHjIv^!6 uAR;0xUtw}`VR>Db@mT>Hx6D@oYX=lzw3CR9@^Qr4qP_{Xk+qsO+v160~ diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index 4cc16f0ca2c4b5c2e9668653389daea152e027cf..b59c3ae4953bed6e815c7ffd4f19fc7d2146b048 100644 GIT binary patch delta 244 zcmaF6mv!x4)(KmgbbTgnSK_UG$^Zrzy?2GxZhUs9g2lwx#BB4?N<*p1CQ}7Avrmx{ z(K0mFvoJ9+HZ#yMF*4ONvoy6dHP$gPx74#VvM@EW(9t!qFw!$LG_kat?7c#h-_p!N z$I#SF$I!$C#Ms=pLYk3DUw`wQl?rSide8cGW}B}*Q+Ak~^-OE>gk5}-r#us${P3Cf zbC&xY)*v_fWn8hR?UyzennOYQ(U#yUqnpotYl$DxXQXG_;m{O@=Xiz(yQI2ua rWV_q-+fQmSrs`}@4`(c57dbdVa*agF^b+y#?*P1(3A@DI}4%A`QLe00000000;yx>mih=G=G#GBq%>#(6Os1T-@- zG_(4XClo3+H!d|eGBzb8Phx6i zV{|DXe0(62vFRKGGB7E(uqgp|Et5df7Y{lhB{3i(A}n8Fa&lpLU6)Z<0TZ_;R{?Sd Y6bc8Q79`Hd*1$8N0XWE6a6^R|CgXuvF8}}l diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index b3c85cd071784ad75ecd4fa4d5414cef8f3b963b..c6760a88746f51b44df7e7170b5dfbf888914869 100644 GIT binary patch delta 253 zcmZqN%X)AR>x8XLdOj1kEAiGoWdMVV-n+tTH$E$@YcCJ^N(VXUdZu9`R4sd?qy6 z?wR)F^Oxke&sAg0Vv>(9$VseBEegmlR>(_DEb>pvN=+^)4oXc-sZ=mDsGVH+wR!S^ z!~D|=f*I?#$7(UA>P*)UXJp^b6wa811(3A@DkPD&A`QLe00000000;yx>mih=5TleGBq%>T6r-V1T-@- zG_#JAClo3+H!d|eGBz zDGfL?I4m+YEHN`NI4m-=7pNNnvoxt729sdd2eVzTr#6#d*9n&}CIKOrUnT()13^?w zlMv=BvjpZNK$E@K5x2Z10crvzC|_-1b8{d)Js>D-Z((FXVsjv0aBN|DWpYnqYGq?| zDIk1&Ad}(S90W2jDSelbQ~{EcOy~%c;M#YS4&4g3U@8GyEGA@WVP{`#Z)YH8Z*py6 zbXy`KL`6bXM>-%SF(4u$EMH-Aa$$L0m)uqX8n?n$0c!^o$Z=D*`av5@k_kxn5}!>r H2axh)(4uCh diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index a72cf16f1c2ffcf70db15822fbac14316d7c84cc..38ac8d2c62ece3206e3e5abb1b356d80d21f2311 100644 GIT binary patch delta 244 zcmbQSm-WUT)(Kmg^n506SK_UG$^Zrzy?2GxZhY2W!D3=;Vz#-U(ol-o$k1Z*(#h%~ zT874Y7A7XfW(GPYMy7gZmZp}b#yTeEmU@;(7N$lPI=UtnMtX*ZCYF|yzb)6~w=}cR zF*G&PF*Gp&F*fV0kY;4k*Wc{EQh^Obr>|dUwz=V%vcqK2XIhgJ4)RU5e(9$VseBEegmlR>(_DEb>pvN=+^)4oXc-sZ=mDsGUC1hH=v5m$&LC q%irbNUZ=$vt+QPyoUw>q#MI>dwF$3v+xvF!RZs|aI53_6jt~I27F47F delta 307 zcmcbyhjqqY)(Kmgv{WW;SK{6KlmQGRRCa~!-T17%g4xK_U~^%mp%jaWv7yQ4rIXb~ zw9L%)Of8Je3=MV6EG+a44UCM8O>~S5%uVzxjEzi<40OzlE%nUIO-v0Ye_O7}Yhi4m zV`QddXlw|iH|wpCW}I%P#>hUoWWC_#`vm{c|5a}$e;6>M!4G;;D2Qyi0u72*qW5-U@S{FAa$ zlS?!eYHAcFZ#W~%Y@k^?ospZddGdo>ecN-j7*loBQZf_M<8$)U71HvHauZ9Um6Tju zokHEM6jTirl$3Ph6N`!xD`U6s4`Xa)7m2ocvHRA=7hN8AtGGIrzG5o-%I*OGSSn;B diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index 0a6f2849417a6925923ae0f5e3273f3565a58a9b..4d94fa7a215cac1563b37612a48ef02759c0cbf2 100644 GIT binary patch delta 252 zcmX@OhqZAJ>x8XL`aTo4EAiGoWdMVV-n+tTH$F3{U@u>(BLV*oL3#?yfwpsI;vcqJ7_3V?6K2@Idh=20Sr$Uqe zJ=LDve@T9OtQun$lYD$ZPGV(hQ9ypNLSAZOk$+NFYH~?&P-XtHqeAGyQ!SBm4G4VT{@AA`0mih<}i2zGBq%>8hJ4q1T-@- zG_y{VClo3+H!d|eGBz^FqA0`1413^?w zlhEZWv&7{iK$Csf5x0CM0crvzC|_-1b8{d)Js>D-Z((FXVsjv0aBN|DWpYnqYGq?| zDIk1&Ad{in90W2jDSekwQ~{Ec4Cn}xpxSqn&fE&OASwY{EGA@WVP{`#Z)YH8Z*py6 zbXy`KL`6bXM>-%SF(4u$EMH-Aa$$L0mz-7s8n=R00c!^o*3b}a=BiiTGC!Qt#9?=g HojnptF|}wW diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index 67ae91c5edc408cece41fad2402b693de6f981a2..f0a02eda686850d547370a6fa332e13ac92d64ce 100644 GIT binary patch delta 243 zcmcb+k9F=o)(Kmg^nE67SK_UG$^Zrzy?2GxZhYob$zoz`Vz$||%1~~n$bmFkRHO!DysIf<32MFIK63VErCMgB=ysmUe9L8*x;l?sLiwbKjb7$;3$ qce{SOr8Z-#&i3o!j797sTAk+@gxdGcj0-yYaW~(MRh#?W_W}UQ300N= delta 273 zcmV+s0q*{tz6IUB1(3A@Dmih=1h45GBq%>HhM7{1T-@- zG_z`yClo3+H!d|eGBzmCjlXsJ0}4X13^?w zmk=ibE3@F{BS4lE0SUK|CjoK-B`9BQVRLgJJv|^OY;R#?L1J?tUvO+;d1Z1>Vrpe$ zbSWTwd?1q{>Kp?yFe$enDgk#bld#ek4>}+vF(4u$EMH-Aa$$L0m%&&86StRF0dfZv XQ0@ld(=~Tvj5**Xs9aj5Yg8X(nJ`s4 diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index b4ce1a6c1678adfb7ea1fa043081054b49016433..d5200296734278d090fb2be9687d3d8c216e75aa 100644 GIT binary patch delta 236 zcmZ3qkM+@B)(Kmg^nE67SK_UG$^Zrzy?2GxZhR(K$zoz`Vz&8LrJ)qFk)g$A{VD1q zT874Y7A7XfW(GPYMy7gZmZp}b#yTeEmU@;(7N$lPI=UtnMtX*ZCYF|y8&+uYTbfzu z7@C^t7@C-X7@N1PkY;4k*WY|`r2-p>{K;L delta 316 zcmaE~mvzxT)(Kmgv{fc~S5%uVzxjEzi<40OzlE%nUIO-v0YH>}X)wJ^5O zF*4IJG&Tg%n|G{`X54&rr2^aL@9Wo@O+TT=s3jI(kds)MS`?69tYE8b=9Q=z6t zVY;FZqsU~xvz*KZnzhp}$}&!x{PqRM_69A+J34A9nThG~Ir-@dY57IDi6zlWN-nNW zq3%`+s)hh0MMa5~vC|JmG73+h5YEWHJvp2)n_WcIFmPki@s$VdU$@*)&xl-l I&*MrR06v#%sQ>@~ diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index f88fd75dfe85fed050090f58a8a00f6be5d6a649..1440849ec2db8122e85128fef41247d301354880 100644 GIT binary patch delta 244 zcmdnHm-X)+)(Kmg^n506SK_UG$^Zrzy?2GxZhW?;g2lwx#BB4_N<*p1EK>zGU!N=` zqGf2TXJKMuY-XTiVq~gkW@&0^YOG^oZmDN!WMOJ#p`&YJVWekhXkuwOS$c&gzonUl zj-jcUj-iPOh_N|vg)}3RzW(N%l?rSix@Y}5v&~DNDLYKIdZslwVHe-zlxM<|H$Kyz zT(F*hvhH(%?KjmJvzX-L3vv=GQ;P!fixu)x6N~(lvQm>vii1)UQz{h<4Qi)flx3VW rneTS}_L*9YsXE)u!x@X%MUI_Lww~v5OI1UC^ILAe^q+sC-(>>;l|EKS delta 274 zcmV+t0qy?%yam0z1(3A@DkPD&A`QLe00000000;yx>mih=B#)FGBq%>mU%H61T-@- zG_%T+Clo3+H!d|eGBzYsOvv8>(29t297_+LcmNt`|*9n(wCIKOrnb8Phx6i zV{|DXe0(62f$1CrGB7E(fGGiYEt3$^7Y{lhB{3i(A}n8Fa&lpLU6&zP0TZ|PRsnJc Y6bXjs{)K!>mavqM^O&o9+!d-jUC5kS-T(jq diff --git a/Sources/epoch_code/System/player_login.fsm b/Sources/epoch_code/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/epoch_code/System/player_login.fsm +++ b/Sources/epoch_code/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Altis/System/player_login.fsm b/Sources/mpmissions/epoch.Altis/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Altis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Altis/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Australia/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Australia/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Porto/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Porto/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm +++ b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Sara/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm +++ b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.VR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.VR/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _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 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.utes/System/player_login.fsm +++ b/Sources/mpmissions/epoch.utes/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; 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"}; @@ -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,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-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,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n