0.3.7.003

This commit is contained in:
vbawol 2015-12-23 11:38:11 -06:00
parent ad4cb8e41b
commit 1ceb25c1f7
89 changed files with 426 additions and 412 deletions

View File

@ -1,3 +1,4 @@
[Fixed] Custom epoch swing animations for Hatchet and sledge now work correctly.
WIP
[Added] Hotwire Kit
[Added] Key Makers Kit

Binary file not shown.

View File

@ -1,6 +1,5 @@
//new2
7 EPOCH_C_SET !="!isNil \"EPOCH_C_SET\"" !="_array = EPOCH_C_SET;" !="EPOCH_C_SET = nil;"
7 EPOCH_GROUP_Delete_PVS !="EPOCH_GROUP_Delete_PVS = [player,Epoch_personalToken];"
7 "BIS_fnc_dynamictext" !="\"BIS_fnc_dynamictext"\" !", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;" !", 0, 0.4, 5, 2, 0, 2] spawn bis_fnc_dynamictext;" !", 0, 1, 6, 2, 0, 1] spawn bis_fnc_dynamictext;" !"snil '_fnc_scriptName') then {_fnc_scriptName}"
7 forceRespawn
7 setFriend

View File

@ -222,7 +222,7 @@ class FSM
" _sound = _sounds select (floor (random (count _sounds)));" \n
" _animalAgent say3D _sound;" \n
" EPOCH_say3D_PVS = [player, _animalAgent, (EPOCH_sounds find _sound),Epoch_personalToken];" \n
" publicVariableServer ""EPOCH_say3D_PVS"";" \n
" EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
" };" \n
"};" \n
"" \n
@ -358,7 +358,7 @@ class FSM
" if (_isDog) then {" \n
" _animalAgent say3D ""dog_cry"";" \n
" EPOCH_say3D_PVS = [player, _animalAgent, 3,Epoch_personalToken];" \n
" publicVariableServer ""EPOCH_say3D_PVS"";" \n
" EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
" };" \n
" };" \n
" _courageTest = false;" \n
@ -369,7 +369,7 @@ class FSM
" if (_isDog) then {" \n
" _animalAgent say3D ""dog_bark"";" \n
" EPOCH_say3D_PVS = [player, _animalAgent, 2,Epoch_personalToken];" \n
" publicVariableServer ""EPOCH_say3D_PVS"";" \n
" EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
" _animalAgent playMoveNow ""Dog_Bark""; " \n
" };" \n
" _animalAgent setDir _dirTo; " \n
@ -379,7 +379,7 @@ class FSM
" if (random 1 < 0.5) then { " \n
" _animalAgent say3D ""dog_bark"";" \n
" EPOCH_say3D_PVS = [player, _animalAgent, 2,Epoch_personalToken];" \n
" publicVariableServer ""EPOCH_say3D_PVS"";" \n
" EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
" };" \n
" };" \n
"};"/*%FSM</STATEINIT""">*/;

View File

@ -451,7 +451,7 @@ class FSM
"" \n
"_copter say3D ""drone_alert0"";" \n
"EPOCH_say3D_PVS = [player, _copter, 10,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"" \n
"_troopsOnGround = true;" \n
"(driver _copter) action [""lightOn"", _copter];" \n

View File

@ -688,7 +688,7 @@ class FSM
"if((random 100) < (_countNrPlyrs * 10))then{" \n
"[_dog, _plyr] say3D ""dog_cry"";" \n
"EPOCH_say3D_PVS = [player, _dog, 17,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
"" \n
""/*%FSM</STATEINIT""">*/;
@ -730,7 +730,7 @@ class FSM
"if (floor(random 100)< 8) then {" \n
"[_dog, _plyr] say3D ""dog_cry"";" \n
"EPOCH_say3D_PVS = [player, _dog, 17,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"_hunger = _hunger + 2;" \n
"};" \n
"" \n
@ -790,7 +790,7 @@ class FSM
"if (floor(random 100)<_dogNoise) then {" \n
"[_dog, _plyr] say3D ""dog_cry"";" \n
"EPOCH_say3D_PVS = [player, _dog, 17,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
"" \n
"" \n
@ -850,7 +850,7 @@ class FSM
"if (floor(random 100) < 6) then {" \n
"[_dog, _plyr] say3D ""dog_bark"";" \n
"EPOCH_say3D_PVS = [player, _dog, 2,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
"" \n
"if (floor(random 100)<_forgive) then {" \n
@ -976,7 +976,7 @@ class FSM
"if (floor(random 100)<_dogNoise) then {" \n
"[_dog, _plyr] say3D ""dog_cry"";" \n
"EPOCH_say3D_PVS = [player, _dog, 17,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
"" \n
"_criteria = ""(moveToCompleted _dog) || (_dog distance _moveTo < 1.5)"";" \n
@ -1052,7 +1052,7 @@ class FSM
"if (floor(random 75)<_dogNoise) then {" \n
"[_dog, _plyr] say3D ""dog_cry_quiet"";" \n
"EPOCH_say3D_PVS = [player, _dog, 17,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
"" \n
"_dirTo = [_dog, getPos (_nrPlyrs select 1)] call BIS_fnc_dirTo;" \n
@ -1092,7 +1092,7 @@ class FSM
"if (_rnd < 42) then {" \n
"[_dog, _plyr] say3D ""dog_bark"";" \n
"EPOCH_say3D_PVS = [player, _dog, 18,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
"" \n
"if (_rnd < 6) then {" \n
@ -1226,20 +1226,20 @@ class FSM
"if (_rnd< 12) then {" \n
"[_dog, _plyr] say3D ""dog_bark"";" \n
"EPOCH_say3D_PVS = [player, _dog, 2,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
"" \n
"if (_rnd < 6) then {" \n
"_hunger = _hunger + 1;" \n
"[_dog, _plyr] say3D ""dog_cry"";" \n
"EPOCH_say3D_PVS = [player, _dog, 3,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
"" \n
"if ((_hunger > 56) && (_rnd < 48)) then {" \n
"[_dog, _plyr] say3D ""dog_cry"";" \n
"EPOCH_say3D_PVS = [player, _dog, 2,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
"" \n
"" \n
@ -1319,8 +1319,8 @@ class FSM
init = /*%FSM<STATEINIT""">*/"{" \n
" if !(alive _x) then {" \n
" if ((_x isKindOf ""Animal_Base_F"" && !(_x isKindOf ""Dog_Base_F"")) || (typeOf _x) in[""Epoch_Sapper_F"", ""Epoch_SapperB_F"", ""Epoch_Cloak_F"", ""I_UAV_01_F""]) then {" \n
" EPOCH_lootAnimal = [_x, player, Epoch_personalToken];" \n
" publicVariableServer ""EPOCH_lootAnimal"";" \n
" [_x, player, Epoch_personalToken] remoteExec [""EPOCH_server_lootAnimal"",2];" \n
"" \n
" };" \n
" };" \n
"" \n

View File

@ -387,8 +387,8 @@ class FSM
{
name = "do_drop";
init = /*%FSM<STATEINIT""">*/"" \n
"EPOCH_airDropCrate_PVS = [_axeCopter,_plyr,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_airDropCrate_PVS"";" \n
"" \n
"[_axeCopter,_plyr,Epoch_personalToken] remoteExec [""EPOCH_server_airDropCrate"",2];" \n
"" \n
"_dropDone = true;" \n
"" \n
@ -467,8 +467,8 @@ class FSM
"" \n
"_dropPos = _plyrPos;" \n
"" \n
"EPOCH_createAirDrop_PVS = [player,Epoch_personalToken,_startPos];" \n
"publicVariableServer ""EPOCH_createAirDrop_PVS"";" \n
"" \n
"[player,Epoch_personalToken,_startPos] remoteExec [""EPOCH_Server_createAirDrop"",2];" \n
"" \n
"" \n
"_axeCopter = objNull;" \n
@ -717,4 +717,4 @@ class FSM
"end"
};
};
/*%FSM</COMPILE>*/
/*%FSM</COMPILE>*/

View File

@ -320,7 +320,7 @@ class FSM
"" \n
"_sapper say3D _sound;" \n
"EPOCH_say3D_PVS = [player, _sapper,(EPOCH_sounds find _sound), Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
"" \n
"_doInterrupt = {" \n
@ -739,7 +739,7 @@ class FSM
"_sound = ""sapper_explode"";" \n
"_sapper say3D _sound;" \n
"EPOCH_say3D_PVS = [player,_sapper,(EPOCH_sounds find _sound),Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"_sapper playMoveNow ""Unconscious"";" \n
"" \n
""/*%FSM</STATEINIT""">*/;
@ -1207,7 +1207,7 @@ class FSM
"_bomb attachTo [_nestMate, [0,0,0],""Pelvis""];" \n
"_nestMate setVariable [""bomb"",_bomb];" \n
"EPOCH_TEMPOBJ_PVS = _nestMate;" \n
"publicVariableServer ""EPOCH_TEMPOBJ_PVS"";" \n
"EPOCH_TEMPOBJ_PVS remoteExec [""EPOCH_localCleanup"",2];" \n
"_nestMate disableAI ""TARGET"";" \n
"_nestMate disableAI ""AUTOTARGET"";" \n
"_nestMate disableAI ""FSM"";" \n
@ -1246,8 +1246,8 @@ class FSM
"" \n
"[_nrBuild, _sapper] spawn {" \n
"sleep 6;" \n
"EPOCH_SapperObjs_PVS = [_this select 0, player, Epoch_personalToken,_this select 1];" \n
"publicVariableServer ""EPOCH_SapperObjs_PVS"";" \n
"" \n
"[_this select 0, player, Epoch_personalToken,_this select 1] remoteExec [""EPOCH_server_handle_sapperObjs"",2];" \n
"};" \n
"" \n
"{" \n
@ -1255,15 +1255,15 @@ class FSM
"_sound = ""sapper_explode"";" \n
"_x say3D _sound;" \n
"EPOCH_say3D_PVS = [player,_x,(EPOCH_sounds find _sound),Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"_x playMoveNow ""Unconscious"";" \n
"" \n
"_x spawn {" \n
"sleep floor (random 3);" \n
"_sBomb = _this getVariable [""bomb"",objNull];" \n
"" \n
"EPOCH_SapperObjs_PVS = [_sBomb, player, Epoch_personalToken,_this,_this];" \n
"publicVariableServer ""EPOCH_SapperObjs_PVS"";" \n
"" \n
"[_sBomb, player, Epoch_personalToken,_this,_this] remoteExec [""EPOCH_server_handle_sapperObjs"",2];" \n
"" \n
"_finalPos = getPosATL _this;" \n
"_finalDir = getDir _this;" \n
@ -1369,8 +1369,8 @@ class FSM
class do_boom
{
name = "do_boom";
init = /*%FSM<STATEINIT""">*/"EPOCH_SapperObjs_PVS = [_sBomb, player, Epoch_personalToken,_sapper,_sapper];" \n
"publicVariableServer ""EPOCH_SapperObjs_PVS"";" \n
init = /*%FSM<STATEINIT""">*/"" \n
"[_sBomb, player, Epoch_personalToken,_sapper,_sapper] remoteExec [""EPOCH_server_handle_sapperObjs"",2];" \n
"" \n
"_sBomb = objNull;" \n
"_finalPos = getPosATL _sapper;" \n
@ -1636,7 +1636,7 @@ class FSM
" _sound = ""sapper_groan2"";" \n
" _sapper say3D _sound;" \n
" EPOCH_say3D_PVS = [player, _sapper,(EPOCH_sounds find _sound), Epoch_personalToken];" \n
" publicVariableServer ""EPOCH_say3D_PVS"";" \n
" EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
""/*%FSM</ACTION""">*/;
};

