From e9847e1f51247f7e97deab06a9b0381e4b14736a Mon Sep 17 00:00:00 2001 From: vbawol Date: Thu, 18 Feb 2016 18:32:01 -0600 Subject: [PATCH] 0.3.7.0110 Start PVC to remoteExec work and attempt to fix login issues. --- .../@epochhive/addons/a3_epoch_server.pbo | Bin 389064 -> 389045 bytes .../mpmissions/epoch.Altis.pbo | Bin 90021 -> 90263 bytes .../mpmissions/epoch.Australia.pbo | Bin 90073 -> 90315 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 90185 -> 90427 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 90038 -> 90280 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 90139 -> 90381 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 90195 -> 90437 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 90153 -> 90395 bytes .../mpmissions/epoch.Esseker.pbo | Bin 90027 -> 90269 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 90342 -> 90584 bytes .../mpmissions/epoch.Porto.pbo | Bin 90145 -> 90387 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 90233 -> 90475 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 90304 -> 90546 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 90319 -> 90561 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 90327 -> 90569 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 90169 -> 90411 bytes .../mpmissions/epoch.Stratis.pbo | Bin 90061 -> 90303 bytes .../mpmissions/epoch.Takistan.pbo | Bin 90084 -> 90326 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 89997 -> 90239 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 90281 -> 90523 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 90222 -> 90464 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 90121 -> 90363 bytes Sources/epoch_code/System/player_login.fsm | 32 +++++++++++------- .../epoch_player/EPOCH_server_checkPlayer.sqf | 7 ++-- .../init/server_securityfunctions.sqf | 14 ++++---- .../epoch.Altis/System/player_login.fsm | 25 +++++++++----- .../epoch.Australia/System/player_login.fsm | 25 +++++++++----- .../System/player_login.fsm | 25 +++++++++----- .../epoch.Bornholm/System/player_login.fsm | 25 +++++++++----- .../epoch.Chernarus/System/player_login.fsm | 25 +++++++++----- .../System/player_login.fsm | 25 +++++++++----- .../epoch.Desert_E/System/player_login.fsm | 25 +++++++++----- .../epoch.Esseker/System/player_login.fsm | 25 +++++++++----- .../System/player_login.fsm | 25 +++++++++----- .../epoch.Porto/System/player_login.fsm | 25 +++++++++----- .../System/player_login.fsm | 25 +++++++++----- .../epoch.Sara/System/player_login.fsm | 25 +++++++++----- .../epoch.SaraLite/System/player_login.fsm | 25 +++++++++----- .../epoch.Sara_dbe1/System/player_login.fsm | 25 +++++++++----- .../epoch.Shapur_BAF/System/player_login.fsm | 25 +++++++++----- .../epoch.Stratis/System/player_login.fsm | 25 +++++++++----- .../epoch.Takistan/System/player_login.fsm | 25 +++++++++----- .../epoch.VR/System/player_login.fsm | 25 +++++++++----- .../System/player_login.fsm | 25 +++++++++----- .../epoch.Zargabad/System/player_login.fsm | 25 +++++++++----- .../epoch.utes/System/player_login.fsm | 25 +++++++++----- 46 files changed, 366 insertions(+), 212 deletions(-) diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 14f9cab1538d62f53e6ce6b731d8812e6e21307f..53836b3d68c04f4d72ea1162c02e57a7ad977e3a 100644 GIT binary patch delta 463 zcmX?cUwrF*@eOjEY?Gpnh3#aWe346KdJhXT*JNRK!Oh8>P29}2F~>H)5Mg0teH3{t zENt^f(d;XmV_$_cc}AnOyhq$Z}sDio#W=9i?pR-`5? zM60_7_&a;V7l4)dS>84zpPp zT9{iHwo7be+Agt?`Iv=7ymNf8YlwoaLVQU^X0bwXYEEi$iGq>!v{%fkF;K~Z(&7xK z#N=!Rb#-f?DXE~LRCgCb<&K`rOBpU`00enNxw%`uVnysMU6bxGde Q%(*|SI8t%JsaQ&JOCta-UOIXN}* z%kxr;6yghVDvSJ+vZh~nz$`w!;5Q@t^a>_sJ|<_S$$#FIHB+rU*e&wYGxOYneHCmK;!83zi-AmQC54zgUM>X)P;w3MclL-c$VseB zE%E`W_RPyHQLvr-f0I;wT7FS(Vo9`;l8dWTsJoSds-cd8s*#eC4%jRm1&H1ps2#Cr zCUc@nD-@@e0Id&8EXqtw%1Kp-1{(qt%}GrzQ83VfI1t7+1e!KE<(=&Gd=19MlP^38 zpPmrJ$T2-qmyvsO?3$x`lhtp>PVT&|ym{m8Yt_?x!WjeE;+^AzT|=fjL@6jUq>X{iC znHd@Am|K|YS(sQD8JOwlnj4zynF19U8tRx@nCe(qOy0L#QNYr~QpeE3NXO8`+yunf z{C;^N^W^y_e@<_ZU}T>jsmI8(Id|<*JyzEMe`k-$Mt5SNto}R7)AgAc**0&!bG4cW zEF13}AM6^UH2q^RqmyuAQBh*0f~^9Q%ybzhM#=4;BN!*Ji%b%mu4DOL>-EBOvddFt LHbuNWu|g35woFa6 diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index fdeea9e6563351aa62f7ba129a9b4e5ead328e94..1b2e0c85ca74b21067d07ae0aa39be8218ac3461 100644 GIT binary patch delta 393 zcmcb)pY`-X)(Kmg(_)TI+@Z+(`#A#`e2+R7_Iu;A+sh11P4p}*jm*pqbWF@G^$ZP7 zObv{5j7{{63{A}}Ep&7(%#8IcO-wC~jCD*cOm)nRCx2e9C}3e}u48CypkruaWCUVt zR#}nAJiT6oQQF=$z~9*;J|{mtGtVv9SHV^xz9b{F7|66%Qi#dp4E~8>A*bSjAQ!t)%4Q>J;j3rJ!o4qo8V}q@)8jNk;+IhFCOnIZ>q* zic?E~mWL%4WhN%&q$)&%4FQVgq$Zar80bKp2jd&UO`F`gL1MDp`$dy~?GK;6K$Vew zbL*OmdXuAX$4=gRTY2--+t;e69|&g*WRG`_4|WZ)p1g3c@OIM(#tG~qCGj41{~y2k Ro-yxvwa}mFo1Jae2LY;Ih2{VN delta 266 zcmX?okoD$%)(Kmg-+Vtfafc!==W_-yc=-Kb80W@kx0lsh8ta*x8ycG#>6jUq>X{iC znHd@Am|K|YS(sQD8JOwlnj4zynF19U8tRx@nCe(q80Z+*TJv(1XXd5kmq*7c*eX;T z>F63Fkfn*Gj-iE-j-iRU37BCFG}{=YM@wH{OVusd*GAvN)zQUHOP_bM{R&s+$rCRA zoc=+Xk$v;jwHNhRT?71`Jtn8!iG{Kb-%*CJHb1*_ts26dz9)h)5X$6@WR!$3x2r`m cPGlGP6}Qmg@8lxC1PA*-QAshk%RzM=08p1x5dZ)H diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index a76bbee00aab37e972ac98242e38d6a033725059..dd1456ebb352978591fc26a1fa69a45af103eab6 100644 GIT binary patch delta 393 zcmX?kfOYpF)(Kmg(_)TI+@Z+(`#A#`e2+R7_Iu+q@8yQ3CVCc@MrP&)Iwt0pdWME3 zrUphj#wL13hNfng7CO2XX2yD!CZ?7~#yX}JraETElap5{3Rqa0>lhjv=op$98G#s^ zr>sb1p8j5hQQF=$z~9*;J|{mtGtVv9SHV^xz9b{F7|66%Qi#dp4E{H%LtmSj|=+t)%4Q>J;j3rJ!o4qo8V}q@)8jNk;+IhFCOnIZ>q* zic?E~mWL%4WhN%&q$)&%4FQVgq$Zar80bKp2jd&UO`H64gT&;%_lqWH9SEN;pvK6) z`RkgCdXrDzj-9M~M|pGToom(84I&r=+2ft#gIz<-k Rx0duSV%fW2xxuh-H2|xwf>Zzi delta 265 zcmdmei1p+F)(Kmg-+Vtfafc!==W_-yc=-Kb80W@k-plJPjrGjU4UNr=bj%D)^~{Wn z%!~|l%q>jyEKDqn49s+N%?-`gZyprO&&0{R&s+Ntb?3 zPf%fG-^{x1q8_VjfWNcHsU<-B!V-%z6O(dM6{5k007Y|BlS>o~bRaH*@eP5dO%DDfH+jOofFjTQS5fu132>=K#erW&z delta 224 zcmZ2+kagRB)(Kmg-+Vtfafc!==W_-yc=-Kb80W@kJC+$)8ta*x8ycG#>6jUq>X{iC znHd@Am|K|YS(sQD8JOwlnj4zynF19U8tRx@nCe(qOg_I{QNYr~QpeE3NXO8`+yunf zv?7st@`jT?r`M@5vTrV0dr^}$iIX>7mWV$XBqa-(&sbH&+mzgtp!yS?B%8`tP>>|RpufE=NE$Jy<@Me`sY(z)v HEWvUBceG3` diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 945af353ea634c8a889bba0f5988f9241684dc92..1aa42cd81ce6b6137646b03a85c8eb7b0e554344 100644 GIT binary patch delta 403 zcmbPzfVKA!>x8Y$=`qJ9?oj0Y{hR>|zDFGk`@Qj*>~cd>6Fmz{BQtXY9TRg)Jwrni zQv)L%V-r0iLsK(L3mshxGh;nV6H`kgV;xfqQynwo$)+n51uQJhbqtLSbPP?5j6jUd zX)6+$C;P9Gwsj5gclL(la!auZ9Um6TjuokHEM6jTj$6jY6rlytzx=_sID6N_dz zC#tkUacT+B1!0LrnTbg`sS43xLx7?=smUb@209Qo!uW!-Z?(lHDvk)Z$>Bn_{5^3#7dA)A%cogj3V31BN!*J bi-^rD_rH5Du~lH__W!x^Whd{aY-0uh?0tn& delta 214 zcmeA@#5(%`>x8Y$Z@(X$xI>Yb^Em?;Jp6tzjC12N+2ux-#(L)FhQ?+_I%Wo@dS*sO zW<~}&<`$-U7A6)(24*_C=7#2ara%RThB~GeraBfDlTB7A3Rs$0>KIxW=@^=rn}8Ub zQ&%K1PtWIIoIL%3EhGQ*9yP|e&DYmn)SJHFhmmda$~!Tvt^xke9+O$`DnnSCHSS)k w2Fp(WAHf&^5uENH$tVe7ZqJBhoX9R>B)dtKjV(x#JCyrIV~x|q&_n4e0C<^13IG5A diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index ddd5745dd29c9a0065be4c1df51b6916e0282056..99ba1d541a4f402c2c1ac6289ed6b3e6fa4b9e75 100644 GIT binary patch delta 386 zcmcb7fc5Ah)(Kmg(_@ZJ+@Z+(`#A#`e2+R7_Iu;A(B+1vCVCc@MrP&)Iwt0pdWME3 zrUphj#wL13hNfng7CO2XX2yD!CZ?7~#yX}JraETElXF)n3Rqa0>lhjv=op$98G#s^ z=dDO&p7fb-@`LTXlCA;%&K~hO`RSQ?Zo$3^whHkj8JWdE=48W7qWlFpiIu5EJ|J1o zyv&lxflq`d@7v5-pO#;gn^+R9q~zl26zXoJplYb2plYO~qyyHiqkw8^thJItOdcDjJ zF@{g)3ufflwDyADjyEKDqn49s+N%?-`p1{P&Hu>S57*^K+e`k-$ws(~wtj!5`uT_I(S)Jp9 zT|*{29&?&r7s<%U4OSQr7Mw2V&nOI0zkNX@<3x55zjd?Sbl=y%`=NVGq+~XK&i)IR GX95837fXl$ diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index 7f6a1a7a00c6e5bcf29d9d1135728c799636748d..9820d1047cf78b7e9f25ffc86f2acb1cfeb2d2cd 100644 GIT binary patch delta 393 zcmZ2^fOYmE)(Kmg(_@ZJ+@Z+(`#A#`e2+R7_Iu+q?d681CVCc@MrP&)Iwt0pdWME3 zrUphj#wL13hNfng7CO2XX2yD!CZ?7~#yX}JraETElbu&63Rqa0>lhjv=op$98G#s^ zOI9Q@Pd_ihC~fZ=;P31apOc@SndcVlt6-}TUy_ko3}jj>Da7RQaw$N75=31=PGV(h zkq=0A*1tY)i^R#I|tbqaO2QcyM2QBXBfQqlpNq@#dpLoAxPoT$QWc`Xh5$u#Qj<#*40IsQgYgaFrcJ)NL1J>=`$dzz4unttpvuU; z`RbaBdXrb*j-AYVM|rd9oom(81tJ&&+2ft#gIzjyEKDqn49s+N%?-`gZyprO&&$e}yaaBds!so cM0Sy7_wA;ipQ<~#OJbdyWSKp~vwWL503+j3$^ZZW diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index 4a51279fcf5a27295e309e9fd643370bd91c7ac9..bb5aca901bb0535c53a92c00529eb5855d8a24c5 100644 GIT binary patch delta 403 zcmZ3zpLOm*)(KmgGh&WS+@Z+(`#A#`e2+R7_Iu;AwaW}mP4p}*jm*pqbWF@G^$ZP7 zObv{5j7{{63{A}}Ep&7(%#8IcO-wC~jCD*cOm)nRCm&s|C}3e}u48CypkruaWCUVt z{~opIr-_Cd2YeJ3bqRIB^jB;K&G{lLQEbnmjVPRLDUuGBvz&t z`G8b==4F;lf5^lrJXzrrXMI|JQEp;Mw33pGt5c}Em4d3Fj)JO@l9CSCI2{F4Yhuw1 z=R}oOC{8T_x*#mEC^IoBCsiRDYzR;^CpEc5!9WM%Mi}1^XxemVVMe*hAKopRd}e?6 z=72Rf^d{@xj-A|pTY2;L+t;eu;+^AzT|=fPcr!Zj$0rsQC02rb3K85G$tbd&J%Vup cyU6C}sk)-cD7k=ae0R1nBtN;K2 delta 214 zcmbPxkahKb)(Kmg-+ezgafc!==W_-yc=-Kb80W@kYnK^W8ta*x8ycG#>6jUq>X{iC znHd@Am|K|YS(sQD8JOwlnj4zynF19U8tRx@nCe(qOg^$)QNYr~QpeE3NXO8`+yunf z{B?OE^Ys7hjFYDq*fR1@mr-Mk+nm1kqTY0WA4ayxmUm)UT?71`Jtj}RqYPnf-f`zz yHCT3fe*|LyL~#232u4W=bNi17#)<4A&Qik1np);hnHu-?bn@TJ?|S{Fm;(T0gi0U) diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index b698e5820c7289a33998cc6f7abfc4648b5114fb..d96ece3205ac7c2bb0d329c6ef00bfb324dddd5e 100644 GIT binary patch delta 370 zcmaEMkoCr4)(KmgGh&WS+@Z+(`#A#`e2+R7_Iu;A7t0MzP4p}*jm*pqbWF@G^$ZP7 zObv{5j7{{63{A}}Ep&7(%#8IcO-wC~jCD*cOm)nRC#_Tzu&^}OF*G*NF*GqU0x>ol zu1sW}ykMjBJsaOENNxflTYk2d;_;7UU#WrWW~tq&@R8OB8G; zJ8Y4vPs=aLO)QC4QgU&13U#+qP&L$1P&HCg(gADMQE(0LclL$IGPv z0ZN>x(h9|?B|!Va5{ohulX6lOqQQm$MRQV$H=pJ-rA#jlQZtbPCj)b`6={7|AHI-6@iB0=r08 YwjbM`GuGm-yJUqIwM`ICYCc#B03|Sg#{d8T delta 225 zcmca{nDyB~)(Kmg-+ezgafc!==W_-yc=-Kb80W@kFP0lw8ta*x8ycG#>6jUq>X{iC znHd@Am|K|YS(sQD8JOwlnj4zynF19U8tRx@nCe(qO#Z(@QNYr~QpeE3NXO8`+yunf zY_KwsdGdo(Kc}x#XJp^JXx&9UR@VT3XOGFncVnTf3wM>L7ceujZT@oiYBfY``pHPf zKyI+Yc<1}wg*Qs7P5;RQj}it%6x$~*BkY%N}*;I J>Tf410|3zOO@#me diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index 0274628bf41368c04d4e56ee5b442b3984e663ac..e6dd6606173bfe5349b6e7d473c797f945791791 100644 GIT binary patch delta 375 zcmZ2@fOYaA)(KmgGh>cT+@Z+(`#A#`e2+R7_Iu+q<>iK^CVCc@MrP&)Iwt0pdWME3 zrUphj#wL13hNfng7CO2XX2yD!CZ?7~#yX}JraETEldV@M3Rqa0>lhjv=op$98G#s^ zb5eR@f~uj8f~t{{k`7p(j)H4|zq3bt4oC;kkXUOag_t~E zE(His;zX5JC{8T_stQXi%1lhkNmYmj8v+!~Nlh+MFwlWG2F5ppn>KmpA&JTIdlpT9 zpu`xr`RtmDdXpF5j-AYUM|rdEoom(X@y_wVt|3a34Gua^4~SsooE{g!D7n2Rf^j0d ah(Fi;y+&`mJ{2`+s!rV76mjyfz5@XBlYdPB delta 221 zcmbPyh;`us)(Kmg-+ezgafc!==W_-yc=-Kb80W@k%FB%`jrGjU4UNr=bj%D)^~{Wn z%!~|l%q>jyEKDqn49s+N%?-`ryCwOQ}(wQ8^|n{#}yYlzZh zheM9jeIgk-xxp&q!J^YYMllLQG;Gg{WSqz@vdpwcT+@Z+(`#A#`e2+R7_Iu;A>g9%}CVCc@MrP&)Iwt0pdWME3 zrUphj#wL13hNfng7CO2XX2yD!CZ?7~#yX}JraETElP9lG6tJ)~*D*9U&@nVIG6FF+ zA6b#eJY8OtQQF=$z~9*;J|{mtGtVv9SHV^xz9b{F7|66%Qi#dp4E*H%LuxSj|=+t)%4Q>J;j3rJ!o4qo8V}q@)8jNk;+IhFCOnIZ>q* zic?E~mWL%4WhN%&q$)&%4FQVgq$Zar80bKp2jd&UO`EK_QDXAG_lqXaIuJhHL5-1p zv+CN5dXsjyEKDqn49s+N%?-`gZyprO&(h{t8#-$p)8x zPM@H{$iCTh-9B`>{yI ciR>cA{B?Q@PCmL&?%~hzAdWRo#!5IG0M&R=Pyhe` diff --git a/Server_Install_Pack/mpmissions/epoch.Sara.pbo b/Server_Install_Pack/mpmissions/epoch.Sara.pbo index 048a7eee7d6668cca87637d955719a395067c750..e5c12568b5e995fbf455f5508ae09e2003f9db65 100644 GIT binary patch delta 365 zcmX?bkag2x)(KmgGh>cT+@Z+(`#A#`e2+R7_Iu;AL(2_KP4p}*jm*pqbWF@G^$ZP7 zObv{5j7{{63{A}}Ep&7(%#8IcO-wC~jCD*cOm)nRC*NA3C}3e}u48CypkruaWCUVt z=3be|Jh}fp@8pI}e3RF1;t)*F%ySF&Rj^fvFUiO(1~R8R1~H2A7vv;XrWX0+1EoFl zGD{{ao)n&LAj-%&+3E^kzLkQip^k#8k&==QSeK51YkSShfj9-mH;kQp@TJ1!eR~#7H&A1Y z+nlrZqTXbuJF%0O+)>_q=FYWh_IT&`VAl|($>$F`PJbW4$T|IQ1f%43=}5+j>>?Xd YHTSOHIQRS9@7bl1&+-p`-7B070P75Z)&Kwi delta 224 zcmdmVnDxLx)(Kmg-+wz8ta*x8ycG#>6jUq>X{iC znHd@Am|K|YS(sQD8JOwlnj4zynF19U8tRx@nCe(qOuo57QNYr~QpeE3NXO8`+yunf z%(XI+dHFqMM#jxG>n`fCx(4_=drbDd8w+Kvx~mLfZ9aSVS~V|NI^H=x*fm5+X>#IY xhv}~)89BL;gr`r8VHAdF+0GlqIFVhX`{@a7`%ddk^LDkf+8+tEHd()>001?iOA-J8 diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo index 7cbd95740b0f5dccac58a08854b3598c92bfe494..df69bd43842a6ff55c420cc10e9b86daf801978e 100644 GIT binary patch delta 363 zcmX?qkoDkU)(Kmgvto`-+@Z+(`#A#`e2+R7_Iu;Ai^~m7P4p}*jm*pqbWF@G^$ZP7 zObv{5j7{{63{A}}Ep&7(%#8IcO-wC~jCD*cOm)nRC%;^wC}3e}u48CypkruaWCUVt zmRgy}Jo&>0>FM!7jBLU=`RSQ?Zo$3^whHkj8JWdE=JbFdMp6EPoW#o1A|H^nXI^H> z^u}05;pz6GjGU7_ukhttDX1FiD5x4KDd~W<=_t4c_&a;V!;FiyR#J$`qB*I_B?<;Q5VyeihOv`Bu2PtMcF&^89}a|XE?Ij+ zZ*t(B*vXskC~v-f=UO#eymNf8YslopJI>SpM=)|s=ZR#L+^!YLIFVf>(N;TbvDx(r R?h|f`@`ofm+2nuN8~|IAeCGfF delta 241 zcmX?jnDzWY)(Kmg-+w6jUq>X{iC znHd@Am|K|YS(sQD8JOwlnj4zynF19U8tRx@nCe(qOn$LKQNYr~QpeE3NXO8`+yunf zEV(j~dHGvqM#jzE>n`fCx(4_=drXeG8w+LaysHdhZN78&S~V|NI^H=x*fm5+X>!41 z2c7uDqN2n~1zQCqDQhK#m^@xC1q4t6%Wjv6Vw}h>vf|GEj%9oEw)@;aGHK$qXhX%Y G+gSiOP*61h diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index 6ecfeaf086d86d60a1734a875f16a03128e7d4af..38e5dc1546972bd82b38b752fc3723db2c4b0f20 100644 GIT binary patch delta 389 zcmcb9koDwY)(Kmgvto`-+@Z+(`#A#`e2+R7_Iu;Ao68MNP4p}*jm*pqbWF@G^$ZP7 zObv{5j7{{63{A}}Ep&7(%#8IcO-wC~jCD*cOm)nRCx2X_C}3e}u48CypkruaWCUVt zR$7_JJbi)@Bj03$jl7fhUu750PtVMA3-(p8RfsRi$SejjttW51Dk4~rlUSKr~opIZz{Gt(6pF z@_4xvAV7%|Ra&7qwFGEeSYlCTVp2}3LNwSAplD8Na*2Y04#Yh$z9HPS%`>kFGESeT z#>l?8dF@5L$&q(rC-1(ay!r8+Yt_^DMKA`k$2-RdyM|a#HasBA17-p}mzS9X7T6vX e$ymrP^5LuO0sDlk8$8FCPwTbLH#xFu^K$@HJ%soG delta 231 zcmX?knDzQW)(KmgKYTwpafc!==W_-yc=-Kb80W@kH6jUq>X{iC znHd@Am|K|YS(sQD8JOwlnj4zynF19U8tRx@nCe(qO#ZM!QNYr~QpeE3NXO8`+yunf zthh3fd2-*SpVQ~7GqP`{{_xw|TQd?$=2D4blYw Dey34s diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index bc4b852d8217e50227cca82ce3ad27db2b4e7d67..d445b70b0d58e14ab6355229ea160738fc507a7a 100644 GIT binary patch delta 392 zcmdmafOYjD)(Kmgvto`-+@Z+(`#A#`e2+R7_Iu+q>*a=~CVCc@MrP&)Iwt0pdWME3 zrUphj#wL13hNfng7CO2XX2yD!CZ?7~#yX}JraETElY>_%3Rqa0>lhjv=op$98G#s^ zTUI18Pron1C~fZ=;P31apOc@SndcVlt6-}TUy_ko3}jj>Da7RQaw$N75=31=PGV(h zkq=08>A*XtY)i^R#I|tbqaO2QcyM2QBXBfQqlpNq@#dpLoAxPoT$QWc`Xh5$u#Qj<#*40IsQgYgaFrcHjiL1J><`$dzZ4unrrV`Sg_ zbj?M*$-8gIPL{o+yxH~6wd&~#5sZQC@y_wVt|8Ww8TScqpBlk9fnDTtXRqDv-4?Ma QiXuEM&c%mzX>!#90E23Oo&W#< delta 266 zcmZ2|h;`=y)(KmgKYTwpafc!==W_-yc=-Kb80W@k*30WHjrGjU4UNr=bj%D)^~{Wn z%!~|l%q>jyEKDqn49s+N%?-`gZyprO&&0{t8#-$saEM zoF1UU$iDgO+KYOut^xke9+QvViG{M1?aiHn%qYoo`xk>f*1=xhqyJc6r?X1^}4;RuupM diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 598eb99d42755e47b8b2aa3a83896d4cc3c2f130..774d62ff46ce21ae20fe387c9abe24704789b2af 100644 GIT binary patch delta 391 zcmX@RpLPF1)(Kmgvty1;+@Z+(`#A#`e2+R7_Iu;A^UDlPP4p}*jm*pqbWF@G^$ZP7 zObv{5j7{{63{A}}Ep&7(%#8IcO-wC~jCD*cOm)nRCqG}VC}3e}u48CypkruaWCUVt zmROO7$>reB(xp0dUSL4 S$;b)+ITBa@SXRwbXbb@N_Jt?_ delta 206 zcmdmgkoD|-)(KmgKYTwpafc!==W_-yc=-Kb80W@k=a(5-8ta*x8ycG#>6jUq>X{iC znHd@Am|K|YS(sQD8JOwlnj4zynF19U8tRx@nCe(qOn$apQNYr~QpeE3NXO8`+yunf zEWRRJsaOENNxflO;9g_t~EE(Hisf~YIV zNvupQ@&T##%*!m9e$awZc(VUy&ib_cqTIxiXeA{VSEo>SD+N_U9R*b*B_$oOaXJd9 z*2JP2&WS3mP@Gx* za>2>)>GOjaIW|vRb3t!%+U?lMCvGcm{&4$R_4L!>jDgb?BN!#O+ea`?WEYWEzT_wJ UD4(t8P{#6G8&0j9aC}n?0J`>s`Tzg` delta 225 zcmcb1koC!a)(KmgKYl+rafc!==W_-yc=-Kb80W@k&z2ck8ta*x8ycG#>6jUq>X{iC znHd@Am|K|YS(sQD8JOwlnj4zynF19U8tRx@nCe(qO#ZuEQNYr~QpeE3NXO8`+yunf zthXYOdGfuJKc_DUX5^SYQ;(5*^P06s^(G(q$~L*^P7JGSfWNcH@N Q>8!D)ZESe~`DV5M0g#DMWB>pF diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index e48b918e0caa5d8e5b6fccf939a7378f788daeed..2456fb2794a318b46e6906bd8a316d4d52c0f37b 100644 GIT binary patch delta 391 zcmeC(&-(uW>x8Y$IWfm3?oj0Y{hR>|zDFGk`@Qj5|1v{U6Fmz{BQtXY9TRg)Jwrni zQv)L%V-r0iLsK(L3mshxGh;nV6H`kgV;xfqQynwo$;+233Rqa0>lhjv=op$98G#s^ zZ!Aw_p1k0Nw5@A^zq3btPJVi3o?Ec5f~`V)Nk(QdkZG-?5R=Etr2qj+5OoDPiIu5E zJ|NYed6^}X8CMBU|0~SMIhp-3U%r)ss-cd8s*#eC4%iSK1ysXh(TwCol~yQDEdkma zmROXTn3R*M5Dhj2D4LU+T%us0192IQZx}mWQG`)pdH@IGqRH#_hfglJ#j)9H%>}*5 z{I_E#7v5IhJoEOoYPNXi_+ZzN=>=kpPSf{gf;*G delta 206 zcmex=fVFo&>x8Y$AHN@*xI>Yb^Em?;Jp6tzjC13&{$)m%#(L)FhQ?+_I%Wo@dS*sO zW<~}&<`$-U7A6)(24*_C=7#2ara%RThB~GeraBfDlb0=56tFb0)G@R$(lInKHvus= zUtgZcynMA1BjaYzwHNhRT?71`Jtj-tiG{Mt?Yd`U)TF_3Akq!5$G%cTGTN)UAgIf<32 zMLrIOeqr~KQ?-xxzbs&6tff^(G z=Fqhl^(JfIiJjbgM|tzsJJ+hGPl#X)WRG`_4|WZ)o?N(3cspw(;{Cw(2 RPhLDV&uq2q4L-T}H2~0Of{p+H delta 266 zcmbPzn04hr)(KmgKYc$qafc!==W_-yc=-Kb80W@ktC!bX8ta*x8ycG#>6jUq>X{iC znHd@Am|K|YS(sQD8JOwlnj4zynF19U8tRx@nCe(q80Z+*TJv(1XXd5kmq*7c*eX;T z>F63Fkfn*Gj-iE-j-iRU37BCFG}{=YM@wH{OVusd*GAvN)zQUHOP_Z$|4LWp$qAQ! zPCuZ+$i6vs-9_k0RlWcK diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index 2e2ba4090395520ff6ad183ac5a2087abea57656..636c31127a08e7ab2a5a51544c5f1a3c0b50a624 100644 GIT binary patch delta 386 zcmaENfc3#4)(Kmgb7PK8+@Z+(`#A#`e2+R7_Iu;Ag5`#$CVCc@MrP&)Iwt0pdWME3 zrUphj#wL13hNfng7CO2XX2yD!CZ?7~#yX}JraETElRH)@3Rqa0>lhjv=op$98G#s^ zcdkfeo-A-!diuXWMmFJ`{PfH`w_sldTZQ zX)P~t?D zRwzy_0a_H6Sd^KVl#{9u4K@TQnv81efia40C*3B`Tzg` delta 225 zcmaEGi1pn8)(KmgKYc$qafc!==W_-yc=-Kb80W@k1rjrGjU4UNr=bj%D)^~{Wn z%!~|l%q>jyEKDqn49s+N%?-`$u3^tBiot^Vx(*@tRcb5YI>E22d diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index 76f7929014df7688b55b85da7d3b1be4bb5e0820..992358f0f45898a13544cd7366e8f29fcd5e4901 100644 GIT binary patch delta 393 zcmeA?!20_j>x8Y$*)hi^?oj0Y{hR>|zDFGk`@QiQ_i{s16Fmz{BQtXY9TRg)Jwrni zQv)L%V-r0iLsK(L3mshxGh;nV6H`kgV;xfqQynwo$;vAf1uQJhbqtLSbPP?5j6jUd zAuAG@r>_@bl(u&b@OSoz&&f~E%ySF&Rj^fvFUiO(1~RRc6k_stxfCEk38JnbC$TcM z$Ooj_GcU75!FF=}2C2yctJ&(Km6TjuokHEM6jTj$6jY6rlytx*=_sJu5Q}CmC#tkU zacT+B^036B%*3ReRE21;Awbcb)Z`Kc109I-V0=TkX_I$ukeKZEe$iyD1L4yzs4}u| z-n! delta 266 zcmex;khSvw>x8Y$AHN@*xI>Yb^Em?;Jp6tzjC12N?&bBC#(L)FhQ?+_I%Wo@dS*sO zW<~}&<`$-U7A6)(24*_C=7#2ara%RThB~GeraBfD20Dhd*1TNhnRzMs<a;uBU_F+12d0oOb2!r}-s6i)=()0Ck~Mm;e9( diff --git a/Sources/epoch_code/System/player_login.fsm b/Sources/epoch_code/System/player_login.fsm index f7f1fc4e..80dead98 100644 --- a/Sources/epoch_code/System/player_login.fsm +++ b/Sources/epoch_code/System/player_login.fsm @@ -1,8 +1,8 @@ /*%FSM*/ /*%FSM*/ /* -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"}; +item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item1[] = {"FINISH",1,4346,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"}; @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,1946.016846,1047.855225,585,630,1}; +window[] = {2,-1,-1,-1,-1,871,104,1396,104,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -256,7 +263,8 @@ class FSM " diag_log ""EPOCH-LOGIN: Finish!"";" \n "};" \n "" \n - "" \n + "EPOCH_loginFSM = nil;" \n + "EPOCH_playerLoginInit = nil;" \n "" \n "//player enableSimulation true;" \n "" \n @@ -517,9 +525,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1352,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_checkPlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_checkPlayer.sqf index bde9a420..8e310c3c 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_checkPlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_checkPlayer.sqf @@ -22,7 +22,7 @@ if (typename _this == "OBJECT") then { _arr = (_response select 1); }; - if (count _arr < 11) then { + if (count _arr < 11) then { _dead = true; } else { _medical = _arr select 1; @@ -43,12 +43,11 @@ if (typename _this == "OBJECT") then { }; /* true => New Char false => load old Char */ - EPOCH_checkPlayer_PVC = _dead; - (owner _plyrObj) publicVariableClient "EPOCH_checkPlayer_PVC"; + ['_checkPlayer_PVC', _dead] remoteExec ['EPOCH_playerLoginInit',_plyrObj]; if (!_dead) then { //Load old Char [_plyrObj, _isMale] call EPOCH_server_loadPlayer; }; }; }; -}; \ No newline at end of file +}; diff --git a/Sources/epoch_server/init/server_securityfunctions.sqf b/Sources/epoch_server/init/server_securityfunctions.sqf index 961db0f1..e6bb6fe4 100644 --- a/Sources/epoch_server/init/server_securityfunctions.sqf +++ b/Sources/epoch_server/init/server_securityfunctions.sqf @@ -168,7 +168,7 @@ EPOCH_server_getPToken = compileFinal ("private['_ret','_var'];_ret = false;if ( EPOCH_server_setPToken = compileFinal ("private '_var';_var = 'epochserver' callExtension '810';_this setVariable ['"+_skn_AH_rndVarPlayer+"',_var];_var"); if (!_skn_enableAntihack) exitWith { - EPOCH_server_pushPlayer = compileFinal ("EPOCH_C_SET = _this select 2;EPOCH_C_SET pushBack '"+_skn_PVC_INDEX+"';EPOCH_C_SET pushBack '';(_this select 0) publicVariableClient 'EPOCH_C_SET'"); + EPOCH_server_pushPlayer = compileFinal ("_C_SET = _this select 2;_C_SET pushBack '"+_skn_PVC_INDEX+"';_C_SET pushBack '';['_C_SET', _C_SET] remoteExec ['EPOCH_playerLoginInit',(_this select 0)];"); EPOCH_server_isPAdmin = compileFinal ("false"); EPOCH_server_Authed = compileFinal ("true"); EPOCH_server_disconnect = compileFinal("true"); @@ -550,18 +550,18 @@ if (_skn_PVSPrefix == "") then { }; EPOCH_server_pushPlayer = compileFinal (" - EPOCH_C_SET = _this select 2; + _C_SET = _this select 2; if (_this select 1 in "+ str _skn_adminUIDArray+") then { (_this select 0) publicVariableClient '"+_skn_Admin_Code+"'; (_this select 0) publicVariableClient '"+_skn_pv_adminLog+"'; (_this select 0) publicVariableClient '"+_skn_pv_hackerLog+"'; - EPOCH_C_SET pushBack '"+_skn_PVC_INDEX+"'; - EPOCH_C_SET pushBack '[] spawn "+_skn_Admin_Init+"'; + _C_SET pushBack '"+_skn_PVC_INDEX+"'; + _C_SET pushBack '[] spawn "+_skn_Admin_Init+"'; } else { - EPOCH_C_SET pushBack '"+_skn_PVC_INDEX+"'; - EPOCH_C_SET pushBack '[] spawn "+_skn_AH_Init+"'; + _C_SET pushBack '"+_skn_PVC_INDEX+"'; + _C_SET pushBack '[] spawn "+_skn_AH_Init+"'; }; - (_this select 0) publicVariableClient 'EPOCH_C_SET'; + ['_C_SET', _C_SET] remoteExec ['EPOCH_playerLoginInit',(_this select 0)]; true "); EPOCH_server_isPAdmin = compileFinal ("if (isNull _this) then {false} else {getPlayerUID _this in "+str _skn_adminUIDArray+"}"); diff --git a/Sources/mpmissions/epoch.Altis/System/player_login.fsm b/Sources/mpmissions/epoch.Altis/System/player_login.fsm index f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Altis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Altis/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Australia/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Australia/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Porto/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Porto/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm +++ b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Sara/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm +++ b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.VR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.VR/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \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 f7f1fc4e..9f3f93e3 100644 --- a/Sources/mpmissions/epoch.utes/System/player_login.fsm +++ b/Sources/mpmissions/epoch.utes/System/player_login.fsm @@ -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,-393.771362,605.622620,785.848206,-717.513611,585,880,1}; -window[] = {2,-1,-1,-1,-1,949,182,1474,182,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-354.892670,479.114502,34.215698,-863.945923,585,630,1}; +window[] = {2,-1,-1,-1,-1,897,130,1422,130,3,603}; *//*%FSM*/ class FSM { @@ -218,7 +218,14 @@ class FSM " _timeout = ((diag_tickTime - _myTime) > 30);" \n " diag_log format [""LOGIN-DEBUG mass match: %1 in %2 seconds, timeout: %3"", _logic1,(diag_tickTime - _myTime),_timeout];" \n " (_logic1 || _timeout)" \n - "};"/*%FSM*/; + "};" \n + "" \n + "EPOCH_loginFSM = _thisFSM;" \n + "EPOCH_playerLoginInit = {" \n + " diag_log format[""DEBUG: %1, %2"",_this, EPOCH_loginFSM];" \n + " EPOCH_loginFSM setFSMVariable [_this select 0, _this select 1];" \n + "};" \n + ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -517,9 +524,9 @@ class FSM priority = 0.000000; to="Process_2"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_checkPlayer_PVC"""/*%FSM*/; - action=/*%FSM*/"_newChar = EPOCH_checkPlayer_PVC;" \n - "EPOCH_checkPlayer_PVC = nil;"/*%FSM*/; + condition=/*%FSM*/"!isNil ""_checkPlayer_PVC"""/*%FSM*/; + action=/*%FSM*/"_newChar = _checkPlayer_PVC;" \n + "_checkPlayer_PVC = nil;"/*%FSM*/; }; /*%FSM*/ /*%FSM*/ @@ -1344,9 +1351,9 @@ class FSM priority = 0.000000; to="Check_New_Player"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; - action=/*%FSM*/"_array = EPOCH_C_SET;" \n - "EPOCH_C_SET = nil;" \n + condition=/*%FSM*/"!isNil ""_C_SET"""/*%FSM*/; + action=/*%FSM*/"_array = _C_SET;" \n + "_C_SET = nil;" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n