Playtesting Fixes

- Updated Arena Mode, CTF and Tournament panels
- Fixed the referenced HudBlack color not being available
- Fixed visual issues with the Demoman, Scout and Medic meters
- Miscellenaous font and color tweaks

14 files changed, 85 insertions, 87 deletions

diff --git a/resource/ui/ClassSelection.res b/resource/ui/ClassSelection.res
index 00177de..41d2ff0 100644
--- a/resource/ui/ClassSelection.res
+++ b/resource/ui/ClassSelection.res
@@ -451,7 +451,7 @@
 		"labelText"		"(&E)  EDIT LOADOUT"
 		"textAlignment"	"west"
 		"Command"		"openloadout"
-		"font"			"CerbeticaBold16"
+		"font"			"CerbeticaBold14"
 	}
 	
 	"CancelButton" [$WIN32]
diff --git a/resource/ui/FreezePanel_Basic.res b/resource/ui/FreezePanel_Basic.res
index 2b47554..d998b43 100644
--- a/resource/ui/FreezePanel_Basic.res
+++ b/resource/ui/FreezePanel_Basic.res
@@ -139,7 +139,7 @@
 		{	
 			"ControlName"	"Label"
 			"fieldName"		"FreezeLabel"
-			"font"			"Cerbetica13"
+			"font"			"Cerbetica12"
 			"xpos"			"40"
 			"ypos"			"15"
 			"zpos"			"1"
diff --git a/resource/ui/HudArenaNotification.res b/resource/ui/HudArenaNotification.res
index 109ed08..de3fdb2 100644
--- a/resource/ui/HudArenaNotification.res
+++ b/resource/ui/HudArenaNotification.res
@@ -8,12 +8,13 @@
 		"ypos"			"20"
 		"zpos"			"-1"
 		"wide"			"280"
-		"tall"			"150"
+		"tall"			"100"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"0 0 0 200"
+		"fillcolor"		"0 0 0 230"
+		"border"		"CyanBorderThick"
 	}
 	
 	"WarningLabel"
@@ -22,7 +23,7 @@
 		"fieldName"		"WarningLabel"
 		"font"			"CerbeticaBold72"
 		"xpos"			"40"
-		"ypos"			"50"
+		"ypos"			"35"
 		"zpos"			"1"
 		"wide"			"72"
 		"tall"			"72"
@@ -40,8 +41,8 @@
 		"ControlName"	"Label"
 		"fieldName"		"BalanceLabel"
 		"font"			"CerbeticaBold20"
-		"xpos"			"75"
-		"ypos"			"30"
+		"xpos"			"70"
+		"ypos"			"20"
 		"zpos"			"1"
 		"wide"			"230"
 		"tall"			"64"
@@ -60,7 +61,7 @@
 		"fieldName"		"BalanceLabelTip"
 		"font"			"CerbeticaBold16"
 		"xpos"			"70"
-		"ypos"			"94"
+		"ypos"			"54"
 		"zpos"			"1"
 		"wide"			"230"
 		"tall"			"64"
diff --git a/resource/ui/HudArenaPlayerCount.res b/resource/ui/HudArenaPlayerCount.res
index 48ea696..8f8d6e4 100644
--- a/resource/ui/HudArenaPlayerCount.res
+++ b/resource/ui/HudArenaPlayerCount.res
@@ -8,29 +8,23 @@
 		"ypos"			"-7"

 		"zpos"			"0"

 		"wide"			"60"

-		"tall"			"30"

+		"tall"			"33"

 		"visible"		"1"

 		

 		"background"

 		{

-			"ControlName"	"CTFImagePanel"

+			"ControlName"	"EditablePanel"

 			"fieldName"		"background"

 			"xpos"			"9"

 			"ypos"			"7"

 			"zpos"			"0"

 			"wide"			"46"

-			"tall"			"23"

+			"tall"			"33"

 			"autoResize"	"0"

 			"pinCorner"		"0"

 			"visible"		"1"

 			"enabled"		"1"

-			"image"			"../hud/color_panel_blu"

-			

-			"src_corner_height"		"23"

-			"src_corner_width"		"23"

-			

-			"draw_corner_width"		"0"

-			"draw_corner_height" 	"0"

+			"bgcolor_override"	"104 124 155 255"

 		}

 		

 		"count"

