Merge pull request #126 from raysfire/dev

v2019.0406

1 files changed, 339 insertions, 482 deletions

diff --git a/customizations/Scoreboard/ScoreBoard-default.res b/customizations/Scoreboard/ScoreBoard-default.res
index 9d29822..3774fa4 100644
--- a/customizations/Scoreboard/ScoreBoard-default.res
+++ b/customizations/Scoreboard/ScoreBoard-default.res
@@ -41,7 +41,8 @@
 		"fillcolor"		"70 130 180 153"
 		"scaleImage"	"1"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
 	}
@@ -75,7 +76,8 @@
 		"fillcolor"		"205 50 50 153"
 		"scaleImage"	"1"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
 	}
@@ -107,7 +109,8 @@
 		"visible"		"0"
 		"enabled"		"0"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
 	}
@@ -125,7 +128,8 @@
 		"enabled"		"1"
 		"fillcolor"		"0 0 0 100"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
 	}
@@ -144,9 +148,10 @@
 		"enabled"		"0"
 		"fillcolor"		"0 0 0 100"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
-		}		
+		}
 	}
 	
 	"Red6sBackground"
@@ -162,7 +167,8 @@
 		"enabled"		"0"
 		"fillcolor"		"0 0 0 100"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
 	}
@@ -180,10 +186,11 @@
 		"enabled"		"0"
 		"fillcolor"		"0 0 0 100"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
-	}			
+	}
 	"BlueTeamLabel1"
 	{
 		"ControlName"	"CExLabel"
@@ -200,10 +207,11 @@
 		"visible"		"1"
 		"enabled"		"1"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
-	}							
+	}
 	"BlueTeamScore"
 	{
 		"ControlName"	"CExLabel"
@@ -221,7 +229,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
 	}
@@ -230,7 +239,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueTeamScoreDropshadow"
 		"font"			"CerbeticaBold36"
-		"fgcolor"		"Black"
+		"fgcolor"		"TransparentBlack"
 		"labelText"		"%blueteamscore%"
 		"textAlignment"	"east"
 		"xpos"			"c-105"
@@ -243,10 +252,11 @@
 		"visible"		"1"
 		"enabled"		"1"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
-	}							
+	}
 	"BlueTeamPlayerCount"
 	{
 		"ControlName"	"CExLabel"
@@ -263,10 +273,11 @@
 		"visible"		"1"
 		"enabled"		"1"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
-	}							
+	}
 	"RedTeamLabel1"
 	{
 		"ControlName"	"CExLabel"
@@ -283,7 +294,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
 	}
@@ -299,39 +311,40 @@
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"55"
-		"tall_hidef"	"75"
-		"tall_lodef"	"75"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
 	}
 	"RedTeamScoreDropshadow"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"RedTeamScoreDropshadow"
-		"font"			"CerbeticaBold36"
-		"fgcolor"		"Black"
-		"labelText"		"%redteamscore%"
-		"textAlignment"	"west"
-		"xpos"			"c7"
-		"ypos"			"129"
-		"zpos"			"4"
-		"wide"			"100"
-		"tall"			"55"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"ControlName"		"CExLabel"
+		"fieldName"			"RedTeamScoreDropshadow"
+		"font"				"CerbeticaBold36"
+		"fgcolor"			"Black"
+		"labelText"			"%redteamscore%"
+		"textAlignment"		"west"
+		"xpos"				"c7"
+		"ypos"				"129"
+		"zpos"				"4"
+		"wide"				"100"
+		"tall"				"55"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
 		
-		if_mvm {
-			"visible"	"0"
+		if_mvm
+		{
+			"visible"		"0"
 		}
-	}							
+	}
+	
 	"RedTeamPlayerCount"
 	{
 		"ControlName"	"CExLabel"
@@ -348,10 +361,12 @@
 		"visible"		"1"
 		"enabled"		"1"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
-	}							
+	}
+	
 	"ServerLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -366,7 +381,7 @@
 		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"	[$WIN32]
