Updated for vaccinator fix.

2 files changed, 79 insertions, 67 deletions

diff --git a/resource/ClientScheme.res b/resource/ClientScheme.res
index ccfb7c4..1446f39 100644
--- a/resource/ClientScheme.res
+++ b/resource/ClientScheme.res
@@ -23,15 +23,15 @@ Scheme
 	
 		//rayshud colors
 	
-		"Ammo In Clip" 		 "148 0 211 255"
-		"Ammo In Reserve" 		 "127 255 212 255"
-		"Ammo In Clip Low" 		 "255 255 0 255"
-		"Ammo In Reserve Low" 		 "255 140 0 255"
+		"Ammo In Clip"							"48 255 48 255"
+		"Ammo In Reserve"						"72 255 255 255"
+		"Ammo In Clip Low"						"255 42 130 255"
+		"Ammo In Reserve Low"					"255 128 28 255"
 		
 		//refers to watching stvs/killcam shots
-		"Spec Health Normal" 		 "235 226 202 255"
-		"Spec Health Buff" 		 "148 0 211 255"			
-		"Spec Health Hurt" 		 "255 215 0 255"
+		"Spec Health Normal"					"235 226 202 255"
+		"Spec Health Buff"						"48 255 48 255"			
+		"Spec Health Hurt"						"255 153 0 255"
 		
 		//alternate colors for flashing values
 		"Alternate Spec Health Normal"						"235 226 202 255"
@@ -39,29 +39,29 @@ Scheme
 		"Alternate Spec Health Hurt"						"255 153 0 255"
 		
 		//refers to player health/targetids
-		"Health Normal" 		 "235 226 202 255"
-		"Health Buff" 		 "148 0 211 255"
-		"Health Hurt" 		 "255 215 0 255"
+		"Health Normal"							"235 226 202 255"
+		"Health Buff"							"48 255 48 255"
+		"Health Hurt"							"255 153 0 255"
 		
 		//alternate colors for flashing values
 		"Alternate Health Normal"						"235 226 202 255"
 		"Alternate Health Buff"						"48 255 48 255"			
 		"Alternate Health Hurt"						"255 153 0 255"
 		
-		"Uber Bar Color" 		 "235 226 202 255"
+		"Uber Bar Color"						"235 226 202 255"
 
 		//solid color uber disabled by default; to enable, uncomment lines in hudanimations_tf.txt
 		"Solid Color Uber"						"255 50 255 255"
 		
-		"Flashing Uber Color1" 		 "64 224 208 255"
-		"Flashing Uber Color2" 		 "148 0 211 255"
-		//"Ubercharge Amount" 		 "148 0 211 255" // disabled temporarily; currently controlled by ammo in clip color
+		"Flashing Uber Color1"					"255 165 0 255"
+		"Flashing Uber Color2"					"255 69 0 255"
+		//"Ubercharge Amount"						"48 255 48 255" // disabled temporarily; currently controlled by ammo in clip color
 	
-		"Heal Numbers" 		 "148 0 211 255"
-		"Damage Numbers" 		 "0 255 255 255"
+		"Heal Numbers"							"48 255 48 255"
+		"Damage Numbers"						"72 255 255 255"
 		
 		//'Last DamageHeal Info' refers to the number that appears above hp
-		"Last DamageHeal Info" 		 "72 255 255 255"
+		"Last DamageHeal Info"					"72 255 255 255"
 		
 		//Menu/Color scheme colors
 		"Base Color"				"15 255 255 255"
@@ -2271,6 +2271,18 @@ Scheme
 				"antialias"	"1"
 			}
 		}
+		
+				
+		"Blocks24"
+		{
+			"1"
+			{
+				"name"		"Blocks"
+				"tall"		"24"
+				"weight"	"0"
+				"antialias"	"1"
+			}
+		}
 
 		//hud xhairs
 		"xHairCircle"
diff --git a/resource/ui/HudMedicCharge.res b/resource/ui/HudMedicCharge.res
index 994672c..abc5b7a 100644
--- a/resource/ui/HudMedicCharge.res
+++ b/resource/ui/HudMedicCharge.res
@@ -70,8 +70,8 @@
 		"zpos"			"2"
 		"wide"			"150"
 		"tall"			"20"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"fillcolor" 		"255 255 255 50"
 	}
 	
@@ -86,8 +86,8 @@
 		"tall"			"72"
 		"autoResize"	"1"
 		"pinCorner"		"2"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"tabPosition"	"0"
 		"labelText"		"#TF_IndividualUberchargesMinHUD"
 		"textAlignment"	"center"
@@ -100,23 +100,23 @@
 	"IndividualChargesLabelShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName" 	"IndividualChargesLabelShadow"
+		"fieldName" 	"IndividualChargesLabel"
 		"xpos" 			"238"
 		"ypos" 			"41"
