W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 12:12:34 +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);";
};
};
};
};

27
SQF/dayz_code/actions/doorManagement/doorAddFriend.sqf
View File

@@ -1,17 +1,24 @@
private ["_pos","_plots","_inList","_friends","_toAdd"];
private ["_inList","_toAdd","_friends","_friendUID","_friendName","_userList"];
disableSerialization;
_userList = (findDisplay 711195) displayCtrl 7101;
_friendUID = _this select 0;
_friendName = _userList lbText (lbCurSel _userList);
if (_friendUID == "") exitWith {};
_pos = _this select 0;
if (_pos < 0) exitWith {};
_toAdd = (Humans select _pos);
_friends = TheDoor getVariable ["doorfriends",[]];
_toAdd = [_friendUID,toArray _friendName];
_inList = false;
{
if((_x select 0) == (_toAdd select 0)) exitWith { _inList = true; };
} forEach _friends;
if(_inList) exitWith { localize "STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_ALREADYONTHELIST" call dayz_rollingMessages; };
if(count _friends >= DZE_doorManagementMaxFriends) exitWith { format[localize "STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_FRIENDLIMIT", DZE_doorManagementMaxFriends] call dayz_rollingMessages; };
_friends set [count _friends, _toAdd];
{ if ((_x select 0) == (_toAdd select 0)) exitWith { _inList = true; }; false } count _friends;
if (_inList) exitWith { systemChat localize "STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_ALREADYONTHELIST"; };
if ((count _friends) == DZE_doorManagementMaxFriends) exitWith { systemChat format[localize "STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_FRIENDLIMIT", DZE_doorManagementMaxFriends]; };
_friends set [(count _friends), _toAdd];
TheDoor setVariable ["doorfriends", _friends, true];
PVDZ_veh_Save = [TheDoor,"gear"];
if (isServer) then {
PVDZ_veh_Save call server_updateObject;

21
SQF/dayz_code/actions/doorManagement/doorNearbyHumans.sqf
View File

@@ -1,14 +1,19 @@
private ["_closePeople","_friendUID","_friendName"];
private ["_closePeople","_friendUID","_friendName","_userList"];
disableSerialization;
_userList = (findDisplay 711195) displayCtrl 7101;
lbClear _userList;
_closePeople = if (DZE_doorManagementMustBeClose) then { player nearEntities ["CAManBase", 10] } else { playableUnits };
lbClear 7101;
_closePeople = player nearEntities ["CAManBase", 10];
if (!DZE_doorManagementMustBeClose) then {_closePeople = playableUnits};
Humans = [];
{
if (isPlayer _x) then {
_friendUID = [_x] call FNC_GetPlayerUID;
_friendName = name _x;
Humans set [count Humans, [_friendUID,toArray _friendName]];
lbAdd [7101, _friendName];
_friendName = name _x;
_userList lbAdd _friendName;
_userList lbSetData [(lbSize _userList) -1,_friendUID];
};
} forEach _closePeople;
lbSort _userList;

23
SQF/dayz_code/actions/plotManagement/plotAddFriend.sqf
View File

@@ -1,26 +1,33 @@
private ["_pos","_plots","_thePlot","_inList","_toAdd","_friends"];
private ["_plots","_thePlot","_inList","_toAdd","_friends","_friendUID","_friendName","_userList"];
disableSerialization;
_pos = _this select 0;
if (_pos < 0) exitWith {};
_userList = (findDisplay 711194) displayCtrl 7001;
_toAdd = (Humans select _pos);
_plots = nearestObjects [[player] call FNC_getPos, ["Plastic_Pole_EP1_DZ"],15];
_friendUID = _this select 0;
_friendName = _userList lbText (lbCurSel _userList);
if (_friendUID == "") exitWith {};
_plots = nearestObjects [[player] call FNC_getPos, ["Plastic_Pole_EP1_DZ"],15];
_thePlot = _plots select 0;
_friends = _thePlot getVariable ["plotfriends",[]];
_toAdd = [_friendUID,toArray _friendName];
_inList = false;
{ if ((_x select 0) == (_toAdd select 0)) exitWith { _inList = true; }; } count _friends;
if (_inList) exitWith {localize "STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_ALREADYONTHELIST" call dayz_rollingMessages};
if ((count _friends) == DZE_MaxPlotFriends) exitWith { format[localize "STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_FRIENDLIMIT", DZE_MaxPlotFriends] call dayz_rollingMessages;};
{ if ((_x select 0) == (_toAdd select 0)) exitWith { _inList = true; }; false } count _friends;
if (_inList) exitWith { systemChat localize "STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_ALREADYONTHELIST"; };
if ((count _friends) == DZE_MaxPlotFriends) exitWith { systemChat format[localize "STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_FRIENDLIMIT", DZE_MaxPlotFriends]; };
_friends set [(count _friends), _toAdd];
_thePlot setVariable ["plotfriends", _friends, true];
PVDZ_veh_Save = [_thePlot,"gear"];
if (isServer) then {
PVDZ_veh_Save call server_updateObject;
} else {
publicVariableServer "PVDZ_veh_Save";
};
call PlotGetFriends;
call PlotNearbyHumans;

20
SQF/dayz_code/actions/plotManagement/plotNearbyHumans.sqf
View File

@@ -1,13 +1,19 @@
private ["_closePeople","_friendUID","_friendName"];
private ["_closePeople","_friendUID","_friendName","_userList"];
disableSerialization;
_userList = (findDisplay 711194) displayCtrl 7001;
lbClear _userList;
_closePeople = if (DZE_plotManagementMustBeClose) then { player nearEntities ["CAManBase", 10] } else { playableUnits };
lbClear 7001;
if (!DZE_plotManagementMustBeClose) then {_closePeople = playableUnits;} else {_closePeople = player nearEntities ["CAManBase", 10];};
Humans = [];
{
if (isPlayer _x) then {
_friendUID = [_x] call FNC_GetPlayerUID;
_friendName = name _x;
Humans = Humans + [[_friendUID,toArray _friendName]];
lbAdd [7001, _friendName];
_userList lbAdd _friendName;
_userList lbSetData [(lbSize _userList) -1,_friendUID];
};
} forEach _closePeople;
} forEach _closePeople;
lbSort _userList;