New tournament spectator HUD

6 files changed, 396 insertions, 296 deletions

diff --git a/4_by_3_ratio/SpectatorTournament.res b/4_by_3_ratio/SpectatorTournament.res
index 258d8da..ee15d34 100644
--- a/4_by_3_ratio/SpectatorTournament.res
+++ b/4_by_3_ratio/SpectatorTournament.res
@@ -10,21 +10,22 @@
 		"pinCorner"		"0"
 		"enabled"		"1"
 				
-		"team1_player_base_offset_x"		"-295"
-		"team1_player_base_y"				"460"
+		"team1_player_base_offset_x"		"0"
+		"team1_player_base_y"				"220"
 		"team1_player_delta_x"				"0"
 		"team1_player_delta_y"				"-16"
-		"team2_player_base_offset_x"		"135"
-		"team2_player_base_y"				"460"
+		"team2_player_base_offset_x"		"0"
+		"team2_player_base_y"				"240"
 		"team2_player_delta_x"				"0"
-		"team2_player_delta_y"				"-16"
+		"team2_player_delta_y"				"16"
 		
 		"playerpanels_kv"
 		{
 			"visible"		"0"
-			"wide"			"160"
-			"tall"			"18"
+			"wide"			"156"
+			"tall"			"16"
 			"zpos"			"1"
+		
 
 			
 			"color_ready"	"0 255 0 220"
@@ -40,7 +41,7 @@
 			"ypos"			"0"
 			"zpos" 			"-1"
 			"wide" 			"160"
-			"tall" 			"18"
+			"tall" 			"0"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
 			"visible" 		"1"
@@ -48,36 +49,68 @@
 			"fillcolor" 	"15 15 15 50"
 			}
 			
-			"PanelLeft"
+			"PanelLeftFringe"
 			{
 			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelLeft"
+			"fieldName" 	"PanelLeftFringe"
 			"xpos" 			"0"
 			"ypos"			"0"
 			"zpos" 			"-1"
-			"wide" 			"47"
+			"wide" 			"52"
 			"tall" 			"18"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
 			"visible" 		"1"
 			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 255"
+			"fillcolor" 	"15 15 15 64"
+			}			
+			
+			"PanelLeftHalf"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelLeftHalf"
+			"xpos" 			"0"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"49"
+			"tall" 			"18"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 128"
 			}
 			
-			"PanelTop"
+			"PanelLeftFull"
 			{
 			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelTop"
+			"fieldName" 	"PanelLeftFull"
+			"xpos" 			"0"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"26"
+			"tall" 			"18"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 110"
+			}
+			
+			"PanelFull"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelFull"
 			"xpos" 			"0"
 			"ypos"			"0"
 			"zpos" 			"-1"
 			"wide" 			"160"
-			"tall" 			"3"
+			"tall" 			"18"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
 			"visible" 		"1"
 			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 255"
+			"fillcolor" 	"15 15 15 100"
 			}
 			
 			"PanelBottom"
@@ -91,8 +124,8 @@
 			"tall" 			"4"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
+			"visible" 		"0"
+			"enabled" 		"0"
 			"fillcolor" 	"15 15 15 255"
 			}
 			
@@ -107,8 +140,8 @@
 			"tall" 			"16"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
+			"visible" 		"0"
+			"enabled" 		"0"
 			"fillcolor" 	"15 15 15 255"
 			}
 		
@@ -116,11 +149,11 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"playername"
-				"font"			"CerbeticaBold14"
-				"xpos"			"48"
+				"font"			"Cerbetica14"
+				"xpos"			"54"
 				"ypos"			"0"
 				"zpos"			"5"
-				"wide"			"92"
+				"wide"			"86"
 				"tall"			"16"
 				"autoResize"	"0"
 				"pinCorner"		"0"
@@ -128,18 +161,18 @@
 				"labelText"		"%playername%"
 				"textAlignment"	"west"
 				"fgcolor"		"235 226 202 255"
-				
+			
 			}
 			
 			"classimage"
 			{
 				"ControlName"	"CTFClassImage"
 				"fieldName"		"classimage"
-				"xpos"			"0"
-				"ypos"			"1"
+				"xpos"			"27"
+				"ypos"			"0"
 				"zpos"			"2"
-				"wide"			"22"
-				"tall"			"22"
+				"wide"			"18"
+				"tall"			"18"
 				"visible"		"1"
 				"enabled"		"1"
 				"team1_image"			"../hud/class_scoutred"
@@ -161,18 +194,14 @@
 				"bgcolor_override"		"Black"
 				"PaintBackgroundType"	"0"
 				
-				if_mvm
-				{
-					"visible"		"1"
-				}
 			}
 			
 			"HealthIcon"
 				{
 					"ControlName" "EditablePanel"
 					"fieldName" "HealthIcon"
-					"xpos" "22"
-					"ypos" "1"
+					"xpos" "0"
+					"ypos" "0"
 					"zpos" "3"
 					"wide" "24"
 					"tall" "14"
@@ -206,10 +235,6 @@
 				"draw_corner_width"	"3"				// screen size of the corners ( and sides ), proportional
 				"draw_corner_height" 	"3"
 				
-				if_mvm
-				{
-					"visible"		"1"
-				}	
 			}
 			
 			"ReadyImage"
