Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

same

Browse Source
This commit is contained in:
vbawol 2015-12-23 11:40:24 -06:00
parent 1ceb25c1f7
commit bd183c7d2e
7 changed files with 1233 additions and 1316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Changelogs/0.3.7.0.txt
View File

@ -1,8 +1,12 @@
**Client**
[Changed] Change all publicVariableServer calls to use remoteExec calls for better performance.
[Fixed] Custom epoch swing animations for Hatchet and sledge now work correctly. [Fixed] Custom epoch swing animations for Hatchet and sledge now work correctly.
WIP [WIP] Hotwire Kit
[Added] Hotwire Kit [WIP] Key Makers Kit
[Added] Key Makers Kit [WIP] Keys in colors: (Black,Red,Green,Blue,Yellow)
[Added] Keys in colors: (Black,Red,Green,Blue,Yellow) [WIP] 55 Gallon Fuel Barrel (Full/Empty)
[Added] 55 Gallon Fuel Barrel (Full/Empty) [WIP] Metal Pipes
[Added] Metal Pipes [WIP] Documents (Trash,Vehicle Upgrades)
[Added] Documents (Trash,Vehicle Upgrades) **Server**
[Updated] New Battleye remoteExec.txt for added remoteExec calls.
[Info] Removed old .bikey and added new one for 0370.

2
Server_Install_Pack/sc/battleye/remoteexec.txt
View File

@ -1 +1 @@
5 "" !="epoch_server_save_vehicles \[.+\]" 5 "" !="epoch_server_checkplayer [A-Z]{1} [A-Za-z]{4,10} [0-9]{1,3}-[0-9]{1,3}:[0-9]{1,3} \(.+\) REMOTE" !="epoch_server_(save(_vehicles|building)|(lock|pack)Storage|(upgrade|remove|paint|maint)build) \[.+\]" !="epoch_server_((load|respawn|dead|invite|revive|teleport)Player|(upgrade|updateplayer|create|delete)Group) \[.+\]" !="epoch_server_(knockDownTree|mineRocks|lootAnimal|handle_(say3d|switchmove|sapperObjs)) \[.+\]" !="epoch_server_((repair|fill|lock)Vehicle|(loot|fill)Container|(store|take)Crypto|make(NPC|)Trade) \[.+\]" !="epoch_server_(tradeRequest|equippeditem|packJack|localCleanup|createAirDrop|airDropCrate) \[.+\]"

24
Sources/epoch_code/System/gender_selection.fsm
View File