@@ -46,7 +40,7 @@
 			"pinCorner"		"0"

 			"visible"		"1"

 			"enabled"		"1"

-			"font"			"Cerbetica24"

+			"font"			"CerbeticaBold28"

 			"labelText"		"%blue_alive%"

 			"textAlignment"	"center"

 			"fgcolor"		"TanLight"

@@ -64,7 +58,7 @@
 			"pinCorner"		"0"

 			"visible"		"1"

 			"enabled"		"1"

-			"font"			"Cerbetica24"

+			"font"			"CerbeticaBold28"

 			"labelText"		"%blue_alive%"

 			"textAlignment"	"center"

 			"fgcolor"		"TransparentBlack"

@@ -81,8 +75,8 @@
 			"xpos"			"12"

 			"ypos"			"10"

 			"zpos"			"3"

-			"wide"			"8"

-			"tall"			"16"

+			"wide"			"10"

+			"tall"			"18"

 			"visible"		"1"

 			"enabled"		"1"

 			"image"			"capture_icon_white"

@@ -98,28 +92,23 @@
 		"ypos"			"-7"

 		"zpos"			"0"

 		"wide"			"60"

-		"tall"			"30"

+		"tall"			"33"

 		"visible"		"1"

 		

 		"background"

 		{

-			"ControlName"	"CTFImagePanel"

+			"ControlName"	"EditablePanel"

 			"fieldName"		"background"

-			"xpos"			"5"

-			"ypos"			"7"

+			"xpos"			"4"

+			"ypos"			"0"

 			"zpos"			"0"

-			"wide"			"46"

-			"tall"			"23"

+			"wide"			"47"

+			"tall"			"33"

 			"autoResize"	"0"

 			"pinCorner"		"0"

 			"visible"		"1"

 			"enabled"		"1"

-			"image"			"../hud/color_panel_red"

-			

-			"src_corner_height"		"23"

-			"src_corner_width"		"23"

-			"draw_corner_width"		"0"

-			"draw_corner_height" 	"0"

+			"bgcolor_override"	"180 92 77 255"

 		}

 		

 		"count"

@@ -135,7 +124,7 @@
 			"pinCorner"		"0"

 			"visible"		"1"

 			"enabled"		"1"

-			"font"			"Cerbetica24"

+			"font"			"CerbeticaBold28"

 			"labelText"		"%red_alive%"

 			"textAlignment"	"center"

 			"fgcolor"		"TanLight"

@@ -153,7 +142,7 @@
 			"pinCorner"		"0"

 			"visible"		"1"

 			"enabled"		"1"

-			"font"			"Cerbetica24"

+			"font"			"CerbeticaBold28"

 			"labelText"		"%red_alive%"

 			"textAlignment"	"center"

 			"fgcolor"		"TransparentBlack"