@@ -228,10 +253,6 @@
 				"image"			"hud/checkmark"
 				"scaleImage"		"1"
 
-				if_mvm
-				{
-					"visible"		"1"
-				}
 			}
 			
 			"respawntime"
@@ -240,7 +261,7 @@
 				"fieldName"		"respawntime"
 				"font"			"Cerbetica12"
 				"xpos"			"5"
-				"ypos"			"5"
+				"ypos"			"3"
 				"zpos"			"5"
 				"wide"			"23"
 				"tall"			"10"
@@ -269,24 +290,23 @@
 				"textAlignment"	"west"
 				"fgcolor"		"TransparentBlack"
 				
-				
 			}
 			"healthcover"
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"healthcover"
 				"font"			"Blocks48"
-				"xpos"			"22"
+				"xpos"			"0"
 				"ypos"			"1"
 				"zpos"			"5"
-				"wide"			"23"
+				"wide"			"26"
 				"tall"			"20"
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"1"
 				"labelText"		"%respawntime%"
 				"textAlignment"	"west"
-				"fgcolor"		"15 15 15 255"
+				"fgcolor"		"15 15 15 110"
 				
 			}
 			
@@ -295,7 +315,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamount"
 				"font"			"Cerbetica12"
-				"xpos"			"130"
+				"xpos"			"126"
 				"ypos"			"2"
 				"zpos"			"6"
 				"wide"			"25"
@@ -312,7 +332,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamountBG"
 				"font"			"Cerbetica12"
-				"xpos"			"131"
+				"xpos"			"127"
 				"ypos"			"3"
 				"zpos"			"6"
 				"wide"			"25"
@@ -325,7 +345,6 @@
 				"fgcolor"		"TransparentBlack"
 			}
 			
-			
 			"specindex"
 			{
 				"ControlName"	"CExLabel"
@@ -346,15 +365,6 @@
 			
 		}
 		
-		if_mvm
-		{
-			"xpos"					"c-250"
-			"ypos"					"6"
-			"wide"					"500"
-			"tall"					"180"
-	
-			"team1_player_delta_x"			"0"
-		}		
 	}
 
 	"topbar"
@@ -397,8 +407,9 @@
 		
 		if_mvm
 		{
-			"ypos"			"68"	[$WIN32]
+		"ypos"			"68"	[$WIN32]
 		}
+		
 	}
 	"BuyBackLabel"
 	{
@@ -478,112 +489,103 @@
 		"fieldName"		"TipLabel"
 		"visible"		"0"
 	}
