Epoch Survival 0.4 b628

Changelogs/0.4.0.0.txt

@@ -1,5 +1,6 @@
 [New] Dynamic and extensible inventory sub menu system for item interaction and crafting options. (Double click item in your inventory)
 [Added] Vehicle immunity when a vehicle is left locked inside a player owned base (within jammer range) at server startup. Thanks to @morgoth0 for the feedback!
+[Changed] Stamina loss when player jumps.
 [Changed] Inventory Armor stats feature now dynamic and no longer forced via config.
 [Changed] Group menu and group requests options are now found options on the self action menu. (SPACE BAR)
 [Changed] Wardrobe mirror now works in single player.
@@ -13,6 +14,7 @@
 [Fixed] Fireplace position incorrectly shifted down after lighting fireplace. Thanks for the report by @Ignatz-HeMan #592
 [Fixed] Increased anti-teleport range that should hopefully allow for proper HALO spawning.
 [Fixed] Typos in Battleye script.txt that caused the filter not to function properly.
+[Fixed] Trailing commas in mission addons array. Thanks to a RP from @SPKcoding (aka $p4rky on EpochMod.com Forum)
 
 Known Issues:
 Jetski and Electric Motorcycle motorcycle in-vehicle HUD will not initialize if player is spawned inside vehicle, as display getin EH did not fire.

Server_Install_Pack/sc/BattlEye/scripts.txt

@@ -32,7 +32,7 @@
 7 createGroup !="EPOCH_server_createGroup" !="_grp = createGroup RESISTANCE;" !="if (isserver) then {\n_group = creategroup sidelogic;" !="grpVIPGeneral = createGroup RESISTANCE;" !="_grp = createGroup side _plyr;" !="_grp = createGroup side player;" !="_grp = createGroup _side;" !="_grp = createGroup (side _plyr);" !="createcenter sidelogic;\n_grpLogic = creategroup sidelogic;\nbis_functions_mainscope" !="_group = creategroup west;"
 7 createVehicleCrew !="createvehiclecrew _x;"
 7 createVehicleLocal !="\"#particlesource\" createVehicleLocal" !="\"#lightpoint\" createVehicleLocal" !="\"BloodSplat\" createVehicleLocal" !="[\"lightning1_F\", \"lightning2_F\"] call BIS_fnc_selectRandom;\n_lighting = _class createVehicleLocal" !="SLX_XEH_DUMMY createVehicleLocal [0, 0, 0];" !="CBA_eventHandlers = \"Logic\" createVehicleLocal [0, 0];"
