Fixed Phlog/Jet Pack Meters in Minmode

- Removed duplicate backgrounds
- Fixed the Phlog and Thermal Thruster meters in minmode

1 files changed, 33 insertions, 56 deletions

diff --git a/resource/ui/hudmediccharge.res b/resource/ui/hudmediccharge.res
index 7b44ce4..27d0a5e 100644
--- a/resource/ui/hudmediccharge.res
+++ b/resource/ui/hudmediccharge.res
@@ -21,7 +21,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ChargeLabel"
-		"xpos"				"150"
+		"xpos"				"165"
 		"ypos"				"35"
 		"xpos_minmode"		"106"
 		"ypos_minmode"		"-5"
@@ -71,27 +71,24 @@
 
 	"IndividualChargesLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"		"CExImageButton"
 		"fieldName"			"IndividualChargesLabel"
-		"xpos"				"150"
-		"ypos"				"35"
-		"xpos_minmode"		"106"
-		"ypos_minmode"		"-5"
+		"xpos"				"160"
+		"ypos"				"55"
 		"zpos"				"2"
-		"wide"				"120"
-		"tall"				"0"
-		"autoResize"		"1"
-		"pinCorner"			"2"
+		"wide"				"122"
+		"tall"				"35"
+		"xpos_minmode"		"140"
+		"ypos_minmode"		"23"
+		"wide_minmode"		"102"
+		"tall_minmode"		"20"
+		"autoResize"		"0"
+		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#TF_IndividualUberchargesMinHUD"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"font"				"CerbeticaBoldOutline56"
-		"font_minmode"		"CerbeticaBoldOutline32"
-		"fgcolor"			"Ammo In Clip"
+		"defaultbgcolor_override"	"25 25 25 255"
+		"PaintBackgroundType"	"0"
+        "textinsety" 			"99"
 	}
 
 	"ChargeMeterLabel"
@@ -147,14 +144,11 @@
 		"ControlName"		"ContinuousProgressBar"
 		"fieldName"			"ChargeMeter1"
 		"font"				"Default"
-		"xpos"				"150"
-		"ypos"				"50"
+		"xpos"				"-5"
+		"ypos"				"-5"
 		"zpos"				"3"
-		"xpos_minmode"		"125"
-		"ypos_minmode"		"28"
-		"zpos_minmode"		"3"
 		"wide"				"27"
-		"tall"				"40"
+		"tall"				"25"
 		"wide_minmode"		"22"
 		"tall_minmode"		"10"
 		"autoResize"		"0"
@@ -165,6 +159,10 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"fgcolor_override"	"Uber Bar Color"
+
+		"pin_to_sibling"		"IndividualChargesLabel"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 
 	"ChargeMeter2"
@@ -176,7 +174,7 @@
 		"ypos"				"0"
 		"zpos"				"4"
 		"wide"				"27"
-		"tall"				"40"
+		"tall"				"25"
 		"wide_minmode"		"22"
 		"tall_minmode"		"10"
 		"autoResize"		"0"
@@ -202,7 +200,7 @@
 		"ypos"				"0"
 		"zpos"				"4"
 		"wide"				"27"
-		"tall"				"40"
+		"tall"				"25"
 		"wide_minmode"		"22"
 		"tall_minmode"		"10"
 		"autoResize"		"0"
@@ -228,7 +226,7 @@
 		"ypos"				"0"
 		"zpos"				"4"
 		"wide"				"27"
-		"tall"				"40"
+		"tall"				"25"
 		"wide_minmode"		"22"
 		"tall_minmode"		"10"
 		"autoResize"		"0"
@@ -263,13 +261,13 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"ResistIconAnchor"
-		"xpos"				"50"
-		"ypos"				"45"
-		"xpos_minmode"		"50"
-		"ypos_minmode"		"10"
+		"xpos"				"160"
+		"ypos"				"95"
+		"xpos_minmode"		"210"
+		"ypos_minmode"		"48"
 		"zpos"				"2"
-		"wide"				"55"
-		"tall"				"50"
+		"wide"				"30"
+		"tall"				"30"
 		"visible"			"1"
 		"enabled"			"1"
 	}
@@ -281,8 +279,8 @@
 		"xpos"				"0"
 		"ypos"				"0"
 		"zpos"				"3"
-		"wide"				"50"
-		"tall"				"50"
+		"wide"				"30"
+		"tall"				"30"
 		"visible"			"1"
 		"enabled"			"1"
 		"image"				"../HUD/defense_buff_bullet_blue"
@@ -292,25 +290,4 @@
 		"pin_corner_to_sibling"	"PIN_TOPLEFT"
 		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
-
-	"ResistIconBG"
-	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"ResistIconBG"
-		"xpos"				"5"
-		"ypos"				"5"
-		"zpos"				"2"
-		"wide"				"122"
-		"wide_minmode"		"102"
-		"tall"				"50"
-		"tall_minmode"		"20"
-		"visible"			"1"
-		"enabled"			"1"
-		"bgcolor_override"		"25 25 25 255"
-		"PaintBackgroundType"	"2"
-
-		"pin_to_sibling"		"ChargeMeter1"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
-	}
 }
\ No newline at end of file