+		"visible"		"1"
 		"enabled"		"1"
 	}
 	"ServerTimeValue"
@@ -383,9 +398,10 @@
 		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"	[$WIN32]
+		"visible"		"1"
 		"enabled"		"1"
-	}							
+	}
+	
 	"BluePlayerList"
 	{
 		"ControlName"	"SectionedListPanel"
@@ -405,7 +421,8 @@
 		"linegap"		"0"
 		"show_columns"	"0"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"0"
 		}
 	}
@@ -428,23 +445,20 @@
 		"linegap"		"0"
 		"show_columns"	"0"		
 		
- 		if_mvm {
- 			"visible"	"0"
- 		}
+		if_mvm
+		{
+			"visible"	"0"
+		}
 	}
 	"VerticalLine"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"299"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"9999"
 		"zpos"			"9999"
 		"wide"			"2"
 		"tall"			"292"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -453,8 +467,9 @@
 		"fillcolor"		"0 0 0 153"
 		"PaintBackgroundType"	"0"
 		
-		if_mvm {
-			"visible"	"0"
+		if_mvm
+		{
+			"visible"		"0"
 		}
 	}
 	"Spectators"
@@ -473,7 +488,8 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-	}	
+	}
+	
 	"SpectatorsInQueue"
 	{
 		"ControlName"	"CExLabel"
@@ -482,7 +498,7 @@
 		"labelText"		"%waitingtoplay%"
 		"textAlignment"	"west"
 		"xpos"			"2"
-		"ypos"			"42"	
+		"ypos"			"42"
 		"zpos"			"4"
 		"wide"			"600"
 		"tall"			"20"
@@ -491,16 +507,17 @@
 		"visible"		"1"
 		"enabled"		"1"
 		
-		if_mvm {
-			"visible"	"0"
+		if_mvm
+		{
+			"visible"		"0"
 		}
-	}							
+	}
 	"SpecBackground"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"SpecBackground"
 		"xpos"			"c-270"
-		"ypos"			"405"	
+		"ypos"			"405"
 		"zpos"			"2"
 		"wide"			"540"
 		"tall"			"84"
@@ -511,17 +528,13 @@
 		"tabPosition"	"0"	
 		"fillcolor"		"32 32 32 125"
 		"PaintBackgroundType"	"0"
-		
-		if_mvm {
-			"visible"	"1"
-		}
 	}
 	"StatsBackground"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"StatsBackground"
 		"xpos"			"c-270"
-		"ypos"			"418"	
+		"ypos"			"418"
 		"zpos"			"2"
 		"wide"			"540"
 		"tall"			"64"
@@ -532,17 +545,14 @@
 		"tabPosition"	"0"	
 		"fillcolor"		"32 32 32 125"
 		"PaintBackgroundType"	"0"
-		
-		if_mvm {
-			"visible"	"1"
-		}
 	}
-	"ClassImage"	
+	
+	"ClassImage"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"ClassImage"
 		"xpos"			"9999"
-		"ypos"			"9999"	
+		"ypos"			"9999"
 		"zpos"			"3"
 		"wide"			"92"
 		"tall"			"92"
@@ -551,8 +561,9 @@
 		"image"			"../hud/class_scoutred"
 		"scaleImage"	"1"	
 		
-		if_mvm {
-			"visible"	"1"
+		if_mvm
+		{
+			"visible"		"1"
 		}
 	}
 	"PlayerNameLabel"
@@ -563,31 +574,47 @@
 		"labelText"		"%playername%"
 		"textAlignment"	"west"
 		"xpos"			"115"
-		"xpos_lodef"	"105"
-		"ypos"			"9999"	[$WIN32]
+		"ypos"			"9999"
 		"zpos"			"3"
-		"wide"			"9999"	[$WIN32]
+		"wide"			"9999"
 		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		