-		"itempanel"
+	"itempanel"
 	{
 		"ControlName"	"CItemModelPanel"
 		"fieldName"		"itempanel"
 		"xpos"			"r249"
-		"ypos"			"c0"
-		"zpos"			"1"
-		"wide"			"250"
-		"tall"			"900"
+		"ypos"			"c50"
+		"zpos"			"10"
+		"wide"			"240"
+		"tall"			"100"
 		"visible"		"0"
 		"bgcolor_override"		"255 255 255 0"
 		"PaintBackgroundType"	"0"
-		"paintborder"	"0"
-		
-		"model_xpos"		"15"
-		"model_ypos"		"25"
-		"model_center_y"	"1"
-		"model_wide"		"64"
-		"model_tall"		"48"
 		
-		"text_xpos"		"90"
+		"model_ypos"		"10"
+		"model_center_x"	"1"
+		"model_wide"		"90"
+		"model_tall"		"60"
 		
-		"text_wide"		"155"
+		"text_xpos"		"10"
+		"text_ypos"		"10"
+		"text_wide"		"220"
 		"text_center"	"1"
 		
-		"max_text_height"	"90"
+		"max_text_height"	"100"
 		"padding_height"	"10"
 		"resize_to_text"	"1"
 		"text_forcesize"	"2"
 		
-			"ItemBackground"
-			{
+		"ItemBackground"
+		{
 			"ControlName" "ImagePanel"
 			"fieldName" "ItemBackground"
 			"xpos" "0"
 			"ypos" "0"
 			"zpos" "-1"
-			"wide" "250"
+			"wide" "240"
 			"tall" "900"
 			"autoResize" "0"
 			"pinCorner" "0"
 			"visible" "1"
 			"enabled" "1"
 			"fillcolor" "0 0 0 100"
-			}
-			"TitleBackground"
-			{
+		}
+		"TitleBackground"
+		{
 			"ControlName" "ImagePanel"
 			"fieldName" "TitleBackground"
 			"xpos" "4"
 			"ypos" "4"
 			"zpos" "-1"
-			"wide" "246"
+			"wide" "232"
 			"tall" "14"
 			"autoResize" "0"
 			"pinCorner" "0"
 			"visible" "1"
 			"enabled" "1"
 			"fillcolor" "0 0 0 100"
-			}
+		}
 		
 		"itemmodelpanel"
 		{
 			"fieldName"		"itemmodelpanel"
-			"use_item_rendertarget" "1"
+			"use_item_rendertarget" "0"
 			"useparentbg"		"1"
 		}
 		
 		"ItemLabel"
 		{	
-			"ControlName"	"CExLabel"
+			"ControlName"	"Label"
 			"fieldName"		"ItemLabel"
 			"font"			"Cerbetica12"
-			"xpos"			"21"
-			"ypos"			"5"
+			"xpos"			"10"
+			"ypos"			"3"
 			"zpos"			"1"
 			"wide"			"270"
-			"tall"			"12"
+			"tall"			"16"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
 			"labelText"		"#FreezePanel_Item"
-			"textAlignment"	"south-west"
+			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
 		}
-		
-		"attriblabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"attriblabel"
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"south"
-			"fgcolor"		"235 226 202 255"
-			"centerwrap"	"1"
-		}
-	}		
+	}	
+	"spectator_extras"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"spectator_extras"
+		"xpos"			"0"
+		"ypos"			"0"
+		"wide"			"f0"
+		"tall"			"480"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+	}	
 }
diff --git a/minmode/4_by_3_ratio/SpectatorTournament.res b/minmode/4_by_3_ratio/SpectatorTournament.res
index 258d8da..ee15d34 100644
--- a/minmode/4_by_3_ratio/SpectatorTournament.res
+++ b/minmode/4_by_3_ratio/SpectatorTournament.res
@@ -10,21 +10,22 @@
 		"pinCorner"		"0"
 		"enabled"		"1"
 				
-		"team1_player_base_offset_x"		"-295"
-		"team1_player_base_y"				"460"
+		"team1_player_base_offset_x"		"0"
+		"team1_player_base_y"				"220"
 		"team1_player_delta_x"				"0"
 		"team1_player_delta_y"				"-16"
-		"team2_player_base_offset_x"		"135"
-		"team2_player_base_y"				"460"
+		"team2_player_base_offset_x"		"0"
+		"team2_player_base_y"				"240"
 		"team2_player_delta_x"				"0"
-		"team2_player_delta_y"				"-16"
+		"team2_player_delta_y"				"16"
 		
 		"playerpanels_kv"
 		{
 			"visible"		"0"
-			"wide"			"160"
-			"tall"			"18"
+			"wide"			"156"
+			"tall"			"16"
 			"zpos"			"1"
+		
 
 			
 			"color_ready"	"0 255 0 220"
@@ -40,7 +41,7 @@
 			"ypos"			"0"
 			"zpos" 			"-1"
 			"wide" 			"160"
-			"tall" 			"18"
+			"tall" 			"0"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
 			"visible" 		"1"
@@ -48,36 +49,68 @@
 			"fillcolor" 	"15 15 15 50"
 			}
 			
-			"PanelLeft"
+			"PanelLeftFringe"
 			{
 			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelLeft"
+			"fieldName" 	"PanelLeftFringe"
 			"xpos" 			"0"
 			"ypos"			"0"
 			"zpos" 			"-1"
-			"wide" 			"47"
+			"wide" 			"52"
 			"tall" 			"18"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
 			"visible" 		"1"
 			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 255"
+			"fillcolor" 	"15 15 15 64"
+			}			
+			
+			"PanelLeftHalf"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelLeftHalf"
+			"xpos" 			"0"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"49"
+			"tall" 			"18"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 128"
 			}
 			
-			"PanelTop"
+			"PanelLeftFull"
 			{
 			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelTop"
+			"fieldName" 	"PanelLeftFull"
+			"xpos" 			"0"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"26"
+			"tall" 			"18"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 110"
+			}
+			
+			"PanelFull"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelFull"
 			"xpos" 			"0"
 			"ypos"			"0"
 			"zpos" 			"-1"
 			"wide" 			"160"
