Merge pull request #160 from raysfire/dev

v2020.1230

1 files changed, 101 insertions, 176 deletions

diff --git a/resource/ui/freezepanel_basic.res b/resource/ui/freezepanel_basic.res
index 2e7f8cc..8e7220b 100644
--- a/resource/ui/freezepanel_basic.res
+++ b/resource/ui/freezepanel_basic.res
@@ -1,131 +1,57 @@
+#base "hudinspectpanel.res"
+
 "Resource/UI/FreezePanel_Basic.res"
 {
 	"itempanel"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"itempanel"
-		"xpos"			"r249"
-		"ypos"			"c50"
-		"zpos"			"10"
-		"wide"			"240"
-		"tall"			"100"
-		"visible"		"0"
-		"bgcolor_override"		"255 255 255 0"
-		"PaintBackgroundType"	"0"
-
-		"model_ypos"		"20"
-		"model_center_x"	"1"
-		"model_wide"		"90"
-		"model_tall"		"60"
-
-		"text_xpos"			"10"
-		"text_ypos"			"10"
-		"text_wide"			"220"
-		"text_center"		"1"
-
-		"max_text_height"	"100"
-		"padding_height"	"10"
-		"resize_to_text"	"1"
-		"text_forcesize"	"2"
-
-		"ItemBackground"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ItemBackground"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"-1"
-			"wide"			"240"
-			"tall"			"900"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fillcolor"		"TransparentBlack"
-		}
-
-		"TitleBackground"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"TitleBackground"
-			"xpos"			"4"
-			"ypos"			"4"
-			"zpos"			"-1"
-			"wide"			"232"
-			"tall"			"14"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fillcolor"		"TransparentBlack"
-		}
-
-		"itemmodelpanel"
-		{
-			"fieldName"		"itemmodelpanel"
-			"use_item_rendertarget" "0"
-			"useparentbg"			"1"
-			"inventory_image_type"	"1"
-		}
+		// For some reason this doesnt obey the xpos set in HUD Layout
+		"xpos"				"r249"
+	}
 
-		"ItemLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"ItemLabel"
-			"font"			"HudFontSmall"
-			"xpos"			"10"
-			"ypos"			"3"
-			"zpos"			"1"
-			"wide"			"270"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#FreezePanel_Item"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
+	"FreezePanel"
+	{
+		"ControlName"		"CTFFreezePanel"
+		"fieldName"			"FreezePanel"
+		"screenshot_move_panel_to_corner"	"0"
 	}
 
 	"FreezePanelBase"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"FreezePanelBase"
-		"xpos"			"r249"
-		"ypos"			"c-20"
-		"wide"			"240"
-		"tall"			"200"
-		"visible"		"1"
+		"ControlName"		"EditablePanel"
+		"fieldName"			"FreezePanelBase"
+		"xpos"				"r249"
+		"ypos"				"c-20"
+		"wide"				"240"
+		"tall"				"200"
+		"visible"			"1"
 
 		"FreezePanelBGTitle"
 		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"FreezePanelBGTitle"
