Tweaked Building Status Labels

Hypnootize · Nov 28, 2022 · 3f36e72 · 3f36e72
1 parent 09f6c00
commit 3f36e72
Show file tree

Hide file tree

Showing 12 changed files with 141 additions and 86 deletions.
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_ammo.vmt b/materials/vgui/replay/thumbnails/game/buildingstatus_ammo.vmt
@@ -0,0 +1,9 @@
+"UnlitGeneric"
+{
+	"$baseTexture"				"vgui/replay/thumbnails/game/buildingstatus_ammo"
+	"$vertexalpha"				"1"
+	"$alpha"					"1"
+	"$translucent"				"1"
+	"$vertexcolor"				"1"
+	"$no_fullbright"			"1"
+}
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_ammo.vtf b/materials/vgui/replay/thumbnails/game/buildingstatus_ammo.vtf
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_rockets.vmt b/materials/vgui/replay/thumbnails/game/buildingstatus_rockets.vmt
@@ -0,0 +1,9 @@
+"UnlitGeneric"
+{
+	"$baseTexture"				"vgui/replay/thumbnails/game/buildingstatus_rockets"
+	"$vertexalpha"				"1"
+	"$alpha"					"1"
+	"$translucent"				"1"
+	"$vertexcolor"				"1"
+	"$no_fullbright"			"1"
+}
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_rockets.vtf b/materials/vgui/replay/thumbnails/game/buildingstatus_rockets.vtf
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_upgrade.vmt b/materials/vgui/replay/thumbnails/game/buildingstatus_upgrade.vmt
@@ -0,0 +1,9 @@
+"UnlitGeneric"
+{
+	"$baseTexture"				"vgui/replay/thumbnails/game/buildingstatus_upgrade"
+	"$vertexalpha"				"1"
+	"$alpha"					"1"
+	"$translucent"				"1"
+	"$vertexcolor"				"1"
+	"$no_fullbright"			"1"
+}
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_upgrade.vtf b/materials/vgui/replay/thumbnails/game/buildingstatus_upgrade.vtf
diff --git a/resource/ui/hud_obj_dispenser.res b/resource/ui/hud_obj_dispenser.res
@@ -241,23 +241,24 @@
 				"proportionaltoparent"				"1"
 				"bgcolor_override"					"130 130 130 255"
 			}
-			"AmmoLabel"
+			"AmmoIcon"
 			{
-				"ControlName"						"CExLabel"
-				"fieldName"							"AmmoLabel"
-				"font"								"Size 7"
+				"ControlName"						"ImagePanel"
+				"fieldName"							"AmmoIcon"
 				"xpos"								"0"
 				"ypos"								"0"
 				"zpos"								"1"
-				"wide"								"30"
+				"wide"								"25"
 				"tall"								"6"
 				"visible"							"1"
 				"enabled"							"1"
-				"labelText"							"AMMO"
-				"textAlignment"						"center"
-				"fgcolor"							"Black"
-				"proportionaltoparent"				"1"
+				"scaleImage"						"1"
+				"image"								"replay/thumbnails/game/buildingstatus_ammo"
+				"drawcolor"							"Black"
+
 				"pin_to_sibling" 					"Ammo"
+				"pin_corner_to_sibling" 			"PIN_CENTER_TOP"
+				"pin_to_sibling_corner"				"PIN_CENTER_TOP"
 			}
 
 			"Upgrade"
@@ -274,18 +275,24 @@
 				"proportionaltoparent"				"1"
 				"bgcolor_override"					"130 130 130 255"
 			}
-
 			"UpgradeIcon"
 			{
 				"ControlName"						"CIconPanel"
 				"fieldName"							"UpgradeIcon"
-				"xpos"								"9999"
-			}
-			"AmmoIcon"
-			{
-				"ControlName"						"ImagePanel"
-				"fieldName"							"AmmoIcon"
-				"xpos"								"9999"
+				"xpos"								"0"
+				"ypos"								"0"
+				"zpos"								"3"
+				"wide"								"25"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"scaleImage"						"1"
+				"icon"								"ico_metal"
+				"iconColor"							"Black"
+
+				"pin_to_sibling" 					"Upgrade"
+				"pin_corner_to_sibling" 			"PIN_CENTER_TOP"
+				"pin_to_sibling_corner"				"PIN_CENTER_TOP"
 			}
 		}
 	}