-			"tall" 			"3"
+			"tall" 			"18"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
 			"visible" 		"1"
 			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 255"
+			"fillcolor" 	"15 15 15 100"
 			}
 			
 			"PanelBottom"
@@ -91,8 +124,8 @@
 			"tall" 			"4"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
+			"visible" 		"0"
+			"enabled" 		"0"
 			"fillcolor" 	"15 15 15 255"
 			}
 			
@@ -107,8 +140,8 @@
 			"tall" 			"16"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
+			"visible" 		"0"
+			"enabled" 		"0"
 			"fillcolor" 	"15 15 15 255"
 			}
 		
@@ -116,11 +149,11 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"playername"
-				"font"			"CerbeticaBold14"
-				"xpos"			"48"
+				"font"			"Cerbetica14"
+				"xpos"			"54"
 				"ypos"			"0"
 				"zpos"			"5"
-				"wide"			"92"
+				"wide"			"86"
 				"tall"			"16"
 				"autoResize"	"0"
 				"pinCorner"		"0"
@@ -128,18 +161,18 @@
 				"labelText"		"%playername%"
 				"textAlignment"	"west"
 				"fgcolor"		"235 226 202 255"
-				
+			
 			}
 			
 			"classimage"
 			{
 				"ControlName"	"CTFClassImage"
 				"fieldName"		"classimage"
-				"xpos"			"0"
-				"ypos"			"1"
+				"xpos"			"27"
+				"ypos"			"0"
 				"zpos"			"2"
-				"wide"			"22"
-				"tall"			"22"
+				"wide"			"18"
+				"tall"			"18"
 				"visible"		"1"
 				"enabled"		"1"
 				"team1_image"			"../hud/class_scoutred"
@@ -161,18 +194,14 @@
 				"bgcolor_override"		"Black"
 				"PaintBackgroundType"	"0"
 				
-				if_mvm
-				{
-					"visible"		"1"
-				}
 			}
 			
 			"HealthIcon"
 				{
 					"ControlName" "EditablePanel"
 					"fieldName" "HealthIcon"
-					"xpos" "22"
-					"ypos" "1"
+					"xpos" "0"
+					"ypos" "0"
 					"zpos" "3"
 					"wide" "24"
 					"tall" "14"
@@ -206,10 +235,6 @@
 				"draw_corner_width"	"3"				// screen size of the corners ( and sides ), proportional
 				"draw_corner_height" 	"3"
 				
-				if_mvm
-				{
-					"visible"		"1"
-				}	
 			}
 			
 			"ReadyImage"
@@ -228,10 +253,6 @@
 				"image"			"hud/checkmark"
 				"scaleImage"		"1"
 
-				if_mvm
-				{
-					"visible"		"1"
-				}
 			}
 			
 			"respawntime"
@@ -240,7 +261,7 @@
 				"fieldName"		"respawntime"
 				"font"			"Cerbetica12"
 				"xpos"			"5"
-				"ypos"			"5"
+				"ypos"			"3"
 				"zpos"			"5"
 				"wide"			"23"
 				"tall"			"10"
@@ -269,24 +290,23 @@
 				"textAlignment"	"west"
 				"fgcolor"		"TransparentBlack"
 				
-				
 			}
 			"healthcover"
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"healthcover"
 				"font"			"Blocks48"
-				"xpos"			"22"
+				"xpos"			"0"
 				"ypos"			"1"
 				"zpos"			"5"
-				"wide"			"23"
+				"wide"			"26"
 				"tall"			"20"
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"1"
 				"labelText"		"%respawntime%"
 				"textAlignment"	"west"
-				"fgcolor"		"15 15 15 255"
+				"fgcolor"		"15 15 15 110"
 				
 			}
 			
@@ -295,7 +315,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamount"
 				"font"			"Cerbetica12"
-				"xpos"			"130"
+				"xpos"			"126"
 				"ypos"			"2"
 				"zpos"			"6"
 				"wide"			"25"
@@ -312,7 +332,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamountBG"
 				"font"			"Cerbetica12"
-				"xpos"			"131"
+				"xpos"			"127"
 				"ypos"			"3"
 				"zpos"			"6"
 				"wide"			"25"
@@ -325,7 +345,6 @@
 				"fgcolor"		"TransparentBlack"
 			}
 			
-			
 			"specindex"
 			{
 				"ControlName"	"CExLabel"
@@ -346,15 +365,6 @@
 			
 		}
 		
-		if_mvm
-		{
-			"xpos"					"c-250"
-			"ypos"					"6"
-			"wide"					"500"
-			"tall"					"180"
-	
-			"team1_player_delta_x"			"0"
-		}		
 	}
 
 	"topbar"
