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

Sync closeDisplay exit codes for easier scripts.txt filtering

Browse Source
This commit is contained in:
ebaydayz
2016-11-11 14:48:28 -05:00
parent 489e0bbc77
commit 88870a6b2a
23 changed files with 41 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp
View File

@@ -453,7 +453,7 @@ class AdvancedTrading
x = 0.63 * safezoneW + safezoneX;
y = 0.77 * safezoneH + safezoneY;
w = 0.13 * safezoneW;
onButtonClick = "[[],0,false,0,[],[],true] call Z_returnChange; ((ctrlParent (_this select 0)) closeDisplay 9000); localize ""STR_EPOCH_PLAYER_307"" call dayz_rollingMessages;";
onButtonClick = "[[],0,false,0,[],[],true] call Z_returnChange; ((ctrlParent (_this select 0)) closeDisplay 2); localize ""STR_EPOCH_PLAYER_307"" call dayz_rollingMessages;";
colorBackground[] = {1,1,1,1};
color[] = {0,0,0,1};
text = $STR_EPOCH_PLAYER_306;
@@ -464,7 +464,7 @@ class AdvancedTrading
x = 0.63 * safezoneW + safezoneX;
y = 0.80 * safezoneH + safezoneY;
w = 0.13 * safezoneW;
onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 9000);";
onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 2);";
colorBackground[] = {1,1,1,1};
color[] = {0,0,0,1};
text = $STR_UI_CLOSE;

2
SQF/dayz_code/Configs/RscDisplay/deathboards.hpp
View File

@@ -49,7 +49,7 @@ class EpochDeathBoardDialog
y = 0.706267 * safezoneH + safezoneY;
w = 0.0743671 * safezoneW;
h = 0.0550044 * safezoneH;
onButtonClick = "PVDZE_plr_DeathBResult = nil; ((ctrlParent (_this select 0)) closeDisplay 9000);";
onButtonClick = "PVDZE_plr_DeathBResult = nil; ((ctrlParent (_this select 0)) closeDisplay 2);";
};
class RscStructuredText_1100: RscStructuredText
{

2
SQF/dayz_code/Configs/RscDisplay/doorManagement/doorAccess.hpp
View File

@@ -68,7 +68,7 @@ class DoorAccess
x = 0.40 * safezoneW + safezoneX;
y = 0.70 * safezoneH + safezoneY;
w = 0.20;
onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 3000);";
onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 2);";
};
class ZupaButton_3: ZSC_RscButtonMenuBlue

2
SQF/dayz_code/Configs/RscDisplay/doorManagement/doorManagement.hpp
View File

@@ -62,7 +62,7 @@ class DoorManagement
x = 0.40 * safezoneW + safezoneX;
y = 0.75 * safezoneH + safezoneY;
w = 0.08 * safezoneW;
onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 9000);";
onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 2);";
};
class RscText_7107: ZSC_RscTextT

2
SQF/dayz_code/Configs/RscDisplay/plotManagement.hpp
View File

@@ -161,7 +161,7 @@ class PlotManagement
x = 0.40 * safezoneW + safezoneX;
y = 0.75 * safezoneH + safezoneY;
w = 0.08 * safezoneW;
onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 9000);";
onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 2);";
};
};
};

12
SQF/dayz_code/Configs/RscDisplay/safegui.hpp
View File