@@ -167,11 +156,11 @@
 		{

 			"ControlName"	"ImagePanel"

 			"fieldName"		"playerimage"

-			"xpos"			"12"

+			"xpos"			"10"

 			"ypos"			"10"

 			"zpos"			"3"

-			"wide"			"8"

-			"tall"			"16"

+			"wide"			"10"

+			"tall"			"18"

 			"visible"		"1"

 			"enabled"		"1"

 			"image"			"capture_icon_white"

diff --git a/resource/ui/HudArenaTeamMenu.res b/resource/ui/HudArenaTeamMenu.res
index 174e61d..46cfb75 100644
--- a/resource/ui/HudArenaTeamMenu.res
+++ b/resource/ui/HudArenaTeamMenu.res
@@ -106,7 +106,7 @@
 		"fieldName"		"mapname"

 		"xpos"			"10"

 		"ypos"			"35"

-		"wide"			"235"

+		"wide"			"255"

 		"tall"			"30"

 		"textAlignment"	"center"

 		"font"			"CerbeticaBold28"

@@ -119,10 +119,10 @@
 	{

 		"ControlName"	"CTFTeamButton"

 		"fieldName"		"teambutton2"

-		"xpos"			"10"

+		"xpos"			"0"

 		"ypos"			"c-35"

 		"zpos"			"3"

-		"wide"			"245"

+		"wide"			"255"

 		"tall"			"30"

 		"autoResize"	"0"

 		"pinCorner"		"2"

@@ -130,7 +130,7 @@
 		"enabled"		"1"

 		"tabPosition"	"1"

 		"labelText"		"&3 Fight!"

-		"textAlignment"	"west"

+		"textAlignment"	"center"

 		"dulltext"		"0"

 		"brighttext"	"0"

 		"paintborder"	"0"

@@ -152,10 +152,10 @@
 	{

 		"ControlName"	"CTFTeamButton"

 		"fieldName"		"teambutton3"

-		"xpos"			"10"

+		"xpos"			"0"

 		"ypos"			"c5"

 		"zpos"			"3"

-		"wide"			"245"

+		"wide"			"255"

 		"tall"			"30"

 		"autoResize"	"0"

 		"pinCorner"		"2"

@@ -163,7 +163,7 @@
 		"enabled"		"1"

 		"tabPosition"	"2"

 		"labelText"		"&2 Spectate"

-		"textAlignment"	"west"

+		"textAlignment"	"center"

 		"dulltext"		"0"

 		"brighttext"	"0"

 		"paintborder"	"0"

diff --git a/resource/ui/HudDemomanCharge.res b/resource/ui/HudDemomanCharge.res
index 6a7844e..250a8fc 100644
--- a/resource/ui/HudDemomanCharge.res
+++ b/resource/ui/HudDemomanCharge.res
@@ -5,7 +5,7 @@
 		"ControlName"		"ContinuousProgressBar"
 		"fieldName"			"ChargeMeter"
 		"xpos"				"0"
-		"ypos"				"87"
+		"ypos"				"c-172"
 		"xpos_minmode"		"15"
 		"ypos_minmode"		"28"
 		"zpos"				"2"
@@ -26,7 +26,7 @@
 		"ControlName"		"CExLabel"
 		"fieldName"			"ItemEffectMeterLabel"
 		"xpos"				"125"
-		"ypos"				"87"
+		"ypos"				"c-172"
 		"xpos_minmode"		"9999"
 		"ypos_minmode"		"9999"
 		"zpos"				"3"
diff --git a/resource/ui/HudDemomanPipes.res b/resource/ui/HudDemomanPipes.res
index af8aaf8..fa9365c 100644
--- a/resource/ui/HudDemomanPipes.res
+++ b/resource/ui/HudDemomanPipes.res
@@ -5,7 +5,7 @@
 		"ControlName"		"CExLabel"
 		"fieldName"			"ChargeLabel"
 		"xpos"				"125"
-		"ypos"				"c-142"
+		"ypos"				"c-162"
 		"xpos_minmode"		"9999"
 		"ypos_minmode"		"9999"
 		"zpos"				"3"
@@ -28,7 +28,7 @@
 		"ControlName"		"ContinuousProgressBar"
 		"fieldName"			"ChargeMeter"
 		"xpos"				"0"
-		"ypos"				"97"
+		"ypos"				"c-162"
 		"xpos_minmode"		"15"
 		"ypos_minmode"		"35"
 		"zpos"				"2"
@@ -49,7 +49,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"PipesPresentPanel"
 		"xpos"				"24"
-		"ypos"				"53"
+		"ypos"				"c-207"
 		"ypos_minmode"		"0"
 		"zpos"				"1"
 		"wide"				"100"
diff --git a/resource/ui/HudItemEffectMeter_Cleaver.res b/resource/ui/HudItemEffectMeter_Cleaver.res
index 9fb8979..73432ee 100644
--- a/resource/ui/HudItemEffectMeter_Cleaver.res
+++ b/resource/ui/HudItemEffectMeter_Cleaver.res
@@ -4,7 +4,7 @@
 {

 	"HudItemEffectMeter"

 	{

-		"ypos"				"c83"

+		"ypos"				"c93"

 		"ypos_minmode"		"c53"

 	}

 	

diff --git a/resource/ui/HudMedicCharge.res b/resource/ui/HudMedicCharge.res
index af2c27f..1a478f7 100644
--- a/resource/ui/HudMedicCharge.res
+++ b/resource/ui/HudMedicCharge.res
@@ -102,7 +102,7 @@
 		"font"				"Default"
 		"xpos"				"0"
 		"ypos"				"60"
-		"xpos_minmode"		"10"
+		"xpos_minmode"		"17"
 		"ypos_minmode"		"27"
 		"zpos"				"2"
 		"wide"				"150"
@@ -128,13 +128,13 @@
 		"xpos"				"0"
 		"ypos"				"60"
 		"zpos"				"3"
-		"xpos_minmode"		"33"
-		"ypos_minmode"		"22"
+		"xpos_minmode"		"17"
+		"ypos_minmode"		"27"
 		"zpos_minmode"		"4"
 		"wide"				"36"
 		"tall"				"20"
-		"wide_minmode"		"20"
-		"tall_minmode"		"17"
+		"wide_minmode"		"27"
+		"tall_minmode"		"10"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -155,8 +155,8 @@
 		"zpos"				"4"
 		"wide"				"36"
 		"tall"				"20"
-		"wide_minmode"		"20"
-		"tall_minmode"		"17"
+		"wide_minmode"		"27"
+		"tall_minmode"		"10"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -181,8 +181,8 @@
 		"zpos"				"4"
 		"wide"				"36"
 		"tall"				"20"
-		"wide_minmode"		"20"
-		"tall_minmode"		"17"
+		"wide_minmode"		"27"
+		"tall_minmode"		"10"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -207,8 +207,8 @@
 		"zpos"				"4"
 		"wide"				"36"
 		"tall"				"20"
-		"wide_minmode"		"20"
-		"tall_minmode"		"17"
+		"wide_minmode"		"27"
+		"tall_minmode"		"10"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -227,7 +227,7 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"ResistIconAnchor"
-		"xpos"				"150"
+		"xpos"				"160"
 		"ypos"				"57"
 		"xpos_minmode"		"136"
 		"ypos_minmode"		"18"
diff --git a/resource/ui/HudObjectiveFlagPanel.res b/resource/ui/HudObjectiveFlagPanel.res
index a99b13d..440d902 100644
--- a/resource/ui/HudObjectiveFlagPanel.res
+++ b/resource/ui/HudObjectiveFlagPanel.res
@@ -21,11 +21,11 @@
 	{

 		"ControlName"	"ImagePanel"

 		"fieldName"		"LeftSideBG"

-		"xpos"			"c-120"

-		"ypos"			"r20"

+		"xpos"			"c-60"

+		"ypos"			"r30"

 		"zpos"			"-1"

-		"wide"			"120"

-		"tall"			"14"

+		"wide"			"60"

+		"tall"			"34"

 		"visible"		"1"

 		"enabled"		"1"

 		"fillcolor"		"70 130 180 153"

@@ -49,10 +49,10 @@
 		"ControlName"	"ImagePanel"

 		"fieldName"		"RightSideBG"

 		"xpos"			"c0"

-		"ypos"			"r20"

+		"ypos"			"r30"

 		"zpos"			"-1"

-		"wide"			"120"

-		"tall"			"14"

+		"wide"			"60"

+		"tall"			"34"

 		"visible"		"1"

 		"enabled"		"1"

 		"fillcolor"		"205 50 50 153"

@@ -324,8 +324,8 @@
 	{

 		"ControlName"	"CTFFlagStatus"

 		"fieldName"		"BlueFlag"

-		"xpos"			"c-165"

-		"ypos"			"r75"

+		"xpos"			"c-145"

+		"ypos"			"r67"

 		"zpos"			"2"

 		"wide"			"160"

 		"tall"			"90"

@@ -370,8 +370,8 @@
 	{

 		"ControlName"	"CTFFlagStatus"

 		"fieldName"		"RedFlag"

-		"xpos"			"c5"

-		"ypos"			"r75"

+		"xpos"			"c-15"

+		"ypos"			"r67"

 		"zpos"			"5"

 		"wide"			"160"

 		"tall"			"90"

diff --git a/resource/ui/HudTournament.res b/resource/ui/HudTournament.res
index 14c6c6d..90d7c0b 100644
--- a/resource/ui/HudTournament.res
+++ b/resource/ui/HudTournament.res
@@ -133,7 +133,7 @@
 				if_mvm
 				{
 					"xpos"		"7"
-					"ypos"		"1"
+					"ypos"		"0"
 					"wide"		"26"
 					"tall"		"26"
 					"image"		"../vgui/hud_connecting"
@@ -744,7 +744,7 @@
 		"fieldName"		"TournamentInstructionsLabel"
 		"font"			"Cerbetica11"
 		"xpos"			"c-125"
-		"ypos"			"44"
+		"ypos"			"42"
 		"wide"			"250"
 		"tall"			"13"
 		"zpos"			"1"
@@ -787,14 +787,14 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"InstructionBackground"
 		"xpos"			"c-125"
-		"ypos"			"42"
+		"ypos"			"26"
 		"zpos"			"-1"
 		"wide"			"250"
-		"tall"			"16"
+		"tall"			"30"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"0 0 0 150"
+		"fillcolor"		"DarkGrey"
 		
 		if_mvm {
 			"visible"	"0"
@@ -842,7 +842,8 @@
 		{
 			"visible"	"1"
 			"enabled"	"1"
-			"xpos"		"c-20"
+			"xpos"		"c-60"
+			"wide"		"140"
 		}
 	
 		if_competitive
@@ -884,7 +885,8 @@
 		{
 			"visible"		"1"
 			"enabled"		"1"
-			"xpos"			"c-20"
+			"xpos"			"c-60"
+			"wide"			"140"
 		}
 		
 		if_competitive
diff --git a/resource/ui/destroy_menu/HudMenuEngyDestroy.res b/resource/ui/destroy_menu/HudMenuEngyDestroy.res
index 84b6b52..13e4c92 100644
--- a/resource/ui/destroy_menu/HudMenuEngyDestroy.res
+++ b/resource/ui/destroy_menu/HudMenuEngyDestroy.res
@@ -46,7 +46,7 @@
 		"pinCorner"			"0"

 		"visible"			"1"

 		"enabled"			"1"

-		"labelText"			"Ka-Boom!"

+		"labelText"			"#Hud_menu_demolish_title"

 		"textAlignment"		"Left"

 		"dulltext"			"0"

 		"brighttext"		"0"

diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res
index 55ceb87..93037a0 100644
--- a/resource/ui/hudmatchstatus.res
+++ b/resource/ui/hudmatchstatus.res
@@ -424,7 +424,7 @@
 				"ypos"			"19"
 				"zpos"			"5"
 				"wide"			"f0"
-				"tall"			"2"				
+				"tall"			"3"				
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"1"
@@ -444,7 +444,7 @@
 				"ypos"			"19"
 				"zpos"			"6"
 				"wide"			"f0"
-				"tall"			"2"				
+				"tall"			"3"				
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"1"
@@ -513,7 +513,7 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"respawntime"
-				"font"			"Cerbetica13"
+				"font"			"Cerbetica9"
 				"xpos"			"cs-0.5"
 				"ypos"			"0"
 				"zpos"			"5"
diff --git a/resource/ui/hudupgradepanel.res b/resource/ui/hudupgradepanel.res
index ef93a24..d8e2c6c 100644
--- a/resource/ui/hudupgradepanel.res
+++ b/resource/ui/hudupgradepanel.res
@@ -65,7 +65,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"bgcolor_override"	"HudBlack"
+		"bgcolor_override"	"0 0 0 230"
 	}
 	
 	"SelectWeaponPanel"
@@ -691,6 +691,8 @@
 			"Command"		"cancel"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			"border_default"	"ButtonHover"
+			"border_armed"		"ButtonHover"	
 		}
 		
 		"CloseButton"
@@ -716,6 +718,8 @@
 			"Command"		"close"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			"border_default"	"ButtonHover"
+			"border_armed"		"ButtonHover"	
 		}
 
 		"RespecButton"
@@ -741,6 +745,8 @@
 			"Command"		"respec"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			"border_default"	"ButtonHover"
+			"border_armed"		"ButtonHover"	
 		}
 	}