-		if_mvm {
-			"visible"	"1"
+		if_mvm
+		{
+			"visible"		"1"
 		}
-	}							
+	}
+	
+	"MapName"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"mapname"
+		"font"			"Cerbetica14"
+		"labelText"		"%mapname%"
+		"textAlignment"	"west"
+		"xpos"			"3"
+		"ypos"			"25"
+		"zpos"			"3"
+		"wide"			"480"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"fgcolor"		"236 227 203 255"
+	}
 	"HorizontalLine"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"HorizontalLine"
 		"xpos"			"9999"
-		"ypos"			"9999"	
-		"ypos"			"322"	
+		"ypos"			"322"
 		"zpos"			"3"
 		"wide"			"465"
-		"wide_lodef"	"434"
-		"wide_hidef"	"464"
 		"tall"			"1"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -597,8 +624,9 @@
 		"fillcolor"		"127 127 127 153"
 		"PaintBackgroundType"	"0"
 		
-		if_mvm {
-			"visible"	"1"
+		if_mvm
+		{
+			"visible"		"1"
 		}
 	}
 	"PlayerScoreLabel"
@@ -618,28 +646,11 @@
 		"visible"		"0"
 		"enabled"		"0"
 		
-		if_mvm {
-			"visible"	"0"
+		if_mvm
+		{
+			"visible"		"0"
 		}
 	}
-	"MapName"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"mapname"
-		"font"			"Cerbetica14"
-		"labelText"		"%mapname%"
-		"textAlignment"	"west"
-		"xpos"			"3"
-		"ypos"			"25"	
-		"zpos"			"3"
-		"wide"			"480"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fgcolor"		"236 227 203 255"
-	}	
 
 	"LocalPlayerDuelStatsPanel"
 	{
@@ -655,8 +666,9 @@
 		"visible"		"1"
 		"enabled"		"1"
 		
-		if_mvm {
-			"visible"	"0"
+		if_mvm
+		{
+			"visible"		"0"
 		}
 
 		"DuelingLabel"
@@ -716,7 +728,7 @@
 				"tall"			"36"
 				"visible"		"1"
 				"PaintBackgroundType"	"2"
-				"bgcolor_override"	"117 107 94 255"
+				"bgcolor_override"	"TextColor"
 			}
 			"AvatarImage"
 			{
@@ -795,7 +807,7 @@
 				"tall"			"36"
 				"visible"		"1"
 				"PaintBackgroundType"	"2"
-				"bgcolor_override"	"117 107 94 255"
+				"bgcolor_override"	"TextColor"
 			}
 			"AvatarImage"
 			{
@@ -865,7 +877,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"	"1"
 		}
 		
@@ -886,57 +899,6 @@
 			"visible"		"1"
 			"enabled"		"1"
 		}
-		"DeathsLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"DeathsLabel"
-			"font"			"Cerbetica24"
-			"labelText"		"#TF_ScoreBoard_DeathsLabel"
-			"textAlignment"	"east"
-			"xpos"			"9999"
-			"ypos"			"9999"	
-			"zpos"			"3"
-			"wide"			"95"
-			"tall"			"24"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"AssistsLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"AssistsLabel"
-			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_AssistsLabel"
-			"textAlignment"	"west"
-			"xpos"			"4"
-			"ypos"			"2"
-			"zpos"			"3"
-			"wide"			"95"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"DestructionLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"DestructionLabel"
-			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_DestructionLabel"
-			"textAlignment"	"west"
-			"xpos"			"4"
-			"ypos"			"16"	[$WIN32]
-			"zpos"			"3"
-			"wide"			"95"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}												
 		"Kills"
 		{
 			"ControlName"	"CExLabel"
@@ -972,6 +934,24 @@
 			"enabled"		"1"
 			"fgcolor_override" "TanLight"
 		}