@@ -288,7 +288,7 @@ class SafeKeyPad
colorText[] = {1,0.1,0.1,1};
colorBackground[] = {0,0,0,0};
colorBackgroundActive[] = {0,0,0,0};
onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak; keypadCancel = true; ((ctrlParent (_this select 0)) closeDisplay 3000);";
onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak; keypadCancel = true; ((ctrlParent (_this select 0)) closeDisplay 2);";
};
class benter: RscButton
{
@@ -303,7 +303,7 @@ class SafeKeyPad
colorText[] = {0,1,0,1};
colorBackground[] = {0,0,0,0};
colorBackgroundActive[] = {0,0,0,0};
onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak; keypadCancel = false; ((ctrlParent (_this select 0)) closeDisplay 3000); if(!isNull dayz_selectedVault and (typeOf dayz_selectedVault) in DZE_LockedStorage) then {dayz_selectedVault spawn player_unlockVault;};";
onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak; keypadCancel = false; ((ctrlParent (_this select 0)) closeDisplay 2); if(!isNull dayz_selectedVault and (typeOf dayz_selectedVault) in DZE_LockedStorage) then {dayz_selectedVault spawn player_unlockVault;};";
};
};
};
@@ -449,7 +449,7 @@ class ComboLockUI
y = 0.0153665;
w = 0.158511;
h = 0.153191;
onButtonClick = "keypadCancel = true; ((ctrlParent (_this select 0)) closeDisplay 3000);";
onButtonClick = "keypadCancel = true; ((ctrlParent (_this select 0)) closeDisplay 2);";
};
class unlock_combo_btn: main_combo
{
@@ -633,7 +633,7 @@ class KeypadUI
y = 0.312845;
w = 0.126596;
h = 0.153191;
onButtonClick = "keypadCancel = true; [player,""keypad_tick"",0,false] call dayz_zombieSpeak;((ctrlParent (_this select 0)) closeDisplay 3000);";
onButtonClick = "keypadCancel = true; [player,""keypad_tick"",0,false] call dayz_zombieSpeak;((ctrlParent (_this select 0)) closeDisplay 2);";
};
class kpbcancel2: main_button
{
@@ -642,7 +642,7 @@ class KeypadUI
y = 0.50985;
w = 0.126596;
h = 0.153191;
onButtonClick = "keypadCancel = true; [player,""keypad_tick"",0,false] call dayz_zombieSpeak;((ctrlParent (_this select 0)) closeDisplay 3000);";
onButtonClick = "keypadCancel = true; [player,""keypad_tick"",0,false] call dayz_zombieSpeak;((ctrlParent (_this select 0)) closeDisplay 2);";
};
class kpbenter: main_button
{
@@ -651,7 +651,7 @@ class KeypadUI
y = 0.121749;
w = 0.126596;
h = 0.153191;
onButtonClick = "keypadCancel = false; [player,""keypad_tick"",0,false] call dayz_zombieSpeak;((ctrlParent (_this select 0)) closeDisplay 3000); if(!isNull dayz_selectedVault) then {dayz_selectedVault spawn player_unlockVault;};";
onButtonClick = "keypadCancel = false; [player,""keypad_tick"",0,false] call dayz_zombieSpeak;((ctrlParent (_this select 0)) closeDisplay 2); if(!isNull dayz_selectedVault) then {dayz_selectedVault spawn player_unlockVault;};";
};
};
};

8
SQF/dayz_code/Configs/RscDisplay/tradermenu.hpp
View File

