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

Plot / door management userlist sorting (#1747)

Browse Source 
* Plot / door management userlist sorting

This correctly sorts the nearby humans list in both mods, I have this
running on my 1051 server with no issues, @ebaydayz please advise if
this is not right, I've tested it pretty well and it is indeed selecting
the right person/UID

* Door/plot management fixes

As per @ebaydayz
This commit is contained in:
oiad
2016-08-22 09:19:52 +12:00
committed by ebaydayz
parent 8ef349e2bb
commit 6bdc3956fb
7 changed files with 104 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ class DoorAccess
h = 0.50 * safezoneH;
colorBackground[] = {0,0,0,0.8};
};
class ZupaHeader_2: ZSC_RscTextT
{
idc = -1;
@@ -38,8 +38,7 @@ class DoorAccess
colorBackground[] = {0,0,0,0.8};
colorText[] = {1,1,1,1};
};
class ZupaButton_1 : ZSC_RscButtonMenuBlue
{
idc = -1;
@@ -50,7 +49,7 @@ class DoorAccess
w = 0.20;
onButtonClick = "keypadCancel = false; call player_unlockDoor";
};
class ZupaButton_4 : ZSC_RscButtonMenuBlue
{
idc = -1;
@@ -61,7 +60,7 @@ class DoorAccess
w = 0.20;
onButtonClick = "call player_enterCode";
};
class ZupaButton_2: ZSC_RscButtonMenuBlue
{
idc = -1;

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

@@ -11,7 +11,8 @@ class DoorManagement
w = 0.30 * safezoneW;
h = 0.5 * safezoneH;
colorBackground[] = {0,0,0,0.8};
};
};
class RscListbox_7101: RscListbox
{
idc = 7101;
@@ -22,6 +23,7 @@ class DoorManagement
soundSelect[] = {"",0.1,1};
colorBackground[] = {0.1,0.1,0.1,0.8};
};
class RscListbox_7102: RscListbox
{
idc = 7102;
@@ -32,6 +34,7 @@ class DoorManagement
soundSelect[] = {"",0.1,1};
colorBackground[] = {0.1,0.1,0.1,0.8};
};
class RscShortcutButton_7104: ZSC_RscButtonMenuBlue
{
idc = 7104;
@@ -39,9 +42,9 @@ class DoorManagement
x = 0.33 * safezoneW + safezoneX;
y = 0.70 * safezoneH + safezoneY;
w = 0.08 * safezoneW;
//h = 0.06 * safezoneH;
onButtonClick = "[(lbCurSel 7101)] call DoorAddFriend;";
onButtonClick = "[lbData [7101,lbCurSel 7101]] call DoorAddFriend;";
};
class RscShortcutButton_7105: ZSC_RscButtonMenuBlue
{
idc = 7105;
@@ -49,9 +52,9 @@ class DoorManagement
x = 0.47 * safezoneW + safezoneX;
y = 0.70 * safezoneH + safezoneY;
w = 0.08 * safezoneW;
//h = 0.06 * safezoneH;
onButtonClick = "[(lbCurSel 7102)] call DoorRemoveFriend;";
};
};
class RscShortcutButton_7106: ZSC_RscButtonMenuBlue
{
idc = 7106;
@@ -59,9 +62,9 @@ class DoorManagement
x = 0.40 * safezoneW + safezoneX;
y = 0.74 * safezoneH + safezoneY;
w = 0.08 * safezoneW;
//h = 0.06 * safezoneH;
onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 9000);";
};
};
class RscText_7107: ZSC_RscTextT
{
idc = 7107;
@@ -69,10 +72,11 @@ class DoorManagement
x = 0.30 * safezoneW + safezoneX;
y = 0.30 * safezoneH + safezoneY;
w = 0.30 * safezoneW;
h = 0.05 * safezoneH;
colorBackground[] = {0,0,0,0.8};
colorText[] = {1,1,1,1};
h = 0.05 * safezoneH;
colorBackground[] = {0,0,0,0.8};
colorText[] = {1,1,1,1};
};
class RscText_7108: ZSC_RscTextT
{
idc = 7108;
@@ -83,7 +87,8 @@ class DoorManagement
h = 0.03 * safezoneH;
colorText[] = {1,1,1,1};
};
class RscText_7103: ZSC_RscTextT
class RscText_7103: ZSC_RscTextT
{
idc = 71103;
text = $STR_EPOCH_DOORMANAGEMENT_FRIENDS;

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

@@ -12,19 +12,19 @@ class PlotManagement
h = 0.65 * safezoneH;
colorBackground[] = {0,0,0,0.8};
};
class RscText_7007: ZSC_RscTextT
class RscText_7007: ZSC_RscTextT
{
idc = 7007;
text = $STR_EPOCH_ACTIONS_MANAGEPLOT;
x = 0.30 * safezoneW + safezoneX;
y = 0.15 * safezoneH + safezoneY;
w = 0.30 * safezoneW;
h = 0.05 * safezoneH;
colorBackground[] = {0,0,0,0.8};
colorText[] = {1,1,1,1};
h = 0.05 * safezoneH;
colorBackground[] = {0,0,0,0.8};
colorText[] = {1,1,1,1};
};
class RscShortcutButton_7009: ZSC_RscButtonMenuBlue
{
idc = -1;
@@ -34,8 +34,8 @@ class PlotManagement
w = 0.08 * safezoneW;
onButtonClick = "call PlotPreview;";
};
class RscShortcutButton_7010: ZSC_RscButtonMenuBlue
class RscShortcutButton_7010: ZSC_RscButtonMenuBlue
{
idc = -1;
text = $STR_EPOCH_REFRESH;
@@ -44,8 +44,8 @@ class PlotManagement
w = 0.08 * safezoneW;
onButtonClick = "'preview' call MaintainPlot;";
};
class RscShortcutButton_7011: ZSC_RscButtonMenuBlue
class RscShortcutButton_7011: ZSC_RscButtonMenuBlue
{
idc = -1;
text = $STR_EPOCH_ACTIONS_MAINTAIN;
@@ -54,6 +54,7 @@ class PlotManagement
w = 0.08 * safezoneW;
onButtonClick = "'maintain' call MaintainPlot;";
};
class RscText_7012: ZSC_RscTextT
{
idc = 7012;
@@ -61,11 +62,11 @@ class PlotManagement
x = 0.31 * safezoneW + safezoneX;
y = 0.30 * safezoneH + safezoneY;
w = 0.30 * safezoneW;
h = 0.05 * safezoneH;
h = 0.05 * safezoneH;
colorText[] = {1,1,1,1};
};
class RscText_7014: RscStructuredText
{
idc = 7014;
@@ -74,11 +75,11 @@ class PlotManagement
y = 0.15 * safezoneH + safezoneY;
w = 0.30 * safezoneW;
h = 0.03 * safezoneH;
class Attributes {
class Attributes {
align = "right";
};
};
class RscText_7013: ZSC_RscTextT
{
idc = 7013;
@@ -89,8 +90,7 @@ class PlotManagement
h = 0.03 * safezoneH;
colorText[] = {1,1,1,1};
};
class RscText_7008: ZSC_RscTextT
{
idc = -1;
@@ -100,7 +100,8 @@ class PlotManagement
w = 0.13 * safezoneW;
h = 0.03 * safezoneH;
colorText[] = {1,1,1,1};
};
};
class RscText_7003: ZSC_RscTextT
{
idc = -1;
@@ -111,8 +112,7 @@ class PlotManagement
h = 0.03 * safezoneH;
colorText[] = {1,1,1,1};
};
class RscListbox_7001: RscListbox
{
idc = 7001;
@@ -123,6 +123,7 @@ class PlotManagement
soundSelect[] = {"",0.1,1};
colorBackground[] = {0.1,0.1,0.1,0.8};
};
class RscListbox_7002: RscListbox
{
idc = 7002;
@@ -133,6 +134,7 @@ class PlotManagement
soundSelect[] = {"",0.1,1};
colorBackground[] = {0.1,0.1,0.1,0.8};
};
class RscShortcutButton_7004: ZSC_RscButtonMenuBlue
{
idc = -1;
@@ -140,8 +142,9 @@ class PlotManagement
x = 0.33 * safezoneW + safezoneX;
y = 0.70 * safezoneH + safezoneY;
w = 0.08 * safezoneW;
onButtonClick = "[(lbCurSel 7001)] call PlotAddFriend;";
onButtonClick = "[lbData [7001,lbCurSel 7001]] call PlotAddFriend;";
};
class RscShortcutButton_7005: ZSC_RscButtonMenuBlue
{
idc = -1;
@@ -150,7 +153,8 @@ class PlotManagement
y = 0.70 * safezoneH + safezoneY;
w = 0.08 * safezoneW;
onButtonClick = "[(lbCurSel 7002)] call PlotRemoveFriend;";
};
};
class RscShortcutButton_7006: ZSC_RscButtonMenuBlue
{
idc = -1;
@@ -158,9 +162,7 @@ class PlotManagement
x = 0.40 * safezoneW + safezoneX;
y = 0.74 * safezoneH + safezoneY;
w = 0.08 * safezoneW;
onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 9000);";
};
};
};
};