From 49fbf3c6473fd60ed9e7d3af06ecbb3548ca673f Mon Sep 17 00:00:00 2001
From: Ian Bruton <raysfire64@gmail.com>
Date: Wed, 17 Oct 2012 00:36:44 -0500
Subject: Added in color panels on tournament spectator panel

---
 4_by_3_ratio/SpectatorTournament.res    |  89 ++++-
 resource/ui/SpectatorTournament-old.res | 552 ++++++++++++++++++++++++++++++++
 resource/ui/SpectatorTournament.res     |  90 +++++-
 3 files changed, 705 insertions(+), 26 deletions(-)
 create mode 100644 resource/ui/SpectatorTournament-old.res

diff --git a/4_by_3_ratio/SpectatorTournament.res b/4_by_3_ratio/SpectatorTournament.res
index 67506ec..4580b3c 100644
--- a/4_by_3_ratio/SpectatorTournament.res
+++ b/4_by_3_ratio/SpectatorTournament.res
@@ -23,9 +23,8 @@
 		{
 			"visible"		"0"
 			"wide"			"160"
-			"tall"			"16"
+			"tall"			"18"
 			"zpos"			"1"
-			"paintborder"	"0"
 
 			
 			"color_ready"	"0 255 0 220"
@@ -41,14 +40,78 @@
 			"ypos"			"0"
 			"zpos" 			"-1"
 			"wide" 			"160"
+			"tall" 			"18"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 50"
+			}
+			
+			"PanelLeft"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelLeft"
+			"xpos" 			"0"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"47"
+			"tall" 			"18"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 255"
+			}
+			
+			"PanelTop"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelTop"
+			"xpos" 			"0"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"160"
+			"tall" 			"3"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 255"
+			}
+			
+			"PanelBottom"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelBottom"
+			"xpos" 			"0"
+			"ypos"			"15"
+			"zpos" 			"-1"
+			"wide" 			"160"
+			"tall" 			"4"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 255"
+			}
+			
+			"PanelRight"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelRight"
+			"xpos" 			"157"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"4"
 			"tall" 			"16"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
 			"visible" 		"1"
 			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 250"
+			"fillcolor" 	"15 15 15 255"
 			}
-										  			
+		
 			"playername"
 			{
 				"ControlName"	"CExLabel"
@@ -57,7 +120,7 @@
 				"xpos"			"48"
 				"ypos"			"0"
 				"zpos"			"5"
-				"wide"			"115"
+				"wide"			"92"
 				"tall"			"16"
 				"autoResize"	"0"
 				"pinCorner"		"0"
@@ -81,7 +144,7 @@
 				"ControlName"	"CTFClassImage"
 				"fieldName"		"classimage"
 				"xpos"			"0"
-				"ypos"			"0"
+				"ypos"			"1"
 				"zpos"			"2"
 				"wide"			"22"
 				"tall"			"22"
@@ -125,7 +188,7 @@
 					"ControlName" "EditablePanel"
 					"fieldName" "HealthIcon"
 					"xpos" "22"
-					"ypos" "0"
+					"ypos" "1"
 					"zpos" "3"
 					"wide" "24"
 					"tall" "14"
@@ -193,7 +256,7 @@
 				"fieldName"		"respawntime"
 				"font"			"Cerbetica12"
 				"xpos"			"5"
-				"ypos"			"4"
+				"ypos"			"5"
 				"zpos"			"5"
 				"wide"			"23"
 				"tall"			"10"
@@ -215,7 +278,7 @@
 				"fieldName"		"respawntimeBG"
 				"font"			"Cerbetica12"
 				"xpos"			"6"
-				"ypos"			"5"
+				"ypos"			"6"
 				"zpos"			"5"
 				"wide"			"23"
 				"tall"			"10"
@@ -259,7 +322,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamount"
 				"font"			"Cerbetica12"
-				"xpos"			"139"
+				"xpos"			"130"
 				"ypos"			"2"
 				"zpos"			"6"
 				"wide"			"25"
@@ -268,7 +331,7 @@
 				"pinCorner"		"0"
 				"visible"		"1"
 				"labelText"		"%chargeamount%"
-				"textAlignment"	"west"
+				"textAlignment"	"east"
 				"fgcolor"		"0 255 255 255"
 			}
 			"chargeamountBG"