diff --git a/resource/ui/hud_obj_sentrygun.res b/resource/ui/hud_obj_sentrygun.res
@@ -300,23 +300,24 @@
 				"proportionaltoparent"				"1"
 				"bgcolor_override"					"130 130 130 255"
 			}
-			"ShellLabel"
+			"ShellIcon"
 			{
-				"ControlName"						"CExLabel"
-				"fieldName"							"ShellLabel"
-				"font"								"Size 7"
+				"ControlName"						"ImagePanel"
+				"fieldName"							"ShellIcon"
 				"xpos"								"0"
 				"ypos"								"0"
 				"zpos"								"1"
-				"wide"								"30"
+				"wide"								"25"
 				"tall"								"6"
 				"visible"							"1"
 				"enabled"							"1"
-				"labelText"							"AMMO"
-				"textAlignment"						"center"
-				"fgcolor"							"Black"
-				"proportionaltoparent"				"1"
+				"scaleImage"						"1"
+				"image"								"replay/thumbnails/game/buildingstatus_ammo"
+				"drawcolor"							"Black"
+
 				"pin_to_sibling" 					"Shells"
+				"pin_corner_to_sibling" 			"PIN_CENTER_TOP"
+				"pin_to_sibling_corner"				"PIN_CENTER_TOP"
 			}
 
 			"Rockets"
@@ -332,23 +333,23 @@
 				"proportionaltoparent"				"1"
 				"bgcolor_override"					"130 130 130 255"
 			}
-			"RocketsLabel"
+			"RocketIcon"
 			{
-				"ControlName"						"CExLabel"
-				"fieldName"							"RocketsLabel"
-				"font"								"Size 7"
+				"ControlName"						"ImagePanel"
+				"fieldName"							"RocketIcon"
 				"xpos"								"0"
 				"ypos"								"0"
 				"zpos"								"1"
-				"wide"								"30"
+				"wide"								"25"
 				"tall"								"6"
-				"visible"							"1"
+				"visible"							"0"
 				"enabled"							"1"
-				"labelText"							"ROCKETS"
-				"textAlignment"						"center"
-				"fgcolor"							"Black"
-				"proportionaltoparent"				"1"
+				"scaleImage"						"1"
+				"image"								"replay/thumbnails/game/buildingstatus_rockets"
+				"drawcolor"							"Black"
 				"pin_to_sibling" 					"Rockets"
+				"pin_corner_to_sibling" 			"PIN_CENTER_TOP"
+				"pin_to_sibling_corner"				"PIN_CENTER_TOP"
 			}
 
 			"Upgrade"
@@ -365,31 +366,32 @@
 				"proportionaltoparent"				"1"
 				"bgcolor_override"					"130 130 130 255"
 			}
+			"UpgradeIcon"
+			{
+				"ControlName"						"CIconPanel"
+				"fieldName"							"UpgradeIcon"
+				"xpos"								"0"
+				"ypos"								"0"
+				"zpos"								"3"
+				"wide"								"25"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"scaleImage"						"1"
+				"icon"								"ico_metal"
+				"iconColor"							"Black"
+
+				"pin_to_sibling" 					"Upgrade"
+				"pin_corner_to_sibling" 			"PIN_CENTER_TOP"
+				"pin_to_sibling_corner"				"PIN_CENTER_TOP"
+			}
 
 			"KillIcon"
 			{
 				"ControlName"						"ImagePanel"
 				"fieldName"							"KillIcon"
 				"xpos"								"9999"
 			}
-			"ShellIcon"
-			{
-				"ControlName"						"ImagePanel"
-				"fieldName"							"ShellIcon"
-				"xpos"								"9999"
-			}
-			"RocketIcon"
-			{
-				"ControlName"						"ImagePanel"
-				"fieldName"							"RocketIcon"
-				"xpos"								"9999"
-			}
-			"UpgradeIcon"
-			{
-				"ControlName"						"CIconPanel"
-				"fieldName"							"UpgradeIcon"
-				"xpos"								"9999"
-			}
 		}
 	}
 

diff --git a/resource/ui/hud_obj_sentrygun_disp.res b/resource/ui/hud_obj_sentrygun_disp.res
@@ -258,23 +258,24 @@
 				"proportionaltoparent"				"1"
 				"bgcolor_override"					"130 130 130 255"
 			}
