Permalink
Browse files

Merge pull request #584 from EpochModTeam/experimental

0.3.9 b570
  • Loading branch information...
2 parents 654927b + 792e2d9 commit dcfc352e717e9cfe8121e400e7d9de1387a85a69 @vbawol vbawol committed on GitHub Jul 12, 2016
Showing with 22 additions and 15 deletions.
  1. BIN Server_Install_Pack/@epochhive/addons/epoch_server.pbo
  2. BIN Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo
  3. BIN Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo
  4. BIN Server_Install_Pack/mpmissions/epoch.Altis.pbo
  5. BIN Server_Install_Pack/mpmissions/epoch.Australia.pbo
  6. BIN Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo
  7. BIN Server_Install_Pack/mpmissions/epoch.Bornholm.pbo
  8. BIN Server_Install_Pack/mpmissions/epoch.Chernarus.pbo
  9. BIN Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo
  10. BIN Server_Install_Pack/mpmissions/epoch.Desert_E.pbo
  11. BIN Server_Install_Pack/mpmissions/epoch.Esseker.pbo
  12. BIN Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo
  13. BIN Server_Install_Pack/mpmissions/epoch.Napf.pbo
  14. BIN Server_Install_Pack/mpmissions/epoch.Porto.pbo
  15. BIN Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo
  16. BIN Server_Install_Pack/mpmissions/epoch.Sara.pbo
  17. BIN Server_Install_Pack/mpmissions/epoch.SaraLite.pbo
  18. BIN Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo
  19. BIN Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo
  20. BIN Server_Install_Pack/mpmissions/epoch.Stratis.pbo
  21. BIN Server_Install_Pack/mpmissions/epoch.Takistan.pbo
  22. BIN Server_Install_Pack/mpmissions/epoch.Tanoa.pbo
  23. BIN Server_Install_Pack/mpmissions/epoch.VR.pbo
  24. BIN Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo
  25. BIN Server_Install_Pack/mpmissions/epoch.Zargabad.pbo
  26. BIN Server_Install_Pack/mpmissions/epoch.utes.pbo
  27. +4 −2 Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf
  28. +10 −6 Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeathDetonate.sqf
  29. +2 −1 Sources/epoch_config/Configs/CfgEpochClient.hpp
  30. +1 −1 Sources/epoch_config/build.hpp
  31. +1 −1 Sources/epoch_config/sandbox_config.hpp
  32. +1 −1 Sources/epoch_server/build.hpp
  33. BIN Sources/epoch_server/treeView.txt
  34. +1 −1 Sources/epoch_server_core/build.hpp
  35. BIN Sources/epoch_server_core/treeView.txt
  36. +1 −1 Sources/epoch_server_settings/build.hpp
  37. BIN Sources/epoch_server_settings/treeView.txt
  38. BIN Sources/mpmissions/epoch.Altis/treeView.txt
  39. BIN Sources/mpmissions/epoch.Australia/treeView.txt
  40. BIN Sources/mpmissions/epoch.Bootcamp_ACR/treeView.txt
  41. BIN Sources/mpmissions/epoch.Bornholm/treeView.txt
  42. BIN Sources/mpmissions/epoch.Chernarus/treeView.txt
  43. BIN Sources/mpmissions/epoch.Chernarus_Summer/treeView.txt
  44. BIN Sources/mpmissions/epoch.Desert_E/treeView.txt
  45. BIN Sources/mpmissions/epoch.Esseker/treeView.txt
  46. BIN Sources/mpmissions/epoch.Mountains_ACR/treeView.txt
  47. BIN Sources/mpmissions/epoch.Napf/treeView.txt
  48. BIN Sources/mpmissions/epoch.Porto/treeView.txt
  49. BIN Sources/mpmissions/epoch.ProvingGrounds_PMC/treeView.txt
  50. BIN Sources/mpmissions/epoch.Sara/treeView.txt
  51. BIN Sources/mpmissions/epoch.SaraLite/treeView.txt
  52. BIN Sources/mpmissions/epoch.Sara_dbe1/treeView.txt
  53. BIN Sources/mpmissions/epoch.Shapur_BAF/treeView.txt
  54. BIN Sources/mpmissions/epoch.Stratis/treeView.txt
  55. BIN Sources/mpmissions/epoch.Takistan/treeView.txt
  56. BIN Sources/mpmissions/epoch.Tanoa/treeView.txt
  57. BIN Sources/mpmissions/epoch.VR/treeView.txt
  58. BIN Sources/mpmissions/epoch.Woodland_ACR/treeView.txt
  59. BIN Sources/mpmissions/epoch.Zargabad/treeView.txt
  60. BIN Sources/mpmissions/epoch.utes/treeView.txt
  61. +1 −1 build.txt
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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;
};
@@ -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;
};
-};
+};
@@ -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"
@@ -1 +1 @@
-build=566;
+build=570;
@@ -13,7 +13,7 @@
author = "Epoch Mod Team";
class Header
{
- gameType = Survival;
+ gameType = Survive;
minPlayers = 1;
maxPlayers = 100;
};
@@ -1 +1 @@
-build=566;
+build=570;
Binary file not shown.
@@ -1 +1 @@
-build=566;
+build=570;
Binary file not shown.
@@ -1 +1 @@
-build=566;
+build=570;
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -1 +1 @@
-566
+570

0 comments on commit dcfc352

Please sign in to comment.