diff --git a/CHANGE LOG 1.0.6.2.txt b/CHANGE LOG 1.0.6.2.txt index 7daa5b65e..728409642 100644 --- a/CHANGE LOG 1.0.6.2.txt +++ b/CHANGE LOG 1.0.6.2.txt @@ -27,6 +27,7 @@ [UPDATED] Locking and unlocking safes now uses call instead of spawn on the server. This fixes the user input lock and safes appearing to disappear momentarily when server FPS is low. [UPDATED] Added cleanup of destroyed vehicles and CraterLong after 5 minutes in sched_corpses.sqf. [UPDATED] Reverted group menu color scheme to A2OA default for consistency with game dialogs +[UPDATED] All Zupa dialogs have been updated to use consistent title bar color, button colors, text style and background. The trader menu background is now semi-transparent for increased visibility of surroundings. [UPDATED] DZE_ZombieSpeed = [min, max]; has replaced the, now removed, DZE_slowZombies variable. set DZE_ZombieSpeed = [2,2]; for DZE_slowZombies = true; behavior. see configvariables.sqf for more info [UPDATED] Reverted increased waves in stormy weather to Chernarus default settings. [UPDATED] Removed server control panel, because it is abused by players and not currently used by admins diff --git a/SQF/dayz_code/Configs/RscDisplay/ZSCdefines.hpp b/SQF/dayz_code/Configs/RscDisplay/ZSCdefines.hpp index 15320be4d..09a94346c 100644 --- a/SQF/dayz_code/Configs/RscDisplay/ZSCdefines.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/ZSCdefines.hpp @@ -1,3 +1,5 @@ +#define ZSC_DARK_BLUE 0.3843, 0.7019, 0.8862 + class ZSC_RscScrollBar { color[] = {1,1,1,0.6}; @@ -208,14 +210,14 @@ class ZSC_RscButton sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; colorText[] = {1,1,1,1.0}; colorDisabled[] = {0.4,0.4,0.4,1}; - colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])",0.7}; - colorBackgroundActive[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])",1}; + colorBackground[] = {ZSC_DARK_BLUE,0.7}; + colorBackgroundActive[] = {ZSC_DARK_BLUE,1}; colorBackgroundDisabled[] = {0.95,0.95,0.95,1}; offsetX = 0.003; offsetY = 0.003; offsetPressedX = 0.002; offsetPressedY = 0.002; - colorFocused[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])",1}; + colorFocused[] = {ZSC_DARK_BLUE,1}; colorShadow[] = {0,0,0,1}; colorBorder[] = {0,0,0,1}; borderSize = 0.0; @@ -247,8 +249,8 @@ class ZSC_RscShortcutButton { colorFocused[] = {1,1,1,1.0}; color2[] = {0.95,0.95,0.95,1}; colorDisabled[] = {1,1,1,0.25}; - colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])",1}; - colorBackgroundFocused[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])",1}; + colorBackground[] = {ZSC_DARK_BLUE,1}; + colorBackgroundFocused[] = {ZSC_DARK_BLUE,1}; colorBackground2[] = {1,1,1,1}; periodFocus = 1.2; periodOver = 0.8; @@ -315,12 +317,12 @@ class ZSC_RscButtonMenu : ZSC_RscShortcutButton { animTextureFocused = "#(argb,8,8,3)color(1,1,1,1)"; animTexturePressed = "#(argb,8,8,3)color(1,1,1,1)"; animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)"; - colorBackground[] = {0,0,0,0.8}; - colorBackgroundFocused[] = {1,1,1,1}; - colorBackground2[] = {0.75,0.75,0.75,1}; + colorBackground[] = {ZSC_DARK_BLUE, 0.5}; + colorBackgroundFocused[] = {.9,.9,.9,.5}; + colorBackground2[] = {.9,.9,.9,.5}; color[] = {1,1,1,1}; - colorFocused[] = {0,0,0,1}; - color2[] = {0,0,0,1}; + colorFocused[] = {1,1,1,1}; + color2[] = {1,1,1,1}; colorText[] = {1,1,1,1}; colorDisabled[] = {1,1,1,0.25}; period = 1.2; @@ -342,7 +344,7 @@ class ZSC_RscButtonMenu : ZSC_RscShortcutButton { { font = "Zeppelin32"; color = "#E5E5E5"; - align = "left"; + align = "center"; shadow = "false"; }; class ShortcutPos @@ -412,7 +414,7 @@ class ZSC_RscCheckbox { color[] = {0, 0, 0, 0}; colorBackground[] = {0, 0, 1, 1}; colorTextSelect[] = {0, 0.8, 0, 1}; - colorSelectedBg[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])", 1}; + colorSelectedBg[] = {ZSC_DARK_BLUE,1}; colorSelect[] = {0, 0, 0, 1}; colorTextDisable[] = {0.4, 0.4, 0.4, 1}; colorDisable[] = {0.4, 0.4, 0.4, 1}; @@ -441,12 +443,13 @@ class ZSC_RscProgress shadow = 2; colorFrame[] = {0, 0, 0, 1}; colorBackground[] = {0,0,0,0.7}; - colorBar[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.7])"}; + colorBar[] = {ZSC_DARK_BLUE,0.7}; }; class ZSC_RscListBox { - style = 16; + style = 0; //white outline + //style = 16; //no outline idc = -1; type = 5; w = 0.275; @@ -456,8 +459,8 @@ class ZSC_RscListBox colorText[] = {1, 1, 1, 1}; colorBackground[] = {0.28,0.28,0.28,0.28}; colorSelect2[] = {1, 1, 1, 1}; - colorSelectBackground[] = {0.95, 0.95, 0.95, 0.5}; - colorSelectBackground2[] = {1, 1, 1, 0.5}; + colorSelectBackground[] = {.7,.7,.7,.5}; + colorSelectBackground2[] = {.7,.7,.7,.5}; colorScrollbar[] = {0.2, 0.2, 0.2, 1}; wholeHeight = 0.45; rowHeight = 0.04; @@ -472,6 +475,16 @@ class ZSC_RscListBox tooltipColorText[] = {1,1,1,1}; tooltipColorBox[] = {1,1,1,1}; tooltipColorShade[] = {0,0,0,0.65}; + class ScrollBar { + color[] = {1, 1, 1, 0.6}; + colorActive[] = {1, 1, 1, 1}; + colorDisabled[] = {1, 1, 1, 0.3}; + thumb = "\ca\ui\data\ui_scrollbar_thumb_ca.paa"; + arrowFull = "\ca\ui\data\ui_arrow_top_active_ca.paa"; + arrowEmpty = "\ca\ui\data\ui_arrow_top_ca.paa"; + border = "\ca\ui\data\ui_border_scroll_ca.paa"; + shadow = 0; + }; class ListScrollBar: ZSC_RscScrollBar { color[] = {1,1,1,1}; @@ -494,7 +507,7 @@ class ZSC_RscEdit { colorText[] = {0.95, 0.95, 0.95, 1}; colorDisabled[] = {1, 1, 1, 0.25}; autocomplete = false; - colorSelection[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])", 1}; + colorSelection[] = {ZSC_DARK_BLUE,1}; canModify = 1; soundPush[] = { "", 0, 1 }; soundEnter[] = { "", 0, 1 }; @@ -638,38 +651,7 @@ class ZSC_RscToolbox { colorSelect[] = {0.95, 0.95, 0.95, 1}; colorTextDisable[] = {0.4, 0.4, 0.4, 1}; colorDisable[] = {0.4, 0.4, 0.4, 1}; - colorSelectedBg[] = {"(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}; + colorSelectedBg[] = {ZSC_DARK_BLUE, 0.5}; font = "Zeppelin32"; sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)"; -}; - -class ZSC_RscTextT // Used in plot management -{ - //access = 0; - type = 0; - idc = -1; - colorBackground[] = {0,0,0,0}; - colorText[] = {0.8784,0.8471,0.651,1}; - text = ""; - fixedWidth = 0; - x = 0; - y = 0; - h = 0.037; - w = 0.3; - style = 0; - 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/advancedTrading.hpp b/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp index d9f88df9d..41108cfa5 100644 --- a/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp @@ -1,35 +1,33 @@ -class AT_Zupa_BlueButton: ZSC_RscButtonMenu { - colorBackground[] = {0.2,0.75,1,1}; - colorText[] = {1,1,1,1}; - class Attributes - { - align = "center"; - }; -}; - class AdvancedTrading { idd = 711197; class Controls { - class RscText_ATBackground1: ZSC_RscText + class RscText_ATBackground1 { idc = -1; x = 0.20 * safezoneW + safezoneX; y = 0.15 * safezoneH + safezoneY; w = 0.40 * safezoneW; h = 0.70 * safezoneH; - colorBackground[] = {0.2,0.2,0.2,1}; + colorBackground[] = {0,0,0,0.8}; + type = 0; + colorText[] = {0.8784,0.8471,0.651,1}; + text = ""; + fixedWidth = 0; + style = 0; + shadow = 2; + font = "Zeppelin32"; + SizeEx = 0.03921; }; - class RscText_ATBackground2: ZSC_RscText + class RscText_ATBackground2: RscText_ATBackground1 { idc = -1; x = 0.60 * safezoneW + safezoneX; y = 0.15 * safezoneH + safezoneY; w = 0.20 * safezoneW; h = 0.70 * safezoneH; - colorBackground[] = {0.1,0.1,0.1,1}; }; - class RscText_AT2: ZSC_RscText + class RscText_AT2: ZSC_RscText { idc = -1; text = $STR_EPOCH_PLAYER_289; @@ -37,11 +35,10 @@ class AdvancedTrading y = 0.15 * safezoneH + safezoneY; w = 0.60 * safezoneW; h = 0.04 * safezoneH; - colorBackground[] = {0.2,0.75,1,1}; + colorBackground[] = {ZSC_DARK_BLUE, 0.5}; colorText[] = {1,1,1,1}; }; - - class RscText_Zupa_1: ZSC_RscText + class RscText_Zupa_1: ZSC_RscText { idc = 7408; text = $STR_EPOCH_TRADE_SELLING_GEAR; @@ -51,7 +48,7 @@ class AdvancedTrading h = 0.05 * safezoneH; colorText[] = {1,1,1,1}; }; - class ZSC_RscButtonMenu_Z1: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_Z1: ZSC_RscButtonMenu { idc = -1; text = $STR_UI_GEAR; @@ -59,10 +56,8 @@ class AdvancedTrading y = 0.26 * safezoneH + safezoneY; w = 0.08 * safezoneW; onButtonClick = "[2] call Z_getContainer;"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; - class ZSC_RscButtonMenu_Z2: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_Z2: ZSC_RscButtonMenu { idc = -1; text = $STR_EPOCH_TRADE_BACKPACK; @@ -70,10 +65,8 @@ class AdvancedTrading y = 0.26 * safezoneH + safezoneY; w = 0.08 * safezoneW; onButtonClick = "[0] call Z_getContainer;"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; - class ZSC_RscButtonMenu_Z3: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_Z3: ZSC_RscButtonMenu { idc = -1; text = $STR_DN_VEHICLE; @@ -81,10 +74,8 @@ class AdvancedTrading y = 0.26 * safezoneH + safezoneY; w = 0.08 * safezoneW; onButtonClick = "[1] call Z_getContainer;"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; - class ZSC_RscButtonMenu_Z4: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_Z4: ZSC_RscButtonMenu { idc = 7416; text = $STR_EPOCH_PLAYER_292; @@ -92,8 +83,6 @@ class AdvancedTrading y = 0.26 * safezoneH + safezoneY; w = 0.08 * safezoneW; onButtonClick = "Z_CategoryView = true; Z_ResetContainer = true; call Z_ChangeBuySell;"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; class RscText_AT6: ZSC_RscText { @@ -115,7 +104,7 @@ class AdvancedTrading h = 0.03 * safezoneH; colorText[] = {1,1,1,1}; }; - class ZSC_RscButtonMenu_BACK: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_BACK: ZSC_RscButtonMenu { idc = 7449; text = $STR_DISP_BACK; @@ -123,8 +112,6 @@ class AdvancedTrading y = 0.33 * safezoneH + safezoneY; w = 0.08 * safezoneW; onButtonClick = "Z_Selling = true; Z_CategoryView = true; call Z_ChangeBuySell;"; //Z_Selling is flipped in ChangeBuySell - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; class RscText_AT8: ZSC_RscText { @@ -146,54 +133,18 @@ class AdvancedTrading h = 0.03 * safezoneH; colorText[] = {1,1,1,1}; }; - class RscBackgroundText_Zupa_1: ZSC_RscText - { - idc = -1; - text = ""; - x = 0.21* safezoneW + safezoneX; - y = 0.41 * safezoneH + safezoneY; - w = 0.13 * safezoneW; - h = 0.30 * safezoneH; - colorText[] = {1,1,1,1}; - colorBackground[] = {0.1,0.1,0.1,1}; - }; - class RscBackgroundText_Zupa_2: ZSC_RscText - { - idc = -1; - text = ""; - x = 0.46 * safezoneW + safezoneX; - y = 0.41* safezoneH + safezoneY; - w = 0.13 * safezoneW; - h = 0.30 * safezoneH; - colorText[] = {1,1,1,1}; - colorBackground[] = {0.1,0.1,0.1,1}; - }; - class RscListbox_AT10: ZSC_RscListBox { idc = 7401; - type = 5; idcLeft = -1; - idcRight = -1; + idcRight = -1; x = 0.21* safezoneW + safezoneX; y = 0.41 * safezoneH + safezoneY; w = 0.13 * safezoneW; h = 0.30 * safezoneH; soundSelect[] = {"",0.1,1}; - colorBackground[] = {0.1,0.1,0.1,0.8}; onLBSelChanged = "['sellable',(lbCurSel 7401)] call Z_getItemInfo"; class ListScrollBar: ZSC_RscScrollBar{}; - class ScrollBar - { - color[] = {1,1,1,0.6}; - colorActive[] = {1,1,1,1}; - colorDisabled[] = {1,1,1,0.3}; - shadow = 0; - thumb = "\ca\ui\data\ui_scrollbar_thumb_ca.paa"; - arrowFull = "\ca\ui\data\ui_arrow_top_active_ca.paa"; - arrowEmpty = "\ca\ui\data\ui_arrow_top_ca.paa"; - border = "\ca\ui\data\ui_border_scroll_ca.paa"; - }; }; class RscListbox_AT11: ZSC_RscListBox { @@ -203,48 +154,23 @@ class AdvancedTrading w = 0.13 * safezoneW; h = 0.30 * safezoneH; soundSelect[] = {"",0.1,1}; - colorBackground[] = {0.1,0.1,0.1,0.8}; onLBSelChanged = "['selling',(lbCurSel 7402)] call Z_getItemInfo"; class ListScrollBar: ZSC_RscScrollBar{}; - class ScrollBar - { - color[] = {1,1,1,0.6}; - colorActive[] = {1,1,1,1}; - colorDisabled[] = {1,1,1,0.3}; - shadow = 0; - thumb = "\ca\ui\data\ui_scrollbar_thumb_ca.paa"; - arrowFull = "\ca\ui\data\ui_arrow_top_active_ca.paa"; - arrowEmpty = "\ca\ui\data\ui_arrow_top_ca.paa"; - border = "\ca\ui\data\ui_border_scroll_ca.paa"; - }; }; class RscListbox_AT20: ZSC_RscListBox { idc = 7421; - type = 5; idcLeft = -1; - idcRight = -1; + idcRight = -1; x = 0.21* safezoneW + safezoneX; y = 0.41 * safezoneH + safezoneY; w = 0.13 * safezoneW; h = 0.30 * safezoneH; soundSelect[] = {"",0.1,1}; - colorBackground[] = {0.1,0.1,0.1,0.8}; onload = "ctrlShow [_this,false]"; onLBDblClick = "if (Z_CategoryView) then {(lbCurSel 7421) call Z_fillCategoryList;};"; onLBSelChanged = "if (!Z_CategoryView) then {['buyable',(lbCurSel 7421)] call Z_getItemInfo;};"; class ListScrollBar: ZSC_RscScrollBar{}; - class ScrollBar - { - color[] = {1,1,1,0.6}; - colorActive[] = {1,1,1,1}; - colorDisabled[] = {1,1,1,0.3}; - shadow = 0; - thumb = "\ca\ui\data\ui_scrollbar_thumb_ca.paa"; - arrowFull = "\ca\ui\data\ui_arrow_top_active_ca.paa"; - arrowEmpty = "\ca\ui\data\ui_arrow_top_ca.paa"; - border = "\ca\ui\data\ui_border_scroll_ca.paa"; - }; }; class RscListbox_AT21: ZSC_RscListBox { @@ -254,30 +180,18 @@ class AdvancedTrading w = 0.13 * safezoneW; h = 0.30 * safezoneH; soundSelect[] = {"",0.1,1}; - colorBackground[] = {0.1,0.1,0.1,0.8}; onload = "ctrlShow [_this,false]"; onLBSelChanged = "['buying',(lbCurSel 7422)] call Z_getItemInfo"; - class ScrollBar - { - color[] = {1,1,1,0.6}; - colorActive[] = {1,1,1,1}; - colorDisabled[] = {1,1,1,0.3}; - shadow = 0; - thumb = "\ca\ui\data\ui_scrollbar_thumb_ca.paa"; - arrowFull = "\ca\ui\data\ui_arrow_top_active_ca.paa"; - arrowEmpty = "\ca\ui\data\ui_arrow_top_ca.paa"; - border = "\ca\ui\data\ui_border_scroll_ca.paa"; - }; }; - class RscSearchBackground: ZSC_RscText + class RscSearchBackground: ZSC_RscListBox { idc = -1; x = 0.21 * safezoneW + safezoneX; y = 0.72 * safezoneH + safezoneY; w = 0.13 * safezoneW; h = 0.03 * safezoneH; - colorText[] = {1,1,1,1}; - colorBackground[] = {0.1,0.1,0.1,1}; + soundSelect[] = {"",0.1,1}; + class ListScrollBar: ZSC_RscScrollBar{}; }; class Zupa_Filter_Edit : ZSC_RscEdit { idc = 7444; @@ -287,20 +201,18 @@ class AdvancedTrading x = 0.21 * safezoneW + safezoneX; y = 0.72 * safezoneH + safezoneY; w = 0.13 * safezoneW; - h = 0.04; + h = 0.03 * safezoneH; }; - class ZSC_RscButtonMenu_ATTFilter: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_ATTFilter: ZSC_RscButtonMenu { idc = 7498; text = $STR_UI_FILTER; - x = 0.21 * safezoneW + safezoneX; + x = 0.21 * safezoneW + safezoneX; y = 0.77 * safezoneH + safezoneY; w = 0.13 * safezoneW; onButtonClick = "if (Z_CategoryView && !Z_Selling) then {(lbCurSel 7421) call Z_fillCategoryList} else {[(ctrlText 7444)] call Z_filterList};"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; - class ZSC_RscButtonMenu_AT12: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_AT12: ZSC_RscButtonMenu { idc = 7430; text = " > "; @@ -308,10 +220,8 @@ class AdvancedTrading y = 0.41 * safezoneH + safezoneY; w = 0.08 * safezoneW; onButtonClick = "[(lbCurSel 7401)] call Z_pushItemToList;"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; - class ZSC_RscButtonMenu_AT14: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_AT14: ZSC_RscButtonMenu { idc = 7431; text = " >> "; @@ -319,10 +229,8 @@ class AdvancedTrading y = 0.49 * safezoneH + safezoneY; w = 0.08 * safezoneW; onButtonClick = "call Z_pushAllToList;"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; - class ZSC_RscButtonMenu_AT13: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_AT13: ZSC_RscButtonMenu { idc = 7432; text = " < "; @@ -330,10 +238,8 @@ class AdvancedTrading y = 0.57 * safezoneH + safezoneY; w = 0.08 * safezoneW; onButtonClick = "[(lbCurSel 7402)] call Z_removeItemFromList;"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; - class ZSC_RscButtonMenu_AT15: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_AT15: ZSC_RscButtonMenu { idc = 7433; text = " << "; @@ -341,10 +247,8 @@ class AdvancedTrading y = 0.65 * safezoneH + safezoneY; w = 0.08 * safezoneW; onButtonClick = "call Z_removeAllToList;"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; - class ZSC_RscButtonMenu_ATT1: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_ATT1: ZSC_RscButtonMenu { idc = 7440; @@ -354,10 +258,8 @@ class AdvancedTrading w = 0.08 * safezoneW; onButtonClick = "[(lbCurSel 7421),(ctrlText 7441)] call Z_toBuyingList;"; onload = "ctrlShow [_this,false]"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; - class Zupa_Ammount_Edit : ZSC_RscEdit { + class Zupa_Amount_Edit : ZSC_RscEdit { idc = 7441; colorText[] = {1,1,1,1}; text = "1"; @@ -365,10 +267,10 @@ class AdvancedTrading x = 0.36 * safezoneW + safezoneX; y = 0.49 * safezoneH + safezoneY; w = 0.08 * safezoneW; - h = 0.03; + h = 0.03 * safezoneH; onload = "ctrlShow [_this,false]"; }; - class ZSC_RscButtonMenu_ATT3: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_ATT3: ZSC_RscButtonMenu { idc = 7442; text = " < "; @@ -377,10 +279,8 @@ class AdvancedTrading w = 0.08 * safezoneW; onButtonClick = "[(lbCurSel 7422)] call Z_removeItemFromBuyingList;"; onload = "ctrlShow [_this,false]"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; - class ZSC_RscButtonMenu_ATT4: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_ATT4: ZSC_RscButtonMenu { idc = 7443; text = " << "; @@ -389,8 +289,6 @@ class AdvancedTrading w = 0.08 * safezoneW; onButtonClick = "call Z_removeAllFromBuyingList;"; onload = "ctrlShow [_this,false]"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; class RscText_ATT8: ZSC_RscStructuredText { @@ -403,16 +301,15 @@ class AdvancedTrading colorText[] = {1,1,1,1}; onload = "ctrlShow [_this,false]"; }; - class RscSearchBackground2: ZSC_RscText + class RscSearchBackground2: ZSC_RscListBox { idc = -1; - text = ""; x = 0.46 * safezoneW + safezoneX; y = 0.72 * safezoneH + safezoneY; w = 0.13 * safezoneW; h = 0.03 * safezoneH; - colorText[] = {1,1,1,1}; - colorBackground[] = {0.1,0.1,0.1,1}; + soundSelect[] = {"",0.1,1}; + class ListScrollBar: ZSC_RscScrollBar{}; }; class RscText_AT18: ZSC_RscText { @@ -424,7 +321,7 @@ class AdvancedTrading h = 0.03 * safezoneH; colorText[] = {1,1,1,1}; }; - class ZSC_RscButtonMenu_AT16: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_AT16: ZSC_RscButtonMenu { idc = 7435; text = $STR_EPOCH_PLAYER_292; @@ -432,10 +329,8 @@ class AdvancedTrading y = 0.77 * safezoneH + safezoneY; w = 0.13 * safezoneW; onButtonClick = "call Z_SellItems;"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; - class ZSC_RscButtonMenu_AT27: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_AT27: ZSC_RscButtonMenu { idc = 7436; text = $STR_EPOCH_PLAYER_291; @@ -444,29 +339,23 @@ class AdvancedTrading w = 0.13 * safezoneW; onload = "ctrlShow [_this,false]"; onButtonClick = "call Z_BuyItems;"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; }; - class ZSC_RscButtonMenu_AT28: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_AT28: ZSC_RscButtonMenu { idc = -1; 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 2); localize ""STR_EPOCH_PLAYER_307"" call dayz_rollingMessages;"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; text = $STR_EPOCH_PLAYER_306; }; - class ZSC_RscButtonMenu_AT29: AT_Zupa_BlueButton + class ZSC_RscButtonMenu_AT29: ZSC_RscButtonMenu { idc = -1; x = 0.63 * safezoneW + safezoneX; y = 0.80 * safezoneH + safezoneY; w = 0.13 * safezoneW; onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 2);"; - colorBackground[] = {1,1,1,1}; - color[] = {0,0,0,1}; text = $STR_UI_CLOSE; }; class RscStrText_AT_PriceInfo: ZSC_RscStructuredText // todo @@ -487,28 +376,28 @@ class AdvancedTrading y = 0.38 * safezoneH + safezoneY; w = 0.20 * safezoneW; h = 0.03 * safezoneH; - colorBackground[] = {0.2,0.75,1,1}; + colorBackground[] = {ZSC_DARK_BLUE, 0.5}; colorText[] = {1,1,1,1}; }; class RscText_AT_BreakLine: ZSC_RscText { - idc = -1; - x = 0.60 * safezoneW + safezoneX; - y = 0.15 * safezoneH + safezoneY; - w = 0.0005 * safezoneW; - h = 0.70 * safezoneH; - colorBackground[] = {0.2,0.75,1,1}; + idc = -1; + x = 0.60 * safezoneW + safezoneX; + y = 0.15 * safezoneH + safezoneY; + w = 0.0005 * safezoneW; + h = 0.70 * safezoneH; + colorBackground[] = {ZSC_DARK_BLUE, 0.5}; + }; + class RscStrText_AT_ItemInfo: ZSC_RscStructuredText + { + idc = 7445; + text = ""; + x = 0.61 * safezoneW + safezoneX; + y = 0.43 * safezoneH + safezoneY; + w = 0.19 * safezoneW; + h = 0.59 * safezoneH; + colorText[] = {1,1,1,1}; }; - class RscStrText_AT_ItemInfo: ZSC_RscStructuredText - { - idc = 7445; - text = ""; - x = 0.61 * safezoneW + safezoneX; - y = 0.43 * safezoneH + safezoneY; - w = 0.19 * safezoneW; - h = 0.59 * safezoneH; - colorText[] = {1,1,1,1}; - }; class RscStrText_AT_ContainerInfo: ZSC_RscStructuredText { idc = 7446; diff --git a/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorAccess.hpp b/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorAccess.hpp index df895376d..2bc129c71 100644 --- a/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorAccess.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorAccess.hpp @@ -10,7 +10,6 @@ class DoorAccess { class ZupaBackground_1 { - //access = 0; type = 0; colorText[] = {0.8784,0.8471,0.651,1}; text = ""; @@ -27,7 +26,7 @@ class DoorAccess colorBackground[] = {0,0,0,0.8}; }; - class ZupaHeader_2: ZSC_RscTextT + class ZupaHeader_2: ZSC_RscText { idc = -1; x = 0.35 * safezoneW + safezoneX; @@ -35,11 +34,11 @@ class DoorAccess w = 0.20 * safezoneW; h = 0.05 * safezoneH; text = $STR_EPOCH_DOORACCESS_TITLE; - colorBackground[] = {0,0,0,0.8}; + colorBackground[] = {ZSC_DARK_BLUE, 0.5}; colorText[] = {1,1,1,1}; }; - class ZupaButton_1 : ZSC_RscButtonMenuBlue + class ZupaButton_1 : ZSC_RscButtonMenu { idc = -1; text = $STR_EPOCH_DOORACCESS_SCAN; @@ -50,7 +49,7 @@ class DoorAccess onButtonClick = "keypadCancel = false; call player_unlockDoor"; }; - class ZupaButton_4 : ZSC_RscButtonMenuBlue + class ZupaButton_4 : ZSC_RscButtonMenu { idc = -1; text = $STR_EPOCH_DOORACCESS_MANUAL; @@ -61,7 +60,7 @@ class DoorAccess onButtonClick = "call player_enterCode"; }; - class ZupaButton_2: ZSC_RscButtonMenuBlue + class ZupaButton_2: ZSC_RscButtonMenu { idc = -1; text = $STR_DISP_CANCEL; @@ -71,7 +70,7 @@ class DoorAccess onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 2);"; }; - class ZupaButton_3: ZSC_RscButtonMenuBlue + class ZupaButton_3: ZSC_RscButtonMenu { idc = -1; text = $STR_EPOCH_ACTIONS_MANAGEDOOR; diff --git a/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorManagement.hpp b/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorManagement.hpp index 7a99aeebe..b8e355d49 100644 --- a/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorManagement.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorManagement.hpp @@ -3,7 +3,7 @@ class DoorManagement idd = 711195; onLoad = "if (DZE_doorManagementMustBeClose) then {(_this select 0) displayCtrl 7108 ctrlSetText localize 'STR_EPOCH_HUMANS_NEARBY';};"; class Controls { - class RscText_7100: ZSC_RscTextT + class RscText_7100: ZSC_RscText { idc = 7100; x = 0.30 * safezoneW + safezoneX; @@ -13,7 +13,7 @@ class DoorManagement colorBackground[] = {0,0,0,0.8}; }; - class RscListbox_7101: RscListbox + class RscListbox_7101: ZSC_RscListBox { idc = 7101; x = 0.31* safezoneW + safezoneX; @@ -22,9 +22,12 @@ class DoorManagement h = 0.30 * safezoneH; soundSelect[] = {"",0.1,1}; colorBackground[] = {0.1,0.1,0.1,0.8}; + sizeEx = 0.035; + class ListScrollBar: ZSC_RscScrollBar{}; + style = 16; //no outline }; - class RscListbox_7102: RscListbox + class RscListbox_7102: ZSC_RscListBox { idc = 7102; x = 0.45 * safezoneW + safezoneX; @@ -33,9 +36,12 @@ class DoorManagement h = 0.30 * safezoneH; soundSelect[] = {"",0.1,1}; colorBackground[] = {0.1,0.1,0.1,0.8}; + sizeEx = 0.035; + class ListScrollBar: ZSC_RscScrollBar{}; + style = 16; //no outline }; - class RscShortcutButton_7104: ZSC_RscButtonMenuBlue + class RscShortcutButton_7104: ZSC_RscButtonMenu { idc = 7104; text = $STR_EPOCH_ADD; @@ -45,7 +51,7 @@ class DoorManagement onButtonClick = "[lbData [7101,lbCurSel 7101]] call DoorAddFriend;"; }; - class RscShortcutButton_7105: ZSC_RscButtonMenuBlue + class RscShortcutButton_7105: ZSC_RscButtonMenu { idc = 7105; text = $STR_DISP_DELETE; @@ -55,7 +61,7 @@ class DoorManagement onButtonClick = "[(lbCurSel 7102)] call DoorRemoveFriend;"; }; - class RscShortcutButton_7106: ZSC_RscButtonMenuBlue + class RscShortcutButton_7106: ZSC_RscButtonMenu { idc = 7106; text = $STR_UI_CLOSE; @@ -65,7 +71,7 @@ class DoorManagement onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 2);"; }; - class RscText_7107: ZSC_RscTextT + class RscText_7107: ZSC_RscText { idc = 7107; text = $STR_EPOCH_DOORMANAGEMENT_TITLE; @@ -73,11 +79,11 @@ class DoorManagement y = 0.30 * safezoneH + safezoneY; w = 0.30 * safezoneW; h = 0.05 * safezoneH; - colorBackground[] = {0,0,0,0.8}; + colorBackground[] = {ZSC_DARK_BLUE, 0.5}; colorText[] = {1,1,1,1}; }; - class RscText_7108: ZSC_RscTextT + class RscText_7108: ZSC_RscText { idc = 7108; text = $STR_MP_PLAYERS; @@ -88,7 +94,7 @@ class DoorManagement colorText[] = {1,1,1,1}; }; - class RscText_7103: ZSC_RscTextT + class RscText_7103: ZSC_RscText { idc = 71103; text = $STR_EPOCH_DOORMANAGEMENT_FRIENDS; diff --git a/SQF/dayz_code/Configs/RscDisplay/plotManagement.hpp b/SQF/dayz_code/Configs/RscDisplay/plotManagement.hpp index 17cc48c3f..e5f3be552 100644 --- a/SQF/dayz_code/Configs/RscDisplay/plotManagement.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/plotManagement.hpp @@ -3,7 +3,7 @@ class PlotManagement idd = 711194; onLoad = "if (DZE_plotManagementMustBeClose) then {(_this select 0) displayCtrl 7015 ctrlSetText localize 'STR_EPOCH_HUMANS_NEARBY';};"; class Controls { - class RscText_7000: ZSC_RscTextT + class RscText_7000: ZSC_RscText { idc = 7000; x = 0.30 * safezoneW + safezoneX; @@ -13,19 +13,19 @@ class PlotManagement colorBackground[] = {0,0,0,0.8}; }; - class RscText_7007: ZSC_RscTextT + class RscText_7007: ZSC_RscText { idc = 7007; - text = $STR_EPOCH_ACTIONS_MANAGEPLOT; + text = $STR_EPOCH_PLOTMANAGEMENT_TITLE; x = 0.30 * safezoneW + safezoneX; y = 0.15 * safezoneH + safezoneY; w = 0.30 * safezoneW; h = 0.05 * safezoneH; - colorBackground[] = {0,0,0,0.8}; + colorBackground[] = {ZSC_DARK_BLUE, 0.5}; colorText[] = {1,1,1,1}; }; - class RscShortcutButton_7009: ZSC_RscButtonMenuBlue + class RscShortcutButton_7009: ZSC_RscButtonMenu { idc = -1; text = $STR_EPOCH_DOME; @@ -35,7 +35,7 @@ class PlotManagement onButtonClick = "call PlotPreview;"; }; - class RscShortcutButton_7010: ZSC_RscButtonMenuBlue + class RscShortcutButton_7010: ZSC_RscButtonMenu { idc = -1; text = $STR_EPOCH_ACTIONS_MAINTAIN; @@ -45,7 +45,7 @@ class PlotManagement onButtonClick = "'maintain' call MaintainPlot;"; }; - class RscShortcutButton_7011: ZSC_RscButtonMenuBlue + class RscShortcutButton_7011: ZSC_RscButtonMenu { idc = -1; text = $STR_EPOCH_ACTIONS_MAINTAIN_FORCE; @@ -55,7 +55,7 @@ class PlotManagement onButtonClick = "'force' call MaintainPlot;"; }; - class RscText_7012: ZSC_RscTextT + class RscText_7012: ZSC_RscText { idc = 7012; text = ""; @@ -79,7 +79,7 @@ class PlotManagement }; }; - class RscText_7013: ZSC_RscTextT + class RscText_7013: ZSC_RscText { idc = 7013; text = ""; @@ -90,7 +90,7 @@ class PlotManagement colorText[] = {1,1,1,1}; }; - class RscText_7008: ZSC_RscTextT + class RscText_7008: ZSC_RscText { idc = 7015; text = $STR_MP_PLAYERS; @@ -101,7 +101,7 @@ class PlotManagement colorText[] = {1,1,1,1}; }; - class RscText_7003: ZSC_RscTextT + class RscText_7003: ZSC_RscText { idc = -1; text = $STR_EPOCH_PLOT_FRIENDS; @@ -111,8 +111,7 @@ class PlotManagement h = 0.03 * safezoneH; colorText[] = {1,1,1,1}; }; - - class RscListbox_7001: RscListbox + class RscListbox_7001: ZSC_RscListBox { idc = 7001; x = 0.31* safezoneW + safezoneX; @@ -121,9 +120,12 @@ class PlotManagement h = 0.30 * safezoneH; soundSelect[] = {"",0.1,1}; colorBackground[] = {0.1,0.1,0.1,0.8}; + sizeEx = 0.035; + class ListScrollBar: ZSC_RscScrollBar{}; + style = 16; //no outline }; - class RscListbox_7002: RscListbox + class RscListbox_7002: ZSC_RscListBox { idc = 7002; x = 0.45 * safezoneW + safezoneX; @@ -132,9 +134,12 @@ class PlotManagement h = 0.30 * safezoneH; soundSelect[] = {"",0.1,1}; colorBackground[] = {0.1,0.1,0.1,0.8}; + sizeEx = 0.035; + class ListScrollBar: ZSC_RscScrollBar{}; + style = 16; //no outline }; - class RscShortcutButton_7004: ZSC_RscButtonMenuBlue + class RscShortcutButton_7004: ZSC_RscButtonMenu { idc = -1; text = $STR_EPOCH_ADD; @@ -144,7 +149,7 @@ class PlotManagement onButtonClick = "[lbData [7001,lbCurSel 7001]] call PlotAddFriend;"; }; - class RscShortcutButton_7005: ZSC_RscButtonMenuBlue + class RscShortcutButton_7005: ZSC_RscButtonMenu { idc = -1; text = $STR_DISP_DELETE; @@ -154,7 +159,7 @@ class PlotManagement onButtonClick = "[(lbCurSel 7002)] call PlotRemoveFriend;"; }; - class RscShortcutButton_7006: ZSC_RscButtonMenuBlue + class RscShortcutButton_7006: ZSC_RscButtonMenu { idc = -1; text = $STR_UI_CLOSE; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf index d2ab524f5..2e9fdcd7a 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf @@ -35,11 +35,11 @@ if (isNumber (configFile >> 'CfgVehicles' >> _class >> 'transportMaxMagazines')) if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "%10: %2
" + - "%11: %3
" + - "%13: %6 %4
" + - "%12: %5 %7
" + - "%16: %8 %9
", + "%10: %2
" + + "%11: %3
" + + "%13: %6 %4
" + + "%12: %5 %7
" + + "%16: %8 %9
", _picture, _display, _class, @@ -71,11 +71,11 @@ if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "%10: %2
" + - "%11: %3
" + - "%13: %6 %4
" + - "%12: %5 %7
" + - "%18: %8 %9
", + "%10: %2
" + + "%11: %3
" + + "%13: %6 %4
" + + "%12: %5 %7
" + + "%18: %8 %9
", _picture, _display, _class, diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf index d4747e61f..984e63739 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf @@ -55,10 +55,10 @@ _displayText = getText(configFile >> "CfgMagazines" >> _class >> "descriptionSho if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "%8: %2
" + - "%9: %3
" + - "%11: %6 %7
" + - "%10: %5 %7
", + "%8: %2
" + + "%9: %3
" + + "%11: %6 %7
" + + "%10: %5 %7
", _picture, _display, _class, @@ -84,10 +84,10 @@ if (Z_SingleCurrency) then { }; _formattedText = format [ "
" + - "%11: %2
" + - "%12: %3
" + - "%14: %6 %9
" + - "%13: %5 %7
", + "%11: %2
" + + "%12: %3
" + + "%14: %6 %9
" + + "%13: %5 %7
", _picture, _display, _class, @@ -107,14 +107,14 @@ if (Z_SingleCurrency) then { if (count _compatible > 0) then { _formattedText = _formattedText + format [ - "%1: %2
" + "%1: %2
" ,localize "STR_EPOCH_COMPATIBLE",_compatibleText ]; }; if (_displayText != "") then { _formattedText = _formattedText + format [ - "%1: %2" + "%1: %2" ,localize "STR_EPOCH_DESCRIPTION",_displayText ]; }; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf index f81917288..de082d0af 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf @@ -115,13 +115,13 @@ _wepText = ""; if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "%10: %2
" + - "%11: %3
" + - "%13: %6 %7
" + - "%12: %5 %7
" + - "%14: %8 %9 %4
" + - "%17: %18 %24: %25
" + // Armor / Seats - "%21 %22: %23 %19: %20
", // MaxSpeed / Fuel + "%10: %2
" + + "%11: %3
" + + "%13: %6 %7
" + + "%12: %5 %7
" + + "%14: %8 %9 %4
" + + "%17: %18 %24: %25
" + // Armor / Seats + "%21 %22: %23 %19: %20
", // MaxSpeed / Fuel _picture, _display, _class, @@ -163,13 +163,13 @@ if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "%13: %2
" + - "%14: %3
" + - "%16: %6 %7
" + - "%15: %5 %10
" + - "%17: %8 %9 %4
" + - "%20: %21 %27: %28
" + // Armor / Seats - "%24 %25: %26 %22: %23
", // MaxSpeed / Fuel + "%13: %2
" + + "%14: %3
" + + "%16: %6 %7
" + + "%15: %5 %10
" + + "%17: %8 %9 %4
" + + "%20: %21 %27: %28
" + // Armor / Seats + "%24 %25: %26 %22: %23
", // MaxSpeed / Fuel _picture, _display, _class, @@ -204,7 +204,7 @@ if (Z_SingleCurrency) then { if (count _weapons2 > 0) then { _formattedText = _formattedText + format [ - "%1: %2
", + "%1: %2
", localize "STR_EPOCH_WEAPONS",_wepText ]; }; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf index 4dad317d7..5a22edf12 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf @@ -64,10 +64,10 @@ _magText = ""; if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "%8: %2
" + - "%9: %3
" + - "%11: %6 %7
" + - "%10: %5 %7
", + "%8: %2
" + + "%9: %3
" + + "%11: %6 %7
" + + "%10: %5 %7
", _picture, _display, _class, @@ -93,10 +93,10 @@ if (Z_SingleCurrency) then { }; _formattedText = format [ "
" + - "%11: %2
" + - "%12: %3
" + - "%14: %6 %8
" + - "%13: %5 %7
", + "%11: %2
" + + "%12: %3
" + + "%14: %6 %8
" + + "%13: %5 %7
", _picture, _display, _class, @@ -118,8 +118,8 @@ _parentClasses = [(configFile >> "CfgWeapons" >> _class),true] call BIS_fnc_retu if !("ItemCore" in _parentClasses or "Binocular" in _parentClasses) then { _formattedText = _formattedText + format [ - "%1: %2
" + - "%3: %4
" + "%1: %2
" + + "%3: %4
" ,localize "STR_EPOCH_ATTACHMENTS",_attachText,localize "STR_EPOCH_MAGS",_magText ]; }; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_fillBuyableList.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_fillBuyableList.sqf index 676350996..6e4428ccb 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_fillBuyableList.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_fillBuyableList.sqf @@ -18,7 +18,7 @@ _typeOf = typeOf (unitBackPack player); if (_type == "trade_items") then { { if (isText(configFile >> "CfgWeapons" >> _x >> "Attachments" >> _name) or _name in getArray (configFile >> "CfgWeapons" >> _x >> "magazines")) then { - lbSetColor [Z_AT_BUYABLELIST, _index, [0.2,0.75,1,1]]; + lbSetColor [Z_AT_BUYABLELIST, _index, [0, 1, 0, 0.8]]; //green }; } count _weapons; _count = {_x == _name} count magazines player; @@ -31,10 +31,10 @@ _typeOf = typeOf (unitBackPack player); }; if (_count > 0) then { - lbSetColor [Z_AT_BUYABLELIST, _index, [0, 1, 0, 1]]; + lbSetColor [Z_AT_BUYABLELIST, _index, [1, 0.8, 0, 1]]; //yellow } else { if ((_x select 6) < 0) then { //color items only allowed to either be sold or purchased - lbSetColor [Z_AT_BUYABLELIST, _index, [0, 0.57, 1, 1]]; + lbSetColor [Z_AT_BUYABLELIST, _index, [1, 0, 0, 1]]; //red }; }; } count Z_BuyableArray; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_fillSellList.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_fillSellList.sqf index d8628b37b..769891915 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_fillSellList.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_fillSellList.sqf @@ -10,6 +10,6 @@ private "_index"; _index = lbAdd [Z_AT_SELLABLELIST, _x select 3]; lbSetPicture [Z_AT_SELLABLELIST, _index, _x select 4 ]; if ((_x select 6) < 0) then { //color items only allowed to either be sold or purchased - lbSetColor [Z_AT_SELLABLELIST, _index, [0, 0.57, 1, 1]]; + lbSetColor [Z_AT_SELLABLELIST, _index, [1, 0, 0, 1]]; //red }; } count Z_SellableArray; diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index 7edb123dd..573c51a2d 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -612,7 +612,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur _allowed = ((_hasAccess select 0) or (_hasAccess select 2) or (_hasAccess select 3) or (_hasAccess select 4)); if (DZE_permanentPlot) then { if (s_player_plotManagement < 0 && _allowed) then { - s_player_plotManagement = player addAction [format["%1",localize "STR_EPOCH_ACTIONS_MANAGEPLOT"], "\z\addons\dayz_code\actions\plotManagement\initPlotManagement.sqf", [], 5, false]; + s_player_plotManagement = player addAction [format["%1",localize "STR_EPOCH_ACTIONS_MANAGEPLOT"], "\z\addons\dayz_code\actions\plotManagement\initPlotManagement.sqf", [], 5, false]; }; } else { if (s_player_maintain_area < 0) then { @@ -727,7 +727,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur // Check player access _hasAccess = [player, _cursorTarget] call FNC_check_access; if (s_player_manageDoor < 0 && ((_hasAccess select 0) or (_hasAccess select 2) or (_hasAccess select 3) or (_hasAccess select 4) or (_hasAccess select 5) or (_hasAccess select 6))) then { - s_player_manageDoor = player addAction [format["%1", localize "STR_EPOCH_ACTIONS_MANAGEDOOR"], "\z\addons\dayz_code\actions\doorManagement\initDoorManagement.sqf", _cursorTarget, 5, false]; + s_player_manageDoor = player addAction [format["%1", localize "STR_EPOCH_ACTIONS_MANAGEDOOR"], "\z\addons\dayz_code\actions\doorManagement\initDoorManagement.sqf", _cursorTarget, 5, false]; }; } else { player removeAction s_player_manageDoor; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 94f999326..4be074c8e 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -15456,6 +15456,11 @@ Zeige Grundstücksgrenze Границы участка + + Plot Management + Verwalte Grundstücksmarkierung + Управление строительным столбом + Trader