Merge pull request #126 from raysfire/dev

v2019.0406

1 files changed, 189 insertions, 474 deletions

diff --git a/resource/ui/ClassSelection.res b/resource/ui/ClassSelection.res
index 5f6fa34..3566c6b 100644
--- a/resource/ui/ClassSelection.res
+++ b/resource/ui/ClassSelection.res
@@ -3,7 +3,7 @@
 	"class"
 	{
 		"ControlName"	"ImagePanel"
-		"fieldName"		"ShadeBG"
+		"fieldName"		"class"
 		"xpos"			"0"
 		"ypos"			"0"
 		"wide"			"f0"
@@ -16,17 +16,6 @@
 		"fillcolor"		"0 0 0 128"
 	}
 	
-	"charInfo"
-	{
-		"fieldName"		"charInfo"
-		"xpos"			"0"
-		"ypos"			"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"wide"			"0"
-		"tall"			"0"
-	}
-	
 	"SysMenu"
 	{
 		"ControlName"	"Menu"
@@ -42,6 +31,23 @@
 		"tabPosition"	"0"
 	}
 	
+	"SelectClassLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"SelectClassLabel"
+		"xpos"			"9999"
+		"ypos"			"9999"
+		"zpos"			"5"
+		"wide"			"255"
+		"tall"			"30"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"#TF_SelectAClass"
+		"textAlignment"	"center"
+		"font"			"CerbeticaBold28"
+		"fgcolor"		"HudOffWhite"
+	}
+	
 	"SidePanelBG"
 	{
 		"ControlName"	"ImagePanel"
@@ -57,66 +63,6 @@
 		"fillcolor"		"0 0 0 60"
 	}
 	
-	"random"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"random"
-		"xpos"				"30"
-		"ypos"				"419"
-		"zpos"				"6"
-		"wide"				"150"
-		"tall"				"16"
-		"autoResize"		"0"
-		"pinCorner"			"2"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"&R  Random"	[$WIN32]
-		"textAlignment"		"west"
-		"Command"			"joinclass random"
-		"Default"			"0"
-		"font"				"CerbeticaBold16"
-		"scaleImage"		"1"
-		"paintbackground"	"0"
-		
-		"fgcolor"					"TanLight"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override"		"Button Color"
-		"depressedFgColor_override" "TanLight"
-		"selectedFgColor_override" 	"Button Color"
-	
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"sound_armed"		"UI/buttonrollover.wav"
-	
-		"stayselectedonclick"	"1"
-		"Default"				"1"
-		"selectonhover"			"1"
-		"keyboardinputenabled"	"0"
-	}
-	
-	"Offense"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"Offense"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"2"
-		"wide"			"90"
-		"tall"			"12"
-		"tall_lodef"	"22"
-		"autoResize"	"1"
-		"pinCorner"		"2"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#TF_Offense"
-		"textAlignment"	"left"
-		"font"			"MenuClassBuckets"
-		"font_lodef"	"MenuMainTitle"
-		"fgcolor"		"TanDark"
-		"fgcolor_lodef"	"TanLight"
-	}
 	"scout"
 	{
 		"ControlName"		"CExImageButton"
@@ -131,9 +77,10 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&1  Scout"	[$WIN32]
+		"labelText"			"&1  Scout"
 		"textAlignment"		"west"
 		"Command"			"joinclass scout"
+		"Default"			"1"
 		"font"				"CerbeticaBold16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
@@ -143,16 +90,16 @@
 		"armedFgColor_override"		"Button Color"
 		"depressedFgColor_override" "TanLight"
 		"selectedFgColor_override" 	"Button Color"
-	
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"sound_armed"		"UI/buttonrollover.wav"
 		
 		"stayselectedonclick"	"1"
-		"Default"				"1"
 		"selectonhover"			"1"
 		"keyboardinputenabled"	"0"
 	}
