Merge pull request #173 from raysfire/dev

v2021.0705

1 files changed, 72 insertions, 84 deletions

diff --git a/resource/ui/hud_obj_sentrygun.res b/resource/ui/hud_obj_sentrygun.res
index c3fbe53..67fef95 100644
--- a/resource/ui/hud_obj_sentrygun.res
+++ b/resource/ui/hud_obj_sentrygun.res
@@ -6,8 +6,8 @@
 		"fieldName"		"BuildingStatusItem"
 		"xpos"			"0"
 		"ypos"			"0"
-		"wide"			"140"
-		"tall"			"35"
+		"wide"			"120"
+		"tall"			"40"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -29,8 +29,8 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"Icon_Sentry_1"
-		"xpos"			"15"
-		"ypos"			"3"
+		"xpos"			"12"
+		"ypos"			"5"
 		"wide"			"30"
 		"tall"			"30"
 		"visible"		"1"
@@ -44,8 +44,8 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"Icon_Sentry_2"
-		"xpos"			"15"
-		"ypos"			"3"
+		"xpos"			"12"
+		"ypos"			"5"
 		"wide"			"30"
 		"tall"			"30"
 		"visible"		"0"
@@ -59,8 +59,8 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"Icon_Sentry_3"
-		"xpos"			"15"
-		"ypos"			"3"
+		"xpos"			"12"
+		"ypos"			"5"
 		"wide"			"30"
 		"tall"			"30"
 		"visible"		"0"
@@ -74,9 +74,9 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"NotBuiltPanel"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"160"
+		"xpos"			"50"
+		"ypos"			"5"
+		"wide"			"50"
 		"tall"			"35"
 		"visible"		"1"
 
@@ -85,16 +85,16 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"NotBuiltLabel"
 			"font"			"HudFontSmallest"
-			"xpos"			"60"
+			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"200"
+			"wide"			"50"
 			"tall"			"35"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
 			"labelText"		"#Building_hud_sentry_not_built"
-			"textAlignment"	"Left"
+			"textAlignment"	"west"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"proportionaltoparent"	"1"
@@ -107,17 +107,16 @@
 		"fieldName"		"BuiltPanel"
 		"xpos"			"0"
 		"ypos"			"0"
-		"wide"			"160"
-		"tall"			"35"
+		"wide"			"120"
+		"tall"			"40"
 		"visible"		"0"
