W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add anti logout if a EVR Storm is running, also include dayz_soundMuted check

Browse Source
This commit is contained in:
A Man
2022-05-05 17:59:57 +02:00
parent 89d4bdfc9a
commit 8221387b90
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
SQF/dayz_code/compile/client_evr.sqf
View File

@@ -186,6 +186,9 @@ fnc_evr = {
}; };
if (_this == "Stage5") exitWith { if (_this == "Stage5") exitWith {
DZE_EVRStormRunning = true;
[player,false] call fnc_setCombat;
if (_hasAPSI) then { if (_hasAPSI) then {
playSound "ns_evrDetect"; playSound "ns_evrDetect";
uiSleep 0.2; uiSleep 0.2;
@@ -231,7 +234,7 @@ fnc_evr = {
"chromAberration" ppEffectEnable false; "chromAberration" ppEffectEnable false;
}; };
if (_this == "Stage6") exitWith { if (_this == "Stage6") exitWith {
if (_hasAPSI) then { if (_hasAPSI) then {
playSound "ns_evrDetect"; playSound "ns_evrDetect";
uiSleep 0.2; uiSleep 0.2;
@@ -277,15 +280,12 @@ fnc_evr = {
"chromAberration" ppEffectEnable false; "chromAberration" ppEffectEnable false;
}; };
if (_this == "Stage7") exitWith { if (_this == "Stage7") exitWith {
if (_hasAPSI) then { if (_hasAPSI) then {
playSound "ns_evrDetect"; playSound "ns_evrDetect";
cutRsc ["RscAPSI_Start","PLAIN"]; cutRsc ["RscAPSI_Start","PLAIN"];
}; };
player setVariable["startcombattimer", 1];
playSound "ns_evrBegin"; playSound "ns_evrBegin";
"dynamicBlur" ppEffectAdjust [8]; "dynamicBlur" ppEffectAdjust [8];
"dynamicBlur" ppEffectEnable true; "dynamicBlur" ppEffectEnable true;
@@ -359,7 +359,7 @@ fnc_evr = {
if (!_hasAPSI) then { if (!_hasAPSI) then {
playSound "ns_evrPsy"; // This is the voices sound file playSound "ns_evrPsy"; // This is the voices sound file
}; };
uiSleep 4; uiSleep 4;
FLASH FLASH
playSound (_wave select (round (random 2))); playSound (_wave select (round (random 2)));
@@ -427,7 +427,12 @@ fnc_evr = {
uiSleep 1; uiSleep 1;
4 fadeSound 0; 4 fadeSound 0;
uiSleep 10; uiSleep 10;
6 fadeSound 1;
if (dayz_soundMuted) then {
6 fadeSound 0.25;
} else {
6 fadeSound 1;
};
titleText["","BLACK IN",10]; titleText["","BLACK IN",10];
ppEffectDestroy _effect; ppEffectDestroy _effect;
@@ -474,6 +479,8 @@ fnc_evr = {
disableUserInput false; disableUserInput false; disableUserInput false; disableUserInput false;
disableUserInput true; disableUserInput true; disableUserInput true; disableUserInput true;
disableUserInput false; disableUserInput false; disableUserInput false; disableUserInput false;
DZE_EVRStormRunning = false;
player setVariable["startcombattimer", 0];
}; };
}; };
}; };

4
SQF/dayz_code/compile/player_onPause.sqf
View File

@@ -64,6 +64,10 @@ while {(!isNull _display) && !r_player_dead} do {
closeDialog 2; closeDialog 2;
}; };
}; };
case (DZE_EVRStormRunning) : {
_btnAbort ctrlEnable false;
[localize "STR_EPOCH_PLAYER_12_1",1] call dayz_rollingMessages;
};
case (_inCombat) : { case (_inCombat) : {
_btnAbort ctrlEnable false; _btnAbort ctrlEnable false;
_btnAbort ctrlSetText format["%1 (in %2)", _btnAbortText, ceil (_timeout - diag_tickTime)]; _btnAbort ctrlSetText format["%1 (in %2)", _btnAbortText, ceil (_timeout - diag_tickTime)];

1
SQF/dayz_code/init/variables.sqf
View File

@@ -453,6 +453,7 @@ if (!isDedicated) then {
DZE_Surrender = false; DZE_Surrender = false;
DZE_InRadiationZone = false; DZE_InRadiationZone = false;
DZE_myVehicle = objNull; DZE_myVehicle = objNull;
DZE_EVRStormRunning = false;
dayz_groupNameTags = (profileNamespace getVariable ["streamerMode",0] == 0); //If streamer mode is on then hide name tags at startup. Toggle with Windows key. dayz_groupNameTags = (profileNamespace getVariable ["streamerMode",0] == 0); //If streamer mode is on then hide name tags at startup. Toggle with Windows key.
dayz_minusDownTime = 0; dayz_minusDownTime = 0;
dayz_lastCodeFail = 0; dayz_lastCodeFail = 0;

4
SQF/dayz_code/stringtable.xml
View File

@@ -23323,6 +23323,10 @@
<French>Impossible d'interrompre dans un marché!</French> <French>Impossible d'interrompre dans un marché!</French>
<Czech>Nelze se odpojit, když jste v trader area!</Czech> <Czech>Nelze se odpojit, když jste v trader area!</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_PLAYER_12_1">
<English>You cannot abort while an EVR Storm is running!</English>
<German>Du darfst dich nicht während eines EVR-Sturms ausloggen!</German>
</Key>
<Key ID="STR_EPOCH_PLAYER_16"> <Key ID="STR_EPOCH_PLAYER_16">
<English>You cannot pack while another player is nearby.</English> <English>You cannot pack while another player is nearby.</English>
<German>Packen nicht möglich, während ein anderer Spieler in der Nähe ist.</German> <German>Packen nicht möglich, während ein anderer Spieler in der Nähe ist.</German>