@@ -192,7 +192,7 @@ class TraderDialog
y = 0.720064 * safezoneH + safezoneY;
w = 0.0743718 * safezoneW;
h = 0.055016 * safezoneH;
onButtonClick = "[(lbCurSel 12001)] call TraderDialogBuy; ((ctrlParent (_this select 0)) closeDisplay 9000);";
onButtonClick = "[(lbCurSel 12001)] call TraderDialogBuy; ((ctrlParent (_this select 0)) closeDisplay 2);";
};
class RscShortcutButtonTraderDialog_1701: RscShortcutButtonTraderDialog
{
@@ -202,7 +202,7 @@ class TraderDialog
y = 0.720064 * safezoneH + safezoneY;
w = 0.0743718 * safezoneW;
h = 0.055016 * safezoneH;
onButtonClick = "[(lbCurSel 12001)] call TraderDialogSell; ((ctrlParent (_this select 0)) closeDisplay 9000);";
onButtonClick = "[(lbCurSel 12001)] call TraderDialogSell; ((ctrlParent (_this select 0)) closeDisplay 2);";
};
class RscShortcutButtonTraderDialog_1703: RscShortcutButtonTraderDialog
{
@@ -212,7 +212,7 @@ class TraderDialog
y = 0.720064 * safezoneH + safezoneY;
w = 0.1287436 * safezoneW;
h = 0.055016 * safezoneH;
onButtonClick = "[[],0] call epoch_returnChange; ((ctrlParent (_this select 0)) closeDisplay 9000); localize ""STR_EPOCH_PLAYER_307"" call dayz_rollingMessages;";
onButtonClick = "[[],0] call epoch_returnChange; ((ctrlParent (_this select 0)) closeDisplay 2); localize ""STR_EPOCH_PLAYER_307"" call dayz_rollingMessages;";
};
class RscTextTraderDialog_1003: RscTextTraderDialog
{
@@ -260,7 +260,7 @@ class TraderDialog
y = 0.720064 * safezoneH + safezoneY;
w = 0.0743718 * safezoneW;
h = 0.055016 * safezoneH;
onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 9000);";
onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 2);";
};
class RscText_1007: RscTextTraderDialog
{

2
SQF/dayz_code/actions/doorManagement/initDoorManagement.sqf
View File

@@ -10,7 +10,7 @@ if (count(_this) > 0) then
// close DoorAccess if open
_display = findDisplay 61144;
_display closeDisplay 3000;
_display closeDisplay 2;
// Check player access
_hasAccess = [player, TheDoor] call FNC_check_access;

2
SQF/dayz_code/actions/doorManagement/player_enterCode.sqf
View File

@@ -2,7 +2,7 @@ private "_display";
// Close DoorAccess
_display = findDisplay 61144;
_display closeDisplay 3000;
_display closeDisplay 2;
if (DZE_doorManagementAllowManualCode) then {
//DZE_Lock_Door != (this getvariable['CharacterID','0']);
DZE_topCombo = 0;

2
SQF/dayz_code/compile/BIS_fnc/fn_halo.sqf
View File

@@ -314,7 +314,7 @@ if (typename _this == typename []) then {
//--- Crash
_velZ = velocity _para select 2;
if ((_velZ - bis_fnc_halo_para_velZ) > 7 && (getposatl _para select 2) < 100) then {player setdamage 1;debuglog ["Log::::::::::::::",(_velZ - bis_fnc_halo_para_velZ)];};
//if ((_velZ - bis_fnc_halo_para_velZ) > 7 && (getposatl _para select 2) < 100) then {player setdamage 1;debuglog ["Log::::::::::::::",(_velZ - bis_fnc_halo_para_velZ)];};
bis_fnc_halo_para_velZ = _velZ;
//--- Pos

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

@@ -33,7 +33,7 @@ if ((vehicle player) == player) then {
_rID = if (DZE_permanentPlot) then { getPlayerUID _cTarget } else { _cTarget getVariable ["CharacterID","0"] };
if ((!canbuild or isInTraderCity) && {_cTarget isKindOf "Man"} && {alive _cTarget} && {isPlayer _cTarget} && {!(_rID in _friendlies)} && {(player distance _cTarget) < 12}) then {
localize "STR_EPOCH_PLAYER_316" call dayz_rollingMessages;
_display closeDisplay 1;
_display closeDisplay 2;
};
};
};
@@ -42,7 +42,7 @@ if ((vehicle player) == player) then {
_lastSave = dayz_lastSave;
_startTime = diag_tickTime;
localize "str_epoch_player_7" call dayz_rollingMessages;
_display closeDisplay 1;
_display closeDisplay 2;
_ctType = typeOf _cTarget;
//direct gear to cursorTarget
[_lastSave, _startTime, _ctType, _cTarget] spawn {

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

@@ -55,7 +55,7 @@ if (_inVehicle) then {
if (_doNothing) exitwith {};
if ("ItemMap_Debug" in items player) then {
/*if ("ItemMap_Debug" in items player) then {
deleteMarkerLocal "MaxZeds";
deleteMarkerLocal "Counter";
deleteMarkerLocal "Loot30";
@@ -98,7 +98,7 @@ if ("ItemMap_Debug" in items player) then {
diag_log (format["%1 Local.Agents: %2/%3, NearBy.Agents: %8/%9, Global.Agents: %6/%7, W.holders: %10/%11, (radius:%4m %5fps).","SpawnCheck",
_maxlocalspawned, _maxControlledZombies, _radius, round diag_fpsmin,dayz_currentGlobalZombies,
dayz_maxGlobalZeds, dayz_CurrentNearByZombies, dayz_maxNearByZombies, _currentWeaponHolders,_maxWeaponHolders]);
};
};*/
_nearby = nearestObjects [_position, _spawnableObjects,_radius];
_maxlocalspawned = _maxlocalspawned max floor(_maxControlledZombies*.8);

10
SQF/dayz_code/compile/player_unlockDoor.sqf
View File

@@ -30,7 +30,7 @@ if (!isNull dayz_selectedDoor) then {
if (_notNearestPlayer) then {
// close display since another player is closer
_display closeDisplay 3000;
_display closeDisplay 2;
localize "STR_EPOCH_ACTIONS_16" call dayz_rollingMessages;
} else {
// get object combination
@@ -58,7 +58,7 @@ if (!isNull dayz_selectedDoor) then {
[player,"combo_unlock",0,false] call dayz_zombieSpeak;
// close display
_display closeDisplay 3000;
_display closeDisplay 2;
// unlock if locked
if (_obj animationPhase "Open_hinge" == 0) then {
@@ -86,17 +86,17 @@ if (!isNull dayz_selectedDoor) then {
if (KeyCodeTry >= ((round(random 4)) + 4)) then {
if (isNil 'KeyCodeTryTimer') then {KeyCodeTryTimer = diag_tickTime+10;};
localize "str_epoch_player_19" call dayz_rollingMessages;
_display closeDisplay 3000;
_display closeDisplay 2;
};
if(_doorMethod == "Eye") then {
localize "STR_EPOCH_DOORACCESS_FAILURE" call dayz_rollingMessages;
_display closeDisplay 3000;
_display closeDisplay 2;
};
};
};
} else {
// close display since no target
_display closeDisplay 3000;
_display closeDisplay 2;
};
DZE_DYN_UnlockDoorInprogress = nil;

4
SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_DoTired.sqf vendored
View File

@@ -78,12 +78,12 @@ while {true} do {
_level = 0 max (1 - (_level / 100));
#ifdef R3F_TIRED_DEBUG
hintsilent format["Fatique : %1/%2\nBlack level : %3\nPoids total : %4\n Poids armement : %5",
/*hintsilent format["Fatique : %1/%2\nBlack level : %3\nPoids total : %4\n Poids armement : %5",
R3F_TIRED_Accumulator,
R3F_TIRED_BLACKOUT_LEVEL,
_level,
R3F_TIRED_POIDS_TOTAL_PLAYER,
R3F_Weight];
R3F_Weight];*/
#endif
[_level] call R3F_TIRED_FNCT_Voile_Noir;

2
SQF/dayz_code/system/mission/chernarus/poi/C130Crash.sqf
View File

@@ -2,7 +2,6 @@
//Created by Dr Bane 20/11/2013
//Copyright Dr Bane And Musty Gaming
if (isServer) then {
_vehicle_233 = objNull;
if (true) then
@@ -294,4 +293,3 @@ _this setVariable ["", true]; // prevent network SV by loot/zeds spawner
_vehicle_274 = _this;
_this setPos [12710.407, 9548.6572, 8.768301];
};
};

3
SQF/dayz_code/system/mission/chernarus/poi/ChernoBuildings.sqf
View File

@@ -2,8 +2,6 @@
//Created by Dr Bane 20/11/2013
//Copyright Dr Bane And Musty Gaming
if (isServer) then {
_vehicle_24 = objNull;
if (true) then
{
@@ -400,4 +398,3 @@ _this setVariable ["", true]; // prevent network SV by loot/zeds spawner
_this setDir -108.38199;
_this setPos [6965.25, 2759.8867, 9.727478e-005];
};
};

2
SQF/dayz_code/system/mission/chernarus/poi/DeadForest.sqf
View File

@@ -2,7 +2,6 @@
//Created by Dr Bane 20/11/2013
//Copyright Dr Bane And Musty Gaming
if (isServer) then {
_vehicle_5 = objNull;
if (true) then
@@ -3937,4 +3936,3 @@ _this setVariable ["", true]; // prevent network SV by loot/zeds spawner
_this setDir 98.278824;
_this setPos [8398.0586, 3012.748, 1.2397766e-005];
};
};

2
SQF/dayz_code/system/mission/chernarus/poi/DevilsFarm.sqf
View File

@@ -2,7 +2,6 @@
//Created by Dr Bane 20/11/2013
//Copyright Dr Bane And Musty Gaming
if (isServer) then {
_vehicle_27 = objNull;
if (true) then
@@ -4185,4 +4184,3 @@ _this setVariable ["", true]; // prevent network SV by loot/zeds spawner
_this setDir -139.52458;
_this setPos [1760.7675, 11721.288, -0.48907313];
};
};

2
SQF/dayz_code/system/mission/chernarus/poi/KomyshovoRoadblock.sqf
View File

@@ -2,7 +2,6 @@
//Created by Dr Bane 20/11/2013
//Copyright Dr Bane And Musty Gaming
if (isServer) then {
_vehicle_2 = objNull;
if (true) then
@@ -444,4 +443,3 @@ _this setVariable ["", true]; // prevent network SV by loot/zeds spawner
_this setDir 75.434654;
_this setPos [11715.259, 3417.4905, 6.1988831e-006];
};
};

2
SQF/dayz_code/system/mission/chernarus/poi/MilitaryAirpoort.sqf
View File

@@ -2,7 +2,6 @@
//Created by Dr Bane 20/11/2013
//Copyright Dr Bane And Musty Gaming
if (isServer) then {
_vehicle_6 = objNull;
if (true) then
@@ -2234,4 +2233,3 @@ _this setVariable ["", true]; // prevent network SV by loot/zeds spawner
_this setDir -9.4858913;
_this setPos [3826.2429, 10102.542, -3.0517578e-005];
};
};

2
SQF/dayz_code/system/mission/chernarus/poi/NEA.sqf
View File

@@ -2,7 +2,6 @@
//Created by Dr Bane 20/11/2013
//Copyright Dr Bane And Musty Gaming
if (isServer) then {
_vehicle_5 = objNull;
if (true) then
@@ -3956,4 +3955,3 @@ _this setVariable ["", true]; // prevent network SV by loot/zeds spawner
_this setDir -71.381462;
_this setPos [11836.992, 12685.103, 7.6293945e-005];
};
};

2
SQF/dayz_code/system/mission/chernarus/poi/ZelenogorskBuildings.sqf
View File

@@ -2,7 +2,6 @@
//Created by Dr Bane 20/11/2013
//Copyright Dr Bane And Musty Gaming
if (isServer) then {
_vehicle_155 = objNull;
if (true) then
@@ -139,4 +138,3 @@ _this setVariable ["", true]; // prevent network SV by loot/zeds spawner
_vehicle_188 = _this;
_this setPos [2540.7234, 5062.2808];
};
};

20
SQF/dayz_code/system/mission/chernarus/poi/init.sqf
View File

@@ -1,10 +1,12 @@
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\DevilsFarm.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\NEA.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\C130Crash.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\ChernoBuildings.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\DeadForest.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\KomyshovoRoadblock.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\MilitaryAirpoort.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\ZelenogorskBuildings.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\Twains.sqf";
if (isServer) then {
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\DevilsFarm.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\NEA.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\C130Crash.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\ChernoBuildings.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\DeadForest.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\KomyshovoRoadblock.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\MilitaryAirpoort.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\ZelenogorskBuildings.sqf";
[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\Twains.sqf";
};