diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 58f11356..5237e29d 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 e1ae794f..d770f8e5 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 d5ef92c1..c1fca264 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 02527f00..f05d8d4a 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 00c06a44..a5f9518b 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 dea4716e..62fb533b 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 e45b752b..a521d4d0 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 b98ea125..4c1392d3 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 da1027c9..a6212826 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 0e4d82fd..77bbf9a5 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 62f6e751..7d06135f 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 f7e782bf..ded6fdc0 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 dbc4377c..2bfd010f 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 bee3ebd3..eee24b1f 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 4cc16f0c..b59c3ae4 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 b3c85cd0..c6760a88 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 a72cf16f..38ac8d2c 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 0a6f2849..4d94fa7a 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 67ae91c5..f0a02eda 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 b4ce1a6c..d5200296 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 f88fd75d..1440849e 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 88909760..6bede808 100644 --- a/Sources/epoch_code/System/player_login.fsm +++ b/Sources/epoch_code/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Altis/System/player_login.fsm b/Sources/mpmissions/epoch.Altis/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Altis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Altis/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Australia/System/player_login.fsm b/Sources/mpmissions/epoch.Australia/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Australia/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Australia/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Porto/System/player_login.fsm b/Sources/mpmissions/epoch.Porto/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Porto/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Porto/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm +++ b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Sara/System/player_login.fsm b/Sources/mpmissions/epoch.Sara/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Sara/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm +++ b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.VR/System/player_login.fsm b/Sources/mpmissions/epoch.VR/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.VR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.VR/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.utes/System/player_login.fsm b/Sources/mpmissions/epoch.utes/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.utes/System/player_login.fsm +++ b/Sources/mpmissions/epoch.utes/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n