+	
 	"soldier"
 	{
 		"ControlName"		"CExImageButton"
@@ -167,7 +114,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&2  Soldier"	[$WIN32]
+		"labelText"			"&2  Soldier"
 		"textAlignment"		"west"
 		"Command"			"joinclass soldier"
 		"Default"			"0"
@@ -180,16 +127,16 @@
 		"armedFgColor_override"		"Button Color"
 		"depressedFgColor_override" "TanLight"
 		"selectedFgColor_override" 	"Button Color"
-	
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"sound_armed"		"UI/buttonrollover.wav"
 		
 		"stayselectedonclick"	"1"
-		"Default"				"1"
 		"selectonhover"			"1"
 		"keyboardinputenabled"	"0"
 	}
+	
 	"pyro"
 	{
 		"ControlName"		"CExImageButton"
@@ -204,11 +151,11 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&3  Pyro"	[$WIN32]
+		"labelText"			"&3  Pyro"
 		"textAlignment"		"west"
 		"Command"			"joinclass pyro"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"	
+		"font"				"CerbeticaBold16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 		
@@ -217,39 +164,16 @@
 		"armedFgColor_override"		"Button Color"
 		"depressedFgColor_override" "TanLight"
 		"selectedFgColor_override" 	"Button Color"
-	
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"sound_armed"		"UI/buttonrollover.wav"
-
+		
 		"stayselectedonclick"	"1"
-		"Default"				"1"
 		"selectonhover"			"1"
 		"keyboardinputenabled"	"0"
 	}
 	
-	"Defense"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"Defense"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"2"
-		"wide"			"90"
-		"tall"			"12"
-		"tall_lodef"	"22"
-		"autoResize"	"1"
-		"pinCorner"		"2"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#TF_Defense"
-		"textAlignment"	"left"
-		"font"			"MenuClassBuckets"
-		"font_lodef"	"MenuMainTitle"
-		"fgcolor"		"TanDark"
-		"fgcolor_lodef"	"TanLight"
-	}
 	"demoman"
 	{
 		"ControlName"		"CExImageButton"
@@ -264,11 +188,11 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&4  Demoman"	[$WIN32]
+		"labelText"			"&4  Demoman"
 		"textAlignment"		"west"
 		"Command"			"joinclass demoman"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"	
+		"font"				"CerbeticaBold16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 		
@@ -277,16 +201,16 @@
 		"armedFgColor_override"		"Button Color"
 		"depressedFgColor_override" "TanLight"
 		"selectedFgColor_override" 	"Button Color"
-			
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"sound_armed"		"UI/buttonrollover.wav"
 		
 		"stayselectedonclick"	"1"
-		"Default"				"1"
 		"selectonhover"			"1"
 		"keyboardinputenabled"	"0"
-	}	
+	}
+
 	"heavyweapons"
 	{
 		"ControlName"		"CExLabel"
@@ -301,11 +225,11 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&5  Heavy"	[$WIN32]
+		"labelText"			"&5  Heavy"
 		"textAlignment"		"west"
 		"Command"			"joinclass heavyweapons"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"	
+		"font"				"CerbeticaBold16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 		
@@ -314,16 +238,16 @@
 		"armedFgColor_override"		"Button Color"
 		"depressedFgColor_override" "TanLight"
 		"selectedFgColor_override" 	"Button Color"
-	
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"sound_armed"		"UI/buttonrollover.wav"
-
+		
 		"stayselectedonclick"	"1"
-		"Default"				"1"
 		"selectonhover"			"1"
 		"keyboardinputenabled"	"0"
-	}	
+	}
+	
 	"engineer"
 	{
 		"ControlName"		"CExLabel"
@@ -338,51 +262,29 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&6  Engineer"	[$WIN32]
+		"labelText"			"&6  Engineer"
 		"textAlignment"		"west"
 		"Command"			"joinclass engineer"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"	
+		"font"				"CerbeticaBold16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
-	
+		
 		"fgcolor"					"TanLight"
 		"defaultFgColor_override"	"TanLight"
 		"armedFgColor_override"		"Button Color"
 		"depressedFgColor_override" "TanLight"
 		"selectedFgColor_override" 	"Button Color"
-	
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"sound_armed"		"UI/buttonrollover.wav"
 		
 		"stayselectedonclick"	"1"
-		"Default"				"1"
 		"selectonhover"			"1"
 		"keyboardinputenabled"	"0"
 	}
