Merge pull request #173 from raysfire/dev

v2021.0705

1 files changed, 61 insertions, 56 deletions

diff --git a/resource/ui/hudmediccharge.res b/resource/ui/hudmediccharge.res
index 869a860..0de14eb 100644
--- a/resource/ui/hudmediccharge.res
+++ b/resource/ui/hudmediccharge.res
@@ -21,13 +21,13 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ChargeLabel"
-		"xpos"				"165"
-		"ypos"				"35"
-		"xpos_minmode"		"106"
-		"ypos_minmode"		"-5"
+		"xpos"				"c90"
+		"ypos"				"45"
+		"xpos_minmode"		"c40"
+		"ypos_minmode"		"5"
 		"zpos"				"2"
-		"wide"				"120"
-		"tall"				"72"
+		"wide"				"100"
+		"tall"				"50"
 		"autoResize"		"1"
 		"pinCorner"			"2"
 		"visible"			"1"
@@ -49,8 +49,8 @@
 		"xpos"				"-2"
 		"ypos"				"-2"
 		"zpos"				"1"
-		"wide"				"120"
-		"tall"				"72"
+		"wide"				"100"
+		"tall"				"50"
 		"autoResize"		"1"
 		"pinCorner"			"2"
 		"visible"			"1"
@@ -73,20 +73,20 @@
 	{
 		"ControlName"		"CExImageButton"
 		"fieldName"			"IndividualChargesLabel"
-		"xpos"				"160"
+		"xpos"				"c80"
 		"ypos"				"55"
 		"zpos"				"2"
-		"wide"				"122"
+		"wide"				"120"
 		"tall"				"35"
-		"xpos_minmode"		"140"
-		"ypos_minmode"		"23"
-		"wide_minmode"		"102"
-		"tall_minmode"		"20"
+		"xpos_minmode"		"c40"
+		"ypos_minmode"		"20"
+		"wide_minmode"		"100"
+		"tall_minmode"		"22"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"defaultbgcolor_override"	"25 25 25 255"
+		"defaultbgcolor_override"	"Black"
 		"PaintBackgroundType"		"0"
         "textinsety" 				"99"
 	}
@@ -95,18 +95,19 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ChargeMeterLabel"
-		"xpos"				"0"
-		"ypos"				"80"
+		"xpos"				"c-75"
+		"ypos"				"60"
+		"xpos_minmode"		"10"
 		"ypos_minmode"		"35"
 		"zpos"				"3"
 		"wide"				"150"
-		"tall"				"15"
+		"tall"				"20"
 		"autoResize"		"1"
 		"pinCorner"			"2"
 		"visible"			"0"
 		"enabled"			"0"
 		"tabPosition"		"0"
-		"labelText"			"#TF_Charge"
+		"labelText"			"#TF_Ubercharge"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
@@ -119,14 +120,14 @@
 		"ControlName"		"ContinuousProgressBar"
 		"fieldName"			"ChargeMeter"
 		"font"				"Default"
-		"xpos"				"0"
-		"ypos"				"80"
-		"xpos_minmode"		"10"
-		"ypos_minmode"		"35"
+		"xpos"				"15"
+		"ypos"				"5"
+		"xpos_minmode"		"-15"
+		"ypos_minmode"		"0"
 		"zpos"				"2"
 		"wide"				"150"
 		"tall"				"20"
-		"wide_minmode"		"125"
+		"wide_minmode"		"115"
 		"tall_minmode"		"10"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -137,6 +138,10 @@
 		"brighttext"		"0"
 		"fgcolor_override"		"Uber Bar Color"
 		"bgcolor_override"		"32 32 32 128"
+
+		"pin_to_sibling"		"ChargeLabel"
+		"pin_corner_to_sibling"	"PIN_CENTER_RIGHT"
+		"pin_to_sibling_corner"	"PIN_CENTER_LEFT"
 	}
 
 	"ChargeMeter1"
@@ -144,13 +149,13 @@
 		"ControlName"		"ContinuousProgressBar"
 		"fieldName"			"ChargeMeter1"
 		"font"				"Default"
-		"xpos"				"-5"
-		"ypos"				"-5"
+		"xpos"				"-2"
+		"ypos"				"-2"
 		"zpos"				"3"
-		"wide"				"27"
-		"tall"				"25"
-		"wide_minmode"		"22"
-		"tall_minmode"		"10"
+		"wide"				"28"
+		"tall"				"31"
+		"wide_minmode"		"23"
+		"tall_minmode"		"18"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -170,10 +175,10 @@
 		"xpos"				"2"
 		"ypos"				"0"
 		"zpos"				"4"
-		"wide"				"27"
-		"tall"				"25"
-		"wide_minmode"		"22"
-		"tall_minmode"		"10"
+		"wide"				"28"
+		"tall"				"31"
+		"wide_minmode"		"23"
+		"tall_minmode"		"18"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -196,10 +201,10 @@
 		"xpos"				"2"
 		"ypos"				"0"
 		"zpos"				"4"
-		"wide"				"27"
-		"tall"				"25"
-		"wide_minmode"		"22"
-		"tall_minmode"		"10"
+		"wide"				"28"
+		"tall"				"31"
+		"wide_minmode"		"23"
+		"tall_minmode"		"18"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -222,10 +227,10 @@
 		"xpos"				"2"
 		"ypos"				"0"
 		"zpos"				"4"
-		"wide"				"27"
-		"tall"				"25"
-		"wide_minmode"		"22"
-		"tall_minmode"		"10"
+		"wide"				"28"
+		"tall"				"31"
+		"wide_minmode"		"23"
+		"tall_minmode"		"18"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -242,27 +247,26 @@
 
 	"HealthClusterIcon"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"HealthClusterIcon"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"25"
-		"tall"			"25"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"../hud/ico_health_cluster"
-		"scaleImage"	"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"HealthClusterIcon"
+		"xpos"				"0"
+		"ypos"				"0"
+		"wide"				"25"
+		"tall"				"25"
+		"visible"			"0"
+		"enabled"			"0"
+		"image"				"../hud/ico_health_cluster"
+		"scaleImage"		"1"
 	}
 
 	"ResistIconAnchor"
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"ResistIconAnchor"
-		"xpos"				"160"
+		"xpos"				"c80"
 		"ypos"				"95"
-		"xpos_minmode"		"210"
+		"xpos_minmode"		"c40"
 		"ypos_minmode"		"48"
-		"zpos"				"2"
 		"wide"				"30"
 		"tall"				"30"
 		"visible"			"1"
@@ -275,9 +279,10 @@
 		"fieldName"			"ResistIcon"
 		"xpos"				"0"
 		"ypos"				"0"
-		"zpos"				"3"
 		"wide"				"30"
 		"tall"				"30"
+		"wide_minmode"		"25"
+		"tall_minmode"		"25"
 		"visible"			"1"
 		"enabled"			"1"
 		"image"				"../HUD/defense_buff_bullet_blue"