From a6fe2c7c310bfc763574a515a45d9c5e81f5cf68 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Sun, 5 Aug 2018 21:52:03 -0400
Subject: Arena Mode Fixes

---
 resource/ui/HudArenaNotification.res |  6 ++--
 resource/ui/HudArenaPlayerCount.res  | 20 ++++++-----
 resource/ui/HudArenaTeamMenu.res     | 68 ++++++++++++++++++++++--------------
 3 files changed, 57 insertions(+), 37 deletions(-)

(limited to 'resource/ui')

diff --git a/resource/ui/HudArenaNotification.res b/resource/ui/HudArenaNotification.res
index 859b6c9..109ed08 100644
--- a/resource/ui/HudArenaNotification.res
+++ b/resource/ui/HudArenaNotification.res
@@ -13,7 +13,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"0 0 0 100"
+		"fillcolor"		"0 0 0 200"
 	}
 	
 	"WarningLabel"
@@ -53,13 +53,13 @@
 		"labelText"		""
 		"textAlignment"	"west"
 	}
-
+	
 	"BalanceLabelTip"
 	{	
 		"ControlName"	"Label"
 		"fieldName"		"BalanceLabelTip"
 		"font"			"CerbeticaBold16"
-		"xpos"			"75"
+		"xpos"			"70"
 		"ypos"			"94"
 		"zpos"			"1"
 		"wide"			"230"
diff --git a/resource/ui/HudArenaPlayerCount.res b/resource/ui/HudArenaPlayerCount.res
index 3f06e4f..2b5b397 100644
--- a/resource/ui/HudArenaPlayerCount.res
+++ b/resource/ui/HudArenaPlayerCount.res
@@ -15,10 +15,10 @@
 		{
 			"ControlName"	"CTFImagePanel"
 			"fieldName"		"background"
-			"xpos"			"5"
+			"xpos"			"9"
 			"ypos"			"7"
 			"zpos"			"0"
-			"wide"			"50"
+			"wide"			"46"
 			"tall"			"23"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -55,8 +55,8 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"countshadow"
-			"xpos"			"9999"
-			"ypos"			"9999"
+			"xpos"			"-1"
+			"ypos"			"-1"
 			"zpos"			"1"
 			"wide"			"30"
 			"tall"			"25"
@@ -64,10 +64,14 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"font"			"HudFontMedium"
+			"font"			"Cerbetica24"
 			"labelText"		"%blue_alive%"
 			"textAlignment"	"center"
 			"fgcolor"		"Black"
+			
+			"pin_to_sibling"		"count"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 		
 		"playerimage"
@@ -90,7 +94,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"redteam"
-		"xpos"			"c-5"
+		"xpos"			"c-4"
 		"ypos"			"-7"
 		"zpos"			"0"
 		"wide"			"60"
@@ -104,7 +108,7 @@
 			"xpos"			"5"
 			"ypos"			"7"
 			"zpos"			"0"
-			"wide"			"50"
+			"wide"			"46"
 			"tall"			"23"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -150,7 +154,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"font"			"HudFontMedium"
+			"font"			"Cerbetica24"
 			"labelText"		"%red_alive%"
 			"textAlignment"	"center"
 			"fgcolor"		"Black"
diff --git a/resource/ui/HudArenaTeamMenu.res b/resource/ui/HudArenaTeamMenu.res
index fae2cca..53bb8d4 100644
--- a/resource/ui/HudArenaTeamMenu.res
+++ b/resource/ui/HudArenaTeamMenu.res
@@ -26,7 +26,7 @@
 		"tall"			"30"
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"100 100 100 100"
+		"fillcolor"		"0 0 0 200"
 	}
 	"MainBG"
 	{
@@ -40,7 +40,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
-		"fillcolor"		"255 255 255 10"
+		"fillcolor"		"0 0 0 200"
 	}
 	"SidePanelBG"
 	{
@@ -67,7 +67,7 @@
 		"tall"			"30"
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"0 0 0 255"
+		"fillcolor"		"0 0 0 200"
 	}
 
 	"SysMenu"
@@ -87,7 +87,7 @@
 
 	"MapInfo"
 	{
-		"ControlName"		"HTML"
+		"ControlName"	"HTML"
 		"fieldName"		"MapInfo"
 		"xpos"			"100"
 		"ypos"			"34"
@@ -121,7 +121,7 @@
 	}
 	"teambutton2"
 	{
-		"ControlName"		"CTFTeamButton"
+		"ControlName"	"CTFTeamButton"
 		"fieldName"		"teambutton2"
 		"xpos"			"10"
 		"ypos"			"c-35"
@@ -140,16 +140,24 @@
 		"paintborder"	"0"
 		"command"		"jointeam spectate"
 		"associated_model"	"autodoor"
-		"font"			"CerbeticaBold20"
-		"defaultFgColor_override" 	"255 255 255 128"
+		"font"				"CerbeticaBold20"
+		
+		"defaultFgColor_override"	"255 255 255 128"
+		"defaultBgColor_override"	"0 0 0 200"
+		
 		"armedFgColor_override"		"TanLight"
-		"depressedFgColor_override" "255 255 255 128"
-		"selectedFgColor_override" 	"TanLight"
+		"armedBgColor_override"		"TanDarker"
+		
+		"depressedFgColor_override"	"255 255 255 128"
+		"depressedBgColor_override"	"0 0 0 200"
+		
+		"selectedFgColor_override"	"TanLight"
+		"selectedBgColor_override"	"TanDarker"
 	}
 	
 	"teambutton3"
 	{
-		"ControlName"		"CTFTeamButton"
+		"ControlName"	"CTFTeamButton"
 		"fieldName"		"teambutton3"
 		"xpos"			"10"
 		"ypos"			"c5"
@@ -169,10 +177,18 @@
 		"command"		"jointeam spectatearena"
 		"associated_model"	"spectate"	
 		"font"				"CerbeticaBold20"
-		"defaultFgColor_override" 	"255 255 255 128"
+		
+		"defaultFgColor_override"	"255 255 255 128"
+		"defaultBgColor_override"	"0 0 0 200"
+		
 		"armedFgColor_override"		"TanLight"
-		"depressedFgColor_override" "255 255 255 128"
-		"selectedFgColor_override" 	"TanLight"
+		"armedBgColor_override"		"TanDarker"
+		
+		"depressedFgColor_override"	"255 255 255 128"
+		"depressedBgColor_override"	"0 0 0 200"
+		
+		"selectedFgColor_override"	"TanLight"
+		"selectedBgColor_override"	"TanDarker"
 	}
 	
 	"CancelButton" [$WIN32] 
@@ -399,25 +415,25 @@
 	
 	"Footer" [$X360]
 	{
-		"ControlName"		"CTFFooter"
-		"fieldName"			"Footer"
-		"zpos"				"6"
-		"tall"				"80"
-		"button_separator"	"10"
+		"ControlName"				"CTFFooter"
+		"fieldName"					"Footer"
+		"zpos"						"6"
+		"tall"						"80"
+		"button_separator"			"10"
 		"button_separator_lodef"	"5"
-		"buttongap"			"50"
-		"buttongap_hidef"		"35"
+		"buttongap"					"50"
+		"buttongap_hidef"			"35"
 		"buttongap_lodef"			"18"
-		"textadjust"		"3"
-		"textadjust_lodef"		"0"
-		"buttonoffsety"		"20"
+		"textadjust"				"3"
+		"textadjust_lodef"			"0"
+		"buttonoffsety"				"20"
 		"buttonoffsety_hidef"		"0"
 		"buttonoffsety_lodef"		"18"
-		"center"			"0"
+		"center"					"0"
 		"button_pin_right_lodef"	"55"
-		"fonttext"			"MatchmakingDialogMenuLarge"
+		"fonttext"					"MatchmakingDialogMenuLarge"
 		"fonttext_lodef"			"MatchmakingDialogMenuSmall"
-		"fgcolor"			"HudOffWhite" 	
+		"fgcolor"					"HudOffWhite" 	
 		
 		"button"
 		{
-- 
cgit v1.2.3