-7 createUnit !="_unit = _grp createUnit[(_arrUnits select _i), _pos, [], 0, \"FORM\"];" !="_driver = _grp createUnit[\"I_UAV_AI\", position _unit, [], 0, \"CAN_COLLIDE\"];" !="axeGeneral = grpVIPGeneral createUnit [\"I_officer_F\", axeGeneralPos, [], 1, \"CAN_COLLIDE\"];" !="bis_functions_mainscope = _grpLogic createunit [\"Logic\",[9,9,9],[],0,\"none\"];"
+7 createUnit !="_driver = _grp createUnit[\"I_UAV_AI\", position _unit, [], 0, \"CAN_COLLIDE\"];" !="axeGeneral = grpVIPGeneral createUnit [\"I_officer_F\", axeGeneralPos, [], 1, \"CAN_COLLIDE\"];" !="bis_functions_mainscope = _grpLogic createunit [\"Logic\",[9,9,9],[],0,\"none\"];" !="_unit = _grp createUnit[selectRandom _arrUnits, _pos, [], 0, \"FORM\"];"
 7 createAgent !="bis_revive_ratioLethal = createAgent [\"Logic\", [10,10,0], [], 0, \"CAN_COLLIDE\"];" !="_unit = createAgent[_unitClass, _targetPos, [], 256, \"FORM\"];" !="_unit = createAgent [_unitClass, _targetPos, [], 120, \"FORM\"];" !="_animal = createAgent[_randomAIClass, _animalPos, [], 5, \"NONE\"];" !="_unit = createAgent [\"Epoch_Cloak_F\", _pos, [], 0, \"CAN_COLLIDE\"];" !="_unit = createAgent [\"Epoch_Sapper_F\", _targetPos, [], 180, \"FORM\"];" !="_sapper = createAgent [\"Epoch_Sapper_F\", getPos _cage2, [], 0, \"FORM\"];" !="_unit = createAgent[_unitClass, position player, [], _zRange, \"FORM\"];" !="_animal = createAgent[_randomAIClass, _animalPos, [], 0, \"CAN_COLLIDE\"];"
 7 createTeam
 7 createDialog !="createDialog \"rmx_dynamenu\";" !="createDialog \"rmx_craftingUI\";" !="createDialog \"QuickUpgrade\";" !="createDialog \"QuickTake\";" !="createDialog \"InteractBank\";" !="createdialog \"SelectGender\";" !="_handled = createdialog _dialog;" !="if !(createdialog \"InteractItem\") exitWith {};" !="createDialog _tapDiag;" !="if !(createdialog \"Trade\") exitWith {};" !="_ok = createdialog \"Interact\";" !="_ok = createdialog \"TradeNPCMenu\";" !="createDialog \"Epoch_myGroup\";" !="createDialog (if ((Epoch_my_GroupUID == \"\") && (Epoch_my_Group isEqualTo [])) then {\"EPOCH_createGrp\"} else {\"Epoch_myGroup\"});" !="createDialog \"GroupRequests\";" !="_ok = createdialog \"MissionSelect\";" !="createDialog 'Skaronator_AdminMenu';"
@@ -47,9 +47,9 @@
 7 displaySetEventHandler
 7 ctrlSetEventHandler !="_ctrlButtonOK ctrlseteventhandler [\"buttonclick\"," !="ctrlSetEventHandler ['LBDblClick', '_this call" !="_buttonRespawn ctrlseteventhandler [\"buttonclick\",\"with uinamespace do {['buttonRespawn'," !="_ctrl ctrlSetEventHandler [\"mouseEnter\"" !="_ctrlBtn ctrlSetEventHandler [\"MouseButtonDblClick\", _verAct];" !="_button_gen ctrlSetEventHandler [\"ButtonClick\",_btn_code + \"(uiNamespace getVariable [\""
 7 addMPEventHandler