+		
+		"DeathsLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"DeathsLabel"
+			"font"			"Cerbetica24"
+			"labelText"		"#TF_ScoreBoard_DeathsLabel"
+			"textAlignment"	"east"
+			"xpos"			"9999"
+			"ypos"			"9999"
+			"zpos"			"3"
+			"wide"			"95"
+			"tall"			"24"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+		}
 		"Deaths"
 		{
 			"ControlName"	"CExLabel"
@@ -988,7 +968,6 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"alpha" 		"0"
 		}
 		"Deaths2"
 		{
@@ -1007,8 +986,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"fgcolor_override" "TanLight"
-		}			
-
+		}
 		"GameType"
 		{
 			"ControlName"	"CExLabel"
@@ -1026,7 +1004,24 @@
 			"visible"		"0"
 			"enabled"		"0"
 			"fgcolor"		"185 177 153 255"
-		}							
+		}
+		"AssistsLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"AssistsLabel"
+			"font"			"Cerbetica14"
+			"labelText"		"#TF_ScoreBoard_AssistsLabel"
+			"textAlignment"	"west"
+			"xpos"			"4"
+			"ypos"			"2"
+			"zpos"			"3"
+			"wide"			"95"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+		}
 		"Assists"
 		{
 			"ControlName"	"CExLabel"
@@ -1035,7 +1030,7 @@
 			"labelText"		"%assists%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
-			"ypos"			"9999"	[$WIN32]
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1052,7 +1047,7 @@
 			"labelText"		"%assists%"
 			"textAlignment"	"west"
 			"xpos"			"70"
-			"ypos"			"2"	[$WIN32]
+			"ypos"			"2"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1061,7 +1056,25 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"fgcolor_override" "TanLight"
-		}		
+		}
+		
+		"DestructionLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"DestructionLabel"
+			"font"			"Cerbetica14"
+			"labelText"		"#TF_ScoreBoard_DestructionLabel"
+			"textAlignment"	"west"
+			"xpos"			"4"
+			"ypos"			"16"
+			"zpos"			"3"
+			"wide"			"95"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+		}
 		"Destruction"
 		{
 			"ControlName"	"CExLabel"
@@ -1070,7 +1083,7 @@
 			"labelText"		"%destruction%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
-			"ypos"			"9999"	[$WIN32]
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"0"
 			"tall"			"0"
@@ -1087,7 +1100,7 @@
 			"labelText"		"%destruction%"
 			"textAlignment"	"west"
 			"xpos"			"70"
-			"ypos"			"16"	[$WIN32]
+			"ypos"			"16"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1095,17 +1108,18 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "TanLight"		
-		}					
-		"CapturesLabel"
+			"fgcolor_override" "TanLight"
+		}
+		
+		"RevengeLabel"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"CapturesLabel"
+			"fieldName"		"RevengeLabel"
 			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_CapturesLabel"
+			"labelText"		"#TF_ScoreBoard_RevengeLabel"
 			"textAlignment"	"west"
-			"xpos"			"4"	
-			"ypos"			"30"	
+			"xpos"			"102"
+			"ypos"			"16"
 			"zpos"			"3"
 			"wide"			"100"
 			"tall"			"20"
@@ -1113,16 +1127,17 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}						
-		"DefensesLabel"
+		}
+		
+		"CapturesLabel"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"DefensesLabel"
+			"fieldName"		"CapturesLabel"
 			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_DefensesLabel"
+			"labelText"		"#TF_ScoreBoard_CapturesLabel"
 			"textAlignment"	"west"
-			"xpos"			"4"	
-			"ypos"			"44"	
+			"xpos"			"4"
+			"ypos"			"30"
 			"zpos"			"3"
 			"wide"			"100"
 			"tall"			"20"
@@ -1130,67 +1145,69 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}						
-		"DominationLabel"
+		}
+		"Captures"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"DominationLabel"
+			"fieldName"		"Captures"
 			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_DominationLabel"
