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 5237e29d..d130a71c 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 d770f8e5..166eb8ed 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 c1fca264..7532aacc 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 f05d8d4a..3e086715 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 a5f9518b..199a01d2 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 62fb533b..b3c7d3f1 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 a521d4d0..b0ffbe0b 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 4c1392d3..6a934756 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 a6212826..f24ce5f8 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 77bbf9a5..4f6eb6de 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 7d06135f..b8b95b9d 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 ded6fdc0..6232fc25 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 2bfd010f..34ff0dd3 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 eee24b1f..414c9335 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 b59c3ae4..e964833f 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 c6760a88..89875858 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 38ac8d2c..7b4bd625 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 4d94fa7a..bbf25e75 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 f0a02eda..bbb91c52 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 d5200296..35324c22 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 1440849e..e83a634a 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 6bede808..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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Altis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Altis/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Australia/System/player_login.fsm b/Sources/mpmissions/epoch.Australia/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Australia/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Australia/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bootcamp_ACR/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Bornholm/System/player_login.fsm b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bornholm/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Chernarus/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus_Summer/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Desert_E/System/player_login.fsm b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Desert_E/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Esseker/System/player_login.fsm b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Esseker/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Mountains_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Mountains_ACR/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Porto/System/player_login.fsm b/Sources/mpmissions/epoch.Porto/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Porto/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Porto/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm +++ b/Sources/mpmissions/epoch.ProvingGrounds_PMC/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Sara/System/player_login.fsm b/Sources/mpmissions/epoch.Sara/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Sara/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.SaraLite/System/player_login.fsm b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm +++ b/Sources/mpmissions/epoch.SaraLite/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Sara_dbe1/System/player_login.fsm b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara_dbe1/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Shapur_BAF/System/player_login.fsm b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Shapur_BAF/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Stratis/System/player_login.fsm b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Stratis/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Takistan/System/player_login.fsm b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Takistan/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.VR/System/player_login.fsm b/Sources/mpmissions/epoch.VR/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.VR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.VR/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Woodland_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Woodland_ACR/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.Zargabad/System/player_login.fsm b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Zargabad/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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/mpmissions/epoch.utes/System/player_login.fsm b/Sources/mpmissions/epoch.utes/System/player_login.fsm index 6bede808..80dead98 100644 --- a/Sources/mpmissions/epoch.utes/System/player_login.fsm +++ b/Sources/mpmissions/epoch.utes/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,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; -window[] = {2,-1,-1,-1,-1,968,156,1448,156,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 { @@ -211,6 +211,20 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n + "" \n + "" \n + "_finalPlayerObjectCheck = {" \n + " _logic1 = (_mass == (loadAbs _playerObject));" \n + " _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 + "};" \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 @@ -249,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 @@ -510,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*/ @@ -1041,7 +1056,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10} && {call _finalPlayerObjectCheck}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1337,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