@ -1,4 +1,4 @@
/*%FSM<COMPILE "X:\ArmA\Tools\FSM Editor Personal Edition\scriptedFSM.cfg, Gender Selection">*/ /*%FSM<COMPILE "F:\Program Files (x86)\Bohemia Interactive\Tools\FSM Editor Personal Edition\scriptedFSM.cfg, Gender Selection">*/
/*%FSM<HEAD>*/ /*%FSM<HEAD>*/
/* /*
item0[] = {"INIT",0,250,-250.000000,-150.000000,-150.000000,-100.000000,0.000000,"INIT"}; item0[] = {"INIT",0,250,-250.000000,-150.000000,-150.000000,-100.000000,0.000000,"INIT"};
@ -12,12 +12,12 @@ item7[] = {"Process",2,250,-400.000000,75.000000,-300.000000,125.000000,0.000000
item8[] = {"same_gender",4,218,-250.000000,75.000000,-150.000000,125.000000,10.000000,"same" \n "gender"}; item8[] = {"same_gender",4,218,-250.000000,75.000000,-150.000000,125.000000,10.000000,"same" \n "gender"};
item9[] = {"other_gender",4,218,-400.000000,150.000000,-300.000000,200.000000,0.000000,"other" \n "gender"}; item9[] = {"other_gender",4,218,-400.000000,150.000000,-300.000000,200.000000,0.000000,"other" \n "gender"};
item10[] = {"Send_To_Server",3,250,-125.000000,75.000000,-25.000000,125.000000,0.000000,"Send To Server"}; item10[] = {"Send_To_Server",3,250,-125.000000,75.000000,-25.000000,125.000000,0.000000,"Send To Server"};
item11[] = {"TODO__ADD_TIMEOUT",4,4314,-275.000000,250.000000,-175.000000,300.000000,0.000000,"TODO:" \n "ADD TIMEOUT" \n "AND LOBBY KICK"}; item11[] = {"TODO__ADD_TIMEOUT",4,218,-275.000000,250.000000,-175.000000,300.000000,0.000000,"TODO:" \n "ADD TIMEOUT" \n "AND LOBBY KICK"};
item12[] = {"END",1,250,0.000000,450.000000,100.000000,500.000000,0.000000,"END"}; item12[] = {"END",1,250,0.000000,450.000000,100.000000,500.000000,0.000000,"END"};
item13[] = {"Send_new_selection",2,250,-400.000000,250.000000,-300.000000,300.000000,0.000000,"Send new" \n "selection to" \n "server"}; item13[] = {"Send_new_selection",2,250,-400.000000,250.000000,-300.000000,300.000000,0.000000,"Send new" \n "selection to" \n "server"};
item14[] = {"Select_Model",2,250,-400.000000,350.000000,-300.000000,400.000000,0.000000,"Select Model"}; item14[] = {"Select_Model",2,250,-400.000000,350.000000,-300.000000,400.000000,0.000000,"Select Model"};
item15[] = {"new_model____pla",4,218,-525.000000,400.000000,-425.000000,450.000000,0.000000,"new model" \n "==" \n "player"}; item15[] = {"new_model____pla",4,218,-525.000000,400.000000,-425.000000,450.000000,0.000000,"new model" \n "==" \n "player"};
item16[] = {"Setup_EH",2,250,-400.000000,450.000000,-300.000000,500.000000,0.000000,"Setup EH"}; item16[] = {"Setup_EH",2,4346,-400.000000,450.000000,-300.000000,500.000000,0.000000,"Setup EH"};
item17[] = {"true",8,218,-125.000000,450.000000,-25.000000,500.000000,0.000000,"true"}; item17[] = {"true",8,218,-125.000000,450.000000,-25.000000,500.000000,0.000000,"true"};
item18[] = {"____FAKE____",9,720,0.000000,0.000000,0.000000,0.000000,0.000000,"____FAKE____"}; item18[] = {"____FAKE____",9,720,0.000000,0.000000,0.000000,0.000000,0.000000,"____FAKE____"};
link0[] = {0,2}; link0[] = {0,2};
@ -41,8 +41,8 @@ link17[] = {15,16};
link18[] = {16,17}; link18[] = {16,17};
link19[] = {17,12}; link19[] = {17,12};
link20[] = {11,18}; link20[] = {11,18};
globals[] = {25.000000,1,0,0,0,640,480,1,250,6316128,1,-786.968628,194.189285,571.765747,-266.728790,1066,911,1}; globals[] = {25.000000,1,0,0,0,640,480,1,250,6316128,1,-825.287720,232.508224,685.682007,60.530540,687,630,1};
window[] = {2,-1,-1,-1,-1,753,25,1063,25,3,1084}; window[] = {2,-1,-1,-1,-1,884,156,1194,156,3,705};
*//*%FSM</HEAD>*/ *//*%FSM</HEAD>*/
class FSM class FSM
{ {
@ -157,7 +157,7 @@ class FSM
{ {
name = "Send_To_Server"; name = "Send_To_Server";
init = /*%FSM<STATEINIT""">*/"[player, Epoch_personalToken] remoteExec [""EPOCH_server_respawnPlayer"",2];" \n init = /*%FSM<STATEINIT""">*/"[player, Epoch_personalToken] remoteExec [""EPOCH_server_respawnPlayer"",2];" \n
"";"/*%FSM</STATEINIT""">*/; """;"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
{ {
@ -246,13 +246,9 @@ class FSM
class Setup_EH class Setup_EH
{ {
name = "Setup_EH"; name = "Setup_EH";
init = /*%FSM<STATEINIT""">*/"player addEventHandler [""Respawn"", {(_this select 0) call EPOCH_clientRespawn}];" \n init = /*%FSM<STATEINIT""">*/"{" \n
"player addEventHandler [""Put"", {(_this select 1) call EPOCH_interact;_this call EPOCH_PutHandler}];" \n " player addEventHandler [_x,([""CfgEpochClient"", _x, """"] call EPOCH_fnc_returnConfigEntryV2)];" \n
"player addEventHandler [""Take"", {(_this select 1) call EPOCH_interact;_this call EPOCH_UnisexCheck}];" \n "} forEach ([""CfgEpochClient"", ""addEventHandler"", []] call EPOCH_fnc_returnConfigEntryV2);"/*%FSM</STATEINIT""">*/;
"player addEventHandler [""InventoryClosed"", {if !(EPOCH_arr_interactedObjs isEqualTo[]) then {EPOCH_arr_interactedObjs remoteExec[""EPOCH_server_save_vehicles"", 2]; EPOCH_arr_interactedObjs = [];};}];" \n
"player addEventHandler [""InventoryOpened"", {_this spawn EPOCH_initUI; (locked (_this select 1) in [2, 3] || (_this select 1) getVariable[""EPOCH_Locked"", false])}];" \n
"player addEventHandler [""Fired"", {_this call EPOCH_fnc_playerFired}];" \n
"player addEventHandler [""Killed"", {_this call EPOCH_fnc_playerDeath}];"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
{ {
@ -284,7 +280,7 @@ class FSM
initState="INIT"; initState="INIT";
finalStates[] = finalStates[] =
{ {
"END" "END",
}; };
}; };
/*%FSM</COMPILE>*/ /*%FSM</COMPILE>*/

118
Sources/epoch_code/System/player_login.fsm
View File

@ -1,4 +1,4 @@
/*%FSM<COMPILE "P:\FSMEditor\scriptedFSM.cfg, Epoch Login">*/ /*%FSM<COMPILE "F:\Program Files (x86)\Bohemia Interactive\Tools\FSM Editor Personal Edition\scriptedFSM.cfg, Epoch Login">*/
/*%FSM<HEAD>*/ /*%FSM<HEAD>*/
/* /*
item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"};
@ -190,8 +190,8 @@ link97[] = {85,79};
link98[] = {86,16}; link98[] = {86,16};
link99[] = {86,22}; link99[] = {86,22};
link100[] = {87,31}; link100[] = {87,31};
globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-494.255402,984.732300,1761.360352,737.509033,585,832,1}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-35.555386,526.032166,1670.387451,1066.632935,586,630,1};
window[] = {0,-1,-1,-1,-1,1079,713,2114,75,1,603}; window[] = {2,-1,-1,-1,-1,994,182,1474,182,3,604};
*//*%FSM</HEAD>*/ *//*%FSM</HEAD>*/
class FSM class FSM
{ {
@ -202,7 +202,6 @@ class FSM
class INIT class INIT
{ {
name = "INIT"; name = "INIT";
itemno = 0;
init = /*%FSM<STATEINIT""">*/"titleCut ["""", ""BLACK FADED"", 1337];" \n init = /*%FSM<STATEINIT""">*/"titleCut ["""", ""BLACK FADED"", 1337];" \n
"0 fadeSound 0;" \n "0 fadeSound 0;" \n
"player enableSimulation false;" \n "player enableSimulation false;" \n
@ -219,7 +218,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 62;
priority = 0.000000; priority = 0.000000;
to="Process_1"; to="Process_1";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -234,11 +232,15 @@ class FSM
class FINISH class FINISH
{ {
name = "FINISH"; name = "FINISH";
itemno = 1;
init = /*%FSM<STATEINIT""">*/"[] spawn {" \n init = /*%FSM<STATEINIT""">*/"[] spawn {" \n
" disableSerialization;" \n
" waitUntil{!isNull (findDisplay 46)};" \n " waitUntil{!isNull (findDisplay 46)};" \n
" (findDisplay 46) displayAddEventHandler [""KeyDown"",""_this call EPOCH_KeyDown""];" \n " _display = findDisplay 46;" \n
" (findDisplay 46) displayAddEventHandler [""KeyUp"",""_this call EPOCH_KeyUp""];" \n " {" \n
" _display displayAddEventHandler [_x,([""CfgEpochClient"", _x, """"] call EPOCH_fnc_returnConfigEntryV2)];" \n
" } forEach ([""CfgEpochClient"", ""displayAddEventHandler"", []] call EPOCH_fnc_returnConfigEntryV2);" \n
" " \n
" player switchMove """";" \n
"};" \n "};" \n
"" \n "" \n
"3 fadeSound 1;" \n "3 fadeSound 1;" \n
@ -247,7 +249,6 @@ class FSM
" diag_log ""EPOCH-LOGIN: Finish!"";" \n " diag_log ""EPOCH-LOGIN: Finish!"";" \n
"};" \n "};" \n
"" \n "" \n
"" \n
"player enableSimulation true;" \n "player enableSimulation true;" \n
"" \n "" \n
"titleCut ["""", ""BLACK IN"", 1];" \n "titleCut ["""", ""BLACK IN"", 1];" \n
@ -256,9 +257,7 @@ class FSM
"progressLoadingScreen 1.0;" \n "progressLoadingScreen 1.0;" \n
"" \n "" \n
"endLoadingScreen;" \n "endLoadingScreen;" \n
"EPOCH_loadingScreenDone = true;" \n "EPOCH_loadingScreenDone = true;"/*%FSM</STATEINIT""">*/;
"" \n
"player switchMove """";"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
{ {
@ -269,7 +268,6 @@ class FSM
class Version_Check class Version_Check
{ {
name = "Version_Check"; name = "Version_Check";
itemno = 3;
init = /*%FSM<STATEINIT""">*/"if (_debug) then {" \n init = /*%FSM<STATEINIT""">*/"if (_debug) then {" \n
" diag_log ""EPOCH-LOGIN: Version Check"";" \n " diag_log ""EPOCH-LOGIN: Version Check"";" \n
"};" \n "};" \n
@ -305,7 +303,6 @@ class FSM
/*%FSM<LINK "Wrong_Version">*/ /*%FSM<LINK "Wrong_Version">*/
class Wrong_Version class Wrong_Version
{ {
itemno = 7;
priority = 10.000000; priority = 10.000000;
to="ERROR_Wrong_Version"; to="ERROR_Wrong_Version";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -324,7 +321,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 44;
priority = 0.000000; priority = 0.000000;
to="Arma_Version_Che"; to="Arma_Version_Che";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -339,7 +335,6 @@ class FSM
class Check_Player_UID class Check_Player_UID
{ {
name = "Check_Player_UID"; name = "Check_Player_UID";
itemno = 5;
init = /*%FSM<STATEINIT""">*/"if (_debug) then {" \n init = /*%FSM<STATEINIT""">*/"if (_debug) then {" \n
" diag_log ""EPOCH-LOGIN: Check PlayerUID"";" \n " diag_log ""EPOCH-LOGIN: Check PlayerUID"";" \n
"};" \n "};" \n
@ -353,7 +348,6 @@ class FSM
/*%FSM<LINK "PlayerUID_Okay">*/ /*%FSM<LINK "PlayerUID_Okay">*/
class PlayerUID_Okay class PlayerUID_Okay
{ {
itemno = 6;
priority = 10.000000; priority = 10.000000;
to="Check_Server_1"; to="Check_Server_1";
precondition = /*%FSM<CONDPRECONDITION""">*/"!isNil ""_playerUID"""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/"!isNil ""_playerUID"""/*%FSM</CONDPRECONDITION""">*/;
@ -364,7 +358,6 @@ class FSM
/*%FSM<LINK "Empty_PlayerUID">*/ /*%FSM<LINK "Empty_PlayerUID">*/
class Empty_PlayerUID class Empty_PlayerUID
{ {
itemno = 12;
priority = 0.000000; priority = 0.000000;
to="ERROR_PlayerUID"; to="ERROR_PlayerUID";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -379,7 +372,6 @@ class FSM
class ERROR_Wrong_Version class ERROR_Wrong_Version
{ {
name = "ERROR_Wrong_Version"; name = "ERROR_Wrong_Version";
itemno = 9;
init = /*%FSM<STATEINIT""">*/"_msg = ""You have an outdated version of Epoch"";" \n init = /*%FSM<STATEINIT""">*/"_msg = ""You have an outdated version of Epoch"";" \n
"_msg call Epoch_updateLoadingScreen;" \n "_msg call Epoch_updateLoadingScreen;" \n
"diag_log _msg;" \n "diag_log _msg;" \n
@ -394,7 +386,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 32;
priority = 0.000000; priority = 0.000000;
to="Display_Message"; to="Display_Message";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -409,7 +400,6 @@ class FSM
class Disconnect class Disconnect
{ {
name = "Disconnect"; name = "Disconnect";
itemno = 10;
init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n
"1338 cutText [_msg,""PLAIN"",0]; " \n "1338 cutText [_msg,""PLAIN"",0]; " \n
"deleteVehicle player;" \n "deleteVehicle player;" \n
@ -422,7 +412,6 @@ class FSM
/*%FSM<LINK "Check_if_Player">*/ /*%FSM<LINK "Check_if_Player">*/
class Check_if_Player class Check_if_Player
{ {
itemno = 28;
priority = 0.000000; priority = 0.000000;
to="Reject_without_B"; to="Reject_without_B";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -437,7 +426,6 @@ class FSM
class ERROR_PlayerUID class ERROR_PlayerUID
{ {
name = "ERROR_PlayerUID"; name = "ERROR_PlayerUID";
itemno = 13;
init = /*%FSM<STATEINIT""">*/"_msg = ""Can not setup Player Object! (Error 01)"";" \n init = /*%FSM<STATEINIT""">*/"_msg = ""Can not setup Player Object! (Error 01)"";" \n
"_msg call Epoch_updateLoadingScreen;" \n "_msg call Epoch_updateLoadingScreen;" \n
"diag_log _msg;" \n "diag_log _msg;" \n
@ -452,7 +440,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 32;
priority = 0.000000; priority = 0.000000;
to="Display_Message"; to="Display_Message";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -467,7 +454,6 @@ class FSM
class Setup_Player_Var class Setup_Player_Var
{ {
name = "Setup_Player_Var"; name = "Setup_Player_Var";
itemno = 17;
init = /*%FSM<STATEINIT""">*/"diag_log format[""DEBUG TIME WAITED: %1"", (diag_tickTime - _myTime)];" \n init = /*%FSM<STATEINIT""">*/"diag_log format[""DEBUG TIME WAITED: %1"", (diag_tickTime - _myTime)];" \n
"{" \n "{" \n
" missionNamespace setVariable[(format[""EPOCH_player%1"", EPOCH_customVars select _forEachIndex]), _x];" \n " missionNamespace setVariable[(format[""EPOCH_player%1"", EPOCH_customVars select _forEachIndex]), _x];" \n
@ -489,7 +475,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 24;
priority = 0.000000; priority = 0.000000;
to="Setup_EH_s_and_H"; to="Setup_EH_s_and_H";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -504,7 +489,6 @@ class FSM
class Request_Hive class Request_Hive
{ {
name = "Request_Hive"; name = "Request_Hive";
itemno = 18;
init = /*%FSM<STATEINIT""">*/"_myTime = diag_tickTime;" \n init = /*%FSM<STATEINIT""">*/"_myTime = diag_tickTime;" \n
"" \n "" \n
"Epoch_my_Group = [];" \n "Epoch_my_Group = [];" \n
@ -521,7 +505,6 @@ class FSM
/*%FSM<LINK "Hive_Response">*/ /*%FSM<LINK "Hive_Response">*/
class Hive_Response class Hive_Response
{ {
itemno = 78;
priority = 0.000000; priority = 0.000000;
to="Process_2"; to="Process_2";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -533,7 +516,6 @@ class FSM
/*%FSM<LINK "Timeout_No_Respo">*/ /*%FSM<LINK "Timeout_No_Respo">*/
class Timeout_No_Respo class Timeout_No_Respo
{ {
itemno = 19;
priority = 0.000000; priority = 0.000000;
to="ERROR_Server_not_3"; to="ERROR_Server_not_3";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -548,7 +530,6 @@ class FSM
class ERROR_Server_not class ERROR_Server_not
{ {
name = "ERROR_Server_not"; name = "ERROR_Server_not";
itemno = 20;
init = /*%FSM<STATEINIT""">*/"_msg = ""Authentication Failed, Disconnect and try again"";" \n init = /*%FSM<STATEINIT""">*/"_msg = ""Authentication Failed, Disconnect and try again"";" \n
"_msg call Epoch_updateLoadingScreen;" \n "_msg call Epoch_updateLoadingScreen;" \n
"diag_log _msg;" \n "diag_log _msg;" \n
@ -563,7 +544,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 32;
priority = 0.000000; priority = 0.000000;
to="Display_Message"; to="Display_Message";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -578,7 +558,6 @@ class FSM
class ERROR_Wrong_Server class ERROR_Wrong_Server
{ {
name = "ERROR_Wrong_Server"; name = "ERROR_Wrong_Server";
itemno = 25;
init = /*%FSM<STATEINIT""">*/"_msg = format[""Server and Client running with different Version! (You: %1 // Server: %2)"",getText(configFile >> ""CfgMods"" >> ""Epoch"" >> ""version""),_serverVersion];" \n init = /*%FSM<STATEINIT""">*/"_msg = format[""Server and Client running with different Version! (You: %1 // Server: %2)"",getText(configFile >> ""CfgMods"" >> ""Epoch"" >> ""version""),_serverVersion];" \n
"_msg call Epoch_updateLoadingScreen;" \n "_msg call Epoch_updateLoadingScreen;" \n
"diag_log _msg;" \n "diag_log _msg;" \n
@ -593,7 +572,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 32;
priority = 0.000000; priority = 0.000000;
to="Display_Message"; to="Display_Message";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -608,7 +586,6 @@ class FSM
class Setup_Player_Obj class Setup_Player_Obj
{ {
name = "Setup_Player_Obj"; name = "Setup_Player_Obj";
itemno = 27;
init = /*%FSM<STATEINIT""">*/"_ply = player;" \n init = /*%FSM<STATEINIT""">*/"_ply = player;" \n
"_group = group player;" \n "_group = group player;" \n
"selectPlayer _playerObject;" \n "selectPlayer _playerObject;" \n
@ -630,7 +607,6 @@ class FSM
/*%FSM<LINK "Timeout_">*/ /*%FSM<LINK "Timeout_">*/
class Timeout_ class Timeout_
{ {
itemno = 69;
priority = 0.000000; priority = 0.000000;
to="ERROR_Player_Setup"; to="ERROR_Player_Setup";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -641,7 +617,6 @@ class FSM
/*%FSM<LINK "new_player_____p">*/ /*%FSM<LINK "new_player_____p">*/
class new_player_____p class new_player_____p
{ {
itemno = 49;
priority = 0.000000; priority = 0.000000;
to="Setup_Player_Var"; to="Setup_Player_Var";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -656,7 +631,6 @@ class FSM
class Display_Message class Display_Message
{ {
name = "Display_Message"; name = "Display_Message";
itemno = 33;
init = /*%FSM<STATEINIT""">*/"[] spawn {" \n init = /*%FSM<STATEINIT""">*/"[] spawn {" \n
" waitUntil{!isNull (findDisplay 46)};" \n " waitUntil{!isNull (findDisplay 46)};" \n
" (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n " (findDisplay 46) displayAddEventHandler [""KeyDown"",""true""];" \n
@ -671,7 +645,6 @@ class FSM
/*%FSM<LINK "Display_Message">*/ /*%FSM<LINK "Display_Message">*/
class Display_Message class Display_Message
{ {
itemno = 26;
priority = 0.000000; priority = 0.000000;
to="Disconnect"; to="Disconnect";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -686,7 +659,6 @@ class FSM
class Check_Server class Check_Server
{ {
name = "Check_Server"; name = "Check_Server";
itemno = 35;
init = /*%FSM<STATEINIT""">*/"_myTime = diag_tickTime;" \n init = /*%FSM<STATEINIT""">*/"_myTime = diag_tickTime;" \n
"if (_debug) then {" \n "if (_debug) then {" \n
" diag_log ""EPOCH-LOGIN: Check Server"";" \n " diag_log ""EPOCH-LOGIN: Check Server"";" \n
@ -699,7 +671,6 @@ class FSM
/*%FSM<LINK "Server_not_worki">*/ /*%FSM<LINK "Server_not_worki">*/
class Server_not_worki class Server_not_worki
{ {
itemno = 36;
priority = 10.000000; priority = 10.000000;
to="ERROR_Server_not_1"; to="ERROR_Server_not_1";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -711,7 +682,6 @@ class FSM
/*%FSM<LINK "Server_Okay">*/ /*%FSM<LINK "Server_Okay">*/
class Server_Okay class Server_Okay
{ {
itemno = 11;
priority = 0.000000; priority = 0.000000;
to="Server_Version_C"; to="Server_Version_C";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -726,7 +696,6 @@ class FSM
class ERROR_Server_not_1 class ERROR_Server_not_1
{ {
name = "ERROR_Server_not_1"; name = "ERROR_Server_not_1";
itemno = 37;
init = /*%FSM<STATEINIT""">*/"_msg = ""Server not Ready (Error 03)"";" \n init = /*%FSM<STATEINIT""">*/"_msg = ""Server not Ready (Error 03)"";" \n
"_msg call Epoch_updateLoadingScreen;" \n "_msg call Epoch_updateLoadingScreen;" \n
"diag_log _msg;" \n "diag_log _msg;" \n
@ -741,7 +710,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 32;
priority = 0.000000; priority = 0.000000;
to="Display_Message"; to="Display_Message";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -756,7 +724,6 @@ class FSM
class Check_Server_1 class Check_Server_1
{ {
name = "Check_Server_1"; name = "Check_Server_1";
itemno = 39;
init = /*%FSM<STATEINIT""">*/"progressLoadingScreen 0.3;"/*%FSM</STATEINIT""">*/; init = /*%FSM<STATEINIT""">*/"progressLoadingScreen 0.3;"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
@ -764,7 +731,6 @@ class FSM
/*%FSM<LINK "Timeout_No_Respo">*/ /*%FSM<LINK "Timeout_No_Respo">*/
class Timeout_No_Respo class Timeout_No_Respo
{ {
itemno = 40;
priority = 0.000000; priority = 0.000000;
to="ERROR_Server_not_2"; to="ERROR_Server_not_2";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -775,7 +741,6 @@ class FSM
/*%FSM<LINK "freshServer">*/ /*%FSM<LINK "freshServer">*/
class freshServer class freshServer
{ {
itemno = 66;
priority = 0.000000; priority = 0.000000;
to="Update_Loadingscreen"; to="Update_Loadingscreen";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -786,7 +751,6 @@ class FSM
/*%FSM<LINK "Server_Ready">*/ /*%FSM<LINK "Server_Ready">*/
class Server_Ready class Server_Ready
{ {
itemno = 34;
priority = 0.000000; priority = 0.000000;
to="Check_Server"; to="Check_Server";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -802,7 +766,6 @@ class FSM
class ERROR_Server_not_2 class ERROR_Server_not_2
{ {
name = "ERROR_Server_not_2"; name = "ERROR_Server_not_2";
itemno = 41;
init = /*%FSM<STATEINIT""">*/"_msg = ""Server not Ready (Error 02)"";" \n init = /*%FSM<STATEINIT""">*/"_msg = ""Server not Ready (Error 02)"";" \n
"_msg call Epoch_updateLoadingScreen;" \n "_msg call Epoch_updateLoadingScreen;" \n
"diag_log _msg;" \n "diag_log _msg;" \n
@ -817,7 +780,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 32;
priority = 0.000000; priority = 0.000000;
to="Display_Message"; to="Display_Message";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -832,7 +794,6 @@ class FSM
class Reject_without_B class Reject_without_B
{ {
name = "Reject_without_B"; name = "Reject_without_B";
itemno = 43;
init = /*%FSM<STATEINIT""">*/"[] spawn {" \n init = /*%FSM<STATEINIT""">*/"[] spawn {" \n
" waitUntil{!isNull (findDisplay 46)};" \n " waitUntil{!isNull (findDisplay 46)};" \n
" waitUntil {" \n " waitUntil {" \n
@ -850,7 +811,6 @@ class FSM
class Arma_Version_Che class Arma_Version_Che
{ {
name = "Arma_Version_Che"; name = "Arma_Version_Che";
itemno = 45;
init = /*%FSM<STATEINIT""">*/"progressLoadingScreen 0.15;" \n init = /*%FSM<STATEINIT""">*/"progressLoadingScreen 0.15;" \n
""/*%FSM</STATEINIT""">*/; ""/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
@ -859,7 +819,6 @@ class FSM
/*%FSM<LINK "Outdated_Version">*/ /*%FSM<LINK "Outdated_Version">*/
class Outdated_Version class Outdated_Version
{ {
itemno = 46;
priority = 10.000000; priority = 10.000000;
to="ERROR_Wrong_Version_1"; to="ERROR_Wrong_Version_1";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -870,7 +829,6 @@ class FSM
/*%FSM<LINK "Player_Object_Re">*/ /*%FSM<LINK "Player_Object_Re">*/
class Player_Object_Re class Player_Object_Re
{ {
itemno = 4;
priority = 0.000000; priority = 0.000000;
to="Check_Player_UID"; to="Check_Player_UID";
precondition = /*%FSM<CONDPRECONDITION""">*/"!isNull player"/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/"!isNull player"/*%FSM</CONDPRECONDITION""">*/;
@ -885,7 +843,6 @@ class FSM
class ERROR_Wrong_Version_1 class ERROR_Wrong_Version_1
{ {
name = "ERROR_Wrong_Version_1"; name = "ERROR_Wrong_Version_1";
itemno = 47;
init = /*%FSM<STATEINIT""">*/"_msg = ""You have an outdated version of ArmA 3"";" \n init = /*%FSM<STATEINIT""">*/"_msg = ""You have an outdated version of ArmA 3"";" \n
"_msg call Epoch_updateLoadingScreen;" \n "_msg call Epoch_updateLoadingScreen;" \n
"diag_log _msg;" \n "diag_log _msg;" \n
@ -900,7 +857,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 32;
priority = 0.000000; priority = 0.000000;
to="Display_Message"; to="Display_Message";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -915,14 +871,9 @@ class FSM
class Setup_EH_s_and_H class Setup_EH_s_and_H
{ {
name = "Setup_EH_s_and_H"; name = "Setup_EH_s_and_H";
itemno = 50; init = /*%FSM<STATEINIT""">*/"{" \n
init = /*%FSM<STATEINIT""">*/"player addEventHandler [""Respawn"", {(_this select 0) call EPOCH_clientRespawn}];" \n " player addEventHandler [_x,([""CfgEpochClient"", _x, """"] call EPOCH_fnc_returnConfigEntryV2)];" \n
"player addEventHandler [""Put"", {(_this select 1) call EPOCH_interact;_this call EPOCH_PutHandler}];" \n "} forEach ([""CfgEpochClient"", ""addEventHandler"", []] call EPOCH_fnc_returnConfigEntryV2);" \n
"player addEventHandler [""Take"", {(_this select 1) call EPOCH_interact;_this call EPOCH_UnisexCheck}];" \n
"player addEventHandler [""InventoryClosed"", {if !(EPOCH_arr_interactedObjs isEqualTo[]) then {EPOCH_arr_interactedObjs remoteExec[""EPOCH_server_save_vehicles"", 2]; EPOCH_arr_interactedObjs = [];};}];" \n
"player addEventHandler [""InventoryOpened"", {_this spawn EPOCH_initUI; (locked (_this select 1) in [2, 3] || (_this select 1) getVariable[""EPOCH_Locked"", false])}];" \n
"player addEventHandler [""Fired"", {_this call EPOCH_fnc_playerFired}];" \n
"player addEventHandler [""Killed"", {_this call EPOCH_fnc_playerDeath}];" \n
"" \n "" \n
"if (count EPOCH_playerHitPoints isEqualTo count ((getAllHitPointsDamage player) param [0,[]])) then {" \n "if (count EPOCH_playerHitPoints isEqualTo count ((getAllHitPointsDamage player) param [0,[]])) then {" \n
" {" \n " {" \n
@ -946,7 +897,6 @@ class FSM
/*%FSM<LINK "Has_Current_Weap">*/ /*%FSM<LINK "Has_Current_Weap">*/
class Has_Current_Weap class Has_Current_Weap
{ {
itemno = 53;
priority = 10.000000; priority = 10.000000;
to="Find_Active_Weap"; to="Find_Active_Weap";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -957,7 +907,6 @@ class FSM
/*%FSM<LINK "no_weapons">*/ /*%FSM<LINK "no_weapons">*/
class no_weapons class no_weapons
{ {
itemno = 51;
priority = 0.000000; priority = 0.000000;
to="Process"; to="Process";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -972,7 +921,6 @@ class FSM
class Process class Process
{ {
name = "Process"; name = "Process";
itemno = 52;
init = /*%FSM<STATEINIT""">*/"progressLoadingScreen 0.975;"/*%FSM</STATEINIT""">*/; init = /*%FSM<STATEINIT""">*/"progressLoadingScreen 0.975;"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
@ -980,7 +928,6 @@ class FSM
/*%FSM<LINK "Preload_done">*/ /*%FSM<LINK "Preload_done">*/
class Preload_done class Preload_done
{ {
itemno = 29;
priority = 0.000000; priority = 0.000000;
to="FINISH"; to="FINISH";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -995,7 +942,6 @@ class FSM
class Find_Active_Weap class Find_Active_Weap
{ {
name = "Find_Active_Weap"; name = "Find_Active_Weap";
itemno = 54;
init = /*%FSM<STATEINIT""">*/"_activeWeapon = currentWeapon player;" \n init = /*%FSM<STATEINIT""">*/"_activeWeapon = currentWeapon player;" \n
"progressLoadingScreen 0.95;"/*%FSM</STATEINIT""">*/; "progressLoadingScreen 0.95;"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
@ -1004,7 +950,6 @@ class FSM
/*%FSM<LINK "Current_Weapon_S">*/ /*%FSM<LINK "Current_Weapon_S">*/
class Current_Weapon_S class Current_Weapon_S
{ {
itemno = 56;
priority = 0.000000; priority = 0.000000;
to="Do_nothing"; to="Do_nothing";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1015,7 +960,6 @@ class FSM
/*%FSM<LINK "Current_Weapon_Not">*/ /*%FSM<LINK "Current_Weapon_Not">*/
class Current_Weapon_Not class Current_Weapon_Not
{ {
itemno = 55;
priority = 0.000000; priority = 0.000000;
to="Select_Weapon"; to="Select_Weapon";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1030,7 +974,6 @@ class FSM
class Select_Weapon class Select_Weapon
{ {
name = "Select_Weapon"; name = "Select_Weapon";
itemno = 57;
init = /*%FSM<STATEINIT""">*/"_currentWeapon spawn {" \n init = /*%FSM<STATEINIT""">*/"_currentWeapon spawn {" \n
" uiSleep 1; " \n " uiSleep 1; " \n
" player selectWeapon _this;" \n " player selectWeapon _this;" \n
@ -1041,7 +984,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 58;
priority = 0.000000; priority = 0.000000;
to="Process"; to="Process";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1056,7 +998,6 @@ class FSM
class Do_nothing class Do_nothing
{ {
name = "Do_nothing"; name = "Do_nothing";
itemno = 59;
init = /*%FSM<STATEINIT""">*/""/*%FSM</STATEINIT""">*/; init = /*%FSM<STATEINIT""">*/""/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
@ -1064,7 +1005,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 58;
priority = 0.000000; priority = 0.000000;
to="Process"; to="Process";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1079,7 +1019,6 @@ class FSM
class Check_New_Player class Check_New_Player
{ {
name = "Check_New_Player"; name = "Check_New_Player";
itemno = 60;
init = /*%FSM<STATEINIT""">*/"_myTime = diag_tickTime;" \n init = /*%FSM<STATEINIT""">*/"_myTime = diag_tickTime;" \n
"" \n "" \n
"// player reveal [_playerObject, 4];" \n "// player reveal [_playerObject, 4];" \n
@ -1094,7 +1033,6 @@ class FSM
/*%FSM<LINK "Wait_mag_count_m">*/ /*%FSM<LINK "Wait_mag_count_m">*/
class Wait_mag_count_m class Wait_mag_count_m
{ {
itemno = 61;
priority = 0.000000; priority = 0.000000;
to="Setup_Player_Obj"; to="Setup_Player_Obj";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1105,7 +1043,6 @@ class FSM
/*%FSM<LINK "Timeout_No_Respo">*/ /*%FSM<LINK "Timeout_No_Respo">*/
class Timeout_No_Respo class Timeout_No_Respo
{ {
itemno = 15;
priority = 0.000000; priority = 0.000000;
to="ERROR_Server_not"; to="ERROR_Server_not";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1120,7 +1057,6 @@ class FSM
class Process_1 class Process_1
{ {
name = "Process_1"; name = "Process_1";
itemno = 63;
init = /*%FSM<STATEINIT""">*/""/*%FSM</STATEINIT""">*/; init = /*%FSM<STATEINIT""">*/""/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
@ -1128,7 +1064,6 @@ class FSM
/*%FSM<LINK "Wait_ArmA_Loading">*/ /*%FSM<LINK "Wait_ArmA_Loading">*/
class Wait_ArmA_Loading class Wait_ArmA_Loading
{ {
itemno = 64;
priority = 0.000000; priority = 0.000000;
to="Start_Loading_Sc"; to="Start_Loading_Sc";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1143,7 +1078,6 @@ class FSM
class Start_Loading_Sc class Start_Loading_Sc
{ {
name = "Start_Loading_Sc"; name = "Start_Loading_Sc";
itemno = 65;
init = /*%FSM<STATEINIT""">*/"startLoadingScreen ["""",""EpochLoadingScreen""];" \n init = /*%FSM<STATEINIT""">*/"startLoadingScreen ["""",""EpochLoadingScreen""];" \n
"if (_debug) then {" \n "if (_debug) then {" \n
" diag_log ""EPOCH-LOGIN: Start Loadingscreen"";" \n " diag_log ""EPOCH-LOGIN: Start Loadingscreen"";" \n
@ -1155,7 +1089,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 2;
priority = 0.000000; priority = 0.000000;
to="Version_Check"; to="Version_Check";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1170,7 +1103,6 @@ class FSM
class Update_Loadingscreen class Update_Loadingscreen
{ {
name = "Update_Loadingscreen"; name = "Update_Loadingscreen";
itemno = 67;
init = /*%FSM<STATEINIT""">*/"uiNamespace setVariable ['Epoch_freshServer', false];" \n init = /*%FSM<STATEINIT""">*/"uiNamespace setVariable ['Epoch_freshServer', false];" \n
"" \n "" \n
"""Server initializing... Please wait!"" call Epoch_updateLoadingScreen;"/*%FSM</STATEINIT""">*/; """Server initializing... Please wait!"" call Epoch_updateLoadingScreen;"/*%FSM</STATEINIT""">*/;
@ -1180,7 +1112,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 68;
priority = 0.000000; priority = 0.000000;
to="Check_Server_1"; to="Check_Server_1";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1195,7 +1126,6 @@ class FSM
class ERROR_Player_Setup class ERROR_Player_Setup
{ {
name = "ERROR_Player_Setup"; name = "ERROR_Player_Setup";
itemno = 70;
init = /*%FSM<STATEINIT""">*/"_msg = ""Problem setting up player"";" \n init = /*%FSM<STATEINIT""">*/"_msg = ""Problem setting up player"";" \n
"_msg call Epoch_updateLoadingScreen;" \n "_msg call Epoch_updateLoadingScreen;" \n
"diag_log _msg;" \n "diag_log _msg;" \n
@ -1210,7 +1140,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 32;
priority = 0.000000; priority = 0.000000;
to="Display_Message"; to="Display_Message";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1225,7 +1154,6 @@ class FSM
class Server_Version_C class Server_Version_C
{ {
name = "Server_Version_C"; name = "Server_Version_C";
itemno = 72;
init = /*%FSM<STATEINIT""">*/""/*%FSM</STATEINIT""">*/; init = /*%FSM<STATEINIT""">*/""/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
@ -1233,7 +1161,6 @@ class FSM
/*%FSM<LINK "Wrong_Server_Ver">*/ /*%FSM<LINK "Wrong_Server_Ver">*/
class Wrong_Server_Ver class Wrong_Server_Ver
{ {
itemno = 23;
priority = 10.000000; priority = 10.000000;
to="ERROR_Wrong_Server"; to="ERROR_Wrong_Server";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1244,7 +1171,6 @@ class FSM
/*%FSM<LINK "Version_Okay">*/ /*%FSM<LINK "Version_Okay">*/
class Version_Okay class Version_Okay
{ {
itemno = 73;
priority = 0.000000; priority = 0.000000;
to="Request_Hive"; to="Request_Hive";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1259,7 +1185,6 @@ class FSM
class ERROR_Server_not_3 class ERROR_Server_not_3
{ {
name = "ERROR_Server_not_3"; name = "ERROR_Server_not_3";
itemno = 75;
init = /*%FSM<STATEINIT""">*/"_msg = ""Authentication Failed, Disconnect and try again"";" \n init = /*%FSM<STATEINIT""">*/"_msg = ""Authentication Failed, Disconnect and try again"";" \n
"_msg call Epoch_updateLoadingScreen;" \n "_msg call Epoch_updateLoadingScreen;" \n
"diag_log _msg;" \n "diag_log _msg;" \n
@ -1274,7 +1199,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 32;
priority = 0.000000; priority = 0.000000;
to="Display_Message"; to="Display_Message";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1289,7 +1213,6 @@ class FSM
class Process_2 class Process_2
{ {
name = "Process_2"; name = "Process_2";
itemno = 80;
init = /*%FSM<STATEINIT""">*/""/*%FSM</STATEINIT""">*/; init = /*%FSM<STATEINIT""">*/""/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
@ -1297,7 +1220,6 @@ class FSM
/*%FSM<LINK "new_character">*/ /*%FSM<LINK "new_character">*/
class new_character class new_character
{ {
itemno = 77;
priority = 10.000000; priority = 10.000000;
to="Open_Gender_Selection"; to="Open_Gender_Selection";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1309,7 +1231,6 @@ class FSM
/*%FSM<LINK "load_old_charact">*/ /*%FSM<LINK "load_old_charact">*/
class load_old_charact class load_old_charact
{ {
itemno = 79;
priority = 0.000000; priority = 0.000000;
to="Process_3"; to="Process_3";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1324,7 +1245,6 @@ class FSM
class Open_Gender_Selection class Open_Gender_Selection
{ {
name = "Open_Gender_Selection"; name = "Open_Gender_Selection";
itemno = 81;
init = /*%FSM<STATEINIT""">*/"createdialog ""SelectGender"";"/*%FSM</STATEINIT""">*/; init = /*%FSM<STATEINIT""">*/"createdialog ""SelectGender"";"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
@ -1332,7 +1252,6 @@ class FSM
/*%FSM<LINK "Gender_Selected">*/ /*%FSM<LINK "Gender_Selected">*/
class Gender_Selected class Gender_Selected
{ {
itemno = 83;
priority = 10.000000; priority = 10.000000;
to="Send_character_s"; to="Send_character_s";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1343,7 +1262,6 @@ class FSM
/*%FSM<LINK "Timeout">*/ /*%FSM<LINK "Timeout">*/
class Timeout class Timeout
{ {
itemno = 84;
priority = 0.000000; priority = 0.000000;
to="Send_character_s"; to="Send_character_s";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1355,7 +1273,6 @@ class FSM
/*%FSM<LINK "Reopen_when_client">*/ /*%FSM<LINK "Reopen_when_client">*/
class Reopen_when_client class Reopen_when_client
{ {
itemno = 82;
priority = 0.000000; priority = 0.000000;
to="Open_Gender_Selection"; to="Open_Gender_Selection";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1370,7 +1287,6 @@ class FSM
class Send_character_s class Send_character_s
{ {
name = "Send_character_s"; name = "Send_character_s";
itemno = 85;
init = /*%FSM<STATEINIT""">*/"startLoadingScreen ["""",""EpochLoadingScreen""];" \n init = /*%FSM<STATEINIT""">*/"startLoadingScreen ["""",""EpochLoadingScreen""];" \n
"""Gender Selected... Please wait!"" call Epoch_updateLoadingScreen;" \n """Gender Selected... Please wait!"" call Epoch_updateLoadingScreen;" \n
"" \n "" \n
@ -1382,7 +1298,6 @@ class FSM
/*%FSM<LINK "load_old_charact">*/ /*%FSM<LINK "load_old_charact">*/
class load_old_charact class load_old_charact
{ {
itemno = 79;
priority = 0.000000; priority = 0.000000;
to="Process_3"; to="Process_3";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1397,7 +1312,6 @@ class FSM
class Process_3 class Process_3
{ {
name = "Process_3"; name = "Process_3";
itemno = 86;
init = /*%FSM<STATEINIT""">*/""/*%FSM</STATEINIT""">*/; init = /*%FSM<STATEINIT""">*/""/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
@ -1405,7 +1319,6 @@ class FSM
/*%FSM<LINK "Timeout_No_Respo">*/ /*%FSM<LINK "Timeout_No_Respo">*/
class Timeout_No_Respo class Timeout_No_Respo
{ {
itemno = 22;
priority = 0.000000; priority = 0.000000;
to="ERROR_Server_not_4"; to="ERROR_Server_not_4";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1416,7 +1329,6 @@ class FSM
/*%FSM<LINK "Response">*/ /*%FSM<LINK "Response">*/
class Response class Response
{ {
itemno = 16;
priority = 0.000000; priority = 0.000000;
to="Check_New_Player"; to="Check_New_Player";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
@ -1446,7 +1358,6 @@ class FSM
class ERROR_Server_not_4 class ERROR_Server_not_4
{ {
name = "ERROR_Server_not_4"; name = "ERROR_Server_not_4";
itemno = 87;
init = /*%FSM<STATEINIT""">*/"_msg = ""Authentication Failed, Disconnect and try again"";" \n init = /*%FSM<STATEINIT""">*/"_msg = ""Authentication Failed, Disconnect and try again"";" \n
"_msg call Epoch_updateLoadingScreen;" \n "_msg call Epoch_updateLoadingScreen;" \n
"diag_log _msg;" \n "diag_log _msg;" \n
@ -1461,7 +1372,6 @@ class FSM
/*%FSM<LINK "true">*/ /*%FSM<LINK "true">*/
class true class true
{ {
itemno = 32;
priority = 0.000000; priority = 0.000000;
to="Display_Message"; to="Display_Message";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;

11
Sources/epoch_code/compile/setup/EPOCH_clientRevive.sqf
View File

@ -31,7 +31,6 @@ if !(alive player && alive _playerObject && !isPlayer _playerObject) then {
// deleteGroup _group; // deleteGroup _group;
Epoch_canBeRevived = false; Epoch_canBeRevived = false;
Epoch_personalToken = _this select 1; Epoch_personalToken = _this select 1;
// call EPOCH_clientInit; // call EPOCH_clientInit;
@ -41,13 +40,9 @@ if !(alive player && alive _playerObject && !isPlayer _playerObject) then {
closeDialog 0; closeDialog 0;
("BIS_fnc_respawnCounter" call BIS_fnc_rscLayer) cutText ["","PLAIN"]; ("BIS_fnc_respawnCounter" call BIS_fnc_rscLayer) cutText ["","PLAIN"];
player addEventHandler ["Respawn", {(_this select 0) call EPOCH_clientRespawn}]; {
player addEventHandler ["Put", {(_this select 1) call EPOCH_interact;_this call EPOCH_PutHandler}]; player addEventHandler [_x,(["CfgEpochClient", _x, ""] call EPOCH_fnc_returnConfigEntryV2)];
player addEventHandler ["Take", {(_this select 1) call EPOCH_interact;_this call EPOCH_UnisexCheck}]; } forEach (["CfgEpochClient", "addEventHandler", []] call EPOCH_fnc_returnConfigEntryV2);
player addEventHandler ["InventoryClosed", { if !(EPOCH_arr_interactedObjs isEqualTo[]) then{EPOCH_arr_interactedObjs remoteExec["EPOCH_server_save_vehicles", 2]; EPOCH_arr_interactedObjs = []; }; }];
player addEventHandler ["InventoryOpened", {_this spawn EPOCH_initUI; (locked (_this select 1) in [2, 3] || (_this select 1) getVariable["EPOCH_Locked", false]) }];
player addEventHandler ["Fired", {_this call EPOCH_fnc_playerFired}];
player addEventHandler ["Killed", {_this call EPOCH_fnc_playerDeath}];
} else { } else {
deleteVehicle _playerObject; deleteVehicle _playerObject;
}; };

2
Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_target.hpp
View File

@ -119,7 +119,7 @@ class lock_safe
class pack_lockbox class pack_lockbox
{ {
condition = "(dyna_cursorTargetType in ['LockBox_EPOCH','LockBoxProxy_EPOCH']) && (dyna_cursorTarget getVariable ['EPOCH_Locked',false])"; condition = "(dyna_cursorTargetType in ['LockBox_EPOCH','LockBoxProxy_EPOCH']) && (dyna_cursorTarget getVariable ['EPOCH_Locked',false])";
action = "[dyna_cursorTarget,player,Epoch_personalToken] remoteExec ['EPOCH_server_lockStorage',2];"; action = "[dyna_cursorTarget,player,Epoch_personalToken] remoteExec ['EPOCH_server_packStorage',2];";
icon = "x\addons\a3_epoch_code\Data\UI\buttons\build_pack.paa"; icon = "x\addons\a3_epoch_code\Data\UI\buttons\build_pack.paa";
tooltip = "Pack Lockbox"; tooltip = "Pack Lockbox";
}; };

12
Sources/epoch_config/Configs/CfgEpochClient.hpp
View File

@ -81,6 +81,18 @@ class CfgEpochClient
{ "cabinetPos", "Cabinet_EPOCH", false } { "cabinetPos", "Cabinet_EPOCH", false }
}; };
displayAddEventHandler[] = {"keyDown","keyUp"};
keyDown = "_this call EPOCH_KeyDown;";
keyUp = "_this call EPOCH_KeyUp;";
addEventHandler[] = {"Respawn","Put","Take","InventoryClosed","InventoryOpened","Fired","Killed"};
Respawn = "(_this select 0) call EPOCH_clientRespawn";
Put = "(_this select 1) call EPOCH_interact;_this call EPOCH_PutHandler";
Take = "(_this select 1) call EPOCH_interact;_this call EPOCH_UnisexCheck";
Fired = "_this call EPOCH_fnc_playerFired;";
InventoryClosed = "if !(EPOCH_arr_interactedObjs isEqualTo[]) then {EPOCH_arr_interactedObjs remoteExec['EPOCH_server_save_vehicles', 2]; EPOCH_arr_interactedObjs = [];};";
InventoryOpened = "_this spawn EPOCH_initUI;_container = _this select 1;_lockedNear = false;if (_container isKindOf 'GroundWeaponHolder' || _container isKindOf 'WeaponHolderSimulated') then {{if (locked _x in [2, 3] ||_x getVariable['EPOCH_Locked', false]) exitWith {_lockedNear = true}} forEach (player nearSupplies 10);};if (locked _container in [2, 3] || _container getVariable['EPOCH_Locked', false] || _lockedNear) then {[] spawn {disableSerialization;waitUntil {!isNull findDisplay 602};_display = findDisplay 602;_ctrl_cargo = _display displayCtrl 6401;_ctrl_ground = _display displayCtrl 6321;_ctrl_cargo ctrlEnable false;ctrlSetFocus _ctrl_ground;ctrlActivate _ctrl_ground;};};";
Killed = "_this call EPOCH_fnc_playerDeath;";
#include "CfgEpochClient\takistan.hpp" #include "CfgEpochClient\takistan.hpp"
#include "CfgEpochClient\australia.hpp" #include "CfgEpochClient\australia.hpp"