+			"labelText"		"%captures%"
 			"textAlignment"	"west"
-			"xpos"			"102"
-			"ypos"			"2"	
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
-			"wide"			"100"
+			"wide"			"35"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}						
-		"RevengeLabel"
+		}
+		"Captures2"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"RevengeLabel"
+			"fieldName"		"Captures2"
 			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_RevengeLabel"
+			"labelText"		"%captures%"
 			"textAlignment"	"west"
-			"xpos"			"102"
-			"ypos"			"16"	
+			"xpos"			"70"
+			"ypos"			"30"
 			"zpos"			"3"
-			"wide"			"100"
+			"wide"			"35"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}						
-		"Captures"
+			"fgcolor_override" "TanLight"
+		}
+		
+		"DefensesLabel"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Captures"
+			"fieldName"		"DefensesLabel"
 			"font"			"Cerbetica14"
-			"labelText"		"%captures%"
+			"labelText"		"#TF_ScoreBoard_DefensesLabel"
 			"textAlignment"	"west"
-			"xpos"			"9999"	
-			"ypos"			"9999"	
+			"xpos"			"4"
+			"ypos"			"44"
 			"zpos"			"3"
-			"wide"			"35"
+			"wide"			"100"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
 		}
-		"Captures2"
+		"Defenses"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Captures2"
+			"fieldName"		"Defenses"
 			"font"			"Cerbetica14"
-			"labelText"		"%captures%"
+			"labelText"		"%defenses%"
 			"textAlignment"	"west"
-			"xpos"			"70"	
-			"ypos"			"30"	
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1198,17 +1215,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "TanLight"	
-		}			
-		"Defenses"
+		}
+		"Defenses2"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Defenses"
+			"fieldName"		"Defenses2"
 			"font"			"Cerbetica14"
 			"labelText"		"%defenses%"
 			"textAlignment"	"west"
-			"xpos"			"9999"	[$WIN32]
-			"ypos"			"9999"	[$WIN32]
+			"xpos"			"70"
+			"ypos"			"44"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1216,25 +1232,25 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+			"fgcolor_override" "TanLight"
 		}
-		"Defenses2"
+		"DominationLabel"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Defenses2"
+			"fieldName"		"DominationLabel"
 			"font"			"Cerbetica14"
-			"labelText"		"%defenses%"
+			"labelText"		"#TF_ScoreBoard_DominationLabel"
 			"textAlignment"	"west"
-			"xpos"			"70"	[$WIN32]
-			"ypos"			"44"	[$WIN32]
+			"xpos"			"102"
+			"ypos"			"2"
 			"zpos"			"3"
-			"wide"			"35"
+			"wide"			"100"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "TanLight"	
-		}			
+		}
 		"Domination"
 		{
 			"ControlName"	"CExLabel"
@@ -1242,8 +1258,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%dominations%"
 			"textAlignment"	"west"
-			"xpos"			"100"	
-			"ypos"			"108"	
+			"xpos"			"100"
+			"ypos"			"108"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1259,7 +1275,7 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%dominations%"
 			"textAlignment"	"west"
-			"xpos"			"168"	
+			"xpos"			"168"
 			"ypos"			"2"	
 			"zpos"			"3"
 			"wide"			"35"
@@ -1268,8 +1284,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "TanLight"	
-		}			
+			"fgcolor_override" "TanLight"
+		}
 		"Revenge"
 		{
 			"ControlName"	"CExLabel"
@@ -1277,8 +1293,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%Revenge%"
 			"textAlignment"	"west"
-			"xpos"			"9999"	
-			"ypos"			"9999"	
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1287,15 +1303,15 @@
 			"visible"		"1"
 			"enabled"		"1"
 		}
-		"Revenge2"	
+		"Revenge2"
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Revenge2"
 			"font"			"Cerbetica14"
 			"labelText"		"%Revenge%"
 			"textAlignment"	"west"