-7 addEventHandler !"displayAddEventHandler" !"ctrlAddEventHandler" !="player addeventhandler [\"PostReset\",{BIS_EnginePPReset = true;} ];" !="player addEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !="\"CBA_fnc_addEventHandler\"" !="\\fnc_addEventHandler" !="\"addEventHandler" !="_eventFunc = _eventFunc + \"(_this select 0) addEventHandler ['Respawn', \" + str _eventFunc + \"];\";" !="_unit addEventHandler [\"hitpart\"," !="CBA_fnc_addEventHandler" !="_ship addEventHandler [\"AttributesChanged3DEN\"" !="addEventHandler [\"HandleDamage\",bis_fnc_reviveOnPlayerHandleDamage];"
+7 addEventHandler !"displayAddEventHandler" !"ctrlAddEventHandler" !="player addeventhandler [\"PostReset\",{BIS_EnginePPReset = true;} ];" !="player addEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !="\"CBA_fnc_addEventHandler\"" !="\\fnc_addEventHandler" !="\"addEventHandler" !="_eventFunc = _eventFunc + \"(_this select 0) addEventHandler ['Respawn', \" + str _eventFunc + \"];\";" !="_unit addEventHandler [\"hitpart\"," !="CBA_fnc_addEventHandler" !="_ship addEventHandler [\"AttributesChanged3DEN\"" !="addEventHandler [\"HandleDamage\",bis_fnc_reviveOnPlayerHandleDamage];" !="_unit addEventHandler [\"FiredNear\", \"sapperHndl setFSMVariable"
 7 displayAddEventHandler !="(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"true\"];" !="displayAddEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !="_display displayaddeventhandler\n[\n\"mousemoving\"," !="_display displayaddeventhandler [\"unload\",\"uinamespace setvariable ['BIS_fnc_guiMess" !="findDisplay -1337 displayAddEventHandler ['Unload'" !="_display displayaddeventhandler [\"keydown\",\"with uinamespace do {['keyDown'" !="_display displayaddeventhandler [_x,_fnc_animate];" !="Development\") then\n{\n_display displayaddeventhandler [\n\"keydown\"" !="CBA_fnc_addDisplayHandler" !="_display displayAddEventHandler [\"MouseMoving" !="private _handler = _display displayAddEventHandler [_key, _code];"
-7 ctrlAddEventHandler !="_control = _display displayctrl 2406; \n_control ctrladdeventhandler [\"buttonclick\"," !="_control = _display displayctrl 2400;\n_control ctrladdeventhandler [\"buttonclick\"," !="_ctrlTags ctrladdeventhandler [\"lbselchanged\"," !="_ButtonGeneral ctrladdeventhandler [\"buttonclick\"," !="_ctrlExecuteLocal ctrladdeventhandler [\"buttonclick\"," !="_bg ctrlAddEventHandler [\"MouseEnter\"," !="_container ctrlAddEventHandler [\"LBDblClick\",\"_this call EPOCH_itemInteractClick\"];" !="(uiNamespace getVariable 'ESP_map') ctrlAddEventHandler['Draw', '_esp_targets = EPOCH_ESPMAP_TARGETS;" !="ctrlAddEventHandler ['MouseButtonDown'" !="(_display displayctrl _idc) ctrlAddEventHandler [\"LBSelChanged\"," !="_ctrl ctrlSetEventHandler [\"mouseEnter\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseExit\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseButtonDown\", (format [\"call %1;\",(_buttonSettings select _e select 2)])];" !="_prevButton ctrlAddEventHandler [\"MouseButtonUp\", {_this call cba_diagnostic_fnc_debug" !="BIS_RscRespawnControlsMap_ctrlHeaderRespawnButton ctrlAddEventhandler [\"ButtonDown\""
+7 ctrlAddEventHandler !="_display displayctrl 	21995;\n_assetsButton ctrladdeventhandler [\"buttonclick\"," !="_display displayctrl 2406; \n_control ctrladdeventhandler [\"buttonclick\"," !="_display displayctrl 2400;\n_control ctrladdeventhandler [\"buttonclick\"," !="_ctrlTags ctrladdeventhandler [\"lbselchanged\"," !="_ButtonGeneral ctrladdeventhandler [\"buttonclick\"," !="_ctrlExecuteLocal ctrladdeventhandler [\"buttonclick\"," !="_bg ctrlAddEventHandler [\"MouseEnter\"," !="_container ctrlAddEventHandler [\"LBDblClick\",\"_this call EPOCH_itemInteractClick\"];" !="(uiNamespace getVariable 'ESP_map') ctrlAddEventHandler['Draw', '_esp_targets = EPOCH_ESPMAP_TARGETS;" !="ctrlAddEventHandler ['MouseButtonDown'" !="(_display displayctrl _idc) ctrlAddEventHandler [\"LBSelChanged\"," !="_ctrl ctrlSetEventHandler [\"mouseEnter\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseExit\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseButtonDown\", (format [\"call %1;\",(_buttonSettings select _e select 2)])];" !="_prevButton ctrlAddEventHandler [\"MouseButtonUp\", {_this call cba_diagnostic_fnc_debug" !="BIS_RscRespawnControlsMap_ctrlHeaderRespawnButton ctrlAddEventhandler [\"ButtonDown\""
 7 removeAllEventHandlers !"ctrlRemoveAllEventHandlers" !"displayRemoveAllEventHandlers" !="_vehicle removeAllEventHandlers \"GetOut\";" !="_sapper removeAllEventHandlers \"Hit\";\n_sapper removeAllEventHandlers \"FiredNear\";" !="_unit removeAllEventHandlers \"Hit\";\n_unit removeAllEventHandlers \"FiredNear\";" !="{_ship removeAllEventHandlers _x;} forEach [\"AttributesChanged3DEN\"" !="_zombie removeAllEventHandlers \"Hit\";" !="_zombie removeAllEventHandlers \"FiredNear\";"
 7 displayRemoveAllEventHandlers !="_display displayRemoveAllEventHandlers _x;" !="if !(isMultiplayer) then { { (findDisplay 46) displayRemoveAllEventHandlers _x } forEach [\"KeyUp\", \"KeyDown\"] };"
 7 removeAllMissionEventHandlers

Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf

@@ -218,11 +218,13 @@ if (vehicle player == player) then {
 					if ((primaryWeapon player != "") && (currentWeapon player == primaryWeapon player)) then {
 						player switchMove "AovrPercMrunSrasWrflDf";
 						[player, "AovrPercMrunSrasWrflDf", Epoch_personalToken] remoteExec ["EPOCH_server_handle_switchMove",2];
+                        EPOCH_playerStamina = (EPOCH_playerStamina - 30) max 0;
 						_handled = true;
 					} else {
 						if (currentWeapon player == "") then {
 							player switchMove "epoch_unarmed_jump";
 							[player, "epoch_unarmed_jump", Epoch_personalToken] remoteExec ["EPOCH_server_handle_switchMove",2];
+                            EPOCH_playerStamina = (EPOCH_playerStamina - 30) max 0;
 							_handled = true;
 						};
 					};

Sources/epoch_config/build.hpp

@@ -1 +1 @@
-build=626;
+build=628;

Sources/epoch_server/build.hpp

@@ -1 +1 @@
-build=625;
+build=628;

Sources/epoch_server_core/build.hpp

@@ -1 +1 @@
-build=625;
+build=628;

Sources/epoch_server_settings/build.hpp

@@ -1 +1 @@
-build=625;
+build=628;

Sources/mpmissions/epoch.Altis/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"a3_map_altis",
+	"a3_map_altis"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Australia/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"australia",
+	"australia"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Bootcamp_ACR/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_bootcamp_acr_config",
+	"cup_bootcamp_acr_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Bornholm/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"bornholm",
+	"bornholm"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Chernarus/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_chernarus_config",
+	"cup_chernarus_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Chernarus_Summer/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_chernarus_summer_config",
+	"cup_chernarus_summer_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Desert_E/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_desert_e_config",
+	"cup_desert_e_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Esseker/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"esseker",
+	"esseker"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Mountains_ACR/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_afghan_config",
+	"cup_afghan_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Porto/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_desert2_config",
+	"cup_desert2_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.ProvingGrounds_PMC/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_provinggrounds_pmc_config",
+	"cup_provinggrounds_pmc_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Sara/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_sara_config",
+	"cup_sara_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.SaraLite/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_saralite_config",
+	"cup_saralite_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Sara_dbe1/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_sara_dbe1_config",
+	"cup_sara_dbe1_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Shapur_BAF/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_shapur_baf_config",
+	"cup_shapur_baf_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Stratis/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"a3_map_stratis",
+	"a3_map_stratis"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Takistan/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_takistan_config",
+	"cup_takistan_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.VR/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"map_vr",
+	"map_vr"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Woodland_ACR/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_bohemia_config",
+	"cup_bohemia_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.Zargabad/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_zargabad_config",
+	"cup_zargabad_config"
 };
 randomSeed=12032465;
 class ScenarioData

Sources/mpmissions/epoch.utes/mission.sqm

@@ -22,7 +22,7 @@ binarizationWanted=0;
 addons[]=
 {
 	"A3_epoch_config",
-	"cup_utes_config",
+	"cup_utes_config"
 };
 randomSeed=12032465;
 class ScenarioData

build.txt

@@ -1 +1 @@
-626
+628