-
-	"Support"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"Support"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"2"
-		"wide"			"90"
-		"tall"			"12"
-		"autoResize"	"1"
-		"pinCorner"		"2"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#TF_Support"
-		"textAlignment"	"left"
-		"font"			"MenuClassBuckets"
-		"font_lodef"	"MenuMainTitle"
-		"fgcolor"		"TanDark"
-		"fgcolor_lodef"	"TanLight"
-	}
+	
 	"medic"
 	{
 		"ControlName"		"CExImageButton"
@@ -397,11 +299,11 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&7  Medic"	[$WIN32]
+		"labelText"			"&7  Medic"
 		"textAlignment"		"west"
 		"Command"			"joinclass medic"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"	
+		"font"				"CerbeticaBold16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 		
@@ -410,16 +312,16 @@
 		"armedFgColor_override"		"Button Color"
 		"depressedFgColor_override" "TanLight"
 		"selectedFgColor_override" 	"Button Color"
-			
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"sound_armed"		"UI/buttonrollover.wav"
 		
 		"stayselectedonclick"	"1"
-		"Default"				"1"
 		"selectonhover"			"1"
 		"keyboardinputenabled"	"0"
 	}
+
 	"sniper"
 	{
 		"ControlName"		"CExImageButton"
@@ -434,11 +336,11 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&8  Sniper"	[$WIN32]
+		"labelText"			"&8  Sniper"
 		"textAlignment"		"west"
 		"Command"			"joinclass sniper"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"	
+		"font"				"CerbeticaBold16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 		
@@ -447,16 +349,16 @@
 		"armedFgColor_override"		"Button Color"
 		"depressedFgColor_override" "TanLight"
 		"selectedFgColor_override" 	"Button Color"
-	
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"sound_armed"		"UI/buttonrollover.wav"
 		
 		"stayselectedonclick"	"1"
-		"Default"				"1"
 		"selectonhover"			"1"
 		"keyboardinputenabled"	"0"
 	}
+	
 	"spy"
 	{
 		"ControlName"		"CExImageButton"
@@ -471,11 +373,11 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"&9  Spy"	[$WIN32]
+		"labelText"			"&9  Spy"
 		"textAlignment"		"west"
 		"Command"			"joinclass spy"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"	
+		"font"				"CerbeticaBold16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 		
@@ -484,58 +386,114 @@
 		"armedFgColor_override"		"Button Color"
 		"depressedFgColor_override" "TanLight"
 		"selectedFgColor_override" 	"Button Color"
-			
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"sound_armed"		"UI/buttonrollover.wav"
 		
 		"stayselectedonclick"	"1"
-		"Default"				"1"
 		"selectonhover"			"1"
 		"keyboardinputenabled"	"0"
 	}
 