-			"xpos"			"168"	
-			"ypos"			"16"	
+			"xpos"			"168"
+			"ypos"			"16"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1303,8 +1319,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "TanLight"				
-		}				
+			"fgcolor_override" "TanLight"
+		}
 		"HealingLabel"
 		{
 			"ControlName"	"CExLabel"
@@ -1312,76 +1328,77 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_HealingLabel"
 			"textAlignment"	"west"
-			"xpos"			"102"	
-			"ypos"			"30"	
+			"xpos"			"102"
+			"ypos"			"30"
 			"zpos"			"3"
-			"wide"			"95"	
+			"wide"			"95"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}						
-		"InvulnLabel"
+		}
+		"Healing"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"InvulnLabel"
+			"fieldName"		"Healing"
 			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_InvulnLabel"
+			"labelText"		"%healing%"
 			"textAlignment"	"west"
-			"xpos"			"102"	
-			"ypos"			"44"	
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
-			"wide"			"95"
+			"wide"			"35"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}						
-		"TeleportsLabel"
+		}
+		"Healing2"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"TeleportsLabel"
+			"fieldName"		"Healing2"
 			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_TeleportsLabel"
+			"labelText"		"%healing%"
 			"textAlignment"	"west"
-			"xpos"			"342"	
-			"ypos"			"2"	
+			"xpos"			"168"
+			"ypos"			"30"
 			"zpos"			"3"
-			"wide"			"95"	
+			"wide"			"35"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}						
-		"HeadshotsLabel"
+			"fgcolor_override" "TanLight"
+		}
+		"InvulnLabel"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"HeadshotsLabel"
+			"fieldName"		"InvulnLabel"
 			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_HeadshotsLabel"
+			"labelText"		"#TF_ScoreBoard_InvulnLabel"
 			"textAlignment"	"west"
-			"xpos"			"342"	
-			"ypos"			"16"	
+			"xpos"			"102"
+			"ypos"			"44"
 			"zpos"			"3"
-			"wide"			"95"	
+			"wide"			"95"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}						
-		"Healing"
+		}
+		"Invuln"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Healing"
+			"fieldName"		"Invuln"
 			"font"			"Cerbetica14"
-			"labelText"		"%healing%"
+			"labelText"		"%invulns%"
 			"textAlignment"	"west"
-			"xpos"			"9999"	
-			"ypos"			"9999"	
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1390,15 +1407,15 @@
 			"visible"		"1"
 			"enabled"		"1"
 		}
-		"Healing2"
+		"Invuln2"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Healing2"
+			"fieldName"		"Invuln2"
 			"font"			"Cerbetica14"
-			"labelText"		"%healing%"
+			"labelText"		"%invulns%"
 			"textAlignment"	"west"
-			"xpos"			"168"	
-			"ypos"			"30"	
+			"xpos"			"168"
+			"ypos"			"44"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1406,34 +1423,34 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "TanLight"							
-		}			
-		"Invuln"
+			"fgcolor_override" "TanLight"
+		}
+		"TeleportsLabel"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Invuln"
+			"fieldName"		"TeleportsLabel"
 			"font"			"Cerbetica14"
-			"labelText"		"%invulns%"
+			"labelText"		"#TF_ScoreBoard_TeleportsLabel"
 			"textAlignment"	"west"
-			"xpos"			"9999"	
-			"ypos"			"9999"	
+			"xpos"			"342"
+			"ypos"			"2"
 			"zpos"			"3"
-			"wide"			"35"
+			"wide"			"95"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
 		}
-		"Invuln2"
+		"Teleports"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Invuln2"
+			"fieldName"		"Teleports"
 			"font"			"Cerbetica14"
-			"labelText"		"%invulns%"
+			"labelText"		"%teleports%"
 			"textAlignment"	"west"
