Merge pull request #584 from EpochModTeam/experimental

0.3.9 b570

Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf

@@ -27,9 +27,11 @@ params [["_unit",objNull,[objNull]], ["_killer",objNull,[objNull]]];
 
 _config = 'CfgEpochClient' call EPOCH_returnConfig;
 _playerDeathScreen = getText(_config >> "playerDeathScreen");
+_playerRevengeMinAliveTime = getNumber(_config >> "playerRevengeMinAliveTime");
 if (_playerDeathScreen isEqualTo "") then {_playerDeathScreen = "TapOut"};
 _tapDiag = _playerDeathScreen;
-_doRevenge = (getNumber(_config >> "playerDisableRevenge") isEqualTo 0);
+// diag_log format ["DEBUG: EPOCH_playerAliveTime %1",EPOCH_playerAliveTime];
+_doRevenge = ((getNumber(_config >> "playerDisableRevenge") isEqualTo 0) && EPOCH_playerAliveTime >= _playerRevengeMinAliveTime);
 
 // test ejecting unit from vehicle if dead client side
 if (vehicle _unit != _unit) then {
@@ -64,7 +66,7 @@ if (Epoch_canBeRevived) then {
 		if (playerRespawnTime <= 1) exitWith{ (findDisplay 46) closeDisplay 0; };
 		if (playerRespawnTime > 15 && !dialog) then {createDialog _tapDiag2;};
 		if (isObjectHidden player) then {closeDialog 2;};
-		if(player getVariable["EPOCH_doBoom",false])exitWith{player setVariable ["EPOCH_doBoom",nil];[player] call EPOCH_fnc_playerDeathDetonate;};
+		if(player getVariable["EPOCH_doBoom",false])exitWith{player setVariable ["EPOCH_doBoom",nil]; call EPOCH_fnc_playerDeathDetonate;};
 		if(player getVariable["EPOCH_doMorph",false])exitWith{player setVariable ["EPOCH_doMorph",nil];[selectRandom (getArray (getMissionConfig "CfgEpochClient" >> "deathMorphClass")),player,_killer2] call EPOCH_fnc_playerDeathMorph;};
 		uiSleep 0.1;
 	};

Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeathDetonate.sqf

@@ -20,17 +20,21 @@
 	Returns:
 	BOOM
 */
-params ["_player"];
 openmap [false,false];
 closeDialog 2;
-[_player, Epoch_personalToken] remoteExec ["EPOCH_server_deadPlayerDetonate",2];
-deleteVehicle player;
-player setVariable ["doneBoom", true];
-
 [] spawn{
+	// todo: add paricle effect here.
+
+	// random delay of up to 30 seconds,
+	uisleep (random 25) + 5;
+
+	[player, Epoch_personalToken] remoteExec ["EPOCH_server_deadPlayerDetonate",2];
+	deleteVehicle player;
+	player setVariable ["doneBoom", true];
+
 	while {!alive player} do {
 	//Handle clean up
 		if(player getVariable["doneBoom",false])exitWith{player setVariable ["doneBoom",nil]; uiSleep 5; (findDisplay 46) closeDisplay 0;};
 		uiSleep 0.1;
 	};
-};
+};

Sources/epoch_config/Configs/CfgEpochClient.hpp

@@ -34,7 +34,7 @@ class CfgEpochClient
 	EPOCH_news[] = {"Word is that Sappers have a new boss.","Dogs will often lure them monsters away.","My dog was blown up. I miss him.."};
 	deathMorphClass[] = {"Epoch_Sapper_F","Epoch_SapperB_F","I_UAV_01_F","Epoch_Cloak_F"};//Random selection of these classes when player morphs after death. Currently available: Epoch_Cloak_F, Epoch_SapperB_F, Epoch_Sapper_F, I_UAV_01_F
 	niteLight[] = {1.88,22};//Set ambient lighting at night: {Brightness of light,Height of light}. Default (Low Ambient): {1.88,22} | Twilight: {7.2,88} | Distant: {12.8,142}
-	ryanZombiesEnabled = false; // disabled by default
+	ryanZombiesEnabled = true; // enabled by default, false to disable
 	antagonistSpawnIndex[] = {
 		{"Epoch_Cloak_F", 1}, // {"type", limit}
 		{"GreatWhite_F", 2},
@@ -103,6 +103,7 @@ class CfgEpochClient
 	playerDeathScreen = "TapOut";
 	playerKilledScreen = "TapOut2";
 	playerDisableRevenge = 0; // 0 = invoke playerKilledScreen when killed by another player, 1 = disable.
+	playerRevengeMinAliveTime = 900; // time in seconds player must be alive before Revenge option is available.
 
 	// include configs
     #include "CfgEpochClient\Altis.hpp"

Sources/epoch_config/build.hpp

@@ -1 +1 @@
-build=566;
+build=570;

Sources/epoch_config/sandbox_config.hpp

@@ -13,7 +13,7 @@
 author = "Epoch Mod Team";
 class Header
 {
- gameType = Survival;
+ gameType = Survive;
  minPlayers = 1;
  maxPlayers = 100;
 };

Sources/epoch_server/build.hpp

@@ -1 +1 @@
-build=566;
+build=570;

Sources/epoch_server_core/build.hpp

@@ -1 +1 @@
-build=566;
+build=570;

Sources/epoch_server_settings/build.hpp

@@ -1 +1 @@
-build=566;
+build=570;

build.txt

@@ -1 +1 @@
-566
+570