@@ -276,7 +339,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamountBG"
 				"font"			"Cerbetica12"
-				"xpos"			"140"
+				"xpos"			"131"
 				"ypos"			"3"
 				"zpos"			"6"
 				"wide"			"25"
@@ -285,7 +348,7 @@
 				"pinCorner"		"0"
 				"visible"		"1"
 				"labelText"		"%chargeamount%"
-				"textAlignment"	"west"
+				"textAlignment"	"east"
 				"fgcolor"		"TransparentBlack"
 			}
 			
diff --git a/resource/ui/SpectatorTournament-old.res b/resource/ui/SpectatorTournament-old.res
new file mode 100644
index 0000000..0f72e2d
--- /dev/null
+++ b/resource/ui/SpectatorTournament-old.res
@@ -0,0 +1,552 @@
+"Resource/UI/SpectatorTournament.res"
+{
+	"specgui"
+	{
+		"ControlName"		"Frame"
+		"fieldName"		"specgui"
+		"wide"			"f0"
+		"tall"			"480"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"enabled"		"1"
+				
+		"team1_player_base_offset_x"		"-367"
+		"team1_player_base_y"				"460"
+		"team1_player_delta_x"				"0"
+		"team1_player_delta_y"				"-16"
+		"team2_player_base_offset_x"		"207"
+		"team2_player_base_y"				"460"
+		"team2_player_delta_x"				"0"
+		"team2_player_delta_y"				"-16"
+		
+		"playerpanels_kv"
+		{
+			"visible"		"0"
+			"wide"			"160"
+			"tall"			"16"
+			"zpos"			"1"
+			"paintborder"	"0"
+
+			
+			"color_ready"	"0 255 0 220"
+			"color_notready"	"0 0 0 220"
+			
+			"tabPosition"	"0"
+			
+			"PanelBackground"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelBackground"
+			"xpos" 			"0"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"160"
+			"tall" 			"16"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 250"
+			}
+										  			
+			"playername"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"playername"
+				"font"			"CerbeticaBold14"
+				"xpos"			"48"
+				"ypos"			"0"
+				"zpos"			"5"
+				"wide"			"115"
+				"tall"			"16"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"labelText"		"%playername%"
+				"textAlignment"	"west"
+				"fgcolor"		"235 226 202 255"
+					
+				if_mvm
+				{
+					"xpos"				"0"
+					"ypos"				"25"
+					"wide"				"55"
+					"textAlignment"		"center"
+					"font"				"PlayerPanelPlayerName"
+				}
+			}
+			
+			"classimage"
+			{
+				"ControlName"	"CTFClassImage"
+				"fieldName"		"classimage"
+				"xpos"			"0"
+				"ypos"			"0"
+				"zpos"			"2"
+				"wide"			"22"
+				"tall"			"22"
+				"visible"		"1"
+				"enabled"		"1"
+				"team1_image"			"../hud/class_scoutred"
+				"scaleImage"	"1"	
+				
+				if_mvm
+				{
+					"xpos"			"5"
+					"ypos"			"4"
+					"wide"			"20"
+					"tall"			"20"
+					"image"			"../vgui/hud_connecting"
+				}
+			}
+			
+			"classimagebg"
+			{
+				"ControlName"		"Panel"
+				"fieldName"		"classimagebg"
+				"xpos"			"9999"
+				"ypos"			"9999"
+				"zpos"			"2"
+				"wide"			"9999"
+				"tall"			"9999"
+				"visible"		"0"
+				"enabled"		"1"
+				"bgcolor_override"		"Black"
+				"PaintBackgroundType"	"0"
+				
+				if_mvm
+				{
+					"visible"		"1"
+				}
+			}
+			
+			"HealthIcon"
+				{
+					"ControlName" "EditablePanel"
+					"fieldName" "HealthIcon"
+					"xpos" "22"
+					"ypos" "0"
+					"zpos" "3"
+					"wide" "24"
+					"tall" "14"
+					"visible" "1"
+					"enabled" "1"
+					"HealthBonusPosAdj" "10"
+					"HealthDeathWarning" "0.49"
+					"TFFont" "HudFontSmallest"
+					"HealthDeathWarningColor" "HUDDeathWarning"
+					"TextColor" "HudOffWhite"
+				}
+			
+			"ReadyBG"
+			{
+				"ControlName"		"ScalableImagePanel"
+				"fieldName"		"ReadyBG"
+				"xpos"			"0"
+				"ypos"			"0"
+				"zpos"			"-1"
+				"wide"			"16"
+				"tall"			"16"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"0"
+				"enabled"		"1"
+				"image"			"../HUD/tournament_panel_brown"
+
+				"src_corner_height"	"22"				// pixels inside the image
+				"src_corner_width"	"22"
+			
+				"draw_corner_width"	"3"				// screen size of the corners ( and sides ), proportional
+				"draw_corner_height" 	"3"
+				
+				if_mvm
+				{
+					"visible"		"1"
+				}	
+			}
+			
+			"ReadyImage"
+			{
+				"ControlName"		"ImagePanel"
+				"fieldName"		"ReadyImage"
+				"xpos"			"32"
+				"ypos"			"8"
+				"zpos"			"0"
+				"wide"			"12"
+				"tall"			"12"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"0"
+				"enabled"		"1"
+				"image"			"hud/checkmark"
+				"scaleImage"		"1"
+
+				if_mvm
+				{
+					"visible"		"1"
+				}
+			}
+			
+			"respawntime"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"respawntime"
+				"font"			"Cerbetica12"
+				"xpos"			"5"
+				"ypos"			"4"
+				"zpos"			"5"
+				"wide"			"23"
+				"tall"			"10"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"labelText"		"%respawntime%"
+				"textAlignment"	"west"
+				"fgcolor"		"160 32 240 255"
+				
+				if_mvm
+				{
+					"ypos"			"17"
+				}
+			}
+			"respawntimeBG"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"respawntimeBG"
+				"font"			"Cerbetica12"
+				"xpos"			"6"
+				"ypos"			"5"
+				"zpos"			"5"
+				"wide"			"23"
+				"tall"			"10"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"labelText"		"%respawntime%"
+				"textAlignment"	"west"
+				"fgcolor"		"TransparentBlack"
+				
+				if_mvm
+				{
+					"ypos"			"17"
+				}
+			}
+			"healthcover"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"healthcover"
+				"font"			"Blocks48"
+				"xpos"			"22"
+				"ypos"			"1"
+				"zpos"			"5"
+				"wide"			"23"
+				"tall"			"20"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"labelText"		"%respawntime%"
+				"textAlignment"	"west"
+				"fgcolor"		"15 15 15 255"
+				
+				if_mvm
+				{
+					"ypos"			"17"
+				}
+			}
+			
+			"chargeamount"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"chargeamount"
+				"font"			"Cerbetica12"
+				"xpos"			"139"
+				"ypos"			"2"
+				"zpos"			"6"
+				"wide"			"25"
+				"tall"			"15"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"labelText"		"%chargeamount%"
+				"textAlignment"	"west"
+				"fgcolor"		"0 255 255 255"
+			}
+			"chargeamountBG"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"chargeamountBG"
+				"font"			"Cerbetica12"
+				"xpos"			"140"
+				"ypos"			"3"
+				"zpos"			"6"
+				"wide"			"25"
+				"tall"			"15"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"labelText"		"%chargeamount%"
+				"textAlignment"	"west"
+				"fgcolor"		"TransparentBlack"
+			}
+			
+			"specindex"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"specindex"
+				"font"			"DefaultVerySmall"
+				"xpos"			"9999"
+				"ypos"			"9999"
+				"zpos"			"5"
+				"wide"			"50"
+				"tall"			"8"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"labelText"		"%specindex%"
+				"textAlignment"	"north-west"
+				//"fgcolor"		"235 226 202 255"
+			}
+			
+			if_mvm
+			{
+				"wide"		"55"
+				"tall"		"35"
+			}
+		}
+		
+		if_mvm
+		{
+			"xpos"					"c-250"
+			"ypos"					"6"
+			"wide"					"500"
+			"tall"					"180"
+	
+			"team1_player_delta_x"			"52"
+		}		
+	}
+
+	"topbar"
+	{
+		"ControlName"	"Panel"
+		"fieldName"		"TopBar"
+		"visible"		"0"
+		"tall"			"0"
+	}
+	"BottomBar"
+	{
+		"ControlName"	"Frame"
+		"fieldName"		"BottomBar"
+		"visible"		"0"
+		"ypos"			"100"
+		"tall"			"0"
+	}
+	"bottombarblank"
+	{
+		"ControlName"		"Panel"
+		"fieldName"		"bottombarblank"
+		"visible"		"0"
+		"ypos"			"480"
+	}
+	"ReinforcementsLabel"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"ReinforcementsLabel"
+		"xpos"			"c-300"	[$WIN32]
+		"ypos"			"50"	[$WIN32]
+		"wide"			"600"	[$WIN32]
+		"tall"			"24"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"#game_respawntime_in_secs"
+		"textAlignment"		"center"
+		"font"			"Cerbetica24"
+	}
+	"BuyBackLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"BuyBackLabel"
+		"xpos"			"c-190"
+		"ypos"			"16"
+		"wide"			"380"
+		"tall"			"14"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"0"
+		"enabled"		"1"
+		"labelText"		"#TF_PVE_Buyback"
+		"textAlignment"	"center"
+		"font"			"HudFontSmall"
+		"wrap"			"1"
+		"centerwrap"	"1"
+	
+		if_mvm
+		{
+			"visible"		"1"
+		}	
+	}
+	"MapLabel"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"MapLabel"
+		"visible"		"0"
+	}
+	"ClassOrTeamLabel"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"ClassOrTeamLabel"
+		"visible"		"0"
+	}
+	"SwitchCamModeKeyLabel"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"SwitchCamModeKeyLabel"
+		"visible"		"0"
+		
+	}
+	"SwitchCamModeLabel"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"SwitchCamModeLabel"
+		"visible"		"0"
+	}
+	"CycleTargetFwdKeyLabel"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"CycleTargetFwdKeyLabel"
+		"visible"		"0"
+	}
+	"CycleTargetFwdLabel"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"CycleTargetFwdLabel"
+		"visible"		"0"
+	}
+	"CycleTargetRevKeyLabel"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"CycleTargetRevKeyLabel"
+		"visible"		"0"
+	}
+	"CycleTargetRevLabel"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"CycleTargetRevLabel"
+		"visible"		"0"
+	}
+	"TipLabel"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"TipLabel"
+		"visible"		"0"
+	}
+		"itempanel"
+	{
+		"ControlName"	"CItemModelPanel"
+		"fieldName"		"itempanel"
+		"xpos"			"r249"
+		"ypos"			"c0"
+		"zpos"			"1"
+		"wide"			"250"
+		"tall"			"900"
+		"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"
+		
+		"text_wide"		"155"
+		"text_center"	"1"
+		
+		"max_text_height"	"90"
+		"padding_height"	"10"
+		"resize_to_text"	"1"
+		"text_forcesize"	"2"
+		
+			"ItemBackground"
+			{
+			"ControlName" "ImagePanel"
+			"fieldName" "ItemBackground"
+			"xpos" "0"
+			"ypos" "0"
+			"zpos" "-1"
+			"wide" "250"
+			"tall" "900"
+			"autoResize" "0"
+			"pinCorner" "0"
+			"visible" "1"
+			"enabled" "1"
+			"fillcolor" "0 0 0 100"
+			}
+			"TitleBackground"
+			{
+			"ControlName" "ImagePanel"
+			"fieldName" "TitleBackground"
+			"xpos" "4"
+			"ypos" "4"
+			"zpos" "-1"
+			"wide" "246"
+			"tall" "14"
+			"autoResize" "0"
+			"pinCorner" "0"
+			"visible" "1"
+			"enabled" "1"
+			"fillcolor" "0 0 0 100"
+			}
+		
+		"itemmodelpanel"
+		{
+			"fieldName"		"itemmodelpanel"
+			"use_item_rendertarget" "1"
+			"useparentbg"		"1"
+		}
+		
+		"ItemLabel"
+		{	
+			"ControlName"	"CExLabel"
+			"fieldName"		"ItemLabel"
+			"font"			"Cerbetica12"
+			"xpos"			"21"
+			"ypos"			"5"
+			"zpos"			"1"
+			"wide"			"270"
+			"tall"			"12"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"#FreezePanel_Item"
+			"textAlignment"	"south-west"
+			"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"
+		}
+	}		
+}
diff --git a/resource/ui/SpectatorTournament.res b/resource/ui/SpectatorTournament.res
index 0f72e2d..9ad4018 100644
--- a/resource/ui/SpectatorTournament.res
+++ b/resource/ui/SpectatorTournament.res
@@ -23,9 +23,9 @@
 		{
 			"visible"		"0"
 			"wide"			"160"
-			"tall"			"16"
+			"tall"			"18"
 			"zpos"			"1"
-			"paintborder"	"0"
+		
 
 			
 			"color_ready"	"0 255 0 220"
@@ -41,14 +41,78 @@
 			"ypos"			"0"
 			"zpos" 			"-1"
 			"wide" 			"160"
+			"tall" 			"18"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 50"
+			}
+			
+			"PanelLeft"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelLeft"
+			"xpos" 			"0"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"47"
+			"tall" 			"18"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 255"
+			}
+			
+			"PanelTop"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelTop"
+			"xpos" 			"0"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"160"
+			"tall" 			"3"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 255"
+			}
+			
+			"PanelBottom"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelBottom"
+			"xpos" 			"0"
+			"ypos"			"15"
+			"zpos" 			"-1"
+			"wide" 			"160"
+			"tall" 			"4"
+			"autoResize" 	"0"
+			"pinCorner"		"0"
+			"visible" 		"1"
+			"enabled" 		"1"
+			"fillcolor" 	"15 15 15 255"
+			}
+			
+			"PanelRight"
+			{
+			"ControlName" 	"ImagePanel"
+			"fieldName" 	"PanelRight"
+			"xpos" 			"157"
+			"ypos"			"0"
+			"zpos" 			"-1"
+			"wide" 			"4"
 			"tall" 			"16"
 			"autoResize" 	"0"
 			"pinCorner"		"0"
 			"visible" 		"1"
 			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 250"
+			"fillcolor" 	"15 15 15 255"
 			}