-		"zpos" 			"1"
+		"zpos" 			"2"
 		"wide" 			"120"
 		"tall" 			"72"
 		"autoResize" 	"1"
 		"pinCorner" 	"2"
 		"visible" 		"0"
-		"enabled" 		"0"
+		"enabled" 		"1"
 		"tabPosition" 	"0"
-		"labelText" 	"#TF_IndividualUberchargesMinHUD"
+		"labelText" 	"66"
 		"textAlignment" "center"
 		"dulltext"		"0"
 		"brighttext" 	"0"
-		"font" 			"CerbeticaBold56"
-		"fgcolor"		"TransparentBlack"
+		"font" 			"Blocks48"
+		"fgcolor"		"0 0 0 255"
 	}
 	
 	"ChargeMeter"
@@ -124,11 +124,11 @@
 		"ControlName"	"ContinuousProgressBar"
 		"fieldName"		"ChargeMeter"
 		"font"			"Default"
-		"xpos"			"77"
-		"ypos"			"117"
+		"xpos"			"75"
+		"ypos"			"115	"
 		"zpos"			"2"
-		"wide"			"146"
-		"tall"			"16"
+		"wide"			"150"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -145,11 +145,11 @@
 		"ControlName" 		"ContinuousProgressBar"
 		"fieldName" 		"ChargeMeter1"
 		"font" 				"Default"
-		"xpos" 				"77"
-		"ypos" 				"117"
+		"xpos" 				"252"
+		"ypos" 				"55"
 		"zpos"				"2"
-		"wide" 				"35"
-		"tall" 				"16"
+		"wide" 				"86"
+		"tall" 				"9"
 		"autoResize" 		"0"
 		"pinCorner" 		"0"
 		"visible" 			"1"
@@ -160,17 +160,37 @@
 		"fgcolor_override"		"Uber Bar Color"
 	
 	}
+	
+		"ChargeMeter2"
+		{
+		"ControlName" 		"ContinuousProgressBar"
+		"fieldName" 		"ChargeMeter2"
+		"font" 				"Default"
+		"xpos" 				"252"
+		"ypos" 				"66"
+		"zpos"				"2"
+		"wide" 				"86"
+		"tall" 				"10"
+		"autoResize" 		"0"
+		"pinCorner" 		"0"
+		"visible" 			"1"
+		"enabled" 			"1"
+		"textAlignment" 	"Left"
+		"dulltext" 			"0"
+		"brighttext" 		"0"
+		"fgcolor_override"		"Uber Bar Color"
+		}
 
-	"ChargeMeter2"
+	"ChargeMeter3"
 	{
 		"ControlName" 		"ContinuousProgressBar"
-		"fieldName" 		"ChargeMeter2"
+		"fieldName" 		"ChargeMeter3"
 		"font" 				"Default"
-		"xpos" 				"114"
-		"ypos" 				"117"
+		"xpos" 				"252"
+		"ypos" 				"78"
 		"zpos" 				"2"
-		"wide" 				"35"
-		"tall" 				"16"
+		"wide" 				"86"
+		"tall" 				"10"
 		"autoResize" 		"0"
 		"pinCorner"			"0"
 		"visible" 			"1"
@@ -181,36 +201,16 @@
 		"fgcolor_override"		"Uber Bar Color"
 	}
 
-	"ChargeMeter3"
-		{
-			"ControlName" 	"ContinuousProgressBar"
-			"fieldName" 	"ChargeMeter3"
-			"font" 			"Default"
-			"xpos" 			"151"
-			"ypos" 			"117"
-			"zpos" 			"2"
-			"wide" 			"35"
-			"tall" 			"16"
-			"autoResize" 	"0"
-			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
-			"textAlignment" "Left"
-			"dulltext" 		"0"
-			"brighttext" 	"0"
-			"fgcolor_override"		"Uber Bar Color"
-		}
-
 	"ChargeMeter4"
 	{
 		"ControlName" 	"ContinuousProgressBar"
 		"fieldName" 	"ChargeMeter4"
 		"font" 			"Default"
-		"xpos"			"188"
-		"ypos" 			"117"
+		"xpos"			"252"
+		"ypos" 			"90"
 		"zpos" 			"2"
-		"wide" 			"35"
-		"tall" 			"16"
+		"wide" 			"86"
+		"tall" 			"9"
 		"autoResize" 	"0"
 		"pinCorner" 	"0"
 		"visible" 		"1"
@@ -224,7 +224,7 @@
 	"ChargeMeterLabel"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"ChargeLabel"
+		"fieldName"		"ChargeMeterLabel"
 		"xpos"			"75"
 		"ypos"			"117"
 		"zpos"			"3"
@@ -235,7 +235,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		"CHARGE"
+		"labelText"		""
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"