Fixed Medic UI in Mann vs. Machine

Adjusted the ubercharge and item effect meters so to not overlap when the medic has a shield power up. Fixed a rogue shadow element in tournament spectator.

5 files changed, 24 insertions, 41 deletions

diff --git a/resource/ui/HudItemEffectMeter.res b/resource/ui/HudItemEffectMeter.res
index 8d8ec5c..beb7fed 100644
--- a/resource/ui/HudItemEffectMeter.res
+++ b/resource/ui/HudItemEffectMeter.res
@@ -44,11 +44,12 @@
 		"fieldName"			"ItemEffectMeter"

 		"font"				"Default"

 		"xpos"				"0"

-		"xpos_minmode"		"15"

+		"xpos_minmode"		"17"

 		"ypos"				"0"

 		"zpos"				"2"

 		"wide"				"120"

 		"tall"				"8"

+		"wide_minmode"		"114"

 		"tall_minmode"		"5"

 		"autoResize"		"0"

 		"pinCorner"			"0"

diff --git a/resource/ui/HudMedicCharge.res b/resource/ui/HudMedicCharge.res
index 1a478f7..032fc6b 100644
--- a/resource/ui/HudMedicCharge.res
+++ b/resource/ui/HudMedicCharge.res
@@ -23,7 +23,7 @@
 		"fieldName"			"ChargeLabel"
 		"xpos"				"150"
 		"ypos"				"35"
-		"xpos_minmode"		"96"
+		"xpos_minmode"		"106"
 		"ypos_minmode"		"-5"
 		"zpos"				"2"
 		"wide"				"120"
@@ -101,9 +101,9 @@
 		"fieldName"			"ChargeMeter"
 		"font"				"Default"
 		"xpos"				"0"
-		"ypos"				"60"
+		"ypos"				"80"
 		"xpos_minmode"		"17"
-		"ypos_minmode"		"27"
+		"ypos_minmode"		"34"
 		"zpos"				"2"
 		"wide"				"150"
 		"tall"				"20"
diff --git a/resource/ui/SpectatorTournament.res b/resource/ui/SpectatorTournament.res
index 36d3133..ceb4420 100644
--- a/resource/ui/SpectatorTournament.res
+++ b/resource/ui/SpectatorTournament.res
@@ -282,24 +282,6 @@
 				"fgcolor"		"TransparentBlack"
 			}
 			
-			"healthcover"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"healthcover"
-				"font"			"Cerbetica12"
-				"xpos"			"0"
-				"ypos"			"1"
-				"zpos"			"5"
-				"wide"			"26"
-				"tall"			"20"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%respawntime%"
-				"textAlignment"	"west"
-				"fgcolor"		"15 15 15 110"
-			}
-			
 			"chargeamount"
 			{
 				"ControlName"	"CExLabel"
diff --git a/resource/ui/hudmenutauntselection.res b/resource/ui/hudmenutauntselection.res
index 5e7dd7c..a97cd9a 100644
--- a/resource/ui/hudmenutauntselection.res
+++ b/resource/ui/hudmenutauntselection.res
@@ -194,8 +194,8 @@
 		"fieldName"		"NumberLabel1BG"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
-		"ypos"			"97"
-		"xpos"			"36"
+		"xpos"			"35"
+		"ypos"			"96"
 		"zpos"			"5"
 		"wide"			"15"
 		"tall"			"15"
@@ -288,8 +288,8 @@
 		"fieldName"		"NumberLabel2BG"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
-		"xpos"			"91"
-		"ypos"			"97"
+		"xpos"			"90"
+		"ypos"			"96"
 		"zpos"			"5"
 		"wide"			"15"
 		"tall"			"15"
@@ -383,8 +383,8 @@
 		"fieldName"		"NumberLabel3BG"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
-		"ypos"			"97"
-		"xpos"			"146"
+		"ypos"			"96"
+		"xpos"			"145"
 		"zpos"			"5"
 		"wide"			"15"
 		"tall"			"15"
@@ -476,8 +476,8 @@
 		"fieldName"		"NumberLabel4BG"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
-		"ypos"			"97"
-		"xpos"			"202"
+		"ypos"			"96"
+		"xpos"			"201"
 		"zpos"			"5"
 		"wide"			"15"
 		"tall"			"15"
@@ -570,8 +570,8 @@
 		"fieldName"		"NumberLabel5BG"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
-		"ypos"			"97"
-		"xpos"			"258"
+		"ypos"			"96"
+		"xpos"			"257"
 		"zpos"			"5"
 		"wide"			"15"
 		"tall"			"15"
@@ -664,8 +664,8 @@
 		"fieldName"		"NumberLabel6BG"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
-		"ypos"			"97"
-		"xpos"			"312"
+		"ypos"			"96"
+		"xpos"			"311"
 		"zpos"			"5"
 		"wide"			"15"
 		"tall"			"15"
@@ -758,8 +758,8 @@
 		"fieldName"		"NumberLabel7BG"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
-		"ypos"			"97"
-		"xpos"			"366"
+		"ypos"			"96"
+		"xpos"			"365"
 		"zpos"			"5"
 		"wide"			"15"
 		"tall"			"15"
@@ -852,8 +852,8 @@
 		"fieldName"		"NumberLabel8BG"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
-		"xpos"			"422"
-		"ypos"			"97"
+		"xpos"			"421"
+		"ypos"			"96"
 		"zpos"			"5"
 		"wide"			"15"
 		"tall"			"15"
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
index cd2d507..f55ab5b 100644
--- a/scripts/hudlayout.res
+++ b/scripts/hudlayout.res
@@ -933,7 +933,7 @@
 		"enabled" 				"1"
 		"xpos"					"c-100"
 		"ypos"					"246"
-		"ypos_minmode"			"315"
+		"ypos_minmode"			"320"
 		"zpos"					"1"
 		"wide"	 				"600"
 		"tall"	 				"50"
@@ -961,8 +961,8 @@
 		"visible" 				"0"
 		"enabled" 				"1"
 		"xpos"					"c-100"
-		"ypos"					"c100"
-		"ypos_minmode"			"290"
+		"ypos"					"c115"
+		"ypos_minmode"			"298"
 		"zpos"					"1"
 		"wide"					"600"
 		"tall"					"50"