From 5162efa2081f7f3e4dfb90dc3b04c5bce01a5295 Mon Sep 17 00:00:00 2001 From: AirwavesMan Date: Tue, 21 Jul 2020 20:40:52 +0200 Subject: [PATCH] Update mod compatibility --- .../Configs/RscDisplay/RscDisplayGear.hpp | 21 +++++ SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp | 91 +++++++++++++++++-- SQF/dayz_code/Configs/rscTitles.hpp | 5 +- 3 files changed, 110 insertions(+), 7 deletions(-) diff --git a/SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp b/SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp index 13d46be60..619c6d4a7 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp @@ -932,6 +932,27 @@ class RscDisplayGear colorActive[] = {1,1,1,0.8}; action = "0 call dz_fn_switchWeapon"; }; + delete bSmena1; + delete Item_attach1_bg; + delete Item_attach1; + delete Item_attach2_bg; + delete Item_attach2; + delete odezhka_2_bg; + delete odezhka_2; + delete odezhka_3_bg; + delete odezhka_3; + delete odezhka_4_bg; + delete odezhka_4; + delete odezhka_6_bg; + delete odezhka_6; + delete odezhka_7_bg; + delete odezhka_7; + delete odezhka_8_bg; + delete odezhka_8; + delete odezhka_5_bg; + delete odezhka_5; + delete odezhka_1_bg; + delete odezhka_1; }; }; diff --git a/SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp b/SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp index eed303024..87500dade 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp @@ -88,19 +88,22 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay { idc=1016; y = "(120/100) * SafeZoneH + SafeZoneY"; - }; + }; }; class controls { class CA_MP_roles_Title : CA_Title { idc = 1001; style = 2; + font = "Zeppelin32"; + sizeEx = 0.050653595; + colorText[] = {0.95,0.95,0.95,1}; x = "(02/100) * SafeZoneW + SafeZoneX"; y = "(02/100) * SafeZoneH + SafeZoneY"; w = "(96/100) * SafeZoneW"; h = "(06/100) * SafeZoneH"; colorBackground[] = {49/255, 36/255, 25/255, 173/255}; - text = $STR_UI_LOBBY; + text = $STR_UI_LOBBY; }; class TextIsland: RscText { @@ -124,8 +127,26 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay }; class CA_B_West: RscActiveText { - idc = 104; + idc = 104; + x = "(4.15/100) * SafeZoneW + SafeZoneX"; y = "(121/100) * SafeZoneH + SafeZoneY"; //hide + w = "(11.7/100) * SafeZoneW"; + h = "(7/100) * SafeZoneH"; + style = "0x02 + 0x100 + 0x40"; + type = 11; + colorActive[] = {1,1,1,1}; + colorDisabled[] = {1,1,1,0.15}; + colorShade[] = {1,1,1,1}; + colorText[] = {1,1,1,1}; + pictureWidth = 1; + pictureHeight = 1; + textHeight = 0.38; + sideDisabled = "ca\ui\data\flag_none_ca.paa"; + sideToggle = "ca\ui\data\flag_side_toggle_ca.paa"; + color[] = {1,1,1,0.55}; + text = "$STR_WEST"; + picture = "\ca\ui\data\flag_bluefor_ca.paa"; + }; class CA_B_East: CA_B_West { @@ -145,8 +166,61 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay class CA_ValueRoles: RscIGUIListBox { idc = 109; - style = 16; + style = 16; + shadow = 2; + x = "(20/100) * SafeZoneW + SafeZoneX"; y = "(120.5/100) * SafeZoneH + SafeZoneY"; //hide + w = "(38/100) * SafeZoneW"; + h = "(72/100) * SafeZoneH"; + color[] = {1,1,1,1}; + colorSelect[] = {1,1,0,1}; + colorSelectBackground[] = {0.2,0.2,0.2,1}; + colorSelectBackground2[] = {0.1,0.1,0.1,1}; + rowHeight = 0.05; + colorText[] = {0.95,0.95,0.95,1}; + colorPlayer[] = {1,1,0,1}; + colorAI[] = {1,0,0,1}; + colorNobody[] = {0.4,0.4,0.4,1}; + enabledAI = "ca\ui\textures\ai2_on.paa"; + disabledAI = "ca\ui\textures\ai2_off.paa"; + }; + class TextMission: RscText + { + idc = 1002; + x = "(02/100) * SafeZoneW + SafeZoneX"; + y = "(9.5/100) * SafeZoneH + SafeZoneY"; + w = "(18/100) * SafeZoneW"; + h = "(3/100) * SafeZoneH"; + SizeEx = 0.03; + text = "$STR_DISP_SRVSETUP_NAME"; + }; + class ValueMission: RscText + { + idc = 101; + x = "(20/100) * SafeZoneW + SafeZoneX"; + y = "(9.5/100) * SafeZoneH + SafeZoneY"; + w = "(40/100) * SafeZoneW"; + h = "(3/100) * SafeZoneH"; + SizeEx = 0.03; + }; + class CA_TextDescription: RscText + { + idc = 1004; + x = "(02/100) * SafeZoneW + SafeZoneX"; + y = "(12.5/100) * SafeZoneH + SafeZoneY"; + w = "(18/100) * SafeZoneW"; + h = "(3/100) * SafeZoneH"; + SizeEx = 0.03; + text = "$STR_DISP_SRVSETUP_DESC"; + }; + class CA_ValueDescription: RscText + { + idc = 103; + x = "(20/100) * SafeZoneW + SafeZoneX"; + y = "(12.5/100) * SafeZoneH + SafeZoneY"; + w = "(78/100) * SafeZoneW"; + h = "(3/100) * SafeZoneH"; + SizeEx = 0.03; }; class TextPool: RscText { @@ -159,8 +233,11 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay { idc = 114; text = $STR_MP_PLAYERS; - x = "(2/100) * SafeZoneW + SafeZoneX"; // to left - w = "(96/100) * SafeZoneW"; // wide + x = "(2/100) * SafeZoneW + SafeZoneX"; // to left + y = "(20/100) * SafeZoneH + SafeZoneY"; + w = "(96/100) * SafeZoneW"; // wide + h = "(72/100) * SafeZoneH"; + canDrag = 1; }; class CA_ButtonContinue : RscShortcutButton { idc = 1; @@ -217,5 +294,7 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay colorBackground[] = {0,0,0,0}; }; delete CA_B_DSinterface; + delete OriginsSurv; + delete CA_B_WestOri; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index ef13aed12..6a1b70755 100644 --- a/SQF/dayz_code/Configs/rscTitles.hpp +++ b/SQF/dayz_code/Configs/rscTitles.hpp @@ -382,6 +382,7 @@ class RscDisplayMPInterrupt : RscStandardDisplay { h = 0.836601; text = "\ca\ui\data\ui_background_mp_pause_ca.paa"; }; + delete ORI_Logo; }; class controls { @@ -460,6 +461,8 @@ class RscDisplayMPInterrupt : RscStandardDisplay { onButtonClick = "[] spawn player_onPause; call player_forceSave; with uiNameSpace do {RscDMSLoad=-2;};"; // request disconnection from server text = $STR_DISP_INT_ABORT; default = 0; + w = 0.3137255; + h = 0.1045752; }; class ButtonCancel : RscShortcutButton { @@ -469,7 +472,7 @@ class RscDisplayMPInterrupt : RscStandardDisplay { x = 0.1605; y = 0.8617; text = $STR_DISP_INT_CONTINUE; - }; + }; }; };