-			"ShellLabel"
+			"ShellIcon"
 			{
-				"ControlName"						"CExLabel"
-				"fieldName"							"ShellLabel"
-				"font"								"Size 7"
+				"ControlName"						"ImagePanel"
+				"fieldName"							"ShellIcon"
 				"xpos"								"0"
 				"ypos"								"0"
 				"zpos"								"1"
-				"wide"								"30"
+				"wide"								"25"
 				"tall"								"6"
 				"visible"							"1"
 				"enabled"							"1"
-				"labelText"							"AMMO"
-				"textAlignment"						"center"
-				"fgcolor"							"Black"
-				"proportionaltoparent"				"1"
+				"scaleImage"						"1"
+				"image"								"replay/thumbnails/game/buildingstatus_ammo"
+				"drawcolor"							"Black"
+
 				"pin_to_sibling" 					"Shells"
+				"pin_corner_to_sibling" 			"PIN_CENTER_TOP"
+				"pin_to_sibling_corner"				"PIN_CENTER_TOP"
 			}
 
 			"KillIcon"
@@ -283,12 +284,6 @@
 				"fieldName"							"KillIcon"
 				"xpos"								"9999"
 			}
-			"ShellIcon"
-			{
-				"ControlName"						"ImagePanel"
-				"fieldName"							"ShellIcon"
-				"xpos"								"9999"
-			}
 		}
 	}
 

diff --git a/resource/ui/hud_obj_tele_entrance.res b/resource/ui/hud_obj_tele_entrance.res
@@ -330,13 +330,6 @@
 				}
 			}
 
-			"UpgradeIcon"
-			{
-				"ControlName"						"CIconPanel"
-				"fieldName"							"UpgradeIcon"
-				"xpos"								"9999"
-			}
-
 			"Upgrade"
 			{
 				"ControlName"						"ContinuousProgressBar"
@@ -351,6 +344,25 @@
 				"proportionaltoparent"				"1"
 				"bgcolor_override"					"130 130 130 255"
 			}
+			"UpgradeIcon"
+			{
+				"ControlName"						"CIconPanel"
+				"fieldName"							"UpgradeIcon"
+				"xpos"								"0"
+				"ypos"								"0"
+				"zpos"								"3"
+				"wide"								"25"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"scaleImage"						"1"
+				"icon"								"ico_metal"
+				"iconColor"							"Black"
+
+				"pin_to_sibling" 					"Upgrade"
+				"pin_corner_to_sibling" 			"PIN_CENTER_TOP"
+				"pin_to_sibling_corner"				"PIN_CENTER_TOP"
+			}
 		}
 	}
 

diff --git a/resource/ui/hud_obj_tele_exit.res b/resource/ui/hud_obj_tele_exit.res
@@ -228,13 +228,6 @@
 			"visible"								"0"
 			"proportionaltoparent"					"1"
 
-			"UpgradeIcon"
-			{
-				"ControlName"						"CIconPanel"
-				"fieldName"							"UpgradeIcon"
-				"xpos"								"9999"
-			}
-
 			"Upgrade"
 			{
 				"ControlName"						"ContinuousProgressBar"
@@ -249,6 +242,25 @@
 				"proportionaltoparent"				"1"
 				"bgcolor_override"					"130 130 130 255"
 			}
+			"UpgradeIcon"
+			{
+				"ControlName"						"CIconPanel"
+				"fieldName"							"UpgradeIcon"
+				"xpos"								"0"
+				"ypos"								"0"
+				"zpos"								"3"
+				"wide"								"25"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"scaleImage"						"1"
+				"icon"								"ico_metal"
+				"iconColor"							"Black"
+
+				"pin_to_sibling" 					"Upgrade"
+				"pin_corner_to_sibling" 			"PIN_CENTER_TOP"
+				"pin_to_sibling_corner"				"PIN_CENTER_TOP"
+			}
 		}
 	}
 

diff --git a/scripts/mod_textures.txt b/scripts/mod_textures.txt
@@ -2066,11 +2066,11 @@
 
 		"ico_metal"
 		{
-			"file"		"vgui\logos\build icons\metal"
+			"file"		"vgui\replay\thumbnails\game\buildingstatus_upgrade"
 			"x"		"0"
 			"y"		"0"
-			"width"		"32"
-			"height"	"32"
+			"width"		"64"
+			"height"	"16"
 		}
 
 		"ico_demolish"