View File

@ -267,7 +267,7 @@ class FSM
"" \n
"_sapper say3D _sound;" \n
"EPOCH_say3D_PVS = [player, _sapper,(EPOCH_sounds find _sound), Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
"" \n
"_doInterrupt = {" \n
@ -633,7 +633,7 @@ class FSM
"_sound = ""sapper_explode"";" \n
"_sapper say3D _sound;" \n
"EPOCH_say3D_PVS = [player,_sapper,(EPOCH_sounds find _sound),Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"_sapper playMoveNow ""Unconscious"";" \n
"" \n
""/*%FSM</STATEINIT""">*/;
@ -1040,8 +1040,8 @@ class FSM
class do_boom
{
name = "do_boom";
init = /*%FSM<STATEINIT""">*/"EPOCH_SapperObjs_PVS = [_sBomb, player, Epoch_personalToken,_sapper,_sapper];" \n
"publicVariableServer ""EPOCH_SapperObjs_PVS"";" \n
init = /*%FSM<STATEINIT""">*/"" \n
"[_sBomb, player, Epoch_personalToken,_sapper,_sapper] remoteExec [""EPOCH_server_handle_sapperObjs"",2];" \n
"" \n
"_sBomb = objNull;" \n
"" \n
@ -1269,7 +1269,7 @@ class FSM
" _sound = ""sapper_groan2"";" \n
" _sapper say3D _sound;" \n
" EPOCH_say3D_PVS = [player, _sapper,(EPOCH_sounds find _sound), Epoch_personalToken];" \n
" publicVariableServer ""EPOCH_say3D_PVS"";" \n
" EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
""/*%FSM</ACTION""">*/;
};

View File

@ -974,8 +974,8 @@ class FSM
"" \n
"_plyr spawn {" \n
"uiSleep 12;" \n
"EPOCH_FillContainer_PVS = [_this,Epoch_personalToken,objNull,false,15];" \n
"publicVariableServer ""EPOCH_FillContainer_PVS"";" \n
"" \n
"[_this,Epoch_personalToken,objNull,false,15] remoteExec [""EPOCH_server_fillContainer"",2];" \n
"//hint ""Paying Out"";" \n
"};" \n
"" \n

View File