@@ -397,8 +407,9 @@
 		
 		if_mvm
 		{
-			"ypos"			"68"	[$WIN32]
+		"ypos"			"68"	[$WIN32]
 		}
+		
 	}
 	"BuyBackLabel"
 	{
@@ -478,112 +489,103 @@
 		"fieldName"		"TipLabel"
 		"visible"		"0"
 	}
-		"itempanel"
+	"itempanel"
 	{
 		"ControlName"	"CItemModelPanel"
 		"fieldName"		"itempanel"
 		"xpos"			"r249"
-		"ypos"			"c0"
-		"zpos"			"1"
-		"wide"			"250"
-		"tall"			"900"
+		"ypos"			"c50"
+		"zpos"			"10"
+		"wide"			"240"
+		"tall"			"100"
 		"visible"		"0"
 		"bgcolor_override"		"255 255 255 0"
 		"PaintBackgroundType"	"0"
-		"paintborder"	"0"
-		
-		"model_xpos"		"15"
-		"model_ypos"		"25"
-		"model_center_y"	"1"
-		"model_wide"		"64"
-		"model_tall"		"48"
 		
-		"text_xpos"		"90"
+		"model_ypos"		"10"
+		"model_center_x"	"1"
+		"model_wide"		"90"
+		"model_tall"		"60"
 		
-		"text_wide"		"155"
+		"text_xpos"		"10"
+		"text_ypos"		"10"
+		"text_wide"		"220"
 		"text_center"	"1"
 		
-		"max_text_height"	"90"
+		"max_text_height"	"100"
 		"padding_height"	"10"
 		"resize_to_text"	"1"
 		"text_forcesize"	"2"
 		
-			"ItemBackground"
-			{
+		"ItemBackground"
+		{
 			"ControlName" "ImagePanel"
 			"fieldName" "ItemBackground"
 			"xpos" "0"
 			"ypos" "0"
 			"zpos" "-1"
-			"wide" "250"
+			"wide" "240"
 			"tall" "900"
 			"autoResize" "0"
 			"pinCorner" "0"
 			"visible" "1"
 			"enabled" "1"
 			"fillcolor" "0 0 0 100"
-			}
-			"TitleBackground"
-			{
+		}
+		"TitleBackground"
+		{
 			"ControlName" "ImagePanel"
 			"fieldName" "TitleBackground"
 			"xpos" "4"
 			"ypos" "4"
 			"zpos" "-1"
-			"wide" "246"
+			"wide" "232"
 			"tall" "14"
 			"autoResize" "0"
 			"pinCorner" "0"
 			"visible" "1"
 			"enabled" "1"
 			"fillcolor" "0 0 0 100"
-			}
+		}
 		
 		"itemmodelpanel"
 		{
 			"fieldName"		"itemmodelpanel"
-			"use_item_rendertarget" "1"
+			"use_item_rendertarget" "0"
 			"useparentbg"		"1"
 		}
 		
 		"ItemLabel"
 		{	
-			"ControlName"	"CExLabel"
+			"ControlName"	"Label"
 			"fieldName"		"ItemLabel"
 			"font"			"Cerbetica12"
-			"xpos"			"21"
-			"ypos"			"5"
+			"xpos"			"10"
+			"ypos"			"3"
 			"zpos"			"1"
 			"wide"			"270"
-			"tall"			"12"
+			"tall"			"16"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
 			"labelText"		"#FreezePanel_Item"
-			"textAlignment"	"south-west"
+			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
 		}
-		
-		"attriblabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"attriblabel"
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"south"
-			"fgcolor"		"235 226 202 255"
-			"centerwrap"	"1"
-		}
-	}		
+	}	
+	"spectator_extras"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"spectator_extras"
+		"xpos"			"0"
+		"ypos"			"0"
+		"wide"			"f0"
+		"tall"			"480"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+	}	
 }
diff --git a/minmode/resource/ui/SpectatorTournament.res b/minmode/resource/ui/SpectatorTournament.res
index 1d29056..ee15d34 100644
--- a/minmode/resource/ui/SpectatorTournament.res
+++ b/minmode/resource/ui/SpectatorTournament.res
@@ -10,20 +10,20 @@
 		"pinCorner"		"0"
 		"enabled"		"1"
 				
-		"team1_player_base_offset_x"		"-367"
-		"team1_player_base_y"				"460"
+		"team1_player_base_offset_x"		"0"
+		"team1_player_base_y"				"220"
 		"team1_player_delta_x"				"0"
 		"team1_player_delta_y"				"-16"
