diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 14f9cab1..53836b3d 100644 Binary files a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo and b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 48ca3e51..b9dca4a7 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Altis.pbo and b/Server_Install_Pack/mpmissions/epoch.Altis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index fdeea9e6..1b2e0c85 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Australia.pbo and b/Server_Install_Pack/mpmissions/epoch.Australia.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index a76bbee0..dd1456eb 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index 3991bdde..2bc2f450 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo and b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 945af353..1aa42cd8 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index ddd5745d..99ba1d54 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index 7f6a1a7a..9820d104 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo and b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index 4a51279f..bb5aca90 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo and b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index b698e582..d96ece32 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index 0274628b..e6dd6606 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Porto.pbo and b/Server_Install_Pack/mpmissions/epoch.Porto.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index 0884856f..053aafc7 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo and b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Sara.pbo b/Server_Install_Pack/mpmissions/epoch.Sara.pbo index 048a7eee..e5c12568 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Sara.pbo and b/Server_Install_Pack/mpmissions/epoch.Sara.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo index 7cbd9574..df69bd43 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo and b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index 6ecfeaf0..38e5dc15 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo and b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index bc4b852d..d445b70b 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo and b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 598eb99d..774d62ff 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo and b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index 7088f26b..d3cd985d 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo and b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index e48b918e..2456fb27 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.VR.pbo and b/Server_Install_Pack/mpmissions/epoch.VR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index 532dfa1f..e7582551 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index 2e2ba409..636c3112 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo and b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index 76f79290..992358f0 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.utes.pbo and b/Server_Install_Pack/mpmissions/epoch.utes.pbo differ 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