@ -1021,8 +1021,8 @@ class FSM
init = /*%FSM<STATEINIT""">*/"titleText [_wDiag,""PLAIN"", 6];" \n
"" \n
"" \n
"EPOCH_FillContainer_PVS = [_plyr,Epoch_personalToken,objNull,false,25];" \n
"publicVariableServer ""EPOCH_FillContainer_PVS"";" \n
"" \n
"[_plyr,Epoch_personalToken,objNull,false,25] remoteExec [""EPOCH_server_fillContainer"",2];" \n
"" \n
"if (_act != """") then {" \n
"call compile _act;" \n

View File

@ -877,8 +877,8 @@ class FSM
"_wDiag = """";" \n
"_wDiag2 = """";" \n
"" \n
"EPOCH_FillContainer_PVS = [_plyr,Epoch_personalToken,axeGeneralsBoat,false,25];" \n
"publicVariableServer ""EPOCH_FillContainer_PVS"";" \n
"" \n
"[_plyr,Epoch_personalToken,axeGeneralsBoat,false,25] remoteExec [""EPOCH_server_fillContainer"",2];" \n
"" \n
"_sWait = 1.5;" \n
"_actionDone = true;" \n
@ -915,7 +915,7 @@ class FSM
"" \n
"if !(isNull axeVIP) then {" \n
" EPOCH_TEMPOBJ_PVS = axeVIP;" \n
" publicVariableServer ""EPOCH_TEMPOBJ_PVS"";" \n
" EPOCH_TEMPOBJ_PVS remoteExec [""EPOCH_localCleanup"",2];" \n
"};" \n
"" \n
"_grp setCombatMode ""BLUE"";" \n
@ -1039,7 +1039,7 @@ class FSM
"" \n
"if !(isNull axeGeneral) then {" \n
" EPOCH_TEMPOBJ_PVS = axeGeneral;" \n
" publicVariableServer ""EPOCH_TEMPOBJ_PVS"";" \n
" EPOCH_TEMPOBJ_PVS remoteExec [""EPOCH_localCleanup"",2];" \n
"};" \n
"" \n
" for ""_i"" from 1 to 3 step 1 do" \n
@ -1052,7 +1052,7 @@ class FSM
" _unit addEventHandler [""Killed"", ""group (_this select 0) setVariable[""""killer"""",_this select 1]""];" \n
" if !(isNull _unit) then {" \n
" EPOCH_TEMPOBJ_PVS = _unit;" \n
" publicVariableServer ""EPOCH_TEMPOBJ_PVS"";" \n
" EPOCH_TEMPOBJ_PVS remoteExec [""EPOCH_localCleanup"",2];" \n
" };" \n
" [_unit,axeGeneral] execFSM ""\x\addons\a3_epoch_code\System\Mission_VIP_Militia.fsm"";" \n
"" \n

View File

@ -668,7 +668,7 @@ class FSM
"if(diag_tickTime - _lastAlert > 480 && random 100 < _cAggression)then{" \n
"_unit say3D ""cultist_laugh"";" \n
"EPOCH_say3D_PVS = [player, _unit, 8,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"_lastAlert = diag_tickTime;" \n
"" \n
"" \n
@ -676,7 +676,7 @@ class FSM
"" \n
"_unit say3D ""cultist_talk"";" \n
"EPOCH_say3D_PVS = [player, _unit, 7,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"" \n
"};" \n
"" \n

View File

@ -40,7 +40,7 @@ class FSM
"" \n
"_unit say3D ""cultist_laugh"";" \n
"EPOCH_say3D_PVS = [player, _unit, 8,Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"" \n
"" \n
"" \n

View File

@ -156,8 +156,8 @@ class FSM
class Send_To_Server
{
name = "Send_To_Server";
init = /*%FSM<STATEINIT""">*/"EPOCH_respawnPlayer_PVS = [player, Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_respawnPlayer_PVS"";"/*%FSM</STATEINIT""">*/;
init = /*%FSM<STATEINIT""">*/"[player, Epoch_personalToken] remoteExec [""EPOCH_server_respawnPlayer"",2];" \n
"";"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links
{
@ -190,8 +190,8 @@ class FSM
class Send_new_selection
{
name = "Send_new_selection";
init = /*%FSM<STATEINIT""">*/"EPOCH_respawnPlayer_PVS = [player, Epoch_personalToken,EPOCH_PlayerIsMale];" \n
"publicVariableServer ""EPOCH_respawnPlayer_PVS"";"/*%FSM</STATEINIT""">*/;
init = /*%FSM<STATEINIT""">*/"[player, Epoch_personalToken,EPOCH_PlayerIsMale] remoteExec [""EPOCH_server_respawnPlayer"",2];" \n
""/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links
{

View File

@ -509,8 +509,7 @@ class FSM
"" \n
"Epoch_my_Group = [];" \n
"" \n
"EPOCH_checkPlayer_PVS = player;" \n
"publicVariableServer ""EPOCH_checkPlayer_PVS"";" \n
"player remoteExec [""EPOCH_server_checkPlayer"",2];" \n
"" \n
"" \n
"""Loading Player Data... Please wait!"" call Epoch_updateLoadingScreen;" \n
@ -1375,10 +1374,7 @@ class FSM
init = /*%FSM<STATEINIT""">*/"startLoadingScreen ["""",""EpochLoadingScreen""];" \n
"""Gender Selected... Please wait!"" call Epoch_updateLoadingScreen;" \n
"" \n
"" \n
"EPOCH_selectedGender_PVS = [player,EPOCH_PlayerIsMale];" \n
"publicVariableServer ""EPOCH_selectedGender_PVS"";" \n
"EPOCH_selectedGender_PVS = nil;" \n
"[player,EPOCH_PlayerIsMale] remoteExec [""EPOCH_server_loadPlayer"",2];" \n
"EPOCH_PlayerIsMale = nil;"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links

View File

@ -50,7 +50,7 @@ class FSM
"" \n
"if !(isNull _unit) then {" \n
" EPOCH_TEMPOBJ_PVS = _unit;" \n
" publicVariableServer ""EPOCH_TEMPOBJ_PVS"";" \n
" EPOCH_TEMPOBJ_PVS remoteExec [""EPOCH_localCleanup"",2];" \n
"};" \n
"" \n
"_randomGroan = {" \n
@ -59,7 +59,7 @@ class FSM
"" \n
"_unit say3D _sound;" \n
"EPOCH_say3D_PVS = [player, _unit,(EPOCH_sounds find _sound), Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"};" \n
"" \n
"_sMarker = objNull;" \n

View File

@ -95,7 +95,7 @@ class FSM
"_sound = ""sapper_explode"";" \n
"_unit say3D _sound;" \n
"EPOCH_say3D_PVS = [player,_unit,(EPOCH_sounds find _sound),Epoch_personalToken];" \n
"publicVariableServer ""EPOCH_say3D_PVS"";" \n
"EPOCH_say3D_PVS remoteExec [""EPOCH_server_handle_say3D"",2];" \n
"_unit playMoveNow ""Unconscious"";" \n
"" \n
"";
@ -174,8 +174,8 @@ class FSM
{
name = "do_boom";
itemno = ;
init = "EPOCH_SapperObjs_PVS = [_bomb, player, Epoch_personalToken,_unit,_unit];" \n
"publicVariableServer ""EPOCH_SapperObjs_PVS"";" \n
init = "" \n
"[_bomb, player, Epoch_personalToken,_unit,_unit] remoteExec [""EPOCH_server_handle_sapperObjs"",2];" \n
"" \n
"_bomb = objNull;" \n
"_finalPos = getPosATL _unit;" \n
@ -285,4 +285,4 @@ class FSM
{
"end"
};
};
};

View File

@ -13,6 +13,5 @@
https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_code/compile/EPOCH_EnterBuilding.sqf
*/
if !(isNull _this) then{
EPOCH_oneWayTP = [player,_this,Epoch_personalToken];
publicVariableServer "EPOCH_oneWayTP";
[player,_this,Epoch_personalToken] remoteExec ["EPOCH_server_teleportPlayer",2];
};

View File

@ -13,8 +13,7 @@
https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_code/compile/EPOCH_LootIT.sqf
*/
if (!isNull _this) then {
EPOCH_lootContainer = [_this,player,Epoch_personalToken];
publicVariableServer "EPOCH_lootContainer";
[_this,player,Epoch_personalToken] remoteExec ["EPOCH_server_lootContainer",2];
if (typeof _this == "wardrobe_EPOCH") then {
if !(_this getVariable["MIRROR_SETUP", false]) then {

View File

@ -47,7 +47,6 @@ _bushesLootList = getArray(_config >> worldname >> "Bushes");
if (!isNull _object) then {
if (alive _object) then {
EPOCH_knockDownTree = [_object,_type,player,EPOCH_personalToken];
publicVariableServer "EPOCH_knockDownTree";
[_object,_type,player,EPOCH_personalToken] remoteExec ["EPOCH_server_knockDownTree",2];
};
};

View File

@ -166,8 +166,9 @@ switch _interactOption do {
if (_item call _removeItem) then {
player addMagazine "jerrycanE_epoch";
EPOCH_fillVehicle_PVS = [_vehicle,_newFuel,player,Epoch_personalToken];
publicVariableServer "EPOCH_fillVehicle_PVS";
// send
[_vehicle,_newFuel,player,Epoch_personalToken] remoteExec ["EPOCH_server_fillVehicle",2];
_dt = ["<t size='0.8' shadow='0' color='#99ffffff'>Fuel Added</t>", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;
};
};
@ -184,8 +185,7 @@ switch _interactOption do {
if (_newFuel > 0) then {
if (_item call _removeItem) then {
player addMagazine "jerrycan_epoch";
EPOCH_fillVehicle_PVS = [_vehicle,_newFuel,player,Epoch_personalToken];
publicVariableServer "EPOCH_fillVehicle_PVS";
[_vehicle,_newFuel,player,Epoch_personalToken] remoteExec ["EPOCH_server_fillVehicle",2];
_dt = ["<t size='0.8' shadow='0' color='#99ffffff'>Fuel Siphoned</t>", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;
};
} else {
@ -222,15 +222,13 @@ switch _interactOption do {
if (local _vehicle) then {
[_vehicle, [_currentHIT, _newDMG]] call EPOCH_client_repairVehicle;
} else {
EPOCH_repairVehicle_PVS = [_vehicle,[_currentHIT,_newDMG],player,Epoch_personalToken];
publicVariableServer "EPOCH_repairVehicle_PVS";
[_vehicle,[_currentHIT,_newDMG],player,Epoch_personalToken] remoteExec ["EPOCH_server_repairVehicle",2];
};
//diag_log format["DEBUG HITPOINT REPAIRED: %1 %2 %3", _currentHIT, _newDMG, _item];
} else {
if ((damage _vehicle) > 0) then {
EPOCH_repairVehicle_PVS = [_vehicle,["ALL",0],player,Epoch_personalToken];
publicVariableServer "EPOCH_repairVehicle_PVS";
[_vehicle,["ALL",0],player,Epoch_personalToken] remoteExec ["EPOCH_server_repairVehicle",2];
};
};
_dt = ["<t size='0.8' shadow='0' color='#99ffffff'>Vehicle Partially Repaired</t>", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;
@ -242,8 +240,7 @@ switch _interactOption do {
_vehicle = cursorTarget;
if (_vehicle in _vehicles) then {
if (_item call _removeItem) then {
EPOCH_repairVehicle_PVS = [_vehicle,["ALL",0],player,Epoch_personalToken];
publicVariableServer "EPOCH_repairVehicle_PVS";
[_vehicle,["ALL",0],player,Epoch_personalToken] remoteExec ["EPOCH_server_repairVehicle",2];
_dt = ["<t size='0.8' shadow='0' color='#99ffffff'>Vehicle Fully Repaired</t>", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;
};
};
@ -265,8 +262,7 @@ switch _interactOption do {
_paintCanIndex = getNumber(configfile >> "CfgMagazines" >> _item >> "textureIndex");
_paintCanColor = getText(configfile >> "CfgMagazines" >> _item >> "colorName");
EPOCH_PAINTBUILD = [_vehicle,_paintCanIndex,player,Epoch_personalToken];
publicVariableServer "EPOCH_PAINTBUILD";
[_vehicle,_paintCanIndex,player,Epoch_personalToken] remoteExec ["EPOCH_server_paintBUILD",2];
_msg = format["Wall Painted %1", _paintCanColor];
_dt = [format["<t size='0.8' shadow='0' color='#99ffffff'>%1</t>", _msg], 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;
@ -285,16 +281,14 @@ switch _interactOption do {
if (_vehicle in _vehicles) then {
if (damage _vehicle != 0) then {
if (_item call _removeItem) then {
EPOCH_repairVehicle_PVS = [_vehicle,["ALL",0],player,Epoch_personalToken];
publicVariableServer "EPOCH_repairVehicle_PVS";
[_vehicle,["ALL",0],player,Epoch_personalToken] remoteExec ["EPOCH_server_repairVehicle",2];
_dt = ["<t size = '0.8' shadow = '0' color = '#99ffffff'>Healed other player</t>", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;
};
};
} else {
if (damage player != 0) then {
if (_item call _removeItem) then {
EPOCH_repairVehicle_PVS = [player,["ALL",0],player,Epoch_personalToken];
publicVariableServer "EPOCH_repairVehicle_PVS";
[player,["ALL",0],player,Epoch_personalToken] remoteExec ["EPOCH_server_repairVehicle",2];
_dt = ["<t size = '0.8' shadow = '0' color = '#99ffffff'>Healed yourself</t>", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;
};
};

View File

@ -35,7 +35,7 @@ if (surfaceIsWater _currentPos) then {
_bobber = createVehicle ["Bobber_EPOCH",_currentPos, [], 0, "CAN_COLLIDE"];
EPOCH_TEMPOBJ_PVS = [_bobber];
publicVariableServer "EPOCH_TEMPOBJ_PVS";
EPOCH_TEMPOBJ_PVS remoteExec ["EPOCH_localCleanup",2];
_bobber setPosASL _currentPos;
_bobber setVariable ["EPOCH_bobberTime", diag_tickTime];

View File

@ -79,20 +79,17 @@ if (diag_tickTime - EPOCH_lastTrash > 2) then {
}forEach _objects;
if (!isNull _lootAnimalObj) then {
EPOCH_lootAnimal = [_lootAnimalObj, player, Epoch_personalToken];
_bloodPos = getPosATL _lootAnimalObj;
_blood = "BloodSplat" createVehicleLocal _bloodPos;
_blood setPosATL _bloodPos;
EPOCH_playerSoiled = (EPOCH_playerSoiled + 1) min 100;
publicVariableServer "EPOCH_lootAnimal";
// send
[_lootAnimalObj, player, Epoch_personalToken] remoteExec ["EPOCH_server_lootAnimal",2];
_return = true;
_dt = ["<t size='0.8' shadow='0' color='#99ffffff'>Object Looted</t>", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;
};
if (!isNull _destroyTrashObj) then {
EPOCH_destroyTrash = [_destroyTrashObj, _trashType, player, Epoch_personalToken];
// hint str EPOCH_destroyTrash;
publicVariableServer "EPOCH_destroyTrash";
[_destroyTrashObj, _trashType, player, Epoch_personalToken] remoteExec ["EPOCH_server_destroyTrash",2];
EPOCH_playerSoiled = (EPOCH_playerSoiled + 1) min 100;
_return = true;
_dt = ["<t size='0.8' shadow='0' color='#99ffffff'>Object Looted</t>", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;
@ -111,14 +108,14 @@ if (diag_tickTime - EPOCH_lastTrash > 2) then {
_animals pushBack _animal;
};
EPOCH_TEMPOBJ_PVS = _animals;
publicVariableServer "EPOCH_TEMPOBJ_PVS";
EPOCH_TEMPOBJ_PVS remoteExec ["EPOCH_localCleanup",2];
};
};
if (!isNull EPOCH_bankTerminal) then {
// make balance request
if (isNil "EPOCH_bankTransferActive") then {
EPOCH_storeCrypto_PVS = [player, [], Epoch_personalToken];
publicVariableServer "EPOCH_storeCrypto_PVS";
[player, [], Epoch_personalToken] remoteExec ["EPOCH_server_storeCrypto",2];
closeDialog 0;
createDialog "InteractBank";

View File

@ -53,8 +53,7 @@ if ((diag_tickTime - EPOCH_lastMineRocks) >= 2) then {
if (!isNull _object) then {
if (alive _object) then {
EPOCH_mineRocks_PVS = [_object, _foundIndex, player, Epoch_personalToken];
publicVariableServer "EPOCH_mineRocks_PVS";
[_object, _foundIndex, player, Epoch_personalToken] remoteExec ["EPOCH_server_mineRocks",2];
};
};
};

View File

@ -59,4 +59,4 @@ for "_i" from 0 to ((count _arrUnits)-1) do {
// cleanup units or (transfer ownership) if player logs out
EPOCH_TEMPOBJ_PVS = _units;
publicVariableServer "EPOCH_TEMPOBJ_PVS";
EPOCH_TEMPOBJ_PVS remoteExec ["EPOCH_localCleanup",2];

View File

@ -115,5 +115,5 @@ switch _unitClass do {
if !(isNull _unit) then {
EPOCH_TEMPOBJ_PVS = _unit;
publicVariableServer "EPOCH_TEMPOBJ_PVS";
EPOCH_TEMPOBJ_PVS remoteExec ["EPOCH_localCleanup",2];
};

View File

@ -76,9 +76,7 @@ if (!isNull _this) then {
// proceed to send save to server
} else {
if (_saveCheck) then {
EPOCH_SAVEBUILD = [_this, player, Epoch_personalToken];
publicVariableServer "EPOCH_SAVEBUILD";
//diag_log format["DEBUG SAVE: %1", _this];
[_this, player, Epoch_personalToken] remoteExec["EPOCH_server_saveBuilding", 2];
};
};
};

View File

@ -40,8 +40,7 @@ if (EPOCH_playerCrypto > 0) then {
EPOCH_maintainLockout = true;
EPOCH_MAINTBUILD = [_this, player, _maintainCount, Epoch_personalToken];
publicVariableServer "EPOCH_MAINTBUILD";
[_this, player, _maintainCount, Epoch_personalToken] remoteExec ["EPOCH_server_maintBUILD",2];
[_rnd,_maintainCount] spawn {
params ["_rnd","_maintainCount"];

View File

@ -82,8 +82,7 @@ if !(_buildingAllowed)exitWith{false};
_removeParts = getArray(('CfgBaseBuilding' call EPOCH_returnConfig) >> _objType >> "removeParts");
if !(_removeParts isEqualTo[]) then{
EPOCH_REMBUILD = [_this, player, Epoch_personalToken];
publicVariableServer "EPOCH_REMBUILD";
[_this, player, Epoch_personalToken] remoteExec ["EPOCH_server_removeBUILD",2];
_return = true;
_dt = ["<t size='0.8' shadow='0' color='#99ffffff'>Removed</t>", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;
};

View File

@ -72,8 +72,7 @@ if (isText(_config)) then {
_newObj setposATL (_worldspace select 0);
if (_textureSlot != 0) then {
EPOCH_PAINTBUILD = [_newObj, _textureSlot, player, Epoch_personalToken];
publicVariableServer "EPOCH_PAINTBUILD";
[_newObj, _textureSlot, player, Epoch_personalToken] remoteExec ["EPOCH_server_paintBUILD",2];
};
};
EP_velocityTransformation = [];

View File

@ -74,7 +74,7 @@ if (_class != "") then {
EPOCH_target = createVehicle[_class, _pos2, [], 0, "CAN_COLLIDE"];
EPOCH_TEMPOBJ_PVS = EPOCH_target;
publicVariableServer "EPOCH_TEMPOBJ_PVS";
EPOCH_TEMPOBJ_PVS remoteExec ["EPOCH_localCleanup",2];
if (_pos2 select 2 > _maxHeight) then {
_pos2 set[2, _maxHeight];

View File

@ -124,8 +124,7 @@ if (_object isKindOf "Constructions_static_F") then {
if (_canUpgradePartCount == _removedPartCount) then {
// send to server for upgrade
EPOCH_UPBUILD = [_object,player,Epoch_upgradeIndex,Epoch_personalToken];
publicVariableServer "EPOCH_UPBUILD";
[_object,player,Epoch_upgradeIndex,Epoch_personalToken] remoteExec ["EPOCH_server_upgradeBUILD",2];
Epoch_upgradeIndex = nil;
_return = true;
_dt = ["<t size='0.8' shadow='0' color='#99ffffff'>Upgraded</t>", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;

View File

@ -101,7 +101,7 @@ if !(isNull _this && alive _this) then {
_this say3D _soundEffect;
if (_soundEffectGlobal) then {
EPOCH_say3D_PVS = [player, _this, _soundEffectIndex, Epoch_personalToken];
publicVariableServer "EPOCH_say3D_PVS";
EPOCH_say3D_PVS remoteExec ["EPOCH_server_handle_say3D",2];
};
};
if (random 1 < _toxicChance) then {

View File

@ -51,7 +51,7 @@ if!(isNil "_animalPos") then {
// diag_log format["DEBUG: spawned %1", _randomAIClass];
EPOCH_TEMPOBJ_PVS = _animal;
publicVariableServer "EPOCH_TEMPOBJ_PVS";
EPOCH_TEMPOBJ_PVS remoteExec ["EPOCH_localCleanup",2];
{
_animal disableAI _x;

View File

@ -32,8 +32,7 @@ if (vehicle _unit != _unit) then {
_unit action["Eject", vehicle _unit];
};
EPOCH_deadPlayer_PVS = [player,_killer,toArray profileName,Epoch_personalToken];
publicVariableServer "EPOCH_deadPlayer_PVS";
[player,_killer,toArray profileName,Epoch_personalToken] remoteExec ["EPOCH_server_deadPlayer",2];
// disable build mode
EPOCH_buildMode = 0;

View File

@ -55,8 +55,7 @@ switch true do {
if ("Defib_EPOCH" in _attachments) then {
if (!alive _cursorTarget) then {
EPOCH_revivePlayer_PVS = [_cursorTarget,player,Epoch_personalToken];
publicVariableServer "EPOCH_revivePlayer_PVS";
[_cursorTarget,player,Epoch_personalToken] remoteExec ["EPOCH_server_revivePlayer",2];
};
};
} else {
@ -83,15 +82,13 @@ switch true do {
if (local _cursorTarget) then {
[_cursorTarget,[_currentHIT,_newDMG]] call EPOCH_client_repairVehicle;
} else {
EPOCH_repairVehicle_PVS = [_cursorTarget,[_currentHIT,_newDMG],player,Epoch_personalToken];
publicVariableServer "EPOCH_repairVehicle_PVS";
[_cursorTarget,[_currentHIT,_newDMG],player,Epoch_personalToken] remoteExec ["EPOCH_server_repairVehicle",2];
};
//diag_log format["DEBUG HITPOINT REPAIRED: %1 %2 %3", _currentHIT, _newDMG, _attachments];
} else {
if ((damage _cursorTarget) > 0) then {
EPOCH_repairVehicle_PVS = [_cursorTarget,["ALL",0],player,Epoch_personalToken];
publicVariableServer "EPOCH_repairVehicle_PVS";
[_cursorTarget,["ALL",0],player,Epoch_personalToken] remoteExec ["EPOCH_server_repairVehicle",2];
};
};
};

View File

@ -248,14 +248,12 @@ if (vehicle player == player) then {
if (isTouchingGround player && speed player > 10) then {
if ((primaryWeapon player != "") && (currentWeapon player == primaryWeapon player)) then {
player switchMove "AovrPercMrunSrasWrflDf";
EPOCH_switchMove_PVS = [player, 1, Epoch_personalToken];
publicVariableServer "EPOCH_switchMove_PVS";
[player, 1, Epoch_personalToken] remoteExec ["EPOCH_server_handle_switchMove",2];
_handled = true;
} else {
if (currentWeapon player == "") then {
player switchMove "epoch_unarmed_jump";
EPOCH_switchMove_PVS = [player, 2, Epoch_personalToken];
publicVariableServer "EPOCH_switchMove_PVS";
[player, 2, Epoch_personalToken] remoteExec ["EPOCH_server_handle_switchMove",2];
_handled = true;
};
};

View File

@ -10,7 +10,7 @@ _cage2 setVectorDirAndUp [[0,0,1],[0,1,0]];
_cage attachTo [_cage2,[0,1.3,0]];
EPOCH_TEMPOBJ_PVS = [_cage,_cage2];
publicVariableServer "EPOCH_TEMPOBJ_PVS";
EPOCH_TEMPOBJ_PVS remoteExec ["EPOCH_localCleanup",2];
_startCage = diag_tickTime;
@ -28,11 +28,10 @@ _sapper forcespeed 0;
if !(isNull _sapper) then {
EPOCH_TEMPOBJ_PVS = _sapper;
publicVariableServer "EPOCH_TEMPOBJ_PVS";
EPOCH_TEMPOBJ_PVS remoteExec ["EPOCH_localCleanup",2];
};
EPOCH_FillContainer_PVS = [player,Epoch_personalToken,objNull,false,25];
publicVariableServer "EPOCH_FillContainer_PVS";
[player,Epoch_personalToken,objNull,false,25] remoteExec ["EPOCH_server_fillContainer",2];
while {player distance _sapper < 100 && alive player} do {
@ -41,7 +40,7 @@ while {player distance _sapper < 100 && alive player} do {
_sound = _sounds select (floor (random (count _sounds)));
_sapper say3D _sound;
EPOCH_say3D_PVS = [player, _sapper,(EPOCH_sounds find _sound), Epoch_personalToken];
publicVariableServer "EPOCH_say3D_PVS";
EPOCH_say3D_PVS remoteExec ["EPOCH_server_handle_say3D",2];
};
uiSleep 0.5;
};

View File

@ -58,8 +58,7 @@ if (!isNull EPOCH_p2ptradeTarget) then {
}forEach _array;
if (_removeCount == count _array) then {
EPOCH_MAKETRADE = [player, EPOCH_p2ptradeTarget, _array, _tradeOffer, Epoch_personalToken];
publicVariableServer "EPOCH_MAKETRADE";
[player, EPOCH_p2ptradeTarget, _array, _tradeOffer, Epoch_personalToken] remoteExec ["EPOCH_server_makeTrade",2];
};
(findDisplay -1900) closeDisplay 1;

View File

@ -9,8 +9,8 @@ if (!isNull _otherPlyr) then {
// restict to only players not in vehicles
if (vehicle player == player && vehicle _otherPlyr == _otherPlyr) then {
EPOCH_MAKETRADEREQ = _this;
publicVariableServer "EPOCH_MAKETRADEREQ";
// send
_this remoteExec ["EPOCH_server_tradeRequest",2];
// target other player
EPOCH_p2ptradeTarget = _otherPlyr;

View File

@ -2,5 +2,5 @@
if !(_prevEquippedItem isEqualTo EPOCH_equippedItem_PVS) then {
_EPOCH_15 = _tickTime;
_prevEquippedItem = EPOCH_equippedItem_PVS;
publicVariableServer "EPOCH_equippedItem_PVS";
EPOCH_equippedItem_PVS remoteExec ["EPOCH_server_equippedItem",2];
};

View File

@ -6,9 +6,9 @@ if (isNil "EPOCH_bankTransferActive") then {
ctrlEnable[1600, false];
[] spawn {
[] spawn {
ctrlSetText[1004,"Transfer started."];
_deposit = parseNumber(ctrlText 1401) min EPOCH_playerCrypto;
_withdraw = parseNumber(ctrlText 1402) min EPOCH_bankBalance;
_transfer = parseNumber(ctrlText 1400) min EPOCH_bankBalance;
@ -16,7 +16,7 @@ if (isNil "EPOCH_bankTransferActive") then {
_totalTransfer = (_deposit + _withdraw) + _transfer;
_progress = 0;
uiSleep 1;
uiSleep 1;
_transferTarget = "";
if (_transfer > 0) then {
@ -37,8 +37,7 @@ if (isNil "EPOCH_bankTransferActive") then {
if (_progress >= 100) then {
// if player waited the full time then send upload
EPOCH_storeCrypto_PVS = [player, [_deposit, _withdraw, [_transfer, _transferTarget]], Epoch_personalToken];
publicVariableServer "EPOCH_storeCrypto_PVS";
[player, [_deposit, _withdraw, [_transfer, _transferTarget]], Epoch_personalToken] remoteExec ["EPOCH_server_storeCrypto",2];
ctrlSetText[1004, "Transfer complete."];
@ -53,4 +52,4 @@ if (isNil "EPOCH_bankTransferActive") then {
EPOCH_bankTransferActive = nil;
ctrlEnable[1600, true];
};
};
};

View File

@ -113,8 +113,7 @@ if (!isNull _this) then {
EPOCH_TRADE_STARTED = true;
// make trade
EPOCH_MAKENPCTRADE = [_this, _arrayIn, _arrayOut, player, Epoch_personalToken];
publicVariableServer "EPOCH_MAKENPCTRADE";
[_this, _arrayIn, _arrayOut, player, Epoch_personalToken] remoteExec ["EPOCH_server_makeNPCTrade",2];
// close menu
closeDialog 0;

View File

@ -3,23 +3,12 @@ if !(isNil "EPOCH_takeCryptoLock") exitWith {};
EPOCH_takeCryptoLock = true;
if (!isNull _this) then {
if ((typeof _this) == "Land_MPS_EPOCH") then {
_getCrypto = _this getVariable["Crypto", 0];
// deleteVehicle _this;
// EPOCH_playerCrypto = (EPOCH_playerCrypto + _getCrypto) min 25000;
EPOCH_takeCrypto_PVS = [player, Epoch_personalToken, _this];
publicVariableServer "EPOCH_takeCrypto_PVS";
[player, Epoch_personalToken, _this] remoteExec ["EPOCH_server_takeCrypto",2];
_dt = [format["<t size='0.8' shadow='0' color='#99ffffff'>You found %1 Krypto.</t>", _getCrypto], 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;
};
};
[] spawn{
uiSleep 2;
EPOCH_takeCryptoLock = nil;
};
};

View File

@ -30,7 +30,7 @@ class CfgMods
hidePicture = 0;
hideName = 0;
action = "http://www.epochmod.com";
version = "0.3.6.0";
version = "0.3.7.0";
majorVersion = 0.3; //MUST BE A NUMBER!; Change this if we release a new major version, don't change if we push just push a hotfix
ArmAVersion = 150;
overview = "Open world survival mod set in the year 2035, Just two years after the mass extinction of billions of people. Those that remain are left with remnants of a once technological society. Try to survive, build, or explore your way through the harsh dynamic environment.";
@ -41,20 +41,20 @@ class Epoch
class Version
{
//Version System, Check if PBO Version is compatible with Code
A3_epoch_assets = "0.3.6.0";
A3_epoch_assets_1 = "0.3.6.0";
epoch_objects = "0.3.6.0";
A3_epoch_assets_3 = "0.3.6.0";
A3_epoch_config = "0.3.6.0";
A3_epoch_language = "0.3.6.0";
Underground_Epoch = "0.3.6.0";
A3_epoch_vehicles = "0.3.6.0";
a3_epoch_weapons = "0.3.6.0";
a2_epoch_weapons = "0.3.6.0";
a3_epoch_structures = "0.3.6.0";
A3_epoch_functions = "0.3.6.0";
A3_epoch_vehicles_1 = "0.3.6.0";
Enhanced_Epoch_AiASupport = "0.3.6.0";
A3_epoch_assets = "0.3.7.0";
A3_epoch_assets_1 = "0.3.7.0";
epoch_objects = "0.3.7.0";
A3_epoch_assets_3 = "0.3.7.0";
A3_epoch_config = "0.3.7.0";
A3_epoch_language = "0.3.7.0";
Underground_Epoch = "0.3.7.0";
A3_epoch_vehicles = "0.3.7.0";
a3_epoch_weapons = "0.3.7.0";
a2_epoch_weapons = "0.3.7.0";
a3_epoch_structures = "0.3.7.0";
A3_epoch_functions = "0.3.7.0";
A3_epoch_vehicles_1 = "0.3.7.0";
Enhanced_Epoch_AiASupport = "0.3.7.0";
};
};

View File

@ -1,7 +1,7 @@
/*
The x and y coords of the child control are relative to the parent class, the height and width are not
If the height and / or width of the child control are greater than the parent control then scrollbars will be seen
This allows the creation of scrollable active text controls etc
The x and y coords of the child control are relative to the parent class, the height and width are not
If the height and / or width of the child control are greater than the parent control then scrollbars will be seen
This allows the creation of scrollable active text controls etc
The entire child class needs to be defined in the parents subclass class Controls {};
External parent classes:
@ -42,9 +42,9 @@ class Epoch_main_config_template: RscControlsGroup
class Epoch_main_config_changelog: Epoch_main_config_template
{
w = 0.425 * safezoneW;
//onLoad = "((findDisplay 49) displayCtrl 71000) htmlLoad 'x\addons\a3_epoch_code\gui\changelog.html';";
onLoad = "((findDisplay 49) displayCtrl 71000) htmlLoad 'https://raw.githubusercontent.com/epochmodteam/epoch/test/changelog.html';";
onLoad = "((findDisplay 49) displayCtrl 71000) htmlLoad 'x\addons\a3_epoch_code\gui\changelog.html';";
//onLoad = "((findDisplay 49) displayCtrl 71000) htmlLoad 'https://raw.githubusercontent.com/epochmodteam/epoch/test/changelog.html';";
class controls
{
class Epoch_main_config_html: RscHtml //https://community.bistudio.com/wiki/DialogControls-Text#CT_HTML.3D9
@ -63,7 +63,7 @@ class Epoch_main_config_changelog: Epoch_main_config_template
colorBold[] = {0.76,0.5,0.07,0.8};
colorLink[] = {1,1,1,0.75};
colorLinkActive[] = {1,1,1,1.0};
colorBackground[] = {0.2,0.2,0.2,1};
colorPicture[] = {1, 1, 1, 1};
@ -294,4 +294,4 @@ class EpochConfigKeyMap: RscControlsGroupNoScrollbars
onMouseButtonClick = "_this call Epoch_config_keymap;";
};
};
};
};

View File

@ -1470,7 +1470,6 @@ class InteractBank
y = 0.9;
w = 0.2375;
h = 0.08;
// action = "closeDialog 0; EPOCH_storeCrypto_PVS = [player,[parseNumber(ctrlText 1401),parseNumber(ctrlText 1402),[parseNumber(ctrlText 1400),(lbData [21500, (lbCurSel 21500)])]],Epoch_personalToken]; publicVariableServer 'EPOCH_storeCrypto_PVS'; ";
action = "call EPOCH_startBankTransfer;";
};
class RscEdit_deposit : RscEdit

View File

@ -9,8 +9,7 @@ _out = switch (typeName _in) do {
};
case "OBJECT":
{
EPOCH_lockStorage_PVS = [_in,(_in getVariable ["EPOCH_Locked",false]),player,Epoch_personalToken];
publicVariableServer "EPOCH_lockStorage_PVS";
[_in,(_in getVariable ["EPOCH_Locked",false]),player,Epoch_personalToken] remoteExec ["EPOCH_server_lockStorage",2];
true
};
default {false};

View File

@ -13,8 +13,7 @@ if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (Epoch_m
[_playerUID,_txt] spawn {
_ret = [_this select 1,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage;
if (_ret) then {
EPOCH_GROUP_Invite_PVS = [_this select 0,Epoch_my_GroupUID,Epoch_my_Group select 0,player,Epoch_personalToken];
publicVariableServer "EPOCH_GROUP_Invite_PVS";
[_this select 0,Epoch_my_GroupUID,Epoch_my_Group select 0,player,Epoch_personalToken] remoteExec ["EPOCH_server_invitePlayer",2];
};
};
};
@ -28,8 +27,7 @@ if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (Epoch_m
[_txt,_upgradePrice] spawn {
_ret = [_this select 0,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage;
if (_ret) then {
EPOCH_GROUP_Upgrade_PVS = [Epoch_my_GroupUID,player,Epoch_personalToken];
publicVariableServer "EPOCH_GROUP_Upgrade_PVS";
[Epoch_my_GroupUID,player,Epoch_personalToken] remoteExec ["EPOCH_server_upgradeGroup",2];
};
};
} else {
@ -40,4 +38,4 @@ if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (Epoch_m
true
} else {
false
};
};

View File

@ -13,10 +13,9 @@ if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (Epoch_m
[_playerUID,_txt] spawn {
_ret = [_this select 1,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage;
if (_ret) then {
EPOCH_GROUP_Player_PVS = [Epoch_my_GroupUID,_this select 0,false,false,player,Epoch_personalToken];
publicVariableServer "EPOCH_GROUP_Player_PVS";
[Epoch_my_GroupUID,_this select 0,false,false,player,Epoch_personalToken] remoteExec ["EPOCH_server_updatePlayerGroup",2];
};
};
};
};
};
};

View File

@ -7,8 +7,7 @@ if (getPlayerUID player == Epoch_my_GroupUID) then {
_txt spawn {
_ret = [_this,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage;
if (_ret) then {
EPOCH_GROUP_Delete_PVS = [player,Epoch_personalToken];
publicVariableServer "EPOCH_GROUP_Delete_PVS";
[player,Epoch_personalToken] remoteExec ["EPOCH_server_deleteGroup",2];
};
};
} else {
@ -16,8 +15,7 @@ if (getPlayerUID player == Epoch_my_GroupUID) then {
_txt spawn {
_ret = [_this,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage;
if (_ret) then {
EPOCH_GROUP_Player_PVS = [Epoch_my_GroupUID,getPlayerUID player,false,false,player,Epoch_personalToken];
publicVariableServer "EPOCH_GROUP_Player_PVS";
[Epoch_my_GroupUID,getPlayerUID player,false,false,player,Epoch_personalToken] remoteExec ["EPOCH_server_updatePlayerGroup",2];
};
};
};
};

View File

@ -15,8 +15,7 @@ if (getPlayerUID player == Epoch_my_GroupUID) then {
[_playerUID,_isMember,_txt] spawn {
_ret = [_this select 2,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage;
if (_ret) then {
EPOCH_GROUP_Player_PVS = [Epoch_my_GroupUID,_this select 0,true,_this select 1,player,Epoch_personalToken];
publicVariableServer "EPOCH_GROUP_Player_PVS";
[Epoch_my_GroupUID,_this select 0,true,_this select 1,player,Epoch_personalToken] remoteExec ["EPOCH_server_updatePlayerGroup",2];
};
};
};
@ -26,4 +25,4 @@ if (getPlayerUID player == Epoch_my_GroupUID) then {
true
} else {
false
};
};

View File

@ -13,14 +13,13 @@ if (count (_array-[32]) == 0) then { //32 = SPACE
_txtCtrl ctrlSetText _groupName;
_upgradePrice = parseNumber (EPOCH_group_upgrade_lvl select 1);
if ((EPOCH_playerCrypto-_upgradePrice) >= 0) then {
if ((EPOCH_playerCrypto-_upgradePrice) >= 0) then {
[_groupName,_upgradePrice] spawn {
_txt = format["Do you want to create your group called %1? You cannot change the group name later!",_this select 0];
_ret = [_txt,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage;
if (_ret) then {
EPOCH_GROUP_create_PVS = [player,_this select 0,Epoch_personalToken];
publicVariableServer "EPOCH_GROUP_create_PVS";
[player,_this select 0,Epoch_personalToken] remoteExec ["EPOCH_server_createGroup",2];
_timeout = diag_tickTime+10;
waitUntil {
((Epoch_my_GroupUID != "") && !(Epoch_my_Group isEqualTo [])) || ((_timeout - diag_tickTime) <= 0)

View File

@ -1,5 +1,4 @@
if (Epoch_invited_GroupUID != "") then {
EPOCH_GROUP_Player_PVS = [Epoch_invited_GroupUID,getPlayerUID player,true,false,player,Epoch_personalToken];
publicVariableServer "EPOCH_GROUP_Player_PVS";
[Epoch_invited_GroupUID,getPlayerUID player,true,false,player,Epoch_personalToken] remoteExec ["EPOCH_server_updatePlayerGroup",2];
};
(findDisplay -1500) closeDisplay 0;
(findDisplay -1500) closeDisplay 0;

View File

@ -16,14 +16,14 @@
class veh_lock
{
condition = "dyna_inVehicle && !dyna_lockedInVehicle";
action = "EPOCH_lockVehicle_PVS = [vehicle player, true, player, Epoch_personalToken]; publicVariableServer 'EPOCH_lockVehicle_PVS';";
action = "[vehicle player, true, player, Epoch_personalToken] remoteExec ['EPOCH_server_lockVehicle',2];";
icon = "x\addons\a3_epoch_code\Data\UI\buttons\pad_cannot_lock.paa";
tooltip = "Lock";
};
class veh_unLock
{
condition = "dyna_inVehicle && dyna_lockedInVehicle";
action = "EPOCH_lockVehicle_PVS = [vehicle player, false, player, Epoch_personalToken]; publicVariableServer 'EPOCH_lockVehicle_PVS';";
action = "[vehicle player, false, player, Epoch_personalToken] remoteExec ['EPOCH_server_lockVehicle',2];";
icon = "x\addons\a3_epoch_code\Data\UI\buttons\pad_can_unlock.paa";
tooltip = "Unlock";
};

View File

@ -49,14 +49,14 @@ class veh_gear
class veh_lock
{
condition = "dyna_isVehicle && !dyna_locked";
action = "EPOCH_lockVehicle_PVS = [dyna_cursorTarget, true, player, Epoch_personalToken]; publicVariableServer 'EPOCH_lockVehicle_PVS';";
action = "[dyna_cursorTarget, true, player, Epoch_personalToken] remoteExec ['EPOCH_server_lockVehicle',2];";
icon = "x\addons\a3_epoch_code\Data\UI\buttons\pad_cannot_lock.paa";
tooltip = "Lock";
};
class veh_unLock
{
condition = "dyna_isVehicle && dyna_locked";
action = "EPOCH_lockVehicle_PVS = [dyna_cursorTarget, false, player, Epoch_personalToken]; publicVariableServer 'EPOCH_lockVehicle_PVS';";
action = "[dyna_cursorTarget, false, player, Epoch_personalToken] remoteExec ['EPOCH_server_lockVehicle',2];";
icon = "x\addons\a3_epoch_code\Data\UI\buttons\pad_can_unlock.paa";
tooltip = "Unlock";
};
@ -119,14 +119,14 @@ class lock_safe
class pack_lockbox
{
condition = "(dyna_cursorTargetType in ['LockBox_EPOCH','LockBoxProxy_EPOCH']) && (dyna_cursorTarget getVariable ['EPOCH_Locked',false])";
action = "EPOCH_packStorage_PVS = [dyna_cursorTarget,player,Epoch_personalToken]; publicVariableServer 'EPOCH_packStorage_PVS';";
action = "[dyna_cursorTarget,player,Epoch_personalToken] remoteExec ['EPOCH_server_lockStorage',2];";
icon = "x\addons\a3_epoch_code\Data\UI\buttons\build_pack.paa";
tooltip = "Pack Lockbox";
};
class pack_safe
{
condition = "(dyna_cursorTargetType in ['Safe_EPOCH','SafeProxy_EPOCH']) && (dyna_cursorTarget getVariable ['EPOCH_Locked',false])";
action = "EPOCH_packStorage_PVS = [dyna_cursorTarget,player,Epoch_personalToken]; publicVariableServer 'EPOCH_packStorage_PVS';";
action = "[dyna_cursorTarget,player,Epoch_personalToken] remoteExec ['EPOCH_server_packStorage',2];";
icon = "x\addons\a3_epoch_code\Data\UI\buttons\build_pack.paa";
tooltip = "Pack Safe";
};

View File

@ -15,7 +15,7 @@
class CfgEpochClient
{
epochVersion = "0.3.6.0";
epochVersion = "0.3.7.0";
sapperRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = 1% - 55% if soiled (+ 2% if in city) chance to spawn sapper
droneRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = // 2% chance (+ 4% chance if in city) (1% - 2% Half if using silencer) to spawn drone if shot fired

View File

@ -34,7 +34,8 @@ class CfgGesturesMale
file = "";
looped = 1;
speed = 0.5;
relSpeedMin = 0.5;
static = 0;
relSpeedMin = 1;
relSpeedMax = 1;
soundEnabled = 0;
soundOverride = "";

View File

@ -386,11 +386,26 @@ class CfgMovesBasic
Binoculars = "";
FDStart = "";
Obstructed = "";
// Custom Start
GestureSwing0 = "";
GestureSwing1 = "";
GestureSwing2 = "";
GestureFinger = "";
SledgeSwing = "";
// Custom End
};
class Actions
{
class NoActions: ManActions
{
// Custom Start
GestureSwing0[] = {"GestureSwing0","Gesture"};
GestureSwing1[] = {"GestureSwing1","Gesture"};
GestureSwing2[] = {"GestureSwing2","Gesture"};
GestureFinger[] = {"GestureFinger","Gesture"};
SledgeSwing[] = {"SledgeSwing","Gesture"};
// Custom End
GestureLegPush[] = {"GestureLegPush","Gesture"};
GestureNod[] = {"GestureNod","Gesture"};
GestureAgonyCargo[] = {"GestureAgonyCargo","Gesture"};

View File

@ -0,0 +1,188 @@
/*
Author: Aaron Clark - EpochMod.com
Contributors:
Description:
RemoteExec whitelist for Epoch sandbox gamemode. This also blacklists default A3 remoteExec commands.
Licence:
Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike
Github:
https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_config/Configs/CfgRemoteExec.hpp
*/
class CfgRemoteExec
{
class Functions
{
mode = 1;
jip = 0;
class EPOCH_server_save_vehicles {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_saveBuilding {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_upgradeBUILD {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_removeBUILD {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_paintBUILD {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_maintBUILD {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_loadPlayer {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_checkPlayer {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_respawnPlayer {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_deadPlayer {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_destroyTrash {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_knockDownTree {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_mineRocks {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_lootAnimal {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_handle_say3D {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_handle_switchMove {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_upgradeGroup {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_updatePlayerGroup {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_createGroup {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_deleteGroup {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_invitePlayer {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_lootContainer {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_revivePlayer {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_storeCrypto {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_tradeRequest {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_makeTrade {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_makeNPCTrade {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_takeCrypto {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_repairVehicle {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_fillVehicle {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_lockVehicle {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_equippedItem {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_lockStorage {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_packStorage {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_packJack {
allowedTargets=2;
jip = 0;
};
class EPOCH_localCleanup {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_teleportPlayer {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_fillContainer {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_handle_sapperObjs {
allowedTargets=2;
jip = 0;
};
class EPOCH_Server_createAirDrop {
allowedTargets=2;
jip = 0;
};
class EPOCH_server_airDropCrate {
allowedTargets=2;
jip = 0;
};
};
class Commands {mode=0;};
};

View File

@ -1607,7 +1607,7 @@ class CfgVehicles
position = "Door_knopf";
radius = 3;
condition = "this animationPhase ""raise"" == 0";
statement = "EPOCH_packJack_PVS = [this,player,Epoch_personalToken]; publicVariableServer ""EPOCH_packJack_PVS"";";
statement = "[this,player,Epoch_personalToken] remoteExec ['EPOCH_server_packJack',2];";
};
};
@ -2820,7 +2820,7 @@ class CfgVehicles
position = "Door_knopf";
radius = 3;
condition = "this getVariable [""EPOCH_Locked"",true]";
statement = "EPOCH_lockStorage_PVS = [this,false,player,Epoch_personalToken]; publicVariableServer ""EPOCH_lockStorage_PVS"";";
statement = "[this,false,player,Epoch_personalToken] remoteExec ["EPOCH_server_lockStorage",2];";
};
class Pack
{
@ -2829,7 +2829,7 @@ class CfgVehicles
position = "Door_knopf";
radius = 3;
condition = "this getVariable [""EPOCH_Locked"",true]";
statement = "EPOCH_packStorage_PVS = [this,player,Epoch_personalToken]; publicVariableServer ""EPOCH_packStorage_PVS"";";
statement = "[this,player,Epoch_personalToken] remoteExec ["EPOCH_server_lockStorage",2];";
};
};
*/
@ -2863,7 +2863,7 @@ class CfgVehicles
position = "Door_knopf";
radius = 3;
condition = "(this getVariable[""EPOCH_secStorParent"", objNull]) getVariable [""EPOCH_Locked"",true]";
statement = "EPOCH_lockStorage_PVS = [this,false,player,Epoch_personalToken]; publicVariableServer ""EPOCH_lockStorage_PVS"";";
statement = "[this,false,player,Epoch_personalToken] remoteExec ["EPOCH_server_lockStorage",2];";
};
class Pack
@ -2873,7 +2873,7 @@ class CfgVehicles
position = "Door_knopf";
radius = 3;
condition = "(this getVariable[""EPOCH_secStorParent"", objNull]) getVariable [""EPOCH_Locked"",true]";
statement = "EPOCH_packStorage_PVS = [this,player,Epoch_personalToken]; publicVariableServer ""EPOCH_packStorage_PVS"";";
statement = "[this,player,Epoch_personalToken] remoteExec ["EPOCH_server_lockStorage",2];";
};
};

View File

@ -33,7 +33,7 @@ class CfgPatches
requiredAddons[] = { "a3_map_altis", "a3_map_stratis", "A3_epoch_assets_3", "a3_epoch_weapons", "epoch_objects", "A3_epoch_vehicles", "A3_epoch_assets_1", "A3_epoch_assets", "A3_Soft_F", "A3_Characters_F", "A3_Characters_F_Beta", "A3_Characters_F_EPA", "A3_Characters_F_EPB", "A3_Structures_F", "A3_Armor_F_Beta", "A3_Data_F", "A3_Weapons_F", "A3_Weapons_F_LongRangeRifles_M320", "A3_Weapons_F_LongRangeRifles_GM6","A3_Weapons_F_EBR", "A3_Weapons_F_EPA_LongRangeRifles_DMR_01", "A3_Weapons_F_Machineguns_M200", "A3_Weapons_F_Machineguns_Zafir", "A3_Weapons_F_Mark_LongRangeRifles_DMR_02", "A3_Weapons_F_Mark_LongRangeRifles_DMR_03", "A3_Weapons_F_Mark_LongRangeRifles_DMR_04", "A3_Weapons_F_Mark_LongRangeRifles_DMR_05", "A3_Weapons_F_Mark_LongRangeRifles_DMR_06","A3_Characters_F_Kart", "A3_Soft_F_Kart_Kart_01", "a2_epoch_weapons", "A3_Air_F_Gamma_UAV_01", "A3_Soft_F_Car", "A3_Soft_F_Heli_Car", "A3_Soft_F_Offroad_01", "A3_Soft_F_Quadbike", "A3_Soft_F_Heli_Quadbike", "A3_Soft_F_SUV", "A3_Soft_F_Heli_SUV", "A3_Boat_F_Boat_Transport_01", "A3_Soft_F_Truck", "A3_Soft_F_Heli_Truck", "A3_Soft_F_Bootcamp_Truck", "A3_Boat_F_Civilian_Boat", "A3_Air_F_Heli_Light_01", "A3_Air_F_Heli_Heli_Light_01", "A3_Air_F_Beta_Heli_Transport_01", "A3_Boat_F_SDV_01", "A3_Boat_F_Heli_SDV_01", "A3_Soft_F_MRAP_01", "A3_Soft_F_Heli_MRAP_01", "A3_Soft_F_HEMTT", "A3_Soft_F_Gamma_HEMTT", "A3_Soft_F_TruckHeavy", "A3_Soft_F_Gamma_TruckHeavy", "A3_Soft_F_EPC_Truck_03", "A3_Air_F_Heli_Light_02", "A3_Air_F_Beta_Heli_Transport_02", "A3_Air_F_EPB_Heli_Light_03", "A3_Air_F_Heli_Heli_Transport_04", "A3_Air_F_Heli_Heli_Transport_03", "A3_Animals_F_Dog", "A3_Animals_F_Rabbit", "A3_Animals_F_Chicken", "A3_Characters_F_Common", "A3_Structures_F_Ind_Transmitter_Tower", "a3_epoch_structures", "A3_Weapons_F_Ammoboxes" };
magazines[] = { "30Rnd_test_mag", "5Rnd_rollins_mag", "CSGAS", "sledge_swing", "30Rnd_test_mag_Tracer", "EnergyPack", "1Rnd_Soda", "1Rnd_Food", "WoodLog_EPOCH", "PaintCanBlk", "PaintCanBlu", "PaintCanBrn", "PaintCanGrn", "PaintCanOra", "PaintCanPur", "PaintCanRed", "PaintCanTeal", "PaintCanYel" };
ammo[] = { "B_EnergyPack", "B_Swing", "Sapper_Charge_Ammo", "SapperB_Charge_Ammo", "B_Soda", "B_Food", "B_Test_Caseless", "ChainSaw_Bullet", "SmokeShellCustom" };
epochVersion = "0.3.6.0";
epochVersion = "0.3.7.0";
};
};
@ -73,15 +73,11 @@ class WeaponCloudsMGun;
#include "\x\addons\a3_epoch_config\Configs\CfgMovesMaleSdr2.hpp"
#include "\x\addons\a3_epoch_config\Configs\CfgGesturesMale.hpp"
#include "\x\addons\a3_epoch_config\Configs\CfgMovesAnimal.hpp"
#include "\x\addons\a3_epoch_config\Configs\CfgSounds.hpp"
#include "\x\addons\a3_epoch_config\Configs\CfgCloudlets.hpp"
#include "\x\addons\a3_epoch_config\Configs\CfgVehicles.hpp"
#include "\x\addons\a3_epoch_config\Configs\CfgActions.hpp"
#include "\x\addons\a3_epoch_config\Configs\CfgRemoteExec.hpp"
//#include "\x\addons\a3_epoch_config\Configs\CfgInGameUI.hpp"
class Mode_SemiAuto;
@ -92,11 +88,8 @@ class CowsSlot;
class PointerSlot;
#include "\x\addons\a3_epoch_config\Configs\cfgRecoils.hpp"
#include "\x\addons\a3_epoch_config\Configs\CfgMagazines.hpp"
#include "\x\addons\a3_epoch_config\Configs\CfgAmmo.hpp"
#include "\x\addons\a3_epoch_config\Configs\CfgWeapons.hpp"
class CfgInventoryGlobalVariable

View File

@ -44,7 +44,7 @@ class cfgFunctions
};
class CfgServerVersion
{
client = "0.3.6.0";
config = "0.3.6.0";
client = "0.3.7.0";
config = "0.3.7.0";
hive = "0.5.1.7";
};

View File

@ -1,44 +1,49 @@
"EPOCH_SAVEBUILD" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_saveBuilding};
"EPOCH_UPBUILD" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_upgradeBUILD};
"EPOCH_REMBUILD" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_removeBUILD};
"EPOCH_PAINTBUILD" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_paintBUILD};
"EPOCH_MAINTBUILD" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_maintBUILD};
"EPOCH_selectedGender_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_loadPlayer};
"EPOCH_checkPlayer_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_checkPlayer};
"EPOCH_respawnPlayer_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_respawnPlayer};
// "EPOCH_S_S_VEHICLES" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_save_vehicles};
// "EPOCH_SAVEBUILD" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_saveBuilding};
// "EPOCH_UPBUILD" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_upgradeBUILD};
// "EPOCH_REMBUILD" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_removeBUILD};
// "EPOCH_PAINTBUILD" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_paintBUILD};
// "EPOCH_MAINTBUILD" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_maintBUILD};
// "EPOCH_selectedGender_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_loadPlayer};
// "EPOCH_checkPlayer_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_checkPlayer};
// "EPOCH_respawnPlayer_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_respawnPlayer};
// "EPOCH_S_S_VEHICLES" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_save_vehicles};
"EPOCH_pushPlayer_PVS" addPublicVariableEventHandler{if([_this select 1 select 0,_this select 1 select 2]call EPOCH_server_getPToken)then{(_this select 1)call EPOCH_server_savePlayer}};
"EPOCH_deadPlayer_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_deadPlayer};
"EPOCH_destroyTrash" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_destroyTrash};
"EPOCH_knockDownTree" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_knockDownTree};
"EPOCH_mineRocks_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_mineRocks};
"EPOCH_lootAnimal" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_lootAnimal};
"EPOCH_say3D_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_handle_say3D};
"EPOCH_switchMove_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_handle_switchMove};
"EPOCH_GROUP_Upgrade_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_upgradeGroup};
"EPOCH_GROUP_Player_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_updatePlayerGroup};
"EPOCH_GROUP_create_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_createGroup};
"EPOCH_GROUP_Delete_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_deleteGroup};
"EPOCH_GROUP_Invite_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_invitePlayer};
"EPOCH_lootContainer" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_lootContainer};
"EPOCH_revivePlayer_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_revivePlayer};
"EPOCH_storeCrypto_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_storeCrypto};
"EPOCH_MAKETRADEREQ" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_tradeRequest};
"EPOCH_MAKETRADE" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_makeTrade};
"EPOCH_MAKENPCTRADE" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_makeNPCTrade};
"EPOCH_takeCrypto_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_takeCrypto};
"EPOCH_repairVehicle_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_repairVehicle};
"EPOCH_fillVehicle_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_fillVehicle};
"EPOCH_lockVehicle_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_lockVehicle};
"EPOCH_equippedItem_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_equippedItem};
"EPOCH_lockStorage_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_lockStorage};
"EPOCH_packStorage_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_packStorage};
"EPOCH_packJack_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_packJack};
"EPOCH_TEMPOBJ_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_localCleanup};
"EPOCH_oneWayTP" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_teleportPlayer};
"EPOCH_FillContainer_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_fillContainer};
"EPOCH_SapperObjs_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_handle_sapperObjs};
"EPOCH_createAirDrop_PVS" addPublicVariableEventHandler{ (_this select 1)call EPOCH_Server_createAirDrop };
// "EPOCH_deadPlayer_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_deadPlayer};
// "EPOCH_destroyTrash" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_destroyTrash};
// "EPOCH_knockDownTree" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_knockDownTree};
// "EPOCH_mineRocks_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_mineRocks};
// "EPOCH_lootAnimal" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_lootAnimal};
// "EPOCH_say3D_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_handle_say3D};
// "EPOCH_switchMove_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_handle_switchMove};
// "EPOCH_GROUP_Upgrade_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_upgradeGroup};
// "EPOCH_GROUP_Player_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_updatePlayerGroup};
// "EPOCH_GROUP_create_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_createGroup};
// "EPOCH_GROUP_Delete_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_deleteGroup};
// "EPOCH_GROUP_Invite_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_invitePlayer};
// "EPOCH_lootContainer" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_lootContainer};
// "EPOCH_revivePlayer_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_revivePlayer};
// "EPOCH_storeCrypto_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_storeCrypto};
// "EPOCH_MAKETRADEREQ" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_tradeRequest};
// "EPOCH_MAKETRADE" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_makeTrade};
// "EPOCH_MAKENPCTRADE" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_makeNPCTrade};
// "EPOCH_takeCrypto_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_takeCrypto};
// "EPOCH_repairVehicle_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_repairVehicle};
// "EPOCH_fillVehicle_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_fillVehicle};
// "EPOCH_lockVehicle_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_lockVehicle};
// "EPOCH_equippedItem_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_equippedItem};
// "EPOCH_lockStorage_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_lockStorage};
// "EPOCH_packStorage_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_packStorage};
// "EPOCH_packJack_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_packJack};
// "EPOCH_TEMPOBJ_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_localCleanup};
// "EPOCH_oneWayTP" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_teleportPlayer};
// "EPOCH_FillContainer_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_fillContainer};
// "EPOCH_SapperObjs_PVS" addPublicVariableEventHandler{(_this select 1)call EPOCH_server_handle_sapperObjs};
// "EPOCH_createAirDrop_PVS" addPublicVariableEventHandler{ (_this select 1)call EPOCH_Server_createAirDrop };
"EPOCH_airDropCrate_PVS" addPublicVariableEventHandler{ (_this select 1)call EPOCH_server_airDropCrate };

View File

@ -20,7 +20,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = 0.1;
epochVersion = "0.3.6.0";
epochVersion = "0.3.7.0";
requiredAddons[] = {};
};
};

View File

@ -74,7 +74,7 @@ class CfgSecConf
checks[] = {"Fired","InventoryClosed","InventoryOpened","Killed","HandleDamage","HandleHeal","Dammaged","Hit","HitPart"};
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') 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;};};";
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;";
HandleDamage = "";
HandleHeal = "";

View File

@ -56,20 +56,6 @@ class cfgFunctions
};
};
class CfgRemoteExec
{
class Functions
{
mode = 1;
jip = 0;
class EPOCH_server_save_vehicles {
allowedTargets=2;
jip = 0;
};
};
class Commands {mode=0;};
};
class CfgEpochSapper
{
detonateDistMax = 8; //Random distance between 3m and this number at which sapper detonates. Min value = 4

View File

@ -56,21 +56,6 @@ class cfgFunctions
};
};
class CfgRemoteExec
{
class Functions
{
mode = 1;
jip = 0;
class EPOCH_server_save_vehicles {
allowedTargets=2;
jip = 0;
};
};
class Commands {mode=0;};
};
class CfgEpochSapper
{
detonateDistMax = 8; //Random distance between 3m and this number at which sapper detonates. Min value = 4

View File

@ -56,21 +56,6 @@ class cfgFunctions
};
};
class CfgRemoteExec
{
class Functions
{
mode = 1;
jip = 0;
class EPOCH_server_save_vehicles {
allowedTargets=2;
jip = 0;
};
};
class Commands {mode=0;};
};
class CfgEpochSapper
{
detonateDistMax = 8; //Random distance between 3m and this number at which sapper detonates. Min value = 4

View File

@ -56,21 +56,6 @@ class cfgFunctions
};
};
class CfgRemoteExec
{
class Functions
{
mode = 1;
jip = 0;
class EPOCH_server_save_vehicles {
allowedTargets=2;
jip = 0;
};
};
class Commands {mode=0;};
};
class CfgEpochSapper
{
detonateDistMax = 8; //Random distance between 3m and this number at which sapper detonates. Min value = 4

View File

@ -56,21 +56,6 @@ class cfgFunctions
};
};
class CfgRemoteExec
{
class Functions
{
mode = 1;
jip = 0;
class EPOCH_server_save_vehicles {
allowedTargets=2;
jip = 0;
};
};
class Commands {mode=0;};
};
class CfgEpochSapper
{
detonateDistMax = 8; //Random distance between 3m and this number at which sapper detonates. Min value = 4

View File

@ -56,21 +56,6 @@ class cfgFunctions
};
};
class CfgRemoteExec
{
class Functions
{
mode = 1;
jip = 0;
class EPOCH_server_save_vehicles {
allowedTargets=2;
jip = 0;
};
};
class Commands {mode=0;};
};
class CfgEpochSapper
{
detonateDistMax = 8; //Random distance between 3m and this number at which sapper detonates. Min value = 4

View File

@ -56,21 +56,6 @@ class cfgFunctions
};
};
class CfgRemoteExec
{
class Functions
{
mode = 1;
jip = 0;
class EPOCH_server_save_vehicles {
allowedTargets=2;
jip = 0;
};
};
class Commands {mode=0;};
};
class CfgEpochSapper
{
detonateDistMax = 8; //Random distance between 3m and this number at which sapper detonates. Min value = 4

View File

@ -56,21 +56,6 @@ class cfgFunctions
};
};
class CfgRemoteExec
{
class Functions
{
mode = 1;
jip = 0;
class EPOCH_server_save_vehicles {
allowedTargets=2;
jip = 0;
};
};
class Commands {mode=0;};
};
class CfgEpochSapper
{
detonateDistMax = 8; //Random distance between 3m and this number at which sapper detonates. Min value = 4

View File

@ -56,24 +56,9 @@ class cfgFunctions
};
};
class CfgRemoteExec
{
class Functions
{
mode = 1;
jip = 0;
class EPOCH_server_save_vehicles {
allowedTargets=2;
jip = 0;
};
};
class Commands {mode=0;};
};
class CfgEpochClient
{
epochVersion = "0.3.6.0";
epochVersion = "0.3.7.0";
sapperRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = 1% - 55% if soiled (+ 2% if in city) chance to spawn sapper
droneRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = // 2% chance (+ 4% chance if in city) (1% - 2% Half if using silencer) to spawn drone if shot fired