-	"CancelButton" [$WIN32] 
+	"random"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"			"random"
+		"xpos"				"30"
+		"ypos"				"419"
+		"zpos"				"6"
+		"wide"				"150"
+		"tall"				"16"
+		"autoResize"		"0"
+		"pinCorner"			"2"
+		"visible"			"1"
+		"enabled"			"1"
+		"tabPosition"		"0"
+		"labelText"			"&R  Random"
+		"textAlignment"		"west"
+		"Command"			"joinclass random"
+		"Default"			"0"
+		"font"				"CerbeticaBold16"
+		"scaleImage"		"1"
+		"paintbackground"	"0"
+		
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"Button Color"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"Button Color"
+		
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+		"sound_armed"		"UI/buttonrollover.wav"
+		
+		"stayselectedonclick"	"1"
+		"selectonhover"			"1"
+		"keyboardinputenabled"	"0"
+	}
+	
+	"EditLoadoutButton" [$WIN32]
 	{
 		"ControlName"	"CExButton"
-		"fieldName"		"CancelButton"
-		"xpos"			"30"
+		"fieldName"		"EditLoadoutButton"
+		"xpos"			"135"
 		"ypos"			"r38"
 		"zpos"			"6"
-		"wide"			"75"
+		"wide"			"100"
 		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"2"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		"#TF_ClassMenu_Cancel"
+		"paintbackground" "0"
+		"labelText"		"(&E)  EDIT LOADOUT"
 		"textAlignment"	"west"
-		"paintbackground""0"
-		"Command"		"vguicancel"
-		"font"			"CerbeticaBold16"
-		"fgcolor"		"TanLight"
+		"Command"		"openloadout"
+		"font"			"CerbeticaBold14"
+		
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"Button Color"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"Button Color"
+		
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+		"sound_armed"		"UI/buttonrollover.wav"
 	}
 	
-	"EditLoadoutButton" [$WIN32] 
+	"CancelButton" [$WIN32]
 	{
 		"ControlName"	"CExButton"
-		"fieldName"		"EditLoadoutButton"
-		"xpos"			"135"
+		"fieldName"		"CancelButton"
+		"xpos"			"30"
 		"ypos"			"r38"
 		"zpos"			"6"
-		"wide"			"100"
+		"wide"			"75"
 		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"2"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"paintbackground""0"
-		"labelText"		"EDIT LOADOUT (&E)"
+		"labelText"		"(&C)  CANCEL"
 		"textAlignment"	"west"
-		"Command"		"openloadout"
-		"font"			"CerbeticaBold16"
+		"Command"		"vguicancel"
+		"font"			"CerbeticaBold14"
+		"paintbackground" "0"
+		"fgcolor"		"TanLight"
+		
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"Button Color"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"Button Color"
+		
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+		"sound_armed"		"UI/buttonrollover.wav"
 	}
 	"LoadoutButtonBackground"
 	{
@@ -546,7 +504,7 @@
 		"wide"			"20"
 		"tall"			"0"
 	}
-	"ResetButton" [$WIN32] 
+	"ResetButton"
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"ResetButton"
@@ -566,26 +524,6 @@
 		"Command"		"resetclass"
 		"font"			"CerbeticaBold16"
 	}
-
-	"ClassMenuSelect"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ClassMenuSelect"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"5"
-		"wide"			"255"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"visible_lodef"	"0"
-		"enabled"		"1"
-		"labelText"		"#TF_SelectAClass"
-		"textAlignment"	"center"
-		"font"			"CerbeticaBold28"
-		"fgcolor"		"HudOffWhite"
-	}
 	
 	"MenuBG"
 	{
@@ -610,8 +548,6 @@
 			"angles_y" "180"
 			"angles_z" "0"
 			"origin_x" "365"
-			"origin_x_lodef" "415"
-			"origin_x_hidef" "380"
 			"origin_y" "0"
 			"origin_z" "-40"
 		}
@@ -622,15 +558,10 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"Hint"
 		"xpos"			"c-300"
-		"xpos_hidef"	"c-287"
-		"xpos_lodef"	"c-260"
 		"ypos"			"95"
-		"ypos_hidef"	"101"
-		"ypos_lodef"	"115"
 		"zpos"			"2"
 		"wide"			"600"
 		"tall"			"50"
-		"tall_lodef"	"30"
 		"autoResize"	"1"
 		"pinCorner"		"2"
 		"visible"		"0"
@@ -640,9 +571,7 @@
 		"textAlignment"	"left"
 		"wrap"			"1"
 		"font"			"HudFontMediumSmallSecondary"
-		"font_lodef"	"HudFontMediumSmallSecondary"
 		"fgcolor"		"HudTrainingHint"
-		"fgcolor_lodef"	"HudTrainingHint"
 	}
 	
 	"ShadedBar"
@@ -651,15 +580,9 @@
 		"fieldName"		"ShadedBar"
 		"xpos"			"9999"
 		"ypos"			"r50"
