Fixed Vaccinator Charge UI

- Fixed shadow elements being visible when the Vaccinator is equipped
- Adjusted the size and positioning of the Vaccinator charge bars

2 files changed, 34 insertions, 86 deletions

diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index 37be8b0..5f15572 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -2689,6 +2689,7 @@ Scheme
 				"tall" 		 "56"
 				"additive"	 "0"
 				"antialias"	 "1"
+				"outline"	 "1"
 			}
 		}
 		"CerbeticaBold64"
diff --git a/resource/ui/HudMedicCharge.res b/resource/ui/HudMedicCharge.res
index 2392e98..87ffebd 100644
--- a/resource/ui/HudMedicCharge.res
+++ b/resource/ui/HudMedicCharge.res
@@ -17,6 +17,25 @@
 		"teambg_3"		"../hud/medic_charge_blue_bg"				
 	}
 	
+	"ChargeBackground"
+	{	
+		"ControlName"	"ImagePanel"
+		"fieldName"		"ChargeBackground"
+		"font"			"Default"
+		"xpos"			"75"
+		"ypos"			"115"
+		"xpos_minmode"	"0"
+		"ypos_minmode"	"35"
+		"zpos"			"2"
+		"wide"			"150"
+		"tall"			"20"
+		"wide_minmode"	"124"
+		"tall_minmode"	"14"
+		"visible"		"0"
+		"enabled"		"0"
+		"fillcolor" 		"255 255 255 50"
+	}
+	
 	"ChargeLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -37,55 +56,11 @@
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"font"			"CerbeticaBold56"
+		"font"			"CerbeticaBoldMedic56"
 		"font_minmode"	"CerbeticaBold32"
 		"fgcolor"		"Ammo In Clip"
 	}
 	
-	"ChargeLabelShadow"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ChargeLabelShadow"
-		"xpos"			"238"
-		"ypos"			"42"
-		"xpos_minmode"	"98"
-		"ypos_minmode"	"-3"
-		"zpos"			"2"
-		"wide"			"120"
-		"tall"			"72"
-		"autoResize"	"1"
-		"pinCorner"		"2"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#TF_UberchargeMinHUD"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"font"			"CerbeticaBold56"
-		"font_minmode"	"CerbeticaBold32"
-		"fgcolor"		"TransparentBlack"
-	}
-	
-	"ChargeBackground"
-	{	
-		"ControlName"	"ImagePanel"
-		"fieldName"		"ChargeBackground"
-		"font"			"Default"
-		"xpos"			"75"
-		"ypos"			"115"
-		"xpos_minmode"	"0"
-		"ypos_minmode"	"35"
-		"zpos"			"2"
-		"wide"			"150"
-		"tall"			"20"
-		"wide_minmode"	"124"
-		"tall_minmode"	"14"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor" 		"255 255 255 50"
-	}
-	
 	"IndividualChargesLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -97,56 +72,28 @@
 		"ypos_minmode"	"-5"
 		"zpos_minmode"	"5"
 		"wide"			"120"
-		"tall"			"72"
+		"tall"			"0"
 		"autoResize"	"1"
 		"pinCorner"		"2"
 		"visible"		"0"
 		"enabled"		"0"
-		"enabled_minmode"	"1"
 		"tabPosition"	"0"
 		"labelText"		"#TF_IndividualUberchargesMinHUD"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"font"			"CerbeticaBold56"
+		"font"			"CerbeticaBoldMedic56"
 		"font_minmode"	"CerbeticaBold32"
 		"fgcolor"		"Ammo In Clip"
 	}
 	
-	"IndividualChargesLabelShadow"	//Blocks48	//Blocks24
-	{
-		"ControlName"	"CExLabel"
-		"fieldName" 	"IndividualChargesLabel"
-		"xpos" 			"238"
-		"ypos" 			"41"
-		"zpos" 			"2"
-		"xpos_minmode"	"98"
-		"ypos_minmode"	"-3"
-		"zpos_minmode"	"3"
-		"wide" 			"120"
-		"tall" 			"72"
-		"autoResize" 	"1"
-		"pinCorner" 	"2"
-		"visible" 		"0"
-		"enabled" 		"1"
-		"tabPosition" 	"0"
-		"labelText" 	"66"
-		"labelText_minmode"	"65"
-		"textAlignment" "center"
-		"dulltext"		"0"
-		"brighttext" 	"0"
-		"font"			"CerbeticaBold56"
-		"font_minmode"	"CerbeticaBold32"
-		"fgcolor_override"		"0 0 0 255"
-	}
-	
 	"ChargeMeter"
 	{	
 		"ControlName"	"ContinuousProgressBar"
 		"fieldName"		"ChargeMeter"
 		"font"			"Default"
 		"xpos"			"75"
-		"ypos"			"115"
+		"ypos"			"95"
 		"xpos_minmode"	"2"
 		"ypos_minmode"	"37"
 		"zpos"			"2"
@@ -170,10 +117,10 @@
 		"ControlName" 		"ContinuousProgressBar"
 		"fieldName" 		"ChargeMeter1"
 		"font" 				"Default"
-		"xpos" 				"252"
+		"xpos" 				"250"
 		"ypos" 				"55"
 		"zpos"				"3"
-		"wide" 				"86"
+		"wide" 				"100"
 		"xpos_minmode"		"136"
 		"ypos_minmode"		"23"
 		"zpos_minmode"		"4"
@@ -194,10 +141,10 @@
 		"ControlName" 		"ContinuousProgressBar"
 		"fieldName" 		"ChargeMeter2"
 		"font" 				"Default"
-		"xpos" 				"252"
+		"xpos" 				"250"
 		"ypos" 				"66"
 		"zpos"				"3"
-		"wide" 				"86"
+		"wide" 				"100"
 		"xpos_minmode"		"158"
 		"ypos_minmode"		"23"
 		"zpos_minmode"		"4"
@@ -218,10 +165,10 @@
 		"ControlName" 		"ContinuousProgressBar"
 		"fieldName" 		"ChargeMeter3"
 		"font" 				"Default"
-		"xpos" 				"252"
+		"xpos" 				"250"
 		"ypos" 				"78"
 		"zpos" 				"3"
-		"wide" 				"86"
+		"wide" 				"100"
 		"tall" 				"10"
 		"xpos_minmode" 		"136"
 		"ypos_minmode" 		"34"
@@ -242,13 +189,13 @@
 		"ControlName" 	"ContinuousProgressBar"
 		"fieldName" 	"ChargeMeter4"
 		"font" 			"Default"
-		"xpos"			"252"
+		"xpos"			"250"
 		"ypos" 			"90"
 		"zpos" 			"3"
 		"xpos_minmode"	"158"
 		"ypos_minmode"	"34"
 		"zpos_minmode"	"4"
-		"wide" 			"86"
+		"wide" 			"100"
 		"tall" 			"9"
 		"wide_minmode" 	"19"
 		"tall_minmode" 	"10"
@@ -294,7 +241,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"ResistIconAnchor"
 		"xpos"			"0"
-		"ypos"			"20"
+		"ypos"			"22"
 		"wide"			"25"
 		"tall"			"25"
 		"visible"		"1"
@@ -306,7 +253,7 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"ResistIcon"
 		"xpos"			"0"
-		"ypos"			"0"
+		"ypos"			"20"
 		"wide"			"25"
 		"tall"			"25"
 		"visible"		"1"