From 9d51fb273686946a6c5f2fb2cd27b57cf764cee1 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Tue, 17 May 2016 22:02:21 -0400 Subject: [PATCH] Fix plot management buttons color and text alignment Fixes unintended black on black buttons and left aligned button text. Plot management uses Zupa's older defines. The only changes for this button type are the background color and text alignment. https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L568 https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L588 --- SQF/dayz_code/Configs/RscDisplay/ZSCdefines.hpp | 14 +++++++++++++- .../Configs/RscDisplay/plotManagement.hpp | 12 ++++++------ .../actions/plotManagement/plotGetFriends.sqf | 2 +- .../actions/plotManagement/plotNearbyHumans.sqf | 3 +-- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/SQF/dayz_code/Configs/RscDisplay/ZSCdefines.hpp b/SQF/dayz_code/Configs/RscDisplay/ZSCdefines.hpp index ed77ed45d..eba177f95 100644 --- a/SQF/dayz_code/Configs/RscDisplay/ZSCdefines.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/ZSCdefines.hpp @@ -643,7 +643,7 @@ class ZSC_RscToolbox { sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)"; }; -class ZSC_RscTextT +class ZSC_RscTextT // Used in plot management { access = 0; type = 0; @@ -660,4 +660,16 @@ class ZSC_RscTextT shadow = 2; font = "Zeppelin32"; SizeEx = 0.03921; +}; + +class ZSC_RscButtonMenuBlue : ZSC_RscButtonMenu // Used in plot management +{ + colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])", 0.5}; + class Attributes + { + font = "Zeppelin32"; + color = "#E5E5E5"; + align = "center"; + shadow = "false"; + }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/RscDisplay/plotManagement.hpp b/SQF/dayz_code/Configs/RscDisplay/plotManagement.hpp index 2d487266b..88281e59d 100644 --- a/SQF/dayz_code/Configs/RscDisplay/plotManagement.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/plotManagement.hpp @@ -25,7 +25,7 @@ class PlotManagement colorText[] = {1,1,1,1}; }; - class RscShortcutButton_7009: ZSC_RscButtonMenu + class RscShortcutButton_7009: ZSC_RscButtonMenuBlue { idc = -1; text = $STR_EPOCH_DOME; @@ -35,7 +35,7 @@ class PlotManagement onButtonClick = "call PlotPreview;"; }; - class RscShortcutButton_7010: ZSC_RscButtonMenu + class RscShortcutButton_7010: ZSC_RscButtonMenuBlue { idc = -1; text = $STR_EPOCH_REFRESH; @@ -45,7 +45,7 @@ class PlotManagement onButtonClick = "[""preview""] call MaintainPlot;"; }; - class RscShortcutButton_7011: ZSC_RscButtonMenu + class RscShortcutButton_7011: ZSC_RscButtonMenuBlue { idc = -1; text = $STR_EPOCH_ACTIONS_MAINTAIN; @@ -133,7 +133,7 @@ class PlotManagement soundSelect[] = {"",0.1,1}; colorBackground[] = {0.1,0.1,0.1,0.8}; }; - class RscShortcutButton_7004: ZSC_RscButtonMenu + class RscShortcutButton_7004: ZSC_RscButtonMenuBlue { idc = -1; text = $STR_EPOCH_ADD; @@ -142,7 +142,7 @@ class PlotManagement w = 0.08 * safezoneW; onButtonClick = "[(lbCurSel 7001)] call PlotAddFriend;"; }; - class RscShortcutButton_7005: ZSC_RscButtonMenu + class RscShortcutButton_7005: ZSC_RscButtonMenuBlue { idc = -1; text = $STR_EPOCH_DELETE; @@ -151,7 +151,7 @@ class PlotManagement w = 0.08 * safezoneW; onButtonClick = "[(lbCurSel 7002)] call PlotRemoveFriend;"; }; - class RscShortcutButton_7006: ZSC_RscButtonMenu + class RscShortcutButton_7006: ZSC_RscButtonMenuBlue { idc = -1; text = $STR_UI_CLOSE; diff --git a/SQF/dayz_code/actions/plotManagement/plotGetFriends.sqf b/SQF/dayz_code/actions/plotManagement/plotGetFriends.sqf index 9938f2b8f..143a716dd 100644 --- a/SQF/dayz_code/actions/plotManagement/plotGetFriends.sqf +++ b/SQF/dayz_code/actions/plotManagement/plotGetFriends.sqf @@ -5,7 +5,7 @@ _thePlot = _plots select 0; _friendlies = _thePlot getVariable ["plotfriends", []]; { lbAdd [7002, (_x select 1)]; -} count _friendlies; +} forEach _friendlies; // count causes Error Type Number, expected Bool here diff --git a/SQF/dayz_code/actions/plotManagement/plotNearbyHumans.sqf b/SQF/dayz_code/actions/plotManagement/plotNearbyHumans.sqf index 9d37ba723..2d5425944 100644 --- a/SQF/dayz_code/actions/plotManagement/plotNearbyHumans.sqf +++ b/SQF/dayz_code/actions/plotManagement/plotNearbyHumans.sqf @@ -10,5 +10,4 @@ Humans = []; Humans = Humans + [[_friendUID,_friendName]] ; lbAdd [7001, _friendName]; }; -} count _closePeople; - +} forEach _closePeople; // count causes Error Type Number, expected Bool here \ No newline at end of file