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

3 files changed, 443 insertions, 98 deletions

diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res
index 8a9a7fc..a50e4e4 100644
--- a/resource/ui/econ/inspectionpanel.res
+++ b/resource/ui/econ/inspectionpanel.res
@@ -1,24 +1,11 @@
 "Resource/UI/econ/QuestEditorPanel.res"
 {
-	"InspectionPanel"
-	{
-		"fieldName"		"InspectionPanel"
-		"xpos"			"cs-0.5"
-		"ypos"			"cs-0.5"
-		"zpos"			"200"
-		"wide"			"f0"
-		"tall"			"f0"
-		"visible"		"0"
-		"proportionaltoparent"	"1"
-		"bgcolor_override"	"30 25 25 245"
-	}
-
 	"BGImage"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"BGImage"
 		"xpos"			"cs-0.5"
-		"ypos"			"cs-0.5"
+		"ypos"			"0"
 		"zpos"			"1"
 		"wide"			"o1"
 		"tall"			"p0.75"
@@ -29,14 +16,47 @@
 		"proportionaltoparent" "1"
 	}	
 
+	"ItemName"
+	{		
+		"ControlName"	"CItemModelPanel"
+		"fieldName"		"ItemName"
+		"xpos"			"cs-0.5"
+		"ypos"			"0"
+		"zpos"			"5"
+		"wide"			"f0"
+		"tall"			"200"
+		"visible"		"1"
+		"bgcolor_override"		"0 0 0 0"
+		"noitem_textcolor"		"117 107 94 255"
+		"PaintBackgroundType"	"2"
+		"paintborder"	"0"
+		"mouseinputenabled"	"0"
+		"proportionaltoparent"	"1"
+
+		"text_ypos"		"15"
+		"text_center"	"0"
+		"paint_icon_hide" "1"
+		"model_hide"	"1"
+		"text_forcesize"	"4"
+		"name_only"	"1"
+
+		"itemmodelpanel"
+		{
+			"use_item_rendertarget" "0"
+			"allow_rot"				"0"
+			"inventory_image_type"	"1"
+			"continued_velocity"	"1"
+		}
+	}
+
 	"ModelInspectionPanel"
 	{
 		"fieldName"		"ModelInspectionPanel"
 		"xpos"			"cs-0.5"
-		"ypos"			"cs-0.5"
+		"ypos"			"0"
 		"zpos"			"5"
 		"wide"			"o1.5"
-		"tall"			"f0"
+		"tall"			"p0.8"
 		"visible"		"1"
 		"proportionaltoparent"	"1"
 
@@ -98,67 +118,12 @@
 		}
 	}
 
-	"CloseButton"
-	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"CloseButton"
-		"xpos"			"c92"
-		"ypos"			"c-98"
-		"zpos"			"100"
-		"wide"			"20"
-		"tall"			"20"
-		"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"
-		"proportionaltoparent" "1"
-		"actionsignallevel" "2"
-			
-		"paintbackground"	"0"
-
-		"pin_to_sibling"		"MainContainer"
-		"pin_corner_to_sibling"	"PIN_BOTTOMLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPRIGHT"
-			
-		"defaultFgColor_override" "46 43 42 255"
-		"armedFgColor_override" "200 80 60 255"
-		"depressedFgColor_override" "46 43 42 255"
-			
-		"image_drawcolor"	"150 60 45 255"
-		"image_armedcolor"	"200 80 60 255"
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"1"
-			"wide"			"f0"
-			"tall"			"f0"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"close_button"
-			"scaleImage"	"1"
-			"proportionaltoparent" "1"
-		}				
-	}	
-
 	"TeamNavPanel"
 	{
 		"ControlName"		"CNavigationPanel"
 		"fieldName"			"TeamNavPanel"
 		"xpos"				"cs-0.5"
-		"ypos"				"c90"
+		"ypos"				"p.7-16"
 		"zpos"				"100"
 		"wide"				"60"
 		"tall"				"25"
@@ -253,4 +218,400 @@
 			}
 		}
 	}