-		"proportionaltoparent"	"1"
 
 		"Icon_Upgrade_1"
 		{
 			"ControlName"	"CIconPanel"
 			"fieldName"		"Icon_Upgrade_1"
-			"xpos"			"46"
-			"ypos"			"20"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"1"
 			"wide"			"10"
 			"tall"			"10"
@@ -126,15 +125,14 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_1"
 			"iconColor"		"White"
-			"proportionaltoparent"	"1"
 		}
 
 		"Icon_Upgrade_2"
 		{
 			"ControlName"	"CIconPanel"
 			"fieldName"		"Icon_Upgrade_2"
-			"xpos"			"46"
-			"ypos"			"20"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"1"
 			"wide"			"10"
 			"tall"			"10"
@@ -143,15 +141,14 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_2"
 			"iconColor"		"White"
-			"proportionaltoparent"	"1"
 		}
 
 		"Icon_Upgrade_3"
 		{
 			"ControlName"	"CIconPanel"
 			"fieldName"		"Icon_Upgrade_3"
-			"xpos"			"45"
-			"ypos"			"15"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"1"
 			"wide"			"10"
 			"tall"			"10"
@@ -160,17 +157,17 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_3"
 			"iconColor"		"White"
-			"proportionaltoparent"	"1"
 		}
 
 		"AlertTray"
 		{
 			"ControlName"	"CBuildingStatusAlertTray"
 			"fieldName"		"AlertTray"
-			"xpos"			"113"
-			"ypos"			"0"
-			"wide"			"34"
-			"tall"			"35"
+			"xpos"			"95"
+			"ypos"			"6"
+			"zpos"			"-2"
+			"wide"			"30"
+			"tall"			"30"
 			"visible"		"1"
 			"enabled"		"1"
 			"icon"			"obj_status_alert_background_tall"
@@ -180,13 +177,13 @@
 		{
 			"ControlName"	"CIconPanel"
 			"fieldName"		"WrenchIcon"
-			"xpos"			"121"
-			"ypos"			"7"
+			"xpos"			"101"
+			"ypos"			"12"
 			"zpos"			"1"
-			"wide"			"19"
-			"tall"			"19"
+			"wide"			"17"
+			"tall"			"17"
 			"visible"		"0"
-			"enabled"		"1"
+			"enabled"		"0"
 			"scaleImage"	"1"
 			"icon"			"obj_status_icon_wrench"
 			"iconColor"		"White"
@@ -196,13 +193,13 @@
 		{
 			"ControlName"	"CIconPanel"
 			"fieldName"		"SapperIcon"
-			"xpos"			"117"
-			"ypos"			"5"
+			"xpos"			"101"
+			"ypos"			"12"
 			"zpos"			"1"
-			"wide"			"25"
-			"tall"			"25"
+			"wide"			"17"
+			"tall"			"17"
 			"visible"		"0"
-			"enabled"		"1"
+			"enabled"		"0"
 			"scaleImage"	"1"
 			"icon"			"obj_status_icon_sapper"
 			"iconColor"		"White"
@@ -213,10 +210,10 @@
 			"ControlName"	"CBuildingHealthBar"
 			"fieldName"		"Health"
 			"font"			"Default"
-			"xpos"			"0"
-			"ypos"			"0"
+			"xpos"			"1"
+			"ypos"			"10"
 			"wide"			"8"
-			"tall"			"38"
+			"tall"			"25"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -224,17 +221,16 @@
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
-			"proportionaltoparent"	"1"
 		}
 
 		"BuildingPanel"
 		{
 			"ControlName"	"EditablePanel"
 			"fieldName"		"BuildingPanel"
-			"xpos"			"60"
+			"xpos"			"50"
 			"ypos"			"0"
-			"wide"			"100"
-			"tall"			"35"
+			"wide"			"50"
+			"tall"			"40"
 			"visible"		"0"
 
 			"BuildingLabel"
@@ -243,8 +239,8 @@
 				"fieldName"		"BuildingLabel"
 				"font"			"HudFontSmallest"
 				"xpos"			"0"
-				"ypos"			"5"
-				"wide"			"200"
+				"ypos"			"7"
+				"wide"			"45"
 				"tall"			"12"
 				"autoResize"	"0"
 				"pinCorner"		"0"
@@ -262,9 +258,9 @@
 				"fieldName"		"BuildingProgress"
 				"font"			"Default"
 				"xpos"			"0"
-				"ypos"			"16"
-				"wide"			"50"
-				"tall"			"10"
+				"ypos"			"20"
+				"wide"			"45"
+				"tall"			"8"
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"1"
@@ -279,28 +275,26 @@
 		{
 			"ControlName"	"EditablePanel"
 			"fieldName"		"RunningPanel"
-			"xpos"			"60"
+			"xpos"			"45"
 			"ypos"			"0"
-			"wide"			"100"
+			"wide"			"50"
 			"tall"			"35"
 			"visible"		"0"
-			"proportionaltoparent"	"1"
 
 			"KillIcon"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"KillIcon"
 				"xpos"			"0"
-				"ypos"			"0"
+				"ypos"			"1"
 				"zpos"			"1"
-				"wide"			"10"
-				"tall"			"10"
+				"wide"			"8"
+				"tall"			"8"
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
 				"image"			"../hud/hud_obj_status_kill_64"
 				"drawcolor"		"ProgressOffWhite"
-				"proportionaltoparent"	"1"
 			}
 
 			"KillsLabel"
@@ -308,19 +302,19 @@
 				"ControlName"	"CExLabel"
 				"fieldName"		"KillsLabel"
 				"font"			"HudFontSmallest"
-				"xpos"			"12"
-				"ypos"			"0"
+				"xpos"			"15"
+				"ypos"			"1"
 				"wide"			"38"
-				"tall"			"10"
+				"tall"			"8"
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"1"
 				"enabled"		"1"
 				"labelText"		"#Building_hud_sentry_kills_assists"
-				"textAlignment"	"center"
+				"textAlignment"	"west"
 				"dulltext"		"0"
 				"brighttext"	"0"
-				"proportionaltoparent"	"1"
+				"drawcolor"		"ProgressOffWhite"
 			}
 
 			"ShellIcon"
@@ -330,14 +324,13 @@
 				"xpos"			"0"
 				"ypos"			"12"
 				"zpos"			"1"
-				"wide"			"10"
-				"tall"			"10"
+				"wide"			"8"
+				"tall"			"8"
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
 				"image"			"../hud/hud_obj_status_ammo_64"
 				"drawcolor"		"ProgressOffWhite"
-				"proportionaltoparent"	"1"
 			}
 
 			"Shells"
@@ -348,7 +341,7 @@
 				"xpos"			"12"
 				"ypos"			"12"
 				"wide"			"38"
-				"tall"			"10"
+				"tall"			"8"
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"1"
@@ -356,7 +349,6 @@
 				"textAlignment"	"Left"
 				"dulltext"		"0"
 				"brighttext"	"0"
-				"proportionaltoparent"	"1"
 			}
 
 			"RocketIcon"