-		"team2_player_base_offset_x"		"240"
-		"team2_player_base_y"				"460"
+		"team2_player_base_offset_x"		"0"
+		"team2_player_base_y"				"240"
 		"team2_player_delta_x"				"0"
-		"team2_player_delta_y"				"-16"
+		"team2_player_delta_y"				"16"
 		
 		"playerpanels_kv"
 		{
 			"visible"		"0"
-			"wide"			"160"
-			"tall"			"18"
+			"wide"			"156"
+			"tall"			"16"
 			"zpos"			"1"
 		
 
@@ -41,7 +41,7 @@
 			"ypos"			"0"
 			"zpos" 			"-1"
 			"wide" 			"160"
-			"tall" 			"18"
+			"tall" 			"0"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
 			"visible" 		"1"
@@ -49,10 +49,26 @@
 			"fillcolor" 	"15 15 15 50"
 			}
 			
-			"PanelLeft"
+			"PanelLeftFringe"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelLeftFringe"
+			"xpos" 			"0"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"52"
+			"tall" 			"18"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 64"
+			}			
+			
+			"PanelLeftHalf"
 			{
 			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelLeft"
+			"fieldName" 	"PanelLeftHalf"
 			"xpos" 			"0"
 			"ypos"			"0"
 			"zpos" 			"-1"
@@ -62,23 +78,39 @@
 			"pinCorner"		"0"
 			"visible" 		"1"
 			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 255"
+			"fillcolor" 	"15 15 15 128"
 			}
 			
-			"PanelTop"
+			"PanelLeftFull"
 			{
 			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelTop"
+			"fieldName" 	"PanelLeftFull"
+			"xpos" 			"0"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"26"
+			"tall" 			"18"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 110"
+			}
+			
+			"PanelFull"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelFull"
 			"xpos" 			"0"
 			"ypos"			"0"
 			"zpos" 			"-1"
 			"wide" 			"160"
-			"tall" 			"3"
+			"tall" 			"18"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
 			"visible" 		"1"
 			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 255"
+			"fillcolor" 	"15 15 15 100"
 			}
 			
 			"PanelBottom"
@@ -92,8 +124,8 @@
 			"tall" 			"4"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
+			"visible" 		"0"
+			"enabled" 		"0"
 			"fillcolor" 	"15 15 15 255"
 			}
 			
@@ -108,8 +140,8 @@
 			"tall" 			"16"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
+			"visible" 		"0"
+			"enabled" 		"0"
 			"fillcolor" 	"15 15 15 255"
 			}
 		
@@ -117,11 +149,11 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"playername"
-				"font"			"CerbeticaBold14"
-				"xpos"			"50"
+				"font"			"Cerbetica14"
+				"xpos"			"54"
 				"ypos"			"0"
 				"zpos"			"5"
-				"wide"			"90"
+				"wide"			"86"
 				"tall"			"16"
 				"autoResize"	"0"
 				"pinCorner"		"0"