-										  			
+		
 			"playername"
 			{
 				"ControlName"	"CExLabel"
@@ -57,7 +121,7 @@
 				"xpos"			"48"
 				"ypos"			"0"
 				"zpos"			"5"
-				"wide"			"115"
+				"wide"			"92"
 				"tall"			"16"
 				"autoResize"	"0"
 				"pinCorner"		"0"
@@ -81,7 +145,7 @@
 				"ControlName"	"CTFClassImage"
 				"fieldName"		"classimage"
 				"xpos"			"0"
-				"ypos"			"0"
+				"ypos"			"1"
 				"zpos"			"2"
 				"wide"			"22"
 				"tall"			"22"
@@ -125,7 +189,7 @@
 					"ControlName" "EditablePanel"
 					"fieldName" "HealthIcon"
 					"xpos" "22"
-					"ypos" "0"
+					"ypos" "1"
 					"zpos" "3"
 					"wide" "24"
 					"tall" "14"
@@ -193,7 +257,7 @@
 				"fieldName"		"respawntime"
 				"font"			"Cerbetica12"
 				"xpos"			"5"
-				"ypos"			"4"
+				"ypos"			"5"
 				"zpos"			"5"
 				"wide"			"23"
 				"tall"			"10"
@@ -215,7 +279,7 @@
 				"fieldName"		"respawntimeBG"
 				"font"			"Cerbetica12"
 				"xpos"			"6"
-				"ypos"			"5"
+				"ypos"			"6"
 				"zpos"			"5"
 				"wide"			"23"
 				"tall"			"10"
@@ -259,7 +323,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamount"
 				"font"			"Cerbetica12"
-				"xpos"			"139"
+				"xpos"			"130"
 				"ypos"			"2"
 				"zpos"			"6"
 				"wide"			"25"
@@ -268,7 +332,7 @@
 				"pinCorner"		"0"
 				"visible"		"1"
 				"labelText"		"%chargeamount%"
-				"textAlignment"	"west"
+				"textAlignment"	"east"
 				"fgcolor"		"0 255 255 255"
 			}
 			"chargeamountBG"
@@ -276,7 +340,7 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamountBG"
 				"font"			"Cerbetica12"
-				"xpos"			"140"
+				"xpos"			"131"
 				"ypos"			"3"
 				"zpos"			"6"
 				"wide"			"25"
@@ -285,7 +349,7 @@
 				"pinCorner"		"0"
 				"visible"		"1"
 				"labelText"		"%chargeamount%"
-				"textAlignment"	"west"
+				"textAlignment"	"east"
 				"fgcolor"		"TransparentBlack"
 			}
 			
-- 
cgit v1.2.3