From e1e2dde22469ced1ad5d118058be1bbaf01cb8b4 Mon Sep 17 00:00:00 2001 From: Sp4rkY Date: Sat, 3 Dec 2016 03:23:43 +0100 Subject: [PATCH 1/3] temp fixed player death screen --- .../functions/EPOCH_fnc_playerDeath.sqf | 42 +++++++------------ 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf index 7b65cfd6..efd8125f 100644 --- a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf +++ b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf @@ -22,51 +22,37 @@ Returns: BOOL */ -//[[[cog import generate_private_arrays ]]] private ["_config","_doRevenge","_playerDeathScreen","_playerKilledScreen","_playerRevengeMinAliveTime","_tapDiag"]; -//[[[end]]] 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"}; +if(_playerDeathScreen isEqualTo "")then{ _playerDeathScreen = "TapOut" }; + _tapDiag = _playerDeathScreen; -// 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 { - _unit action["Eject", vehicle _unit]; -}; - +if (vehicle _unit != _unit) then { _unit action["Eject", vehicle _unit]; }; [player,_killer,toArray profileName,Epoch_personalToken] remoteExec ["EPOCH_server_deadPlayer",2]; -// disable build mode EPOCH_buildMode = 0; EPOCH_snapDirection = 0; EPOCH_Target = objNull; -// playerKilledScreen _playerKilledScreen = getText(_config >> "playerKilledScreen"); -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(_playerKilledScreen isEqualTo "")then {_playerKilledScreen = "TapOut2"}; +if(_doRevenge && player != _killer && (isPlayer _killer || isPlayer (effectiveCommander _killer)))then{ _tapDiag = _playerKilledScreen }; -if (Epoch_canBeRevived) then { - setPlayerRespawnTime 600; - createDialog _tapDiag; -} else { - setPlayerRespawnTime 15; - ["You can be just revived once per life!", 5] call Epoch_message; -}; - -[_killer, _tapDiag] spawn{ +setPlayerRespawnTime 600; +createDialog _tapDiag; +if(!Epoch_canBeRevived)then{ ["You can be just revived once per life!", 5] call Epoch_message; }; +[_killer, _tapDiag] spawn { params ["_killer2","_tapDiag2"]; while {!alive player} do { - 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]; 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;}; + 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]; 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; }; }; +if(!isNil'BIS_DeathBlur')then{ppEffectDestroy BIS_DeathBlur;}; From b88113eb96b431d0acad03d6dd640070e98c00d9 Mon Sep 17 00:00:00 2001 From: Sp4rkY Date: Sat, 3 Dec 2016 16:47:18 +0100 Subject: [PATCH 2/3] FIXED playerDeath function --- .../functions/EPOCH_fnc_playerDeath.sqf | 65 +++++++++++++------ 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf index efd8125f..869973ac 100644 --- a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf +++ b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf @@ -22,37 +22,60 @@ Returns: BOOL */ -private ["_config","_doRevenge","_playerDeathScreen","_playerKilledScreen","_playerRevengeMinAliveTime","_tapDiag"]; + + +//[[[cog import generate_private_arrays ]]] +private ["_Epoch_PlayerRespawnTime","_config","_doRevenge","_playerDeathScreen","_playerKilledScreen","_playerRevengeMinAliveTime","_tapDiag"]; +//[[[end]]] 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" }; - +if (_playerDeathScreen isEqualTo "") then {_playerDeathScreen = "TapOut"}; _tapDiag = _playerDeathScreen; +// diag_log format ["DEBUG: EPOCH_playerAliveTime %1",EPOCH_playerAliveTime]; _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]; - + +// disable build mode EPOCH_buildMode = 0; EPOCH_snapDirection = 0; EPOCH_Target = objNull; - + +// playerKilledScreen _playerKilledScreen = getText(_config >> "playerKilledScreen"); -if(_playerKilledScreen isEqualTo "")then {_playerKilledScreen = "TapOut2"}; -if(_doRevenge && player != _killer && (isPlayer _killer || isPlayer (effectiveCommander _killer)))then{ _tapDiag = _playerKilledScreen }; - -setPlayerRespawnTime 600; -createDialog _tapDiag; -if(!Epoch_canBeRevived)then{ ["You can be just revived once per life!", 5] call Epoch_message; }; -[_killer, _tapDiag] spawn { - params ["_killer2","_tapDiag2"]; - while {!alive player} do { - 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]; 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; - }; +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 (Epoch_canBeRevived) then { + _Epoch_PlayerRespawnTime = 600; + createDialog _tapDiag; +} else { + _Epoch_PlayerRespawnTime = 15; + ["You can be just revived once per life!", 5] call Epoch_message; +}; + +[_killer, _tapDiag, _Epoch_PlayerRespawnTime] spawn{ + params ["_killer2","_tapDiag2","_Epoch_PlayerRespawnTime"]; + while {!alive player} do { + _Epoch_PlayerRespawnTime = _Epoch_PlayerRespawnTime - 0.1; + if (playerRespawnTime < 0) then { + _Layer = 'RespawnTimer' call BIS_fnc_rscLayer; + _txt = format ["Respawn in %1 seconds",round _Epoch_PlayerRespawnTime]; + [_txt,0,0.75*safezoneH+safezoneY,0,0,0,_Layer] spawn bis_fnc_dynamicText; + }; + if (_Epoch_PlayerRespawnTime <= 1) exitWith{ (findDisplay 46) closeDisplay 0; }; + if (_Epoch_PlayerRespawnTime > 15 && !dialog) then {createDialog _tapDiag2;}; + 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_doMorph",false])exitWith{player setVariable ["EPOCH_doMorph",nil];[selectRandom (getArray (getMissionConfig "CfgEpochClient" >> "deathMorphClass")),player,_killer2] call EPOCH_fnc_playerDeathMorph;}; + uiSleep 0.1; + }; }; if(!isNil'BIS_DeathBlur')then{ppEffectDestroy BIS_DeathBlur;}; From 2830f50be749c58e68c5282f4b58b6de154dc599 Mon Sep 17 00:00:00 2001 From: Sp4rkY Date: Sat, 3 Dec 2016 16:58:21 +0100 Subject: [PATCH 3/3] FIXED playerDeath function --- Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf index 869973ac..3236c4b9 100644 --- a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf +++ b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf @@ -54,9 +54,11 @@ 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 (Epoch_canBeRevived) then { + setPlayerRespawnTime 600; _Epoch_PlayerRespawnTime = 600; createDialog _tapDiag; } else { + setPlayerRespawnTime 15; _Epoch_PlayerRespawnTime = 15; ["You can be just revived once per life!", 5] call Epoch_message; };