Fix slow login timer and wrong login timeout message

This commit is contained in:
icomrade
2016-02-18 23:14:36 -05:00
parent 11dd17cb8f
commit 6db02d28bf
2 changed files with 1609 additions and 1541 deletions

View File

@@ -437,7 +437,7 @@ if (!isDedicated) then {
[] spawn { [] spawn {
private["_timeOut","_display","_control1","_control2"]; private["_timeOut","_display","_control1","_control2"];
disableSerialization; disableSerialization;
_timeOut = 0; _timeOut = diag_tickTime;
dayz_loadScreenMsg = ""; dayz_loadScreenMsg = "";
diag_log "DEBUG: loadscreen guard started."; diag_log "DEBUG: loadscreen guard started.";
_display = uiNameSpace getVariable "BIS_loadingScreen"; _display = uiNameSpace getVariable "BIS_loadingScreen";
@@ -450,7 +450,7 @@ if (!isDedicated) then {
}; };
// 120 sec timeout (12000 * 0.01) // 120 sec timeout (12000 * 0.01)
while { _timeOut < 12000 } do { while { (_timeOut + 120) > diag_tickTime } do {
if (dayz_clientPreload && dayz_authed) exitWith { if (dayz_clientPreload && dayz_authed) exitWith {
diag_log "PLOGIN: Login loop completed!"; diag_log "PLOGIN: Login loop completed!";
endLoadingScreen; endLoadingScreen;
@@ -469,20 +469,18 @@ if (!isDedicated) then {
dayz_loadScreenMsg = ""; dayz_loadScreenMsg = "";
}; };
_control2 ctrlSetText format["%1",round(_timeOut*0.01)]; _control2 ctrlSetText format["%1",round(diag_tickTime - _timeOut)];
}; };
_timeOut = _timeOut + 1; //_timeOut = _timeOut + 1;
uiSleep 0.001;
if (_timeOut >= 12000) then { };
if (diag_tickTime >= (_timeOut + 120)) then {
1 cutText [localize "str_player_login_timeout", "PLAIN DOWN"]; 1 cutText [localize "str_player_login_timeout", "PLAIN DOWN"];
uiSleep 10; uiSleep 10;
endLoadingScreen; endLoadingScreen;
endMission "END1"; endMission "END1";
}; };
uiSleep 0.01;
};
}; };
dayz_meleeMagazineCheck = { dayz_meleeMagazineCheck = {

View File

@@ -1,4 +1,4 @@
/*%FSM<COMPILE "C:\Program Files (x86)\Bohemia Interactive\Tools\FSM Editor Personal Edition\scriptedFSM.cfg, DayZ Player Monitor">*/ /*%FSM<COMPILE "C:\Program Files (x86)\Steam\steamapps\common\Arma 3 Tools\FSMEditor\scriptedFSM.cfg, DayZ Player Monitor">*/
/*%FSM<HEAD>*/ /*%FSM<HEAD>*/
/* /*
item0[] = {"init",0,250,-75.000000,-350.000000,25.000000,-300.000000,0.000000,"init"}; item0[] = {"init",0,250,-75.000000,-350.000000,25.000000,-300.000000,0.000000,"init"};
@@ -20,7 +20,7 @@ item15[] = {"Parse_Login",2,250,-75.000000,500.000000,25.000000,550.000000,0.000
item16[] = {"Hive_Bad",4,218,50.000000,500.000000,150.000000,550.000000,10.000000,"Hive" \n "Bad"}; item16[] = {"Hive_Bad",4,218,50.000000,500.000000,150.000000,550.000000,10.000000,"Hive" \n "Bad"};
item17[] = {"ERROR__Wrong_HIVE",2,250,175.000000,500.000000,275.000000,550.000000,0.000000,"ERROR:" \n "Wrong HIVE" \n "Version"}; item17[] = {"ERROR__Wrong_HIVE",2,250,175.000000,500.000000,275.000000,550.000000,0.000000,"ERROR:" \n "Wrong HIVE" \n "Version"};
item18[] = {"Hive_Ok",4,218,-175.000000,550.000000,-75.000000,600.000000,0.000000,"Hive" \n "Ok"}; item18[] = {"Hive_Ok",4,218,-175.000000,550.000000,-75.000000,600.000000,0.000000,"Hive" \n "Ok"};
item19[] = {"Phase_One",2,4346,-75.000000,600.000000,25.000000,650.000000,0.000000,"Phase One"}; item19[] = {"Phase_One",2,250,-75.000000,600.000000,25.000000,650.000000,0.000000,"Phase One"};
item20[] = {"Response",4,218,-175.000000,650.000000,-75.000000,700.000000,0.000000,"Response"}; item20[] = {"Response",4,218,-175.000000,650.000000,-75.000000,700.000000,0.000000,"Response"};
item21[] = {"Phase_Two",2,250,-75.000000,700.000000,25.000000,750.000000,0.000000,"Phase Two"}; item21[] = {"Phase_Two",2,250,-75.000000,700.000000,25.000000,750.000000,0.000000,"Phase Two"};
item22[] = {"Dead_Player",4,218,50.000000,700.000000,150.000000,750.000000,0.000000,"Dead" \n "Player"}; item22[] = {"Dead_Player",4,218,50.000000,700.000000,150.000000,750.000000,0.000000,"Dead" \n "Player"};
@@ -56,7 +56,7 @@ item51[] = {"Retry",4,218,25.000000,375.000000,125.000000,425.000000,0.000000,"R
item52[] = {"retry_",4,218,25.000000,425.000000,125.000000,475.000000,0.000000,"retry" \n ""}; item52[] = {"retry_",4,218,25.000000,425.000000,125.000000,475.000000,0.000000,"retry" \n ""};
item53[] = {"Retry",2,250,125.000000,400.000000,225.000000,450.000000,0.000000,"Retry"}; item53[] = {"Retry",2,250,125.000000,400.000000,225.000000,450.000000,0.000000,"Retry"};
item54[] = {"auth_failed",4,218,250.000000,400.000000,350.000000,450.000000,0.000000,"auth failed"}; item54[] = {"auth_failed",4,218,250.000000,400.000000,350.000000,450.000000,0.000000,"auth failed"};
item55[] = {"get_ready_to_clo",2,250,400.000000,400.000000,500.000000,450.000000,0.000000,"get ready to close"}; item55[] = {"get_ready_to_clo",2,4346,400.000000,400.000000,500.000000,450.000000,0.000000,"get ready to close"};
item56[] = {"sleep_",4,218,550.000000,400.000000,650.000000,450.000000,0.000000,"sleep" \n ""}; item56[] = {"sleep_",4,218,550.000000,400.000000,650.000000,450.000000,0.000000,"sleep" \n ""};
item57[] = {"Disconnect",2,250,825.000000,400.000000,925.000000,450.000000,0.000000,"Disconnect"}; item57[] = {"Disconnect",2,250,825.000000,400.000000,925.000000,450.000000,0.000000,"Disconnect"};
item58[] = {"No_time_date",4,218,25.000000,1150.000000,125.000000,1200.000000,0.000000,"No time/date"}; item58[] = {"No_time_date",4,218,25.000000,1150.000000,125.000000,1200.000000,0.000000,"No time/date"};
@@ -169,8 +169,8 @@ link85[] = {75,57};
link86[] = {76,78}; link86[] = {76,78};
link87[] = {77,76}; link87[] = {77,76};
link88[] = {78,57}; link88[] = {78,57};
globals[] = {25.000000,1,0,0,0,640,480,1,143,6316128,1,-648.860474,646.549011,954.039734,36.458042,864,612,1}; globals[] = {0.000000,0,0,0,0,640,480,1,143,6316128,1,65.308601,1078.151001,702.806824,15.855862,864,586,1};
window[] = {0,-1,-1,-32000,-32000,1018,260,1749,260,1,882}; window[] = {0,-1,-1,-1,-1,992,234,1723,234,1,882};
*//*%FSM</HEAD>*/ *//*%FSM</HEAD>*/
class FSM class FSM
{ {
@@ -181,6 +181,7 @@ class FSM
class init class init
{ {
name = "init"; name = "init";
itemno = 0;
init = /*%FSM<STATEINIT""">*/"dayz_versionNo = getText(configFile >> ""CfgMods"" >> ""DayZ"" >> ""version"");" \n init = /*%FSM<STATEINIT""">*/"dayz_versionNo = getText(configFile >> ""CfgMods"" >> ""DayZ"" >> ""version"");" \n
"_AuthAttempt = 0;" \n "_AuthAttempt = 0;" \n
"" \n "" \n
@@ -207,6 +208,7 @@ class FSM
/*%FSM<LINK "Client">*/ /*%FSM<LINK "Client">*/
class Client class Client
{ {
itemno = 5;
priority = 0.000000; priority = 0.000000;
to="Loading"; to="Loading";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -217,6 +219,7 @@ class FSM
/*%FSM<LINK "isServer">*/ /*%FSM<LINK "isServer">*/
class isServer class isServer
{ {
itemno = 1;
priority = 0.000000; priority = 0.000000;
to="wait"; to="wait";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -231,6 +234,7 @@ class FSM
class wait class wait
{ {
name = "wait"; name = "wait";
itemno = 2;
init = /*%FSM<STATEINIT""">*/""/*%FSM</STATEINIT""">*/; init = /*%FSM<STATEINIT""">*/""/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
@@ -238,6 +242,7 @@ class FSM
/*%FSM<LINK "Allow_Conn">*/ /*%FSM<LINK "Allow_Conn">*/
class Allow_Conn class Allow_Conn
{ {
itemno = 3;
priority = 0.000000; priority = 0.000000;
to="Loading"; to="Loading";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -252,6 +257,7 @@ class FSM
class Loading class Loading
{ {
name = "Loading"; name = "Loading";
itemno = 4;
init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n
"if (_debug) then {" \n "if (_debug) then {" \n
"diag_log (""PLOGIN: Initating"");" \n "diag_log (""PLOGIN: Initating"");" \n
@@ -267,6 +273,7 @@ class FSM
/*%FSM<LINK "Initialized">*/ /*%FSM<LINK "Initialized">*/
class Initialized class Initialized
{ {
itemno = 41;
priority = 0.000000; priority = 0.000000;
to="Enable_Sim"; to="Enable_Sim";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -378,6 +385,7 @@ class FSM
class Prepare class Prepare
{ {
name = "Prepare"; name = "Prepare";
itemno = 7;
init = /*%FSM<STATEINIT""">*/"if (_debug) then {" \n init = /*%FSM<STATEINIT""">*/"if (_debug) then {" \n
"diag_log (""PLOGIN: Player Model Exists"");" \n "diag_log (""PLOGIN: Player Model Exists"");" \n
"};"/*%FSM</STATEINIT""">*/; "};"/*%FSM</STATEINIT""">*/;
@@ -387,6 +395,7 @@ class FSM
/*%FSM<LINK "player___player">*/ /*%FSM<LINK "player___player">*/
class player___player class player___player
{ {
itemno = 8;
priority = 0.000000; priority = 0.000000;
to="Collect"; to="Collect";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -401,6 +410,7 @@ class FSM
class Collect class Collect
{ {
name = "Collect"; name = "Collect";
itemno = 9;
init = /*%FSM<STATEINIT""">*/"if (_debug) then {" \n init = /*%FSM<STATEINIT""">*/"if (_debug) then {" \n
"diag_log (""PLOGIN: Player Ready"");" \n "diag_log (""PLOGIN: Player Ready"");" \n
"};" \n "};" \n
@@ -415,6 +425,7 @@ class FSM
/*%FSM<LINK "no_PlayerID">*/ /*%FSM<LINK "no_PlayerID">*/
class no_PlayerID class no_PlayerID
{ {
itemno = 11;
priority = 2.000000; priority = 2.000000;
to="ERROR__No_Player"; to="ERROR__No_Player";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -425,6 +436,7 @@ class FSM
/*%FSM<LINK "Has_PlayerID">*/ /*%FSM<LINK "Has_PlayerID">*/
class Has_PlayerID class Has_PlayerID
{ {
itemno = 10;
priority = 1.000000; priority = 1.000000;
to="Server_Loading"; to="Server_Loading";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -439,6 +451,7 @@ class FSM
class ERROR__No_Player class ERROR__No_Player
{ {
name = "ERROR__No_Player"; name = "ERROR__No_Player";
itemno = 12;
init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n
"selectNoPlayer;" \n "selectNoPlayer;" \n
"_myTime = diag_tickTime;" \n "_myTime = diag_tickTime;" \n
@@ -449,6 +462,7 @@ class FSM
/*%FSM<LINK "Too_Long">*/ /*%FSM<LINK "Too_Long">*/
class Too_Long class Too_Long
{ {
itemno = 36;
priority = 0.000000; priority = 0.000000;
to="Disconnect"; to="Disconnect";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -463,6 +477,7 @@ class FSM
class Request class Request
{ {
name = "Request"; name = "Request";
itemno = 13;
init = /*%FSM<STATEINIT""">*/"if (_debug) then {" \n init = /*%FSM<STATEINIT""">*/"if (_debug) then {" \n
"diag_log (""PLOGIN: Requesting Authentication... ("" + _playerUID + "")"");" \n "diag_log (""PLOGIN: Requesting Authentication... ("" + _playerUID + "")"");" \n
"};" \n "};" \n
@@ -489,6 +504,7 @@ class FSM
/*%FSM<LINK "retry_">*/ /*%FSM<LINK "retry_">*/
class retry_ class retry_
{ {
itemno = 52;
priority = 0.000000; priority = 0.000000;
to="Retry"; to="Retry";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -499,6 +515,7 @@ class FSM
/*%FSM<LINK "Response">*/ /*%FSM<LINK "Response">*/
class Response class Response
{ {
itemno = 14;
priority = 0.000000; priority = 0.000000;
to="Parse_Login"; to="Parse_Login";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -513,6 +530,7 @@ class FSM
class Parse_Login class Parse_Login
{ {
name = "Parse_Login"; name = "Parse_Login";
itemno = 15;
init = /*%FSM<STATEINIT""">*/"dayz_authed = true;" \n init = /*%FSM<STATEINIT""">*/"dayz_authed = true;" \n
"" \n "" \n
"progressLoadingScreen 0.6;" \n "progressLoadingScreen 0.6;" \n
@@ -567,6 +585,7 @@ class FSM
/*%FSM<LINK "Hive_Bad">*/ /*%FSM<LINK "Hive_Bad">*/
class Hive_Bad class Hive_Bad
{ {
itemno = 16;
priority = 10.000000; priority = 10.000000;
to="ERROR__Wrong_HIVE"; to="ERROR__Wrong_HIVE";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -577,6 +596,7 @@ class FSM
/*%FSM<LINK "New_Infected_Cha">*/ /*%FSM<LINK "New_Infected_Cha">*/
class New_Infected_Cha class New_Infected_Cha
{ {
itemno = 66;
priority = 5.000000; priority = 5.000000;
to="Player_Zombie__S"; to="Player_Zombie__S";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -587,6 +607,7 @@ class FSM
/*%FSM<LINK "New_Character">*/ /*%FSM<LINK "New_Character">*/
class New_Character class New_Character
{ {
itemno = 42;
priority = 5.000000; priority = 5.000000;
to="Gender_Selection"; to="Gender_Selection";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -597,6 +618,7 @@ class FSM
/*%FSM<LINK "Hive_Ok">*/ /*%FSM<LINK "Hive_Ok">*/
class Hive_Ok class Hive_Ok
{ {
itemno = 18;
priority = 0.000000; priority = 0.000000;
to="Phase_One"; to="Phase_One";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -611,6 +633,7 @@ class FSM
class ERROR__Wrong_HIVE class ERROR__Wrong_HIVE
{ {
name = "ERROR__Wrong_HIVE"; name = "ERROR__Wrong_HIVE";
itemno = 17;
init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n
"selectNoPlayer;" \n "selectNoPlayer;" \n
"" \n "" \n
@@ -622,6 +645,7 @@ class FSM
/*%FSM<LINK "Too_Long">*/ /*%FSM<LINK "Too_Long">*/
class Too_Long class Too_Long
{ {
itemno = 37;
priority = 0.000000; priority = 0.000000;
to="Disconnect"; to="Disconnect";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -636,6 +660,7 @@ class FSM
class Phase_One class Phase_One
{ {
name = "Phase_One"; name = "Phase_One";
itemno = 19;
init = /*%FSM<STATEINIT""">*/"if ((!isNil ""DZE_defaultSkin"") && _isNew && (_isInfected == 0)) then {" \n init = /*%FSM<STATEINIT""">*/"if ((!isNil ""DZE_defaultSkin"") && _isNew && (_isInfected == 0)) then {" \n
" if (dayz_selectGender == ""Survivor2_DZ"") then {" \n " if (dayz_selectGender == ""Survivor2_DZ"") then {" \n
" _rand = (DZE_defaultSkin select 0) call BIS_fnc_selectRandom;" \n " _rand = (DZE_defaultSkin select 0) call BIS_fnc_selectRandom;" \n
@@ -753,6 +778,7 @@ class FSM
/*%FSM<LINK "Response">*/ /*%FSM<LINK "Response">*/
class Response class Response
{ {
itemno = 20;
priority = 0.000000; priority = 0.000000;
to="Phase_Two"; to="Phase_Two";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -767,6 +793,7 @@ class FSM
class Phase_Two class Phase_Two
{ {
name = "Phase_Two"; name = "Phase_Two";
itemno = 21;
init = /*%FSM<STATEINIT""">*/"dayz_loadScreenMsg = ""Character Data received from server""; " \n init = /*%FSM<STATEINIT""">*/"dayz_loadScreenMsg = ""Character Data received from server""; " \n
"if (_debug) then {" \n "if (_debug) then {" \n
"diag_log ""Finished..."";" \n "diag_log ""Finished..."";" \n
@@ -916,6 +943,7 @@ class FSM
/*%FSM<LINK "Alive">*/ /*%FSM<LINK "Alive">*/
class Alive class Alive
{ {
itemno = 24;
priority = 0.000000; priority = 0.000000;
to="Position"; to="Position";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -926,6 +954,7 @@ class FSM
/*%FSM<LINK "Dead_Player">*/ /*%FSM<LINK "Dead_Player">*/
class Dead_Player class Dead_Player
{ {
itemno = 22;
priority = 0.000000; priority = 0.000000;
to="ERROR__Player_Already"; to="ERROR__Player_Already";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -940,6 +969,7 @@ class FSM
class ERROR__Player_Already class ERROR__Player_Already
{ {
name = "ERROR__Player_Already"; name = "ERROR__Player_Already";
itemno = 23;
init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n
"selectNoPlayer;" \n "selectNoPlayer;" \n
"_myTime = diag_tickTime;" \n "_myTime = diag_tickTime;" \n
@@ -950,6 +980,7 @@ class FSM
/*%FSM<LINK "Too_Long">*/ /*%FSM<LINK "Too_Long">*/
class Too_Long class Too_Long
{ {
itemno = 38;
priority = 0.000000; priority = 0.000000;
to="Disconnect"; to="Disconnect";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -964,6 +995,7 @@ class FSM
class Position class Position
{ {
name = "Position"; name = "Position";
itemno = 25;
init = /*%FSM<STATEINIT""">*/"//Location" \n init = /*%FSM<STATEINIT""">*/"//Location" \n
"_myLoc = getPosATL player;" \n "_myLoc = getPosATL player;" \n
"" \n "" \n
@@ -997,6 +1029,7 @@ class FSM
/*%FSM<LINK "Bad_Version">*/ /*%FSM<LINK "Bad_Version">*/
class Bad_Version class Bad_Version
{ {
itemno = 28;
priority = 0.000000; priority = 0.000000;
to="ERROR__Bad_Versi"; to="ERROR__Bad_Versi";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1007,6 +1040,7 @@ class FSM
/*%FSM<LINK "Version_Ok">*/ /*%FSM<LINK "Version_Ok">*/
class Version_Ok class Version_Ok
{ {
itemno = 26;
priority = 0.000000; priority = 0.000000;
to="Stream"; to="Stream";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1021,6 +1055,7 @@ class FSM
class Load_In class Load_In
{ {
name = "Load_In"; name = "Load_In";
itemno = 27;
init = /*%FSM<STATEINIT""">*/"//Reveal action types" \n init = /*%FSM<STATEINIT""">*/"//Reveal action types" \n
"" \n "" \n
"{player reveal _x} count (nearestObjects [getPosATL player, dayz_reveal, 50]);" \n "{player reveal _x} count (nearestObjects [getPosATL player, dayz_reveal, 50]);" \n
@@ -1044,6 +1079,7 @@ class FSM
/*%FSM<LINK "Display_Ready">*/ /*%FSM<LINK "Display_Ready">*/
class Display_Ready class Display_Ready
{ {
itemno = 30;
priority = 0.000000; priority = 0.000000;
to="Preload_Display"; to="Preload_Display";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1058,6 +1094,7 @@ class FSM
class ERROR__Bad_Versi class ERROR__Bad_Versi
{ {
name = "ERROR__Bad_Versi"; name = "ERROR__Bad_Versi";
itemno = 29;
init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n
"selectNoPlayer;" \n "selectNoPlayer;" \n
"_myTime = diag_tickTime;" \n "_myTime = diag_tickTime;" \n
@@ -1073,6 +1110,7 @@ class FSM
/*%FSM<LINK "Too_Long">*/ /*%FSM<LINK "Too_Long">*/
class Too_Long class Too_Long
{ {
itemno = 39;
priority = 0.000000; priority = 0.000000;
to="get_ready_to_clo_1"; to="get_ready_to_clo_1";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1087,6 +1125,7 @@ class FSM
class Preload_Display class Preload_Display
{ {
name = "Preload_Display"; name = "Preload_Display";
itemno = 31;
init = /*%FSM<STATEINIT""">*/"dayz_lastCheckBit = 0;" \n init = /*%FSM<STATEINIT""">*/"dayz_lastCheckBit = 0;" \n
"" \n "" \n
"player disableConversation true;" \n "player disableConversation true;" \n
@@ -1182,6 +1221,7 @@ class FSM
/*%FSM<LINK "Preload_Done">*/ /*%FSM<LINK "Preload_Done">*/
class Preload_Done class Preload_Done
{ {
itemno = 32;
priority = 0.000000; priority = 0.000000;
to="Initialize"; to="Initialize";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1196,6 +1236,7 @@ class FSM
class Initialize class Initialize
{ {
name = "Initialize"; name = "Initialize";
itemno = 33;
init = /*%FSM<STATEINIT""">*/"//Medical" \n init = /*%FSM<STATEINIT""">*/"//Medical" \n
"dayz_medicalH = [] execVM ""\z\addons\dayz_code\medical\init_medical.sqf""; //Medical Monitor Script (client only)" \n "dayz_medicalH = [] execVM ""\z\addons\dayz_code\medical\init_medical.sqf""; //Medical Monitor Script (client only)" \n
"[player] call fnc_usec_damageHandle;" \n "[player] call fnc_usec_damageHandle;" \n
@@ -1321,6 +1362,7 @@ class FSM
/*%FSM<LINK "No_time_date">*/ /*%FSM<LINK "No_time_date">*/
class No_time_date class No_time_date
{ {
itemno = 58;
priority = 0.000000; priority = 0.000000;
to="ERROR__No_Date_"; to="ERROR__No_Date_";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1331,6 +1373,7 @@ class FSM
/*%FSM<LINK "True">*/ /*%FSM<LINK "True">*/
class True class True
{ {
itemno = 35;
priority = 0.000000; priority = 0.000000;
to="Finish"; to="Finish";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1345,6 +1388,7 @@ class FSM
class Finish class Finish
{ {
name = "Finish"; name = "Finish";
itemno = 34;
init = /*%FSM<STATEINIT""">*/"dayzGearSave = true;" \n init = /*%FSM<STATEINIT""">*/"dayzGearSave = true;" \n
"dayz_myPosition = getPosATL player;" \n "dayz_myPosition = getPosATL player;" \n
"" \n "" \n
@@ -1365,6 +1409,7 @@ class FSM
class Enable_Sim class Enable_Sim
{ {
name = "Enable_Sim"; name = "Enable_Sim";
itemno = 40;
init = /*%FSM<STATEINIT""">*/"if (_debug) then {" \n init = /*%FSM<STATEINIT""">*/"if (_debug) then {" \n
"diag_log (""PLOGIN: Enable Sim"");" \n "diag_log (""PLOGIN: Enable Sim"");" \n
"};" \n "};" \n
@@ -1382,6 +1427,7 @@ class FSM
/*%FSM<LINK "version_check">*/ /*%FSM<LINK "version_check">*/
class version_check class version_check
{ {
itemno = 46;
priority = 2.000000; priority = 2.000000;
to="ERROR__version_c"; to="ERROR__version_c";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1392,6 +1438,7 @@ class FSM
/*%FSM<LINK "player_not_null">*/ /*%FSM<LINK "player_not_null">*/
class player_not_null class player_not_null
{ {
itemno = 6;
priority = 0.000000; priority = 0.000000;
to="Prepare"; to="Prepare";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1406,6 +1453,7 @@ class FSM
class Gender_Selection class Gender_Selection
{ {
name = "Gender_Selection"; name = "Gender_Selection";
itemno = 43;
init = /*%FSM<STATEINIT""">*/"dayz_selectGender = ""Survivor2_DZ"";" \n init = /*%FSM<STATEINIT""">*/"dayz_selectGender = ""Survivor2_DZ"";" \n
"1 cutText ["""", ""BLACK"",0];" \n "1 cutText ["""", ""BLACK"",0];" \n
"endLoadingScreen;" \n "endLoadingScreen;" \n
@@ -1417,6 +1465,7 @@ class FSM
/*%FSM<LINK "Selected">*/ /*%FSM<LINK "Selected">*/
class Selected class Selected
{ {
itemno = 44;
priority = 0.000000; priority = 0.000000;
to="Process"; to="Process";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1431,6 +1480,7 @@ class FSM
class Process class Process
{ {
name = "Process"; name = "Process";
itemno = 45;
init = /*%FSM<STATEINIT""">*/"_model = dayz_selectGender;"/*%FSM</STATEINIT""">*/; init = /*%FSM<STATEINIT""">*/"_model = dayz_selectGender;"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
@@ -1438,6 +1488,7 @@ class FSM
/*%FSM<LINK "Hive_Ok">*/ /*%FSM<LINK "Hive_Ok">*/
class Hive_Ok class Hive_Ok
{ {
itemno = 18;
priority = 0.000000; priority = 0.000000;
to="Phase_One"; to="Phase_One";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1452,6 +1503,7 @@ class FSM
class ERROR__version_c class ERROR__version_c
{ {
name = "ERROR__version_c"; name = "ERROR__version_c";
itemno = 47;
init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n
"selectNoPlayer;" \n "selectNoPlayer;" \n
"_myTime = diag_tickTime;" \n "_myTime = diag_tickTime;" \n
@@ -1464,6 +1516,7 @@ class FSM
/*%FSM<LINK "Too_Long">*/ /*%FSM<LINK "Too_Long">*/
class Too_Long class Too_Long
{ {
itemno = 48;
priority = 0.000000; priority = 0.000000;
to="Disconnect"; to="Disconnect";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1478,6 +1531,7 @@ class FSM
class Stream class Stream
{ {
name = "Stream"; name = "Stream";
itemno = 49;
init = /*%FSM<STATEINIT""">*/"//stream in location" \n init = /*%FSM<STATEINIT""">*/"//stream in location" \n
"//[false] call stream_locationCheck;" \n "//[false] call stream_locationCheck;" \n
"" \n "" \n
@@ -1491,6 +1545,7 @@ class FSM
/*%FSM<LINK "Preloaded">*/ /*%FSM<LINK "Preloaded">*/
class Preloaded class Preloaded
{ {
itemno = 50;
priority = 0.000000; priority = 0.000000;
to="Load_In"; to="Load_In";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1505,6 +1560,7 @@ class FSM
class Retry class Retry
{ {
name = "Retry"; name = "Retry";
itemno = 53;
init = /*%FSM<STATEINIT""">*/"diag_log (""PLOGIN: Retrying Authentication... ("" + _playerUID + "")"");" \n init = /*%FSM<STATEINIT""">*/"diag_log (""PLOGIN: Retrying Authentication... ("" + _playerUID + "")"");" \n
"dayz_loadScreenMsg = (localize ""str_player_14"");" \n "dayz_loadScreenMsg = (localize ""str_player_14"");" \n
"" \n "" \n
@@ -1517,6 +1573,7 @@ class FSM
/*%FSM<LINK "auth_failed">*/ /*%FSM<LINK "auth_failed">*/
class auth_failed class auth_failed
{ {
itemno = 54;
priority = 0.000000; priority = 0.000000;
to="get_ready_to_clo"; to="get_ready_to_clo";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1527,6 +1584,7 @@ class FSM
/*%FSM<LINK "Retry">*/ /*%FSM<LINK "Retry">*/
class Retry class Retry
{ {
itemno = 51;
priority = 0.000000; priority = 0.000000;
to="Request"; to="Request";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1541,8 +1599,9 @@ class FSM
class get_ready_to_clo class get_ready_to_clo
{ {
name = "get_ready_to_clo"; name = "get_ready_to_clo";
itemno = 55;
init = /*%FSM<STATEINIT""">*/"diag_log (""PLOGIN: Authentication Failed ("" + _playerUID + "")"");" \n init = /*%FSM<STATEINIT""">*/"diag_log (""PLOGIN: Authentication Failed ("" + _playerUID + "")"");" \n
"dayz_loadScreenMsg = (localize ""str_player_32"");" \n "dayz_loadScreenMsg = (localize ""str_player_login_timeout"");" \n
"" \n "" \n
"progressLoadingScreen 1;" \n "progressLoadingScreen 1;" \n
"" \n "" \n
@@ -1553,6 +1612,7 @@ class FSM
/*%FSM<LINK "sleep_">*/ /*%FSM<LINK "sleep_">*/
class sleep_ class sleep_
{ {
itemno = 56;
priority = 0.000000; priority = 0.000000;
to="Disconnect"; to="Disconnect";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1567,6 +1627,7 @@ class FSM
class Disconnect class Disconnect
{ {
name = "Disconnect"; name = "Disconnect";
itemno = 57;
init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n
"" \n "" \n
"// disable player interaction && move him off site" \n "// disable player interaction && move him off site" \n
@@ -1589,6 +1650,7 @@ class FSM
class ERROR__No_Date_ class ERROR__No_Date_
{ {
name = "ERROR__No_Date_"; name = "ERROR__No_Date_";
itemno = 59;
init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n
"selectNoPlayer;" \n "selectNoPlayer;" \n
"_myTime = diag_tickTime;" \n "_myTime = diag_tickTime;" \n
@@ -1599,6 +1661,7 @@ class FSM
/*%FSM<LINK "Too_Long">*/ /*%FSM<LINK "Too_Long">*/
class Too_Long class Too_Long
{ {
itemno = 60;
priority = 0.000000; priority = 0.000000;
to="Disconnect"; to="Disconnect";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1613,6 +1676,7 @@ class FSM
class get_ready_to_clo_1 class get_ready_to_clo_1
{ {
name = "get_ready_to_clo_1"; name = "get_ready_to_clo_1";
itemno = 61;
init = /*%FSM<STATEINIT""">*/"//diag_log (""PLOGIN:Wrong DayZ Version ("" + dayz_versionNo + "")"");" \n init = /*%FSM<STATEINIT""">*/"//diag_log (""PLOGIN:Wrong DayZ Version ("" + dayz_versionNo + "")"");" \n
"diag_log format[localize ""str_player_18"",dayz_versionNo,_version];" \n "diag_log format[localize ""str_player_18"",dayz_versionNo,_version];" \n
"" \n "" \n
@@ -1625,6 +1689,7 @@ class FSM
/*%FSM<LINK "sleep_">*/ /*%FSM<LINK "sleep_">*/
class sleep_ class sleep_
{ {
itemno = 62;
priority = 0.000000; priority = 0.000000;
to="Disconnect"; to="Disconnect";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1639,8 +1704,9 @@ class FSM
class Server_Loading class Server_Loading
{ {
name = "Server_Loading"; name = "Server_Loading";
itemno = 63;
init = /*%FSM<STATEINIT""">*/"_myTime = diag_tickTime;" \n init = /*%FSM<STATEINIT""">*/"_myTime = diag_tickTime;" \n
"dayz_loadScreenMsg = (""Waiting for server to start authentication"");" \n "dayz_loadScreenMsg = ""Waiting for server to start authentication"";" \n
"if (_debug) then {" \n "if (_debug) then {" \n
"diag_log ""PLOGIN: Waiting for server to start authentication"";" \n "diag_log ""PLOGIN: Waiting for server to start authentication"";" \n
"};" \n "};" \n
@@ -1651,6 +1717,7 @@ class FSM
/*%FSM<LINK "Server_Ready">*/ /*%FSM<LINK "Server_Ready">*/
class Server_Ready class Server_Ready
{ {
itemno = 65;
priority = 0.000000; priority = 0.000000;
to="Request"; to="Request";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1661,6 +1728,7 @@ class FSM
/*%FSM<LINK "Too_Long">*/ /*%FSM<LINK "Too_Long">*/
class Too_Long class Too_Long
{ {
itemno = 64;
priority = 0.000000; priority = 0.000000;
to="Disconnect"; to="Disconnect";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1675,6 +1743,7 @@ class FSM
class Player_Zombie__S class Player_Zombie__S
{ {
name = "Player_Zombie__S"; name = "Player_Zombie__S";
itemno = 67;
init = /*%FSM<STATEINIT""">*/"_zssupported = [""pz_policeman"",""pz_suit1"",""pz_suit2"",""pz_worker1"",""pz_worker2"",""pz_worker3"",""pz_doctor"",""pz_teacher"",""pz_hunter"",""pz_villager1"",""pz_villager2"",""pz_villager3"",""pz_priest""];" \n init = /*%FSM<STATEINIT""">*/"_zssupported = [""pz_policeman"",""pz_suit1"",""pz_suit2"",""pz_worker1"",""pz_worker2"",""pz_worker3"",""pz_doctor"",""pz_teacher"",""pz_hunter"",""pz_villager1"",""pz_villager2"",""pz_villager3"",""pz_priest""];" \n
"_model = (_zssupported select floor(random(count _zssupported)));" \n "_model = (_zssupported select floor(random(count _zssupported)));" \n
"freshSpawn = 1;"/*%FSM</STATEINIT""">*/; "freshSpawn = 1;"/*%FSM</STATEINIT""">*/;
@@ -1684,6 +1753,7 @@ class FSM
/*%FSM<LINK "Hive_Ok">*/ /*%FSM<LINK "Hive_Ok">*/
class Hive_Ok class Hive_Ok
{ {
itemno = 18;
priority = 0.000000; priority = 0.000000;
to="Phase_One"; to="Phase_One";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@@ -1698,7 +1768,7 @@ class FSM
initState="init"; initState="init";
finalStates[] = finalStates[] =
{ {
"Finish" "Finish",
}; };
}; };
/*%FSM</COMPILE>*/ /*%FSM</COMPILE>*/