Arena Mode Fixes

4 files changed, 500 insertions, 203 deletions

diff --git a/resource/ui/HudArenaClassLayout.res b/resource/ui/HudArenaClassLayout.res
new file mode 100644
index 0000000..2bc7e0c
--- /dev/null
+++ b/resource/ui/HudArenaClassLayout.res
@@ -0,0 +1,305 @@
+"Resource/UI/HudArenaClassLayout.res"
+{
+	"background"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"background"
+		"xpos"			"0"
+		"ypos"			"69"
+		"zpos"			"1"
+		"wide"			"20"
+		"tall"			"60"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../hud/color_panel_blu"
+		"scaleImage"	"1"	
+		"teambg_2"		"../hud/color_panel_red"
+		"teambg_3"		"../hud/color_panel_blu"
+		"paintborder"	"0"
+	
+		"src_corner_height"		"23"			// pixels inside the image
+		"src_corner_width"		"23"
+	
+		"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
+		"draw_corner_height" 	"0"	
+	}
+	
+	"localPlayerBG"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"localPlayerBG"
+		"xpos"			"0"
+		"ypos"			"40"
+		"zpos"			"2"
+		"wide"			"45"
+		"tall"			"80"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../hud/color_panel_clear"
+		"scaleImage"	"1"	
+		"teambg_2"		"../hud/color_panel_clear"
+		"teambg_3"		"../hud/color_panel_clear"
+		"paintborder"	"0"
+	
+		"src_corner_height"		"23"			// pixels inside the image
+		"src_corner_width"		"23"
+	
+		"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
+		"draw_corner_height" 	"0"	
+	}
+	
+	"title"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"title"
+		"xpos"			"c-200"
+		"ypos"			"22"
+		"zpos"			"6"
+		"wide"			"400"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"font"			"CerbeticaBold20"
+		"labelText"		"#TF_Arena_Team_Layout"
+		"textAlignment"	"center"
+		"fgcolor"		"TanLight"
+	}
+	"titleShadow"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"titleShadow"
+		"xpos"			"-1"
+		"ypos"			"-1"
+		"zpos"			"5"
+		"wide"			"400"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"font"			"CerbeticaBold20"
+		"labelText"		"#TF_Arena_Team_Layout"
+		"textAlignment"	"center"
+		"fgcolor"		"TransparentBlack"
+
+		"pin_to_sibling"		"title"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+	}
+	
+	"changeLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"changeLabel"
+		"xpos"			"c-220"
+		"ypos"			"130"
+		"zpos"			"6"
+		"wide"			"440"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"font"			"HudFontSmallBold"
+		"labelText"		"#TF_Arena_F4_ChangeClass"
+		"textAlignment"	"center"
+		"fgcolor"		"TanLight"
+	}
+	"changeLabelShadow"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"changeLabelShadow"
+		"xpos"			"-1"
+		"ypos"			"-1"
+		"zpos"			"5"
+		"wide"			"440"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"font"			"HudFontSmallBold"
+		"labelText"		"#TF_Arena_F4_ChangeClass"
+		"textAlignment"	"center"
+		"fgcolor"		"TransparentBlack"
+
+		"pin_to_sibling"		"changeLabel"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+	}
+	
+	"classImage0"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"classImage0"
+		"xpos"			"0"
+		"ypos"			"25"
+		"zpos"			"3"
+		"wide"			"45"
+		"tall"			"90"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""	
+		"scaleImage"	"1"	
+	}
+	"classImage1"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"classImage1"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"45"
+		"tall"			"90"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""	
+		"scaleImage"	"1"	
+	}
+	"classImage2"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"classImage2"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"45"
+		"tall"			"90"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""	
+		"scaleImage"	"1"	
+	}
+	"classImage3"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"classImage3"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"45"
+		"tall"			"90"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""	
+		"scaleImage"	"1"	
+	}
+	"classImage4"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"classImage4"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"45"
+		"tall"			"90"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""	
+		"scaleImage"	"1"	
+	}
+	"classImage5"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"classImage5"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"45"
+		"tall"			"90"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""	
+		"scaleImage"	"1"	
+	}
+	"classImage6"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"classImage6"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"45"
+		"tall"			"90"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""	
+		"scaleImage"	"1"	
+	}
+	"classImage7"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"classImage7"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"45"
+		"tall"			"90"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""	
+		"scaleImage"	"1"	
+	}
+	"classImage8"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"classImage8"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"45"
+		"tall"			"90"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""	
+		"scaleImage"	"1"	
+	}
+	"classImage9"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"classImage9"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"45"
+		"tall"			"90"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""	
+		"scaleImage"	"1"	
+	}
+	"classImage10"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"classImage10"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"45"
+		"tall"			"90"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""	
+		"scaleImage"	"1"	
+	}
+	"classImage11"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"classImage11"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"45"
+		"tall"			"90"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""	
+		"scaleImage"	"1"	
+	}
+}
\ No newline at end of file
diff --git a/resource/ui/HudArenaPlayerCount.res b/resource/ui/HudArenaPlayerCount.res
index 8f8d6e4..81c25ae 100644
--- a/resource/ui/HudArenaPlayerCount.res
+++ b/resource/ui/HudArenaPlayerCount.res
@@ -4,8 +4,8 @@
 	{

 		"ControlName"	"EditablePanel"

 		"fieldName"		"blueteam"

-		"xpos"			"c-55"

-		"ypos"			"-7"

+		"xpos"			"c-46"

+		"ypos"			"0"

 		"zpos"			"0"

 		"wide"			"60"

 		"tall"			"33"

@@ -15,13 +15,11 @@
 		{

 			"ControlName"	"EditablePanel"

 			"fieldName"		"background"

-			"xpos"			"9"

-			"ypos"			"7"

+			"xpos"			"0"

+			"ypos"			"0"

 			"zpos"			"0"

 			"wide"			"46"

-			"tall"			"33"

-			"autoResize"	"0"

-			"pinCorner"		"0"

+			"tall"			"23"

 			"visible"		"1"

 			"enabled"		"1"

 			"bgcolor_override"	"104 124 155 255"

@@ -31,18 +29,18 @@
 		{

 			"ControlName"	"CExLabel"

 			"fieldName"		"count"

-			"xpos"			"23"

-			"ypos"			"6"

+			"xpos"			"13"

+			"ypos"			"0"

 			"zpos"			"2"

 			"wide"			"30"

-			"tall"			"25"

+			"tall"			"23"

 			"autoResize"	"0"

 			"pinCorner"		"0"

 			"visible"		"1"

 			"enabled"		"1"

 			"font"			"CerbeticaBold28"

 			"labelText"		"%blue_alive%"

-			"textAlignment"	"center"

+			"textAlignment"	"east"

 			"fgcolor"		"TanLight"

 		}

 		"countshadow"

@@ -53,14 +51,14 @@
 			"ypos"			"-1"

 			"zpos"			"1"

 			"wide"			"30"

-			"tall"			"25"

+			"tall"			"23"

 			"autoResize"	"0"

 			"pinCorner"		"0"

 			"visible"		"1"

 			"enabled"		"1"

 			"font"			"CerbeticaBold28"

 			"labelText"		"%blue_alive%"

-			"textAlignment"	"center"

+			"textAlignment"	"east"

 			"fgcolor"		"TransparentBlack"

 			

 			"pin_to_sibling"		"count"

@@ -72,8 +70,8 @@
 		{

 			"ControlName"	"ImagePanel"

 			"fieldName"		"playerimage"

-			"xpos"			"12"

-			"ypos"			"10"

+			"xpos"			"3"

+			"ypos"			"3"

 			"zpos"			"3"

 			"wide"			"10"

 			"tall"			"18"

@@ -88,8 +86,8 @@
 	{

 		"ControlName"	"EditablePanel"

 		"fieldName"		"redteam"

-		"xpos"			"c-4"

-		"ypos"			"-7"

+		"xpos"			"c0"

+		"ypos"			"0"

 		"zpos"			"0"

 		"wide"			"60"

 		"tall"			"33"

@@ -99,13 +97,11 @@
 		{

 			"ControlName"	"EditablePanel"

 			"fieldName"		"background"

-			"xpos"			"4"

+			"xpos"			"0"

 			"ypos"			"0"

 			"zpos"			"0"

-			"wide"			"47"

-			"tall"			"33"

-			"autoResize"	"0"

-			"pinCorner"		"0"

+			"wide"			"46"

+			"tall"			"23"

 			"visible"		"1"

 			"enabled"		"1"

 			"bgcolor_override"	"180 92 77 255"

@@ -115,18 +111,18 @@
 		{

 			"ControlName"	"CExLabel"

 			"fieldName"		"count"

-			"xpos"			"23"

-			"ypos"			"6"

+			"xpos"			"3"

+			"ypos"			"0"

 			"zpos"			"2"

 			"wide"			"30"

-			"tall"			"25"

+			"tall"			"23"

 			"autoResize"	"0"

 			"pinCorner"		"0"

 			"visible"		"1"

 			"enabled"		"1"

 			"font"			"CerbeticaBold28"

 			"labelText"		"%red_alive%"

-			"textAlignment"	"center"

+			"textAlignment"	"west"

 			"fgcolor"		"TanLight"

 		}

 		"countshadow"

@@ -137,14 +133,14 @@
 			"ypos"			"-1"

 			"zpos"			"1"

 			"wide"			"30"

-			"tall"			"25"

+			"tall"			"23"

 			"autoResize"	"0"

 			"pinCorner"		"0"

 			"visible"		"1"

 			"enabled"		"1"

 			"font"			"CerbeticaBold28"

 			"labelText"		"%red_alive%"

-			"textAlignment"	"center"

+			"textAlignment"	"west"

 			"fgcolor"		"TransparentBlack"

 			

 			"pin_to_sibling"		"count"

@@ -156,8 +152,8 @@
 		{

 			"ControlName"	"ImagePanel"

 			"fieldName"		"playerimage"

-			"xpos"			"10"

-			"ypos"			"10"

+			"xpos"			"33"

+			"ypos"			"3"

 			"zpos"			"3"

 			"wide"			"10"

 			"tall"			"18"

diff --git a/resource/ui/HudArenaWinPanel.res b/resource/ui/HudArenaWinPanel.res
index e4da51d..eed19cd 100644
--- a/resource/ui/HudArenaWinPanel.res
+++ b/resource/ui/HudArenaWinPanel.res
@@ -5,7 +5,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"ArenaWinPanelScores"
 		"xpos"			"0"
-		"ypos"			"36"
+		"ypos"			"1"
 		"wide"			"450"
 		"tall"			"200"
 		"visible"		"1"
@@ -19,11 +19,9 @@
 			"zpos"			"-1"
 			"wide"			"200"
 			"tall"			"25"
-			"autoResize"	"0"
-			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fillcolor"		"70 130 180 153"
+			"fillcolor"		"70 130 180 255"
 			"scaleImage"	"1"
 		}
 		"RedScoreBG"
@@ -35,12 +33,10 @@
 			"zpos"			"-1"
 			"wide"			"200"
 			"tall"			"25"
-			"autoResize"	"0"
-			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
 			"PaintBackgroundType"	"2"
-			"fillcolor"		"205 50 50 153"
+			"fillcolor"		"205 50 50 255"
 		}
 		"BlueTeamLabel"
 		{
@@ -181,11 +177,11 @@
 			"fieldName"		"ArenaStreakLabel"
 			"font"			"CerbeticaBold14"
 			"fgcolor"		"TanLight"
-			"xpos"			"35"
-			"ypos"			"-15"
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
-			"wide"			"380"
-			"tall"			"40"
+			"wide"			"176"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -215,14 +211,14 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"WinPanelBG2"
 		"xpos"			"25"
-		"ypos"			"95"
+		"ypos"			"60"
 		"zpos"			"0"
 		"wide"			"400"
 		"tall"			"118"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"		"1"	
-		"fillcolor"		"0 0 0 100"
+		"scaleImage"	"1"
+		"fillcolor"		"0 0 0 250"
 		"src_corner_height" "3"
 		"src_corner_width" "3"
 		"draw_corner_width" "0"
@@ -235,14 +231,14 @@
 		"fieldName"		"WinningTeamLabel"
 		"font"			"CerbeticaBold20"
 		"xpos"			"35"
-		"ypos"			"94"
+		"ypos"			"41"
 		"zpos"			"1"
-		"wide"			"380"
-		"tall"			"40"
+		"wide"			"340"
+		"tall"			"14"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"labelText"		"%WinningTeamLabel%"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
@@ -255,14 +251,14 @@
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
 		"xpos"			"36"
-		"ypos"			"95"
+		"ypos"			"42"
 		"zpos"			"1"
-		"wide"			"380"
-		"tall"			"40"
+		"wide"			"340"
+		"tall"			"14"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"labelText"		"%WinningTeamLabel%"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
@@ -275,14 +271,14 @@
 		"fieldName"		"LosingTeamLabel"
 		"font"			"CerbeticaBold20"
 		"xpos"			"35"
-		"ypos"			"94"
+		"ypos"			"41"
 		"zpos"			"1"
-		"wide"			"380"
-		"tall"			"40"
+		"wide"			"340"
+		"tall"			"14"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"labelText"		"%LosingTeamLabel%"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
@@ -295,14 +291,14 @@
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
 		"xpos"			"36"
-		"ypos"			"95"
+		"ypos"			"42"
 		"zpos"			"1"
-		"wide"			"380"
-		"tall"			"40"
+		"wide"			"340"
+		"tall"			"14"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"labelText"		"%LosingTeamLabel%"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
@@ -316,8 +312,8 @@
 		"xpos"			"9999"
 		"ypos"			"9999"
 		"zpos"			"1"
-		"wide"			"442"
-		"tall"			"20"
+		"wide"			"340"
+		"tall"			"14"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -335,7 +331,7 @@
 		"xpos"			"35"
 		"ypos"			"122"
 		"zpos"			"1"
-		"wide"			"380"
+		"wide"			"418"
 		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -369,10 +365,10 @@
 		"fieldName"		"TopPlayerLabel"
 		"font"			"Cerbetica9"
 		"xpos"			"50"
-		"ypos"			"140"
+		"ypos"			"64"
 		"zpos"			"3"
-		"wide"			"300"
-		"tall"			"20"
+		"wide"			"190"
+		"tall"			"12"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -388,10 +384,10 @@
 		"fieldName"		"DamageThisRoundLabel"
 		"font"			"Cerbetica9"
 		"xpos"			"265"
-		"ypos"			"140"
+		"ypos"			"64"
 		"zpos"			"3"
-		"wide"			"50"
-		"tall"			"20"
+		"wide"			"40"
+		"tall"			"12"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -407,10 +403,10 @@
 		"fieldName"		"PointsThisRoundLabel"
 		"font"			"Cerbetica9"
 		"xpos"			"315"
-		"ypos"			"140"
+		"ypos"			"64"
 		"zpos"			"3"
-		"wide"			"50"
-		"tall"			"20"
+		"wide"			"35"
+		"tall"			"12"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -426,10 +422,10 @@
 		"fieldName"		"PointsThisRoundLabel"
 		"font"			"Cerbetica9"
 		"xpos"			"360"
-		"ypos"			"140"
+		"ypos"			"64"
 		"zpos"			"3"
-		"wide"			"50"
-		"tall"			"20"
+		"wide"			"35"
+		"tall"			"12"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -445,10 +441,10 @@
 		"fieldName"		"PointsThisRoundLabel"
 		"font"			"Cerbetica9"
 		"xpos"			"400"
-		"ypos"			"140"
+		"ypos"			"64"
 		"zpos"			"3"
-		"wide"			"50"
-		"tall"			"20"
+		"wide"			"25"
+		"tall"			"12"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -481,9 +477,9 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"ArenaWinPanelWinnersPanel"
 		"xpos"			"20"
-		"ypos"			"-10"
-		"wide"			"500"
-		"tall"			"218"
+		"ypos"			"76"
+		"wide"			"340"
+		"tall"			"46"
 		"visible"		"1"
 		"zpos"			"3"
 		
@@ -492,7 +488,7 @@
 			"ControlName"	"CAvatarImagePanel"
 			"fieldName"		"Player1Avatar"
 			"xpos"			"21"
-			"ypos"			"170"
+			"ypos"			"4"
 			"wide"			"14"
 			"tall"			"14"
 			"visible"		"1"
@@ -506,9 +502,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player1Name"
 			"xpos"			"40"
-			"ypos"			"167"
-			"wide"			"128"
-			"tall"			"20"
+			"ypos"			"4"
+			"wide"			"126"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -523,9 +519,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player1Class"
 			"xpos"			"175"
-			"ypos"			"167"
-			"wide"			"200"
-			"tall"			"20"
+			"ypos"			"4"
+			"wide"			"45"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -540,9 +536,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player1Damage"
 			"xpos"			"241"
-			"ypos"			"167"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"4"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -557,9 +553,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player1Healing"
 			"xpos"			"289"
-			"ypos"			"167"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"4"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -574,9 +570,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player1Lifetime"
 			"xpos"			"335"
-			"ypos"			"167"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"4"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -591,9 +587,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player1Kills"
 			"xpos"			"362"
-			"ypos"			"167"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"4"
+			"wide"			"25"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -608,7 +604,7 @@
 			"ControlName"	"CAvatarImagePanel"
 			"fieldName"		"Player2Avatar"
 			"xpos"			"21"
-			"ypos"			"186"
+			"ypos"			"19"
 			"wide"			"14"
 			"tall"			"14"
 			"visible"		"1"
@@ -622,9 +618,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player2Name"
 			"xpos"			"40"
-			"ypos"			"183"
-			"wide"			"128"
-			"tall"			"20"
+			"ypos"			"19"
+			"wide"			"126"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -639,9 +635,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player2Class"
 			"xpos"			"175"
-			"ypos"			"183"
-			"wide"			"200"
-			"tall"			"20"
+			"ypos"			"19"
+			"wide"			"45"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -656,9 +652,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player2Damage"
 			"xpos"			"241"
-			"ypos"			"183"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"19"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -673,9 +669,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player2Healing"
 			"xpos"			"289"
-			"ypos"			"183"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"19"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -690,9 +686,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player2Lifetime"
 			"xpos"			"335"
-			"ypos"			"183"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"19"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -707,9 +703,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player2Kills"
 			"xpos"			"362"
-			"ypos"			"183"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"19"
+			"wide"			"25"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -724,7 +720,7 @@
 			"ControlName"	"CAvatarImagePanel"
 			"fieldName"		"Player3Avatar"
 			"xpos"			"21"
-			"ypos"			"202"
+			"ypos"			"34"
 			"wide"			"14"
 			"tall"			"14"
 			"visible"		"1"
@@ -738,9 +734,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player3Name"
 			"xpos"			"40"
-			"ypos"			"199"
-			"wide"			"128"
-			"tall"			"20"
+			"ypos"			"34"
+			"wide"			"126"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -755,9 +751,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player3Class"
 			"xpos"			"175"
-			"ypos"			"199"
-			"wide"			"200"
-			"tall"			"20"
+			"ypos"			"34"
+			"wide"			"45"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -772,9 +768,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player3Damage"
 			"xpos"			"241"
-			"ypos"			"199"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"34"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -789,9 +785,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player3Healing"
 			"xpos"			"289"
-			"ypos"			"199"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"34"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -806,9 +802,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player3Lifetime"
 			"xpos"			"335"
-			"ypos"			"199"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"34"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -823,9 +819,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player3Kills"
 			"xpos"			"362"
-			"ypos"			"199"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"34"
+			"wide"			"25"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -841,9 +837,9 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"ArenaWinPanelLosersPanel"
 		"xpos"			"20"
-		"ypos"			"-10"
-		"wide"			"500"
-		"tall"			"218"
+		"ypos"			"76"
+		"wide"			"340"
+		"tall"			"46"
 		"visible"		"1"
 		"zpos"			"3"
 
@@ -852,7 +848,7 @@
 			"ControlName"	"CAvatarImagePanel"
 			"fieldName"		"Player1Avatar"
 			"xpos"			"21"
-			"ypos"			"170"
+			"ypos"			"4"
 			"wide"			"14"
 			"tall"			"14"
 			"visible"		"1"
@@ -866,9 +862,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player1Name"
 			"xpos"			"40"
-			"ypos"			"167"
-			"wide"			"128"
-			"tall"			"20"
+			"ypos"			"4"
+			"wide"			"126"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -883,9 +879,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player1Class"
 			"xpos"			"175"
-			"ypos"			"167"
-			"wide"			"200"
-			"tall"			"20"
+			"ypos"			"4"
+			"wide"			"45"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -900,9 +896,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player1Damage"
 			"xpos"			"241"
-			"ypos"			"167"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"4"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -917,9 +913,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player1Healing"
 			"xpos"			"289"
-			"ypos"			"167"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"4"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -934,9 +930,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player1Lifetime"
 			"xpos"			"335"
-			"ypos"			"167"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"4"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -951,9 +947,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player1Kills"
 			"xpos"			"362"
-			"ypos"			"167"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"4"
+			"wide"			"25"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -968,7 +964,7 @@
 			"ControlName"	"CAvatarImagePanel"
 			"fieldName"		"Player2Avatar"
 			"xpos"			"21"
-			"ypos"			"186"
+			"ypos"			"19"
 			"wide"			"14"
 			"tall"			"14"
 			"visible"		"1"
@@ -982,9 +978,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player2Name"
 			"xpos"			"40"
-			"ypos"			"183"
-			"wide"			"128"
-			"tall"			"20"
+			"ypos"			"19"
+			"wide"			"126"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -999,9 +995,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player2Class"
 			"xpos"			"175"
-			"ypos"			"183"
-			"wide"			"200"
-			"tall"			"20"
+			"ypos"			"19"
+			"wide"			"45"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1016,9 +1012,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player2Damage"
 			"xpos"			"241"
-			"ypos"			"183"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"19"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1033,9 +1029,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player2Healing"
 			"xpos"			"289"
-			"ypos"			"183"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"19"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1050,9 +1046,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player2Lifetime"
 			"xpos"			"335"
-			"ypos"			"183"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"19"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1067,9 +1063,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player2Kills"
 			"xpos"			"362"
-			"ypos"			"183"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"19"
+			"wide"			"25"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1084,7 +1080,7 @@
 			"ControlName"	"CAvatarImagePanel"
 			"fieldName"		"Player3Avatar"
 			"xpos"			"21"
-			"ypos"			"202"
+			"ypos"			"34"
 			"wide"			"14"
 			"tall"			"14"
 			"visible"		"1"
@@ -1098,9 +1094,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player3Name"
 			"xpos"			"40"
-			"ypos"			"199"
-			"wide"			"128"
-			"tall"			"20"
+			"ypos"			"34"
+			"wide"			"126"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1115,9 +1111,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player3Class"
 			"xpos"			"175"
-			"ypos"			"199"
-			"wide"			"200"
-			"tall"			"20"
+			"ypos"			"34"
+			"wide"			"45"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1132,9 +1128,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player3Damage"
 			"xpos"			"241"
-			"ypos"			"199"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"34"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1149,9 +1145,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player3Healing"
 			"xpos"			"289"
-			"ypos"			"199"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"34"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1166,9 +1162,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player3Lifetime"
 			"xpos"			"335"
-			"ypos"			"199"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"34"
+			"wide"			"35"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1183,9 +1179,9 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"Player3Kills"
 			"xpos"			"362"
-			"ypos"			"199"
-			"wide"			"30"
-			"tall"			"20"
+			"ypos"			"34"
+			"wide"			"25"
+			"tall"			"14"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
index 32e93fc..cd2d507 100644
--- a/scripts/hudlayout.res
+++ b/scripts/hudlayout.res
@@ -1498,7 +1498,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"xpos"				"c-225"
-		"ypos"				"260"
+		"ypos"				"r128"
 		"wide"				"450"
 		"tall"				"300"
 	}