W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-17 09:10:27 +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
{