@@ -364,16 +356,15 @@
 				"ControlName"	"ImagePanel"
 				"fieldName"		"RocketIcon"
 				"xpos"			"0"
-				"ypos"			"24"
+				"ypos"			"23"
 				"zpos"			"1"
-				"wide"			"10"
-				"tall"			"10"
-				"visible"		"1"
+				"wide"			"8"
+				"tall"			"8"
+				"visible"		"0"
 				"enabled"		"1"
 				"scaleImage"	"1"
 				"image"			"../hud/hud_obj_status_rockets_64"
 				"drawcolor"		"ProgressOffWhite"
-				"proportionaltoparent"	"1"
 			}
 
 			"Rockets"
@@ -382,9 +373,9 @@
 				"fieldName"		"Rockets"
 				"font"			"Default"
 				"xpos"			"12"
-				"ypos"			"25"
+				"ypos"			"23"
 				"wide"			"38"
-				"tall"			"10"
+				"tall"			"8"
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"1"
@@ -392,7 +383,6 @@
 				"textAlignment"	"Left"
 				"dulltext"		"0"
 				"brighttext"	"0"
-				"proportionaltoparent"	"1"
 			}
 
 			"UpgradeIcon"
@@ -400,16 +390,15 @@
 				"ControlName"	"CIconPanel"
 				"fieldName"		"UpgradeIcon"
 				"xpos"			"0"
-				"ypos"			"24"
+				"ypos"			"23"
 				"zpos"			"1"
-				"wide"			"10"
-				"tall"			"10"
+				"wide"			"8"
+				"tall"			"8"
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
 				"icon"			"ico_metal"
 				"iconColor"		"ProgressOffWhite"
-				"proportionaltoparent"	"1"
 			}
 
 			"Upgrade"
@@ -418,9 +407,9 @@
 				"fieldName"		"Upgrade"
 				"font"			"Default"
 				"xpos"			"12"
-				"ypos"			"25"
+				"ypos"			"23"
 				"wide"			"38"
-				"tall"			"10"
+				"tall"			"8"
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"1"
@@ -428,7 +417,6 @@
 				"textAlignment"	"Left"
 				"dulltext"		"0"
 				"brighttext"	"0"
-				"proportionaltoparent"	"1"
 			}
 		}
 	}