-		"ypos_lodef"			"r74"
-		"ypos_hidef"			"r65"
 		"zpos"			"4"
 		"wide"			"f0"
 		"tall"			"50"
-		"tall_lodef"			"74"
-		"tall_hidef"			"65"
-		"autoResize"	"0"
-		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"	
@@ -668,90 +591,6 @@
 		"PaintBackgroundType"	"0"
 	}
 	
-	"Footer" [$X360]
-	{
-		"ControlName"		"CTFFooter"
-		"fieldName"			"Footer"
-		"zpos"				"6"
-		"tall"				"80"
-		"button_separator"	"10"
-		"button_separator_lodef"	"5"
-		"buttongap"			"50"
-		"buttongap_hidef"		"35"
-		"buttongap_lodef"			"18"
-		"textadjust"		"3"
-		"textadjust_lodef"		"0"
-		"buttonoffsety"		"20"
-		"buttonoffsety_hidef"		"0"
-		"buttonoffsety_lodef"		"18"
-		"center"			"0"
-		"button_pin_right_lodef"	"55"
-		"fonttext"			"MatchmakingDialogMenuLarge"
-		"fonttext_lodef"			"MatchmakingDialogMenuSmall"
-		"fgcolor"			"HudOffWhite" 
-		
-		"button"
-		{
-			"name"		"cancel"
-			"text"		"#GameUI_Cancel"
-			"icon"		"#GameUI_Icons_B_BUTTON"
-		}
-		
-		"button"
-		{
-			"name"		"nextprev"
-			"text"		"#TF_NextPrev"
-			"icon"		"#GameUI_Icons_DPAD"
-		}
-		
-		"button"
-		{
-			"name"		"select"
-			"text"		"#GameUI_Select"
-			"icon"		"#GameUI_Icons_A_BUTTON"
-		}
-	}
-	
-	"localPlayerImage" [$WIN32]
-	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"localPlayerImage"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"9"
-		"wide"			"45"
-		"tall"			"90"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			""
-		"scaleImage"	"1"
-	}
-	
-	"localPlayerBG"
-	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"localPlayerBG"
-		"xpos"			"9999"
-		"ypos"			"99999"
-		"zpos"			"2"
-		"wide"			"55"
-		"tall"			"80"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			"../hud/color_panel_clear"
-		"scaleImage"	"1"	
-		"teambg_2"		"../hud/color_panel_clear"
-		"teambg_3"		"../hud/color_panel_clear"
-	
-		"src_corner_height"		"23"			// pixels inside the image
-		"src_corner_width"		"23"
-	
-		"draw_corner_width"		"5"				// screen size of the corners ( and sides ), proportional
-		"draw_corner_height" 	"5"	
-	}
-	
 	"countImage0" [$WIN32]
 	{
 		"ControlName"	"CTFImagePanel"
@@ -763,8 +602,8 @@
 		"tall"			"60"
 		"visible"		"0"
 		"enabled"		"1"
-		"image"			""	
-		"scaleImage"	"1"	
+		"image"			""
+		"scaleImage"	"1"
 	}
 	
 	"countImage1" [$WIN32]
@@ -778,8 +617,8 @@
 		"tall"			"60"
 		"visible"		"0"
 		"enabled"		"1"
-		"image"			""	
-		"scaleImage"	"1"	
+		"image"			""
+		"scaleImage"	"1"
 	}
 	
 	"countImage2" [$WIN32]
@@ -793,8 +632,8 @@
 		"tall"			"60"
 		"visible"		"0"
 		"enabled"		"1"
-		"image"			""	
-		"scaleImage"	"1"	
+		"image"			""
+		"scaleImage"	"1"
 	}
 	
 	"countImage3" [$WIN32]
@@ -808,8 +647,8 @@
 		"tall"			"60"
 		"visible"		"0"
 		"enabled"		"1"