+
+	"PaintkitPreviewContainer"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"PaintkitPreviewContainer"
+		"xpos"			"cs-0.5"
+		"ypos"			"p.7"
+		"wide"			"300"
+		"tall"			"100"
+		"zpos"			"100"
+		"border"		"MainMenuBGBorder"
+		"mouseinputenabled"	"1"
+		"proportionaltoparent"	"1"
+
+		"visible"		"0"
+
+		"fixed_item"
+		{
+			"tall"		"80"
+			"visible"	"1"
+		}
+		"fixed_paintkit"
+		{
+			"tall"		"60"
+			"visible"	"1"
+		}
+		"consume_mode"
+		{
+			"border"		"ReplayHighlightBorder"
+		}
+
+		"DebugButton"
+		{
+			"ControlName"	"CExImageButton"
+			"fieldName"		"DebugButton"
+			"xpos"			"5"
+			"ypos"			"0"
+			"zpos"			"1005"
+			"wide"			"8"
+			"tall"			"8"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"0"
+			"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"		"debug_menu"
+			"proportionaltoparent" "1"
+			"actionsignallevel"	"2"
+			
+			"paintbackground"	"0"
+			
+			"defaultFgColor_override" "0 0 0 0"
+			"armedFgColor_override" "200 80 60 255"
+			"depressedFgColor_override" "46 43 42 255"
+			
+			"image_drawcolor"	"TanDark"
+			"image_armedcolor"	"200 80 60 255"
+			"SubImage"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"SubImage"
+				"xpos"			"0"
+				"ypos"			"0"
+				"zpos"			"1"
+				"wide"			"8"
+				"tall"			"8"
+				"visible"		"1"
+				"enabled"		"1"
+				"image"			"glyph_workshop_edit"
+				"scaleImage"	"1"
+			}				
+		} // Debug button
+
+
+		"ComboBoxValidPaintkits"
+		{
+			"ControlName"		"ComboBox"
+			"fieldName"			"ComboBoxValidPaintkits"
+			"Font"				"HudFontSmallest"
+			"wrap"				"0"
+			"xpos"				"rs1-10"
+			"ypos"				"10"
+			"zpos"				"100"
+			"wide"				"200"
+			"tall"				"15"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"textHidden"		"0"
+			"editable"			"0"
+			"maxchars"			"-1"
+			"NumericInputOnly"	"0"
+			"unicode"			"0"
+			"default"			"0"
+			"actionsignallevel"	"2"
+			"proportionaltoparent"	"1"
+
+			"fixed_paintkit"
+			{
+				"visible"	"0"
+			}
+		
+			"fgcolor_override"	"235 226 202 255"
+			"bgcolor_override"	"0 0 0 0"
+			"disabledFgColor_override" "235 226 202 255"
+			"disabledBgColor_override" "0 0 0 0"
+			"selectionColor_override" "0 0 0 0"
+			"selectionTextColor_override" "235 226 202 255"
+			"defaultSelectionBG2Color_override" "0 0 0 0"
+		}
+
+		"PaintkitLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"PaintkitLabel"
+			"font"			"HudFontSmallest"
+			"labelText"		"Preview Paint Kit"
+			"textAlignment"	"west"
+			"xpos"			"8"
+			"ypos"			"10"
+			"wide"			"80"
+			"tall"			"15"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"fgcolor_override"	"235 227 203 255"
+
+			"fixed_paintkit"
+			{
+				"visible"	"0"
+			}
+		}
+
+		"ComboBoxValidItems"
+		{
+			"ControlName"		"ComboBox"
+			"fieldName"			"ComboBoxValidItems"
+			"Font"				"HudFontSmallest"
+			"wrap"				"0"
+			"xpos"				"rs1-10"
+			"ypos"				"30"
+			"fixed_paintkit"
+			{
+				"ypos"		"10"
+			}
+			"zpos"				"100"
+			"wide"				"200"
+			"tall"				"15"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"textHidden"		"0"
+			"editable"			"0"
+			"maxchars"			"-1"
+			"NumericInputOnly"	"0"
+			"unicode"			"0"
+			"default"			"0"
+			"actionsignallevel"	"2"
+
+			"fixed_item"
+			{
+				"visible"	"0"
+			}
+
+			"proportionaltoparent"	"1"
+		
+			"fgcolor_override"	"235 226 202 255"
+			"bgcolor_override"	"0 0 0 0"
+			"disabledFgColor_override" "TanDark"
+			"disabledBgColor_override" "0 0 0 0"
+			"selectionColor_override" "0 0 0 0"
+			"selectionTextColor_override" "235 226 202 255"
+			"defaultSelectionBG2Color_override" "0 0 0 0"
+		}
+
+		"ItemLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"ItemLabel"
+			"font"			"HudFontSmallest"
+			"labelText"		"#TF_ItemPreview_ItemPreview"
+			"textAlignment"	"west"
+			"xpos"			"8"
+			"ypos"			"30"
+			"fixed_paintkit"
+			{
+				"ypos"		"10"
+			}
+			"wide"			"80"
+			"tall"			"15"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"fgcolor_override"	"235 227 203 255"
+
+			"fixed_item"
+			{
+				"visible"	"0"
+			}
+
+			"consume_mode"
+			{
+				"labelText"		"#TF_ItemPreview_RedeemItem"
+			}
+		}
+
+		"WearSlider"
+		{
+			"ControlName"	"Slider"
+			"fieldName"		"WearSlider"
+			"xpos"			"90"
+			"ypos"			"50"
+			"fixed_item"
+			{
+				"ypos"		"30"
+			}
+			"zpos"			"1"
+			"wide"			"204"
+			"tall"			"30"
+			"numticks"		"4"
+			"rangemin"		"1"
+			"rangemax"		"5"
+			"lefttext"		"#TFUI_InvTooltip_BattleScared"
+			"righttext"		"#TFUI_InvTooltip_FactoryNew"
+			"proportionaltoparent"	"1"
+			"actionsignallevel"	"2"
+
+			"fixed_paintkit"
+			{
+				"visible"	"0"
+			}
+
+			"consume_mode"
+			{
+				"visible"	"0"
+			}
+		}
+
+		"WearLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"WearLabel"
+			"font"			"HudFontSmallest"
+			"labelText"		"#TF_ItemPreview_ItemWear"
+			"textAlignment"	"west"
+			"xpos"			"8"
+			"ypos"			"50"
+			"fixed_item"
+			{
+				"ypos"		"30"
+			}
+			"wide"			"80"
+			"tall"			"15"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"fgcolor_override"	"235 227 203 255"
+
+			"fixed_paintkit"
+			{
+				"visible"	"0"
+			}
+
+			"consume_mode"
+			{
+				"visible"	"0"
+			}
+		}
+
+		"NewSeedButton"
+		{
+			"ControlName"	"Button"
+			"fieldName"		"NewSeedButton"
+			"xpos"			"8"
+			"ypos"			"75"
+			"fixed_item"
+			{
+				"ypos"		"50"
+			}
+			"fixed_paintkit"
+			{
+				"ypos"		"30"
+			}
+			"zpos"			"10"
+			"wide"			"70"
+			"tall"			"20"
+			"autoResize"	"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"labelText"		"#TF_ItemPreview_PaintkitSeed"
+			"actionsignallevel" "2"
+			"use_proportional_insets" "1"
+			"textAlignment"	"center"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"keyboardinputenabled"	"0"
+
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+
+			"command"	"random_seed"
+
+			"consume_mode"
+			{
+				"visible"	"0"
+			}
+		}
+
+		"SeedTextEntry"
+		{
+			"ControlName"	"TextEntry"
+			"fieldName"		"SeedTextEntry"
+			"xpos"			"90"
+			"ypos"			"75"
+			"fixed_item"
+			{
+				"ypos"		"50"
+			}
+			"fixed_paintkit"
+			{
+				"ypos"		"30"
+			}
+			"zpos"			"10"
+			"wide"			"115"
+			"tall"			"20"
+			"autoResize"	"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"actionsignallevel" "2"
+			"default"		"1"
+			"NumericInputOnly"	"1"
+			"bgcolor_override"	"0 0 0 200"
+			"maxchars"		"18"
+
+			"consume_mode"
+			{
+				"visible"	"0"
+			}
+		}
+
+		"MarketButton"
+		{
+			"ControlName"	"CExButton"
+			"fieldName"		"MarketButton"
+			"xpos"		"rs1-10"
+			"ypos"			"75"
+			"fixed_item"
+			{
+				"ypos"		"50"
+			}
+			"fixed_paintkit"
+			{
+				"ypos"		"30"
+			}
+			"zpos"		"100"
+			"wide"		"75"
+			"tall"		"20"
+			"labelText"			"#TF_ItemAd_ViewOnMarket"
+			"font"			"AdFont_PurchaseButton"
+			"textinsetx"		"0"
+			"textAlignment"	"center"
+		
+			"proportionaltoparent"	"1"
+			"paintbackground"	"1"
+			"command"	"market"
+			"actionsignallevel" "2"
+			"RoundedCorners"	"0"
+
+			"defaultFgColor_override"	"White"
+			"armedFgColor_override"		"White"
+
+			"border_default"	"NoBorder"
+
+			"defaultBgColor_override"	"72 103 32 255"
+			"armedBgColor_override"		"72 133 32 255"
+
+			"sound_armed"		"ui/item_info_mouseover.wav"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+		}
+	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/itempickuppanel.res b/resource/ui/econ/itempickuppanel.res
index 83efc9b..a41b62a 100644
--- a/resource/ui/econ/itempickuppanel.res
+++ b/resource/ui/econ/itempickuppanel.res
@@ -6,7 +6,7 @@
 		"fieldName"		"item_pickup"
 		"xpos"			"0"
 		"ypos"			"0"
