diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 5237e29d..26027082 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..73ba4c11 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..a2b8a1f1 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..afa3f70d 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..97b094da 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..9c89d791 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..ea3dbc09 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..83bab7b6 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..fe33d08f 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..fa27ac2a 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..a60d6382 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..3de9e49a 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..57ebbf99 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..c8aa5be9 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..e2d8dec9 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..af9aebad 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..3698c1ed 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..9cc20113 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..d28d3963 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..26e648f2 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..e8527995 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..619a830d 100644 --- a/Sources/epoch_code/System/player_login.fsm +++ b/Sources/epoch_code/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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Altis/System/player_login.fsm b/Sources/mpmissions/epoch.Altis/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Australia/System/player_login.fsm b/Sources/mpmissions/epoch.Australia/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Porto/System/player_login.fsm b/Sources/mpmissions/epoch.Porto/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Sara/System/player_login.fsm b/Sources/mpmissions/epoch.Sara/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.VR/System/player_login.fsm b/Sources/mpmissions/epoch.VR/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/ diff --git a/Sources/mpmissions/epoch.utes/System/player_login.fsm b/Sources/mpmissions/epoch.utes/System/player_login.fsm index 6bede808..619a830d 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,-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,-213.844360,425.695953,1213.486816,524.751038,585,630,1}; +window[] = {2,-1,-1,-1,-1,767,-7,1285,0,3,603}; *//*%FSM*/ class FSM { @@ -211,7 +211,14 @@ class FSM "if (_debug) then {" \n " diag_log ""EPOCH-LOGIN: Init"";" \n "};" \n - ""/*%FSM*/; + "" \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 + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1041,7 +1048,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*/