-		"image"			""	
-		"scaleImage"	"1"	
+		"image"			""
+		"scaleImage"	"1"
 	}
 	
 	"countImage4" [$WIN32]
@@ -823,8 +662,8 @@
 		"tall"			"60"
 		"visible"		"0"
 		"enabled"		"1"
-		"image"			""	
-		"scaleImage"	"1"	
+		"image"			""
+		"scaleImage"	"1"
 	}
 	
 	"countImage5" [$WIN32]
@@ -838,8 +677,8 @@
 		"tall"			"60"
 		"visible"		"0"
 		"enabled"		"1"
-		"image"			""	
-		"scaleImage"	"1"	
+		"image"			""
+		"scaleImage"	"1"
 	}
 	
 	"countImage6" [$WIN32]
@@ -853,8 +692,8 @@
 		"tall"			"60"
 		"visible"		"0"
 		"enabled"		"1"
-		"image"			""	
-		"scaleImage"	"1"	
+		"image"			""
+		"scaleImage"	"1"
 	}
 	
 	"countImage7" [$WIN32]
@@ -868,8 +707,8 @@
 		"tall"			"60"
 		"visible"		"0"
 		"enabled"		"1"
-		"image"			""	
-		"scaleImage"	"1"	
+		"image"			""
+		"scaleImage"	"1"
 	}
 	
 	"countImage8" [$WIN32]
@@ -883,8 +722,8 @@
 		"tall"			"60"
 		"visible"		"0"
 		"enabled"		"1"
-		"image"			""	
-		"scaleImage"	"1"	
+		"image"			""
+		"scaleImage"	"1"
 	}
 	
 	"countImage9" [$WIN32]
@@ -898,8 +737,8 @@
 		"tall"			"60"
 		"visible"		"0"
 		"enabled"		"1"
-		"image"			""	
-		"scaleImage"	"1"	
+		"image"			""
+		"scaleImage"	"1"
 	}
 	
 	"countImage10" [$WIN32]
@@ -913,31 +752,11 @@
 		"tall"			"60"
 		"visible"		"0"
 		"enabled"		"1"
-		"image"			""	
-		"scaleImage"	"1"	
-	}
-	
-	"CountLabel" [$WIN32]
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CountLabel"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"10"
-		"wide"			"150"
-		"tall"			"18"
-		"autoResize"	"1"
-		"pinCorner"		"2"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#TF_TeamCount"
-		"textAlignment"	"left"
-		"font"			"HudFontMediumSmallSecondary"
-		"fgcolor"		"TanLight"
+		"image"			""
+		"scaleImage"	"1"
 	}
 	
-	"numScout" [$WIN32]
+	"numScout"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"numScout"
@@ -955,9 +774,9 @@
 		"textAlignment"	"center"
 		"font"			"CerbeticaBold16"
 		"fgcolor"		"TanLight"
-	}	
+	}
 	
-	"numSoldier" [$WIN32]
+	"numSoldier"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"numSoldier"
@@ -975,9 +794,9 @@
 		"textAlignment"	"center"
 		"font"			"CerbeticaBold16"
 		"fgcolor"		"TanLight"
-	}	
+	}
 	
-	"numPyro" [$WIN32]
+	"numPyro"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"numPyro"
@@ -995,9 +814,9 @@
 		"textAlignment"	"center"
 		"font"			"CerbeticaBold16"
 		"fgcolor"		"TanLight"
-	}		
+	}
 	
-	"numDemoman" [$WIN32]
+	"numDemoman"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"numDemoman"
@@ -1017,7 +836,7 @@
 		"fgcolor"		"TanLight"
 	}
 	
-	"numHeavy" [$WIN32]
+	"numHeavy"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"numHeavy"
@@ -1037,7 +856,7 @@
 		"fgcolor"		"TanLight"
 	}
 	
-	"numEngineer" [$WIN32]
+	"numEngineer"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"numEngineer"
@@ -1055,9 +874,9 @@
 		"textAlignment"	"center"
 		"font"			"CerbeticaBold16"
 		"fgcolor"		"TanLight"