-			"xpos"			"168"	
-			"ypos"			"44"	
+			"xpos"			"100"
+			"ypos"			"156"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1441,17 +1458,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "TanLight"							
-		}			
-		"Teleports"
+		}
+		"Teleports2"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Teleports"
+			"fieldName"		"Teleports2"
 			"font"			"Cerbetica14"
 			"labelText"		"%teleports%"
 			"textAlignment"	"west"
-			"xpos"			"100"	[$WIN32]
-			"ypos"			"156"	[$WIN32]
+			"xpos"			"408"
+			"ypos"			"2"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1460,23 +1476,23 @@
 			"visible"		"1"
 			"enabled"		"1"
 		}
-		"Teleports2"
+		"HeadshotsLabel"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Teleports2"
+			"fieldName"		"HeadshotsLabel"
 			"font"			"Cerbetica14"
-			"labelText"		"%teleports%"
+			"labelText"		"#TF_ScoreBoard_HeadshotsLabel"
 			"textAlignment"	"west"
-			"xpos"			"408"	[$WIN32]
-			"ypos"			"2"	[$WIN32]
+			"xpos"			"342"
+			"ypos"			"16"
 			"zpos"			"3"
-			"wide"			"35"
+			"wide"			"95"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}				
+		}
 		"Headshots"
 		{
 			"ControlName"	"CExLabel"
@@ -1484,8 +1500,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%headshots%"
 			"textAlignment"	"west"
-			"xpos"			"9999"	
-			"ypos"			"9999"	
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1501,8 +1517,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%headshots%"
 			"textAlignment"	"west"
-			"xpos"			"408"	
-			"ypos"			"16"	
+			"xpos"			"408"
+			"ypos"			"16"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1510,7 +1526,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}			
+		}
 		"BackstabsLabel"
 		{
 			"ControlName"	"CExLabel"
@@ -1534,7 +1550,7 @@
 			"fieldName"		"Backstabs"
 			"font"			"Cerbetica14"
 			"labelText"		"%backstabs%"
-			"textAlignment"	"west"	
+			"textAlignment"	"west"
 			"xpos"			"9999"
 			"ypos"			"9999"
 			"zpos"			"3"
@@ -1551,7 +1567,7 @@
 			"fieldName"		"Backstabs2"
 			"font"			"Cerbetica14"
 			"labelText"		"%backstabs%"
-			"textAlignment"	"west"	
+			"textAlignment"	"west"
 			"xpos"			"408"
 			"ypos"			"30"
 			"zpos"			"3"
@@ -1561,7 +1577,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}			
+		}
 		"BonusLabel"
 		{
 			"ControlName"	"CExLabel"
@@ -1585,7 +1601,7 @@
 			"fieldName"		"Bonus"
 			"font"			"Cerbetica14"
 			"labelText"		"%bonus%"
-			"textAlignment"	"west"		[$WIN32]
+			"textAlignment"	"west"
 			"xpos"			"9999"
 			"ypos"			"9999"
 			"zpos"			"3"
@@ -1602,7 +1618,7 @@
 			"fieldName"		"Bonus2"
 			"font"			"Cerbetica14"
 			"labelText"		"%bonus%"
-			"textAlignment"	"west"		[$WIN32]
+			"textAlignment"	"west"
 			"xpos"			"408"
 			"ypos"			"44"
 			"zpos"			"3"
@@ -1620,8 +1636,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_Scoreboard_Support"
 			"textAlignment"	"west"
-			"xpos"			"440"	[$WIN32]
-			"ypos"			"2"	[$WIN32]
+			"xpos"			"440"
+			"ypos"			"2"
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1636,9 +1652,9 @@
 			"fieldName"		"Support"
 			"font"			"Cerbetica14"
 			"labelText"		"%support%"
-			"textAlignment"	"west"		
-			"xpos"			"9999"	
-			"ypos"			"9999"	
+			"textAlignment"	"west"
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1653,9 +1669,9 @@
 			"fieldName"		"Support2"
 			"font"			"Cerbetica14"
 			"labelText"		"%support%"
-			"textAlignment"	"west"		
-			"xpos"			"502"	
-			"ypos"			"2"	
+			"textAlignment"	"west"
+			"xpos"			"502"
+			"ypos"			"2"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1672,8 +1688,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_Scoreboard_Damage"
 			"textAlignment"	"west"
-			"xpos"			"440"	
-			"ypos"			"16"	
+			"xpos"			"440"
+			"ypos"			"16"
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1688,8 +1704,8 @@
 			"fieldName"		"Damage"
 			"font"			"Cerbetica14"
 			"labelText"		"%damage%"
-			"textAlignment"	"west"		
-			"xpos"			"9999"	
+			"textAlignment"	"west"
+			"xpos"			"9999"
 			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"35"
@@ -1705,8 +1721,8 @@
 			"fieldName"		"Damage2"
 			"font"			"Cerbetica14"
 			"labelText"		"%damage%"
-			"textAlignment"	"west"		
-			"xpos"			"502"	
+			"textAlignment"	"west"
+			"xpos"			"502"
 			"ypos"			"16"
 			"zpos"			"3"
 			"wide"			"35"
@@ -1715,166 +1731,6 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}	
-	}
-
-	"ButtonLegendBG"		[$X360]
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"ButtonLegendBG"
-		"xpos"			"10"
-		"xpos_hidef"	"30"
-		"ypos"			"373"
-		"zpos"			"0"
-		"wide"			"539"
-		"wide_hidef"	"559"
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"	
-		"fillcolor"		"0 0 0 153"
-		"PaintBackgroundType"	"0"
-	}
-	
-	"ButtonLegend"		[$X360]
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"ButtonLegend"
-		"xpos"			"10"
-		"xpos_hidef"	"35"
-		"ypos"			"373"
-		"zpos"			"1"
-		"wide"			"539"
-		"wide_hidef"	"595"
-		"tall"			"150"
-		"visible"		"1"
-	
-		"SelectHintIcon"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"SelectHintIcon"
-			"font"			"GameUIButtons"
-			"xpos"			"10"
-			"xpos_hidef"	"0"
-			"ypos"			"0"
-			"zpos"			"1"
-			"wide"			"300"
-			"tall"			"38"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"C"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-		
-		"SelectHintLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"SelectHintLabel"
-			"font"			"ScoreboardMedium"
-			"xpos"			"25"
-			"xpos_lodef"	"37"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"300"
-			"tall"			"39"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#GameUI_Select"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-		
-		"GamerCardIcon"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"GamerCardIcon"
-			"font"			"GameUIButtons"
-			"xpos"			"150"
-			"xpos_hidef"	"145"
-			"ypos"			"0"
-			"zpos"			"1"
-			"wide"			"300"
-			"tall"			"38"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"A"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-		
-		"GamerCardLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"GamerCardLabel"
-			"font"			"ScoreboardMedium"
-			"xpos"			"170"
-			"xpos_lodef"	"177"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"300"
-			"tall"			"39"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#TF_ViewGamercard"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-		
-		"ReputationIcon"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"ReputationIcon"
-			"font"			"GameUIButtons"
-			"xpos"			"350"
-			"xpos_hidef"	"378"
-			"ypos"			"0"
-			"zpos"			"1"
-			"wide"			"300"
-			"tall"			"38"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"X"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-		
-		"ReputationLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"ReputationLabel"
-			"font"			"ScoreboardMedium"
-			"xpos"			"403"
-			"xpos_lodef"	"377"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"300"
-			"tall"			"39"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#GameUI_PlayerReview"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
 		}
 	}
 	
@@ -1888,10 +1744,11 @@
 		"wide"				"f0"
 		"tall"				"480"
 		"visible"			"0"
-		"enabled"			"1"	
+		"enabled"			"1"
 		"verbose"			"1"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"		"1"
 		}
 	}