From 9cd80019d85ee471c66e674f9553549c1945f5ad Mon Sep 17 00:00:00 2001 From: CriticalFlaw Date: Sun, 22 Oct 2017 10:47:35 -0400 Subject: 20171022 - Jungle Inferno Hot-Fixes - Fixed the max player health number not displaying properly - Fixed the top overlay covering the tabs in Inventory and Store pages - Fixed the War Paint system not displaying - Fixed the Phlogistinator item effect meter overlapping other meters - Fixed the badge on the main menu not being clickable (might be buggy in non 16:9 resolutions) - Fixed the map name being covered in the loading screen --- resource/ui/CharInfoLoadoutSubPanel.res | 355 +++++++++++++++++++++++++++++--- 1 file changed, 327 insertions(+), 28 deletions(-) (limited to 'resource/ui/CharInfoLoadoutSubPanel.res') diff --git a/resource/ui/CharInfoLoadoutSubPanel.res b/resource/ui/CharInfoLoadoutSubPanel.res index 51bd4fe..defba37 100644 --- a/resource/ui/CharInfoLoadoutSubPanel.res +++ b/resource/ui/CharInfoLoadoutSubPanel.res @@ -267,7 +267,7 @@ { "ControlName" "ImageButton" "fieldName" "ShowBackpackButton" - "xpos" "c-230" + "xpos" "c-290" "ypos" "235" "zpos" "6" "wide" "60" @@ -293,10 +293,10 @@ "ControlName" "CExLabel" "fieldName" "ShowBackpackLabel" "font" "CerbeticaBold16" - "labelText" "Backpack" + "labelText" "#BackpackTitle" "textAlignment" "north" - "xpos" "c-260" - "ypos" "300" + "xpos" "0" + "ypos" "5" "zpos" "7" "wide" "120" "tall" "20" @@ -304,12 +304,16 @@ "pinCorner" "0" "visible" "1" "enabled" "1" + + "pin_to_sibling" "ShowBackpackButton" + "pin_corner_to_sibling" "4" + "pin_to_sibling_corner" "6" } "ShowCraftingButton" { "ControlName" "ImageButton" "fieldName" "ShowCraftingButton" - "xpos" "c-95" + "xpos" "c-160" "ypos" "235" "zpos" "6" "wide" "60" @@ -335,10 +339,10 @@ "ControlName" "CExLabel" "fieldName" "ShowCraftingLabel" "font" "CerbeticaBold16" - "labelText" "Crafting" + "labelText" "#CraftingExplanation_Title" "textAlignment" "north" - "xpos" "c-125" - "ypos" "300" + "xpos" "0" + "ypos" "5" "zpos" "7" "wide" "120" "tall" "20" @@ -346,12 +350,16 @@ "pinCorner" "0" "visible" "1" "enabled" "1" + + "pin_to_sibling" "ShowCraftingButton" + "pin_corner_to_sibling" "4" + "pin_to_sibling_corner" "6" } "ShowArmoryButton" { "ControlName" "ImageButton" "fieldName" "ShowArmoryButton" - "xpos" "c35" + "xpos" "c-30" "ypos" "235" "zpos" "6" "wide" "60" @@ -377,10 +385,10 @@ "ControlName" "CExLabel" "fieldName" "ShowArmoryLabel" "font" "CerbeticaBold16" - "labelText" "Catalog" + "labelText" "#Armory" "textAlignment" "north" - "xpos" "c5" - "ypos" "300" + "xpos" "0" + "ypos" "5" "zpos" "7" "wide" "120" "tall" "20" @@ -388,12 +396,16 @@ "pinCorner" "0" "visible" "1" "enabled" "1" + + "pin_to_sibling" "ShowArmoryButton" + "pin_corner_to_sibling" "4" + "pin_to_sibling_corner" "6" } "ShowTradeButton" { "ControlName" "ImageButton" "fieldName" "ShowTradeButton" - "xpos" "c160" + "xpos" "c100" "ypos" "235" "zpos" "6" "wide" "60" @@ -419,10 +431,58 @@ "ControlName" "CExLabel" "fieldName" "ShowTradeLabel" "font" "CerbeticaBold16" - "labelText" "Trading" + "labelText" "#TradingExplanation_Title" "textAlignment" "north" - "xpos" "c130" - "ypos" "300" + "xpos" "0" + "ypos" "5" + "zpos" "7" + "wide" "120" + "tall" "20" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "wrap" "0" + + "pin_to_sibling" "ShowTradeButton" + "pin_corner_to_sibling" "4" + "pin_to_sibling_corner" "6" + } + + "ShowPaintkitsButton" + { + "ControlName" "ImageButton" + "fieldName" "ShowPaintkitsButton" + "xpos" "c230" + "ypos" "235" + "zpos" "6" + "wide" "60" + "tall" "60" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "" + "textAlignment" "south-west" + "Command" "paintkit_preview" + "Default" "0" + "font" "MenuKeys" + "scaleImage" "1" + "activeimage" "paintkit_tool" + "inactiveimage" "paintkit_tool_bw" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + } + "ShowPaintkitsLabel" + { + "ControlName" "CExLabel" + "fieldName" "ShowPaintkitsLabel" + "font" "HudFontSmallestBold" + "labelText" "#PaintkitTitle" + "textAlignment" "north" + "xpos" "0" + "ypos" "5" "zpos" "7" "wide" "120" "tall" "20" @@ -431,6 +491,10 @@ "visible" "1" "enabled" "1" "wrap" "0" + + "pin_to_sibling" "ShowPaintkitsButton" + "pin_corner_to_sibling" "4" + "pin_to_sibling_corner" "6" } "ClassLabel" @@ -585,7 +649,7 @@ "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "default" "1" + "default" "0" "Command" "show_explanations" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" @@ -736,7 +800,7 @@ "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "default" "1" + "default" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" "Command" "nextexplanation" @@ -785,7 +849,7 @@ "end_y" "60" "end_wide" "250" "end_tall" "130" - "callout_inparents_x" "c-195" + "callout_inparents_x" "c-255" "callout_inparents_y" "240" "next_explanation" "CraftingExplanation" @@ -958,7 +1022,7 @@ "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "default" "1" + "default" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" "Command" "nextexplanation" @@ -1007,7 +1071,7 @@ "end_y" "60" "end_wide" "250" "end_tall" "140" - "callout_inparents_x" "c-65" + "callout_inparents_x" "c-130" "callout_inparents_y" "240" "next_explanation" "ArmoryExplanation" @@ -1180,7 +1244,7 @@ "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "default" "1" + "default" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" "Command" "nextexplanation" @@ -1229,7 +1293,7 @@ "end_y" "60" "end_wide" "250" "end_tall" "140" - "callout_inparents_x" "c60" + "callout_inparents_x" "c0" "callout_inparents_y" "240" "next_explanation" "TradingExplanation" @@ -1402,7 +1466,7 @@ "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "default" "1" + "default" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" "Command" "nextexplanation" @@ -1451,9 +1515,9 @@ "end_y" "60" "end_wide" "250" "end_tall" "140" - "callout_inparents_x" "c180" + "callout_inparents_x" "c130" "callout_inparents_y" "240" - "next_explanation" "ExplanationExplanation" + "next_explanation" "PatternsExplanation" "TitleLabel" { @@ -1539,7 +1603,229 @@ "image" "close_button" "scaleImage" "1" } + } + "PrevButton" + { + "ControlName" "CExImageButton" + "fieldName" "PrevButton" + "xpos" "10" + "ypos" "110" + "zpos" "10" + "wide" "30" + "tall" "30" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labeltext" "" + "font" "HudFontSmallBold" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "0" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "Command" "prevexplanation" + + "paintbackground" "0" + + "defaultFgColor_override" "46 43 42 255" + "armedFgColor_override" "200 80 60 255" + "depressedFgColor_override" "46 43 42 255" + + "image_drawcolor" "235 226 202 255" + "image_armedcolor" "255 255 255 255" + "SubImage" + { + "ControlName" "ImagePanel" + "fieldName" "SubImage" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "30" + "tall" "30" + "visible" "1" + "enabled" "1" + "image" "blog_back" + "scaleImage" "1" + } } + "PositionLabel" + { + "ControlName" "CExLabel" + "fieldName" "PositionLabel" + "font" "HudFontSmallBold" + "labelText" "%explanationnumber%" + "textAlignment" "center" + "xpos" "0" + "ypos" "110" + "zpos" "-1" + "wide" "250" + "tall" "30" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "fgcolor_override" "200 80 60 255" + } + "NextButton" + { + "ControlName" "CExImageButton" + "fieldName" "NextButton" + "xpos" "210" + "ypos" "110" + "zpos" "10" + "wide" "30" + "tall" "30" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labeltext" "" + "font" "HudFontSmallBold" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "0" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "Command" "nextexplanation" + + "paintbackground" "0" + + "defaultFgColor_override" "46 43 42 255" + "armedFgColor_override" "200 80 60 255" + "depressedFgColor_override" "46 43 42 255" + + "image_drawcolor" "235 226 202 255" + "image_armedcolor" "255 255 255 255" + "SubImage" + { + "ControlName" "ImagePanel" + "fieldName" "SubImage" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "30" + "tall" "30" + "visible" "1" + "enabled" "1" + "image" "blog_forward" + "scaleImage" "1" + } + } + } + + "PatternsExplanation" + { + "ControlName" "CExplanationPopup" + "fieldName" "PatternsExplanation" + "xpos" "0" + "ypos" "0" + "zpos" "10000" + "wide" "250" + "tall" "120" + "visible" "0" + "PaintBackgroundType" "2" + "paintbackground" "0" + "border" "MainMenuHighlightBorder" + + "force_close" "1" + "end_x" "c130" + "end_y" "60" + "end_wide" "250" + "end_tall" "140" + "callout_inparents_x" "c255" + "callout_inparents_y" "240" + "next_explanation" "ExplanationExplanation" + + "TitleLabel" + { + "ControlName" "CExLabel" + "fieldName" "TitleLabel" + "font" "HudFontSmallBold" + "labelText" "#WeaponPatternsExplanation_Title" + "textAlignment" "north" + "xpos" "20" + "ypos" "10" + "wide" "210" + "tall" "30" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "wrap" "1" + "fgcolor_override" "46 43 42 255" + } + + "TextLabel" + { + "ControlName" "CExLabel" + "fieldName" "TextLabel" + "font" "HudFontSmall" + "labelText" "#WeaponPatternsExplanation_Text" + "textAlignment" "north-west" + "xpos" "20" + "ypos" "35" + "wide" "210" + "tall" "75" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "wrap" "1" + "fgcolor_override" "46 43 42 255" + } + + "CloseButton" + { + "ControlName" "CExImageButton" + "fieldName" "CloseButton" + "xpos" "230" + "ypos" "5" + "zpos" "10" + "wide" "14" + "tall" "14" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labeltext" "" + "font" "HudFontSmallBold" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "default" "0" + "sound_depressed" "UI/buttonclick.wav" + "sound_released" "UI/buttonclickrelease.wav" + "Command" "close" + + "paintbackground" "0" + + "defaultFgColor_override" "46 43 42 255" + "armedFgColor_override" "235 226 202 255" + "depressedFgColor_override" "46 43 42 255" + + "image_drawcolor" "117 107 94 255" + "image_armedcolor" "200 80 60 255" + "SubImage" + { + "ControlName" "ImagePanel" + "fieldName" "SubImage" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "14" + "tall" "14" + "visible" "1" + "enabled" "1" + "image" "close_button" + "scaleImage" "1" + } + } "PrevButton" { "ControlName" "CExImageButton" @@ -1624,7 +1910,7 @@ "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "default" "1" + "default" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" "Command" "nextexplanation" @@ -1733,7 +2019,7 @@ "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "default" "1" + "default" "0" "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" "Command" "close" @@ -1839,4 +2125,17 @@ "zpos" "500" "visible" "1" } + + "InspectionPanel" + { + "fieldName" "InspectionPanel" + "xpos" "cs-0.5" + "ypos" "0" + "zpos" "2000" + "wide" "f0" + "tall" "f100" + "visible" "0" + "proportionaltoparent" "1" + "bgcolor_override" "30 25 25 245" + } } -- cgit v1.2.3