-	}						
+	}
 	
-	"numMedic" [$WIN32]
+	"numMedic"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"numMedic"
@@ -1077,7 +896,7 @@
 		"fgcolor"		"TanLight"
 	}
 	
-	"numSniper" [$WIN32]
+	"numSniper"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"numSniper"
@@ -1097,7 +916,7 @@
 		"fgcolor"		"TanLight"
 	}
 	
-	"numSpy" [$WIN32]
+	"numSpy"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"numMedic"
@@ -1251,115 +1070,6 @@
 		"image"			"mvm/class_upgraded"
 		"scaleImage"	"1"
 	}
-
-	"StartExplanation"
-	{
-		"ControlName"	"CExplanationPopup"
-		"fieldName"		"StartExplanation"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"10000"
-		"wide"			"250"
-		"tall"			"165"
-		"visible"		"0"
-		"PaintBackgroundType"	"2"
-		"paintbackground" "0"
-		"border"		"MainMenuHighlightBorder"
-		
-		"force_close"	"1"
-		"end_x"			"c-170"
-		"end_y"			"115"
-		"end_wide"		"300"
-		"end_tall"		"240"
-		"callout_inparents_x"	"c-270"
-		"callout_inparents_y"	"40"
-		"next_explanation"		"VoucherExplanation"
-		
-		"TitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#TF_MvM_UpgradeExplanation_Title"
-			"textAlignment"	"north"
-			"xpos"			"20"
-			"ypos"			"10"
-			"wide"			"260"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
-		}
-		
-		"TextLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TextLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"#TF_MvM_UpgradeExplanation_Text"
-			"textAlignment"	"north-west"
-			"xpos"			"20"
-			"ypos"			"45"
-			"wide"			"260"
-			"tall"			"170"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
-		}
-		
-		"CloseButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"CloseButton"
-			"xpos"			"280"
-			"ypos"			"5"
-			"zpos"			"10"
-			"wide"			"14"
-			"tall"			"14"
-			"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"
-			"paintbackground"	"0"
-			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "200 80 60 255"
-			"depressedFgColor_override" "46 43 42 255"
-			
-			"image_drawcolor"	"117 107 94 255"
-			"image_armedcolor"	"200 80 60 255"
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"close_button"
-				"scaleImage"	"1"
-			}
-		}
-	}
 	
 	"TFPlayerModel"
 	{
@@ -1376,7 +1086,7 @@
 		"enabled"		"1"
 		"fov"			"25"
 		"allow_rot"		"0"
-		"paintbackground"	"1"		
+		"paintbackground"	"1"
 		"render_texture"	"0"
 		"paintbackgroundenabled" "1"
 		"bgcolor_override" "255 255 255 0"
@@ -1403,15 +1113,20 @@
 		"ControlName"	"CTFClassTipsPanel"
 		"fieldName"		"ClassTipsPanel"
 		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"7"
-		"wide"			"235"
-		"tall"			"165"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
+	}
+	
+	"localPlayerImage" [$WIN32]
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"localPlayerImage"
+		"xpos"			"9999"
+	}
+	
+	"localPlayerBG"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"localPlayerBG"
+		"xpos"			"9999"
 	}
 	
 	"ClassHighlightPanel"
@@ -1454,7 +1169,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"ClassHighlightText"
@@ -1473,7 +1188,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"CloseButton"
@@ -1501,12 +1216,12 @@
 			"Command"		"close"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "235 226 202 255"
-			"depressedFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
+			"armedFgColor_override" "TanLight"
+			"depressedFgColor_override" "TanDarker"
 			
-			"image_drawcolor"	"117 107 94 255"
-			"image_armedcolor"	"200 80 60 255"
+			"image_drawcolor"	"TextColor"
+			"image_armedcolor"	"LightRed"
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
@@ -1518,7 +1233,7 @@
 				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"close_button"
+				"image"			"replay/thumbnails/close"
 				"scaleImage"	"1"
 			}
 		}