-			"xpos" 			"0"
-			"ypos" 			"15"
-			"zpos" 			"-1"
-			"wide" 			"240"
-			"tall" 			"31"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
-			"fillcolor" 	"0 0 0 128"
+			"ControlName"		"ImagePanel"
+			"fieldName"			"FreezePanelBGTitle"
+			"xpos" 				"0"
+			"ypos" 				"15"
+			"zpos" 				"-1"
+			"wide" 				"240"
+			"tall" 				"31"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible" 			"1"
+			"enabled" 			"1"
+			"fillcolor" 		"0 0 0 128"
 		}
 		"FreezePanelBG"
 		{
-			"ControlName"	"CTFImagePanel"
-			"fieldName"		"FreezePanelBG"
-			"xpos"			"0"
-			"ypos"			"46"
-			"zpos"			"0"
-			"wide"			"240"
-			"tall"			"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"../hud/color_panel_blu"
+			"ControlName"		"CTFImagePanel"
+			"fieldName"			"FreezePanelBG"
+			"xpos"				"0"
+			"ypos"				"46"
+			"zpos"				"0"
+			"wide"				"240"
+			"tall"				"3"
+			"visible"			"1"
+			"enabled"			"1"
+			"image"				"../hud/color_panel_blu"
 			"scaleImage"		"1"
 
 			"src_corner_height"		"23"
@@ -136,35 +62,35 @@
 
 		"FreezeLabel"
 		{
-			"ControlName"	"Label"
-			"fieldName"		"FreezeLabel"
-			"font"			"HudFontSmall"
-			"xpos"			"25"
-			"ypos"			"15"
-			"zpos"			"1"
-			"wide"			"198"
-			"tall"			"15"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#FreezePanel_Killer"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
+			"ControlName"		"CExLabel"
+			"fieldName"			"FreezeLabel"
+			"font"				"HudFontSmall"
+			"xpos"				"25"
+			"ypos"				"15"
+			"zpos"				"1"
+			"wide"				"198"
+			"tall"				"15"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"labelText"			"#FreezePanel_Killer"
+			"textAlignment"		"center"
+			"dulltext"			"0"
+			"brighttext"		"0"
 		}
 
 		"FreezePanelHealth"
 		{
-			"ControlName"	"CTFFreezePanelHealth"
-			"fieldName"		"FreezePanelHealth"
-			"xpos"			"0"
-			"ypos"			"6"
-			"zpos"			"1"
-			"wide"			"30"
-			"tall"			"30"
-			"visible"		"1"
-			"enabled"		"1"
+			"ControlName"		"CTFFreezePanelHealth"
+			"fieldName"			"FreezePanelHealth"
+			"xpos"				"0"
+			"ypos"				"6"
+			"zpos"				"1"
+			"wide"				"30"
+			"tall"				"30"
+			"visible"			"1"
+			"enabled"			"1"
 			"HealthBonusPosAdj"			"9"
 			"HealthDeathWarning"		"0.49"
 			"TFFont"					"HudFontSmall"
@@ -174,56 +100,55 @@
 
 		"FreezeLabelKiller"
 		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"FreezeLabelKiller"
-			"font"			"HudFontSmall"
-			"xpos"			"25"
-			"ypos"			"30"
-			"zpos"			"1"
-			"wide"			"196"
-			"tall"			"15"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%killername%"
-			"textAlignment"	"center"
+			"ControlName"		"CExLabel"
+			"fieldName"			"FreezeLabelKiller"
+			"font"				"HudFontSmall"
+			"xpos"				"25"
+			"ypos"				"30"
+			"zpos"				"1"
+			"wide"				"196"
+			"tall"				"15"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"labelText"			"%killername%"
+			"textAlignment"		"center"
 		}
 
 		"AvatarImage"
 		{
-			"ControlName"	"CAvatarImagePanel"
-			"fieldName"		"AvatarImage"
-			"xpos"			"7"
-			"ypos"			"30"
-			"zpos"			"0"
-			"wide"			"14"
-			"tall"			"14"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			""
-			"scaleImage"	"1"
-			"color_outline"	"HudTimerProgressInActive"
+			"ControlName"		"CAvatarImagePanel"
+			"fieldName"			"AvatarImage"
+			"xpos"				"7"
+			"ypos"				"30"
+			"zpos"				"0"
+			"wide"				"14"
+			"tall"				"14"
+			"visible"			"1"
+			"enabled"			"1"
+			"image"				""
+			"scaleImage"		"1"
+			"color_outline"		"HudTimerProgressInActive"
 		}
 
 		"NemesisSubPanel"
 		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"NemesisSubPanel"
-			"wide"			"0"
-			"tall"			"0"
-			"visible"		"0"
-			"enabled"		"0"
+			"ControlName"		"EditablePanel"
+			"fieldName"			"NemesisSubPanel"
+			"wide"				"0"
+			"tall"				"0"
+			"visible"			"0"
+			"enabled"			"0"
 		}
 	}
 
 	"ScreenshotPanel"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"ScreenshotPanel"
-		"wide"			"0"
-		"tall"			"0"
-		"visible"		"0"
-		"enabled"		"0"
+		"ControlName"		"EditablePanel"
+		"fieldName"			"ScreenshotPanel"
+		"wide"				"0"
+		"tall"				"0"
+		"visible"			"0"
 	}
 }
\ No newline at end of file