Merge pull request #439 from EpochModTeam/experimental

Release 0.3.5.055

Changelogs/0.3.5.0.txt

@@ -32,3 +32,9 @@
 [Fixed] EPOCH_fnc_returnConfigEntry and V2 functions did not use defaults properly.
 [Info] Server pack Tools folder now contains InstalEpoch.cmd that is an updated version of the command line download Epoch client files download script for steam workshop.
 [Info] Removed old .bikey and added new one for 0350.
+
+Build 052-055
+[Fixed] Typo in server side AH event handler code and repacked a3_server_settings.pbo.
+[Fixed] Storage was incorrectly set to set damage to 99% instead of 1% to temp force maintenance option after restart.
+[Fixed] Add player objects to remains collector, this should allow for proper corpse cleanup.
+[Changed] Disable simulation of locked storage devices. This also prevents removal of items until device is unlocked/re-simulated.

Sources/epoch_config/Configs/CfgEpochClient/Esseker.hpp

@@ -51,7 +51,7 @@ class Esseker {
 		"water_source_f.p3d",
 		"kasna_new.p3d"
 	};
-	// main config 
+	// main config
 	TrashClasses[] = { "Trash", "TrashSmall", "TrashVehicle", "PumpkinPatch", "TrashFood" };
 
 	TrashSmall[] = {
@@ -60,7 +60,7 @@ class Esseker {
 	};
 	PumpkinPatch[] = {
 		"p_pumpkin_summer.p3d",
-		"pumpkin.p3d",
+		"pumpkin.p3d"
 	};
 	TrashFood[] = {
 	};
@@ -158,4 +158,4 @@ class Esseker {
 		"uaz_wrecked.p3d",
 		"ural_wrecked.p3d"
 	};
-};
+};

Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf

@@ -123,9 +123,10 @@ if (typename _this == "ARRAY") then {
 			};
 
 			_newPlyr = _group createUnit[_class, _location, [], 0, "CAN_COLLIDE"];
-
 			if !(isNull _newPlyr) then {
 
+				addToRemainsCollector[_newPlyr];
+
 				//diag_log format ["DEBUG Created New Player: %1", _newPlyr];
 				{
 					_newPlyr disableAI _x;

Sources/epoch_server/compile/epoch_player/EPOCH_server_revivePlayer.sqf

@@ -90,6 +90,8 @@ if (!local _plyr) then {
 
 				_newPlyr = _group createUnit[_class, _location, [], 0, "CAN_COLLIDE"];
 
+				addToRemainsCollector[_newPlyr];
+
 				_newPlyr allowDammage false;
 				{
 					_newPlyr disableAI _x;

Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf

@@ -72,7 +72,7 @@ for "_i" from 1 to _this do {
 			};
 
 			// temp set damage to mark for maint
-			_vehicle setDamage 0.99;
+			_vehicle setDamage 0.01;
 
 			_vehicle setposATL _location;
 
@@ -109,6 +109,7 @@ for "_i" from 1 to _this do {
 					// set locked state of secure storage
 					if ((_arr select 6) != -1) then {
 						_vehicle setVariable["EPOCH_Locked", true, true];
+						_vehicle enableSimulationGlobal false;
 					};
 				};
 			};

Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_lockStorage.sqf

@@ -16,9 +16,11 @@ _fnc_lock = {
 	_this setVariable ["EPOCH_Locked", true, true];
 	// force save on lock
 	if !(_this in EPOCH_saveStorQueue) then { EPOCH_saveStorQueue pushBack _this };
+	_this enableSimulationGlobal false;
 };
 _fnc_unlock = {
 	_this setVariable ["EPOCH_Locked", false, true];
+	_this enableSimulationGlobal true;
 };
 // functions
 

Sources/epoch_server_settings/configs/security/security_checks.h

@@ -64,7 +64,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; (locked (_this select 1) in [2, 3] || (_this select 1) getVariable['EPOCH_Locked', false])";
+        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 5);};(locked _container in [2, 3] || _container getVariable['EPOCH_Locked', false] || _lockedNear)";
         Killed          = "_this call EPOCH_fnc_playerDeath;";
         HandleDamage    = "";
         HandleHeal      = "";