From ced4c955b2a5ae691226f47efd0b0f6965ed0415 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Wed, 5 Aug 2020 20:00:36 -0400
Subject: Updated PDA, Achievement Tracker

- Updated the position of the achievement tracker and Engineer buildings.
- Visual tweaks to the Engineer PDA and taunt menues.
---
 resource/ui/build_menu/base_cant_afford.res | 59 ++++++++++++++---------------
 1 file changed, 29 insertions(+), 30 deletions(-)

(limited to 'resource/ui/build_menu/base_cant_afford.res')

diff --git a/resource/ui/build_menu/base_cant_afford.res b/resource/ui/build_menu/base_cant_afford.res
index 53f3b10..9679fe8 100644
--- a/resource/ui/build_menu/base_cant_afford.res
+++ b/resource/ui/build_menu/base_cant_afford.res
@@ -4,9 +4,9 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ItemNameLabel"
-		"font"				"CerbeticaBold12"
+		"font"				"Cerbetica14"
 		"xpos"				"0"
-		"ypos"				"10"
+		"ypos"				"4"
 		"zpos"				"1"
 		"wide"				"100"
 		"tall"				"15"
@@ -33,43 +33,43 @@
 		"visible"			"0"
 		"enabled"			"0"
 		"scaleImage"		"1"
-		"icon"				"hud_menu_item_bg"
-		"iconColor"			"Black"
+		"icon"				"hud_menu_item_bg_outline"
+		"iconColor"			"0 0 0 196"
 	}
 
 	"BuildingIcon"
 	{
 		"ControlName"		"CIconPanel"
 		"fieldName"			"BuildingIcon"
-		"xpos"				"9999"
-		"ypos"				"9999"
+		"xpos"				"22"
+		"ypos"				"35"
 		"zpos"				"2"
 		"wide"				"56"
 		"tall"				"56"
-		"visible"			"1"
-		"enabled"			"1"
+		"visible"			"0"
+		"enabled"			"0"
 		"scaleImage"		"1"
 		"icon"				"hud_menu_sentry_build"
-		"iconColor"			"White"
+		"iconColor"			"ColorRed"
 	}
 
 	"CantBuildReason"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"CantBuildReason"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica14"
+		"fgcolor"			"ColorRed"
 		"xpos"				"0"
 		"ypos"				"60"
 		"zpos"				"2"
 		"wide"				"100"
-		"tall"				"18"
+		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"labelText"			"Metal Required"
+		"labelText"			"#Hud_Menu_Build_Cant_Afford"
 		"textAlignment"		"center"
-		"fgcolor"			"ColorRed"
 	}
 
 	"MetalIcon"
@@ -77,7 +77,7 @@
 		"ControlName"		"CIconPanel"
 		"fieldName"			"MetalIcon"
 		"xpos"				"34"
-		"ypos"				"26"
+		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"10"
 		"tall"				"10"
@@ -92,33 +92,32 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"CostLabel"
-		"font"				"CerbeticaBold16"
-		"fgcolor"			"TanLight"
+		"font"				"Cerbetica14"
+		"fgcolor"			"ColorRed"
 		"xpos"				"50"
-		"ypos"				"25"
-		"zpos"				"1"
+		"ypos"				"20"
+		"zpos"				"4"
 		"wide"				"50"
-		"tall"				"13"
+		"tall"				"10"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"%metal%"
 		"textAlignment"		"Left"
-		"fgcolor_override"	"ColorRed"
 	}
 
 	"CostLabelShadow"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"CostLabelShadow"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica14"
 		"fgcolor"			"TransparentBlack"
-		"xpos"				"-2"
-		"ypos"				"-2"
+		"xpos"				"-1"
+		"ypos"				"-1"
 		"zpos"				"0"
 		"wide"				"50"
-		"tall"				"13"
+		"tall"				"10"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -136,7 +135,7 @@
 		"ControlName"		"CExLabel"
 		"fieldName"			"ModeLabel"
 		"font"				"DefaultSmall"
-		"fgcolor"			"TanDarker"
+		"fgcolor"			"TanDark"
 		"xpos"				"33"
 		"ypos"				"17"
 		"zpos"				"1"
@@ -155,10 +154,10 @@
 		"ControlName"		"CIconPanel"
 		"fieldName"			"NumberBg"
 		"xpos"				"41"
-		"ypos"				"106"
+		"ypos"				"99"
 		"zpos"				"0"
-		"wide"				"18"
-		"tall"				"18"
+		"wide"				"0"
+		"tall"				"0"
 		"visible"			"0"
 		"enabled"			"0"
 		"scaleImage"		"1"
@@ -170,10 +169,10 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"NumberLabel"
-		"font"				"CerbeticaBold20"
+		"font"				"Cerbetica20"
 		"fgcolor"			"ColorRed"
 		"xpos"				"0"
-		"ypos"				"105"
+		"ypos"				"95"
 		"zpos"				"1"
 		"wide"				"100"
 		"tall"				"20"
-- 
cgit v1.2.3


From e391ac81598292127c356fcb6adbd83db72c5888 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Fri, 7 Aug 2020 20:38:01 -0400
Subject: Font Update

- Converted Cerbetica fonts from TTF to OTF
- Removed unused font definitions to reduce loading times
---
 resource/ui/build_menu/base_cant_afford.res | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'resource/ui/build_menu/base_cant_afford.res')

diff --git a/resource/ui/build_menu/base_cant_afford.res b/resource/ui/build_menu/base_cant_afford.res
index 9679fe8..c8a3bb0 100644
--- a/resource/ui/build_menu/base_cant_afford.res
+++ b/resource/ui/build_menu/base_cant_afford.res
@@ -4,7 +4,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ItemNameLabel"
-		"font"				"Cerbetica14"
+		"font"				"HudFontSmall"
 		"xpos"				"0"
 		"ypos"				"4"
 		"zpos"				"1"
@@ -34,7 +34,7 @@
 		"enabled"			"0"
 		"scaleImage"		"1"
 		"icon"				"hud_menu_item_bg_outline"
-		"iconColor"			"0 0 0 196"
+		"iconColor"			"TransparentBlack"
 	}
 
 	"BuildingIcon"
@@ -57,7 +57,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"CantBuildReason"
-		"font"				"Cerbetica14"
+		"font"				"HudFontSmall"
 		"fgcolor"			"ColorRed"
 		"xpos"				"0"
 		"ypos"				"60"
@@ -92,7 +92,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"CostLabel"
-		"font"				"Cerbetica14"
+		"font"				"HudFontSmall"
 		"fgcolor"			"ColorRed"
 		"xpos"				"50"
 		"ypos"				"20"
@@ -111,7 +111,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"CostLabelShadow"
-		"font"				"Cerbetica14"
+		"font"				"HudFontSmall"
 		"fgcolor"			"TransparentBlack"
 		"xpos"				"-1"
 		"ypos"				"-1"
@@ -169,7 +169,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"NumberLabel"
-		"font"				"Cerbetica20"
+		"font"				"HudFontMediumSecondary"
 		"fgcolor"			"ColorRed"
 		"xpos"				"0"
 		"ypos"				"95"
-- 
cgit v1.2.3