-		"zpos"			"100000"
+		"zpos"			"200000"
 		"wide"			"f0"
 		"tall"			"480"
 		"autoResize"		"0"
@@ -28,43 +28,26 @@
 		"modelpanelskv"	
 		{
 			"PaintBackgroundType"	"0"
-			"paintborder"			"0"
-			"bgcolor_override"		"0 0 0 0"
+			"paintborder"			"1"
+			"bgcolor_override"		"Grey"
 			
-			"model_xpos"	"-125"
+			"model_xpos"	"0"
 			"model_center_y"	"1"
 			"model_tall"	"160"
+			"model_wide"	"240"
 			
 			"text_forcesize"	"1"
 			"text_xpos"		"250"
 			"text_wide"		"225"
 			"text_center"	"1"
-			"BackColor"
-			{
-    		"ControlName"		"EditablePanel"
-    		"fieldName"			"BackColor"
-    		"xpos"				"0"
-    		"ypos"				"0"
-    		"zpos"				"-1"
-    		"wide"				"f0"
-    		"tall"	 			"f0"
-    		"visible"			"1"
-    		"enabled"			"1"
-			"pinCorner"			"0"
-			"autoResize"		"0"
-			"PaintBackgroundType""1"
-			"border"			"NoBorder"
-			"bgcolor_override"	"35 35 35 255"
-			
-			}
+			"is_mouseover"	"1"
+			"hide_collection_panel"	"1"
 			
 			"itemmodelpanel"
 			{
 				"use_item_rendertarget" "0"
 				"inventory_image_type" "1"
 			}
-		
-
 		}
 	}
 	
diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res
index fb166e2..3c144d9 100644
--- a/resource/ui/econ/store/v2/storepanel.res
+++ b/resource/ui/econ/store/v2/storepanel.res
@@ -111,7 +111,8 @@
 		"tabxindent"	"80"
 		"tabxdelta"		"10"
 		"tabwidth"		"240"
-		"tabheight"		"34"
+		"tabheight"		"20"
+		"yoffset"		"14"
 		"transition_time" "0"
 		
 		"HeaderLine"
@@ -135,7 +136,7 @@
 		{
 			"textinsetx"		"25"
 			"textAlignment"		"center"
-			"font"				"Cerbetica32"
+			"font"				"Cerbetica20"
 			"ypos"				"50"
 			"selectedcolor"		"TanLight"
 			"unselectedcolor"	"TanDark"