Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

temp fixed player death screen

Browse Source
This commit is contained in:
Sp4rkY 2016-12-03 03:23:43 +01:00
parent b624641f32
commit e1e2dde224
1 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf
View File

@ -22,47 +22,32 @@
Returns: Returns:
BOOL BOOL
*/ */
//[[[cog import generate_private_arrays ]]]
private ["_config","_doRevenge","_playerDeathScreen","_playerKilledScreen","_playerRevengeMinAliveTime","_tapDiag"]; private ["_config","_doRevenge","_playerDeathScreen","_playerKilledScreen","_playerRevengeMinAliveTime","_tapDiag"];
//[[[end]]]
params [["_unit",objNull,[objNull]],["_killer",objNull,[objNull]] ]; params [["_unit",objNull,[objNull]],["_killer",objNull,[objNull]] ];
_config = 'CfgEpochClient' call EPOCH_returnConfig; _config = 'CfgEpochClient' call EPOCH_returnConfig;
_playerDeathScreen = getText(_config >> "playerDeathScreen"); _playerDeathScreen = getText(_config >> "playerDeathScreen");
_playerRevengeMinAliveTime = getNumber(_config >> "playerRevengeMinAliveTime"); _playerRevengeMinAliveTime = getNumber(_config >> "playerRevengeMinAliveTime");
if(_playerDeathScreen isEqualTo "")then{ _playerDeathScreen = "TapOut" }; if(_playerDeathScreen isEqualTo "")then{ _playerDeathScreen = "TapOut" };
_tapDiag = _playerDeathScreen; _tapDiag = _playerDeathScreen;
// diag_log format ["DEBUG: EPOCH_playerAliveTime %1",EPOCH_playerAliveTime];
_doRevenge = ((getNumber(_config >> "playerDisableRevenge") isEqualTo 0) && EPOCH_playerAliveTime >= _playerRevengeMinAliveTime); _doRevenge = ((getNumber(_config >> "playerDisableRevenge") isEqualTo 0) && EPOCH_playerAliveTime >= _playerRevengeMinAliveTime);
if (vehicle _unit != _unit) then { _unit action["Eject", vehicle _unit]; };
// test ejecting unit from vehicle if dead client side
if (vehicle _unit != _unit) then {
_unit action["Eject", vehicle _unit];
};
[player,_killer,toArray profileName,Epoch_personalToken] remoteExec ["EPOCH_server_deadPlayer",2]; [player,_killer,toArray profileName,Epoch_personalToken] remoteExec ["EPOCH_server_deadPlayer",2];
// disable build mode
EPOCH_buildMode = 0; EPOCH_buildMode = 0;
EPOCH_snapDirection = 0; EPOCH_snapDirection = 0;
EPOCH_Target = objNull; EPOCH_Target = objNull;
// playerKilledScreen
_playerKilledScreen = getText(_config >> "playerKilledScreen"); _playerKilledScreen = getText(_config >> "playerKilledScreen");
if(_playerKilledScreen isEqualTo "")then {_playerKilledScreen = "TapOut2"}; if(_playerKilledScreen isEqualTo "")then {_playerKilledScreen = "TapOut2"};
if(_doRevenge && player != _killer && (isPlayer _killer || isPlayer (effectiveCommander _killer)))then{_tapDiag = _playerKilledScreen};//TODO: vehicle check may not always be reliable if(_doRevenge && player != _killer && (isPlayer _killer || isPlayer (effectiveCommander _killer)))then{ _tapDiag = _playerKilledScreen };
if (Epoch_canBeRevived) then {
setPlayerRespawnTime 600; setPlayerRespawnTime 600;
createDialog _tapDiag; createDialog _tapDiag;
} else { if(!Epoch_canBeRevived)then{ ["You can be just revived once per life!", 5] call Epoch_message; };
setPlayerRespawnTime 15;
["You can be just revived once per life!", 5] call Epoch_message;
};
[_killer, _tapDiag] spawn { [_killer, _tapDiag] spawn {
params ["_killer2","_tapDiag2"]; params ["_killer2","_tapDiag2"];
while {!alive player} do { while {!alive player} do {
if (playerRespawnTime <= 1) exitWith{ (findDisplay 46) closeDisplay 0; };
if(playerRespawnTime > 15 && !dialog)then{ createDialog _tapDiag2; }; if(playerRespawnTime > 15 && !dialog)then{ createDialog _tapDiag2; };
if(isObjectHidden player)then{ closeDialog 2; }; if(isObjectHidden player)then{ closeDialog 2; };
if(player getVariable["EPOCH_doBoom",false])exitWith { player setVariable ["EPOCH_doBoom",nil]; call EPOCH_fnc_playerDeathDetonate; }; if(player getVariable["EPOCH_doBoom",false])exitWith { player setVariable ["EPOCH_doBoom",nil]; call EPOCH_fnc_playerDeathDetonate; };
@ -70,3 +55,4 @@ if (Epoch_canBeRevived) then {
uiSleep 0.1; uiSleep 0.1;
}; };
}; };
if(!isNil'BIS_DeathBlur')then{ppEffectDestroy BIS_DeathBlur;};