@@ -136,11 +168,11 @@
 			{
 				"ControlName"	"CTFClassImage"
 				"fieldName"		"classimage"
-				"xpos"			"0"
-				"ypos"			"1"
+				"xpos"			"27"
+				"ypos"			"0"
 				"zpos"			"2"
-				"wide"			"22"
-				"tall"			"22"
+				"wide"			"18"
+				"tall"			"18"
 				"visible"		"1"
 				"enabled"		"1"
 				"team1_image"			"../hud/class_scoutred"
@@ -168,8 +200,8 @@
 				{
 					"ControlName" "EditablePanel"
 					"fieldName" "HealthIcon"
-					"xpos" "23"
-					"ypos" "1"
+					"xpos" "0"
+					"ypos" "0"
 					"zpos" "3"
 					"wide" "24"
 					"tall" "14"
@@ -229,7 +261,7 @@
 				"fieldName"		"respawntime"
 				"font"			"Cerbetica12"
 				"xpos"			"5"
-				"ypos"			"5"
+				"ypos"			"3"
 				"zpos"			"5"
 				"wide"			"23"
 				"tall"			"10"
@@ -264,7 +296,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"healthcover"
 				"font"			"Blocks48"
-				"xpos"			"22"
+				"xpos"			"0"
 				"ypos"			"1"
 				"zpos"			"5"
 				"wide"			"26"
@@ -274,7 +306,7 @@
 				"visible"		"1"
 				"labelText"		"%respawntime%"
 				"textAlignment"	"west"
-				"fgcolor"		"15 15 15 255"
+				"fgcolor"		"15 15 15 110"
 				
 			}
 			
@@ -283,7 +315,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamount"
 				"font"			"Cerbetica12"
-				"xpos"			"130"
+				"xpos"			"126"
 				"ypos"			"2"
 				"zpos"			"6"
 				"wide"			"25"
@@ -300,7 +332,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamountBG"
 				"font"			"Cerbetica12"
-				"xpos"			"131"
+				"xpos"			"127"
 				"ypos"			"3"
 				"zpos"			"6"
 				"wide"			"25"
@@ -461,10 +493,10 @@
 	{
 		"ControlName"	"CItemModelPanel"
 		"fieldName"		"itempanel"
-		"xpos"			"0"
-		"ypos"			"0"
+		"xpos"			"r249"
+		"ypos"			"c50"
 		"zpos"			"10"
-		"wide"			"190"
+		"wide"			"240"
 		"tall"			"100"
 		"visible"		"0"
 		"bgcolor_override"		"255 255 255 0"
@@ -477,7 +509,7 @@
 		
 		"text_xpos"		"10"
 		"text_ypos"		"10"
-		"text_wide"		"170"
+		"text_wide"		"220"
 		"text_center"	"1"
 		
 		"max_text_height"	"100"
diff --git a/minmode/resource/ui/SpectatorTournamentGUIHealth.res b/minmode/resource/ui/SpectatorTournamentGUIHealth.res
index 23e9019..1502571 100644
--- a/minmode/resource/ui/SpectatorTournamentGUIHealth.res
+++ b/minmode/resource/ui/SpectatorTournamentGUIHealth.res
@@ -70,5 +70,21 @@
 		"textAlignment"	"center"	
 		"font"			"CerbeticaBold16"
 		"fgcolor"		"Spec Health Normal"
-	}				
+	}
+	"PlayerStatusHealthValueSpectatorBG"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"PlayerStatusHealthValueSpectatorBG"
+		"xpos"			"1"
+		"ypos"			"1"
+		"zpos"			"4"
+		"wide"			"25"
+		"tall"			"16"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"%Health%"
+		"textAlignment"	"center"	
+		"font"			"CerbeticaBold16"
+		"fgcolor"		"0 0 0 100"
+	}		
 }
diff --git a/resource/ui/SpectatorTournament.res b/resource/ui/SpectatorTournament.res
index 1d29056..ee15d34 100644
--- a/resource/ui/SpectatorTournament.res
+++ b/resource/ui/SpectatorTournament.res
@@ -10,20 +10,20 @@
 		"pinCorner"		"0"
 		"enabled"		"1"
 				
-		"team1_player_base_offset_x"		"-367"
-		"team1_player_base_y"				"460"
+		"team1_player_base_offset_x"		"0"
+		"team1_player_base_y"				"220"
 		"team1_player_delta_x"				"0"
 		"team1_player_delta_y"				"-16"
-		"team2_player_base_offset_x"		"240"
-		"team2_player_base_y"				"460"
+		"team2_player_base_offset_x"		"0"
+		"team2_player_base_y"				"240"
 		"team2_player_delta_x"				"0"
-		"team2_player_delta_y"				"-16"
+		"team2_player_delta_y"				"16"
 		
 		"playerpanels_kv"
 		{
 			"visible"		"0"
-			"wide"			"160"
-			"tall"			"18"
+			"wide"			"156"
+			"tall"			"16"
 			"zpos"			"1"
 		
 
@@ -41,7 +41,7 @@
 			"ypos"			"0"
 			"zpos" 			"-1"
 			"wide" 			"160"
-			"tall" 			"18"
+			"tall" 			"0"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
 			"visible" 		"1"
@@ -49,10 +49,26 @@
 			"fillcolor" 	"15 15 15 50"
 			}
 			
-			"PanelLeft"
+			"PanelLeftFringe"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelLeftFringe"
+			"xpos" 			"0"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"52"
+			"tall" 			"18"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 64"
+			}			
+			
+			"PanelLeftHalf"
 			{
 			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelLeft"
+			"fieldName" 	"PanelLeftHalf"
 			"xpos" 			"0"
 			"ypos"			"0"
 			"zpos" 			"-1"
@@ -62,23 +78,39 @@
 			"pinCorner"		"0"
 			"visible" 		"1"
 			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 255"
+			"fillcolor" 	"15 15 15 128"
 			}
 			
-			"PanelTop"
+			"PanelLeftFull"
 			{
 			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelTop"
+			"fieldName" 	"PanelLeftFull"
+			"xpos" 			"0"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"26"
+			"tall" 			"18"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 110"
+			}
+			
+			"PanelFull"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelFull"
 			"xpos" 			"0"
 			"ypos"			"0"
 			"zpos" 			"-1"
 			"wide" 			"160"
-			"tall" 			"3"
+			"tall" 			"18"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
 			"visible" 		"1"
 			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 255"
+			"fillcolor" 	"15 15 15 100"
 			}
 			
 			"PanelBottom"
@@ -92,8 +124,8 @@
 			"tall" 			"4"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
+			"visible" 		"0"
+			"enabled" 		"0"
 			"fillcolor" 	"15 15 15 255"
 			}
 			
@@ -108,8 +140,8 @@
 			"tall" 			"16"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
+			"visible" 		"0"
+			"enabled" 		"0"
 			"fillcolor" 	"15 15 15 255"
 			}
 		
@@ -117,11 +149,11 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"playername"
-				"font"			"CerbeticaBold14"
-				"xpos"			"50"
+				"font"			"Cerbetica14"
+				"xpos"			"54"
 				"ypos"			"0"
 				"zpos"			"5"
-				"wide"			"90"
+				"wide"			"86"
 				"tall"			"16"
 				"autoResize"	"0"
 				"pinCorner"		"0"
@@ -136,11 +168,11 @@
 			{
 				"ControlName"	"CTFClassImage"
 				"fieldName"		"classimage"
-				"xpos"			"0"
-				"ypos"			"1"
+				"xpos"			"27"
+				"ypos"			"0"
 				"zpos"			"2"
-				"wide"			"22"
-				"tall"			"22"
+				"wide"			"18"
+				"tall"			"18"
 				"visible"		"1"
 				"enabled"		"1"
 				"team1_image"			"../hud/class_scoutred"
@@ -168,8 +200,8 @@
 				{
 					"ControlName" "EditablePanel"
 					"fieldName" "HealthIcon"
-					"xpos" "23"
-					"ypos" "1"
+					"xpos" "0"
+					"ypos" "0"
 					"zpos" "3"
 					"wide" "24"
 					"tall" "14"
@@ -229,7 +261,7 @@
 				"fieldName"		"respawntime"
 				"font"			"Cerbetica12"
 				"xpos"			"5"
-				"ypos"			"5"
+				"ypos"			"3"
 				"zpos"			"5"
 				"wide"			"23"
 				"tall"			"10"
@@ -264,7 +296,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"healthcover"
 				"font"			"Blocks48"
-				"xpos"			"22"
+				"xpos"			"0"
 				"ypos"			"1"
 				"zpos"			"5"
 				"wide"			"26"
@@ -274,7 +306,7 @@
 				"visible"		"1"
 				"labelText"		"%respawntime%"
 				"textAlignment"	"west"
-				"fgcolor"		"15 15 15 255"
+				"fgcolor"		"15 15 15 110"
 				
 			}
 			
@@ -283,7 +315,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamount"
 				"font"			"Cerbetica12"
-				"xpos"			"130"
+				"xpos"			"126"
 				"ypos"			"2"
 				"zpos"			"6"
 				"wide"			"25"
@@ -300,7 +332,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamountBG"
 				"font"			"Cerbetica12"
-				"xpos"			"131"
+				"xpos"			"127"
 				"ypos"			"3"
 				"zpos"			"6"
 				"wide"			"25"
@@ -461,10 +493,10 @@
 	{
 		"ControlName"	"CItemModelPanel"
 		"fieldName"		"itempanel"
-		"xpos"			"0"
-		"ypos"			"0"
+		"xpos"			"r249"
+		"ypos"			"c50"
 		"zpos"			"10"
-		"wide"			"190"
+		"wide"			"240"
 		"tall"			"100"
 		"visible"		"0"
 		"bgcolor_override"		"255 255 255 0"
@@ -477,7 +509,7 @@
 		
 		"text_xpos"		"10"
 		"text_ypos"		"10"
-		"text_wide"		"170"
+		"text_wide"		"220"
 		"text_center"	"1"
 		
 		"max_text_height"	"100"
diff --git a/resource/ui/SpectatorTournamentGUIHealth.res b/resource/ui/SpectatorTournamentGUIHealth.res
index 23e9019..1502571 100644
--- a/resource/ui/SpectatorTournamentGUIHealth.res
+++ b/resource/ui/SpectatorTournamentGUIHealth.res
@@ -70,5 +70,21 @@
 		"textAlignment"	"center"	
 		"font"			"CerbeticaBold16"
 		"fgcolor"		"Spec Health Normal"
-	}				
+	}
+	"PlayerStatusHealthValueSpectatorBG"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"PlayerStatusHealthValueSpectatorBG"
+		"xpos"			"1"
+		"ypos"			"1"
+		"zpos"			"4"
+		"wide"			"25"
+		"tall"			"16"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"%Health%"
+		"textAlignment"	"center"	
+		"font"			"CerbeticaBold16"
+		"fgcolor"		"0 0 0 100"
+	}		
 }