Merge pull request #149 from raysfire/dev

v2020.0808

8 files changed, 38 insertions, 60 deletions

diff --git a/resource/ui/destroy_menu/base_active.res b/resource/ui/destroy_menu/base_active.res
index c76aa1d..2ace4fa 100644
--- a/resource/ui/destroy_menu/base_active.res
+++ b/resource/ui/destroy_menu/base_active.res
@@ -4,9 +4,9 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ItemNameLabel"
-		"font"				"CerbeticaBold12"
+		"font"				"HudFontSmall"
 		"xpos"				"0"
-		"ypos"				"10"
+		"ypos"				"4"
 		"zpos"				"1"
 		"wide"				"100"
 		"tall"				"15"
@@ -32,8 +32,8 @@
 		"visible"			"0"
 		"enabled"			"0"
 		"scaleImage"		"1"
-		"icon"				"hud_menu_item_bg"
-		"iconColor"			"Black"
+		"icon"				"hud_menu_item_bg_outline"
+		"iconColor"			"ProgressOffWhite"
 	}
 
 	"BuildingIcon"
@@ -41,14 +41,14 @@
 		"ControlName"		"CIconPanel"
 		"fieldName"			"BuildingIcon"
 		"xpos"				"22"
-		"ypos"				"43"
+		"ypos"				"25"
 		"zpos"				"2"
 		"wide"				"56"
 		"tall"				"56"
 		"visible"			"1"
 		"enabled"			"1"
 		"scaleImage"		"1"
-		"icon"				"obj_status_sentrygun_1"
+		"icon"				"hud_menu_sentry_build"
 		"iconColor"			"White"
 	}
 
@@ -57,7 +57,7 @@
 		"ControlName"		"CIconPanel"
 		"fieldName"			"DestroyIcon"
 		"xpos"				"22"
-		"ypos"				"43"
+		"ypos"				"33"
 		"zpos"				"2"
 		"wide"				"56"
 		"tall"				"56"
@@ -73,10 +73,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"
@@ -88,10 +88,10 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"NumberLabel"
-		"font"				"CerbeticaBold20"
+		"font"				"HudFontMediumSecondary"
 		"fgcolor"			"TanLight"
 		"xpos"				"0"
-		"ypos"				"105"
+		"ypos"				"95"
 		"zpos"				"1"
 		"wide"				"100"
 		"tall"				"20"
diff --git a/resource/ui/destroy_menu/base_inactive.res b/resource/ui/destroy_menu/base_inactive.res
index 64f4b89..119d671 100644
--- a/resource/ui/destroy_menu/base_inactive.res
+++ b/resource/ui/destroy_menu/base_inactive.res
@@ -4,9 +4,9 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ItemNameLabel"
-		"font"				"CerbeticaBold12"
+		"font"				"HudFontSmall"
 		"xpos"				"0"
-		"ypos"				"10"
+		"ypos"				"4"
 		"zpos"				"1"
 		"wide"				"100"
 		"tall"				"15"
@@ -18,7 +18,7 @@
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
-		"fgcolor"			"ColorRed"
+		"fgcolor_override"	"ColorRed"
 	}
 
 	"ItemBackground"
@@ -41,7 +41,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"NotBuiltLabel"
-		"font"				"CerbeticaBold16"
+		"font"				"HudFontSmall"
 		"xpos"				"0"
 		"ypos"				"60"
 		"zpos"				"2"
@@ -53,14 +53,14 @@
 		"enabled"			"1"
 		"labelText"			"#TF_NotBuilt"
 		"textAlignment"		"center"
-		"fgcolor"			"ColorRed"
+		"fgcolor_override"	"ColorRed"
 	}
 
 	"UnavailableLabel"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"UnavailableLabel"
-		"font"				"CerbeticaBold16"
+		"font"				"HudFontSmall"
 		"xpos"				"0"
 		"ypos"				"60"
 		"zpos"				"2"
@@ -72,7 +72,9 @@
 		"enabled"			"1"
 		"labelText"			"#Hud_Menu_Build_Unavailable"
 		"textAlignment"		"center"
-		"fgcolor"			"ColorRed"
+		"dulltext"			"0"
+		"brighttext"		"0"
+		"fgcolor_override"	"ColorRed"
 	}
 
 	"NumberBg"
@@ -80,10 +82,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"
@@ -95,10 +97,10 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"NumberLabel"
-		"font"				"CerbeticaBold20"
+		"font"				"HudFontMediumSecondary"
 		"fgcolor"			"ColorRed"
 		"xpos"				"0"
-		"ypos"				"105"
+		"ypos"				"95"
 		"zpos"				"1"
 		"wide"				"100"
 		"tall"				"20"
diff --git a/resource/ui/destroy_menu/hudmenuengydestroy.res b/resource/ui/destroy_menu/hudmenuengydestroy.res
index 443b472..35accc6 100644
--- a/resource/ui/destroy_menu/hudmenuengydestroy.res
+++ b/resource/ui/destroy_menu/hudmenuengydestroy.res
@@ -8,10 +8,10 @@
 		"ypos"				"20"
 		"zpos"				"0"
 		"wide"				"400"
-		"tall"				"130"
+		"tall"				"120"
 		"visible"			"1"
 		"enabled"			"1"
-		"paintbackground" 	"0"
+		"paintbackground"	"0"
 	}
 
 	"DestroyIcon"
@@ -33,7 +33,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"TitleLabel"
-		"font"				"CerbeticaBold32"
+		"font"				"Cerbetica28"
 		"xpos"				"20"
 		"ypos"				"0"
 		"zpos"				"2"
@@ -44,7 +44,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"#Hud_menu_demolish_title"
-		"textAlignment"		"Left"
+		"textAlignment"		"west"
 		"dulltext"			"0"
 		"brighttext"		"0"
 	}
@@ -53,7 +53,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"TitleLabelDropshadow"
-		"font"				"CerbeticaBold32"
+		"font"				"Cerbetica28"
 		"fgcolor"			"TransparentBlack"
 		"xpos"				"-2"
 		"ypos"				"-2"
@@ -65,7 +65,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"#Hud_menu_demolish_title"
-		"textAlignment"		"Left"
+		"textAlignment"		"west"
 		"dulltext"			"1"
 		"brighttext"		"0"
 
@@ -192,7 +192,7 @@
 
 	"unavailable_item_1"
 	{
-		"ControlName"		"EditablePanel"
+		"ControlName"		"CEngyDestroyMenuItem"
 		"fieldName"			"unavailable_item_1"
 		"xpos"				"0"
 		"ypos"				"20"
@@ -204,7 +204,7 @@
 
 	"unavailable_item_2"
 	{
-		"ControlName"		"EditablePanel"
+		"ControlName"		"CEngyDestroyMenuItem"
 		"fieldName"			"unavailable_item_2"
 		"xpos"				"100"
 		"ypos"				"20"
@@ -216,7 +216,7 @@
 
 	"unavailable_item_3"
 	{
-		"ControlName"		"EditablePanel"
+		"ControlName"		"CEngyDestroyMenuItem"
 		"fieldName"			"unavailable_item_3"
 		"xpos"				"200"
 		"ypos"				"20"
@@ -228,7 +228,7 @@
 
 	"unavailable_item_4"
 	{
-		"ControlName"		"EditablePanel"
+		"ControlName"		"CEngyDestroyMenuItem"
 		"fieldName"			"unavailable_item_4"
 		"xpos"				"300"
 		"ypos"				"20"
@@ -246,7 +246,7 @@
 		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"400"
-		"tall"				"130"
+		"tall"				"120"
 		"visible"			"1"
 		"enabled"			"1"
 		"bgcolor_override"	"TransparentBlack"
diff --git a/resource/ui/destroy_menu/pipboy/dispenser_inactive.res b/resource/ui/destroy_menu/pipboy/dispenser_inactive.res
index 9e31cc8..4a651a8 100644
--- a/resource/ui/destroy_menu/pipboy/dispenser_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/dispenser_inactive.res
@@ -5,11 +5,5 @@
 	"ItemNameLabel"
 	{
 		"labelText"			"#TF_Object_Dispenser"
-		"fgcolor_override"	"ColorRed"
-	}
-
-	"NumberLabel"
-	{
-		"fgcolor_override"	"ColorRed"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res b/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res
index ab4b7bc..3cba041 100644
--- a/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res
+++ b/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res
@@ -10,7 +10,7 @@
 		"ypos"				"20"
 		"zpos"				"0"
 		"wide"				"400"
-		"tall"				"130"
+		"tall"				"120"
 		"visible"			"1"
 		"enabled"			"1"
 		"scaleImage"		"1"
diff --git a/resource/ui/destroy_menu/pipboy/sentry_inactive.res b/resource/ui/destroy_menu/pipboy/sentry_inactive.res
index 6f1c439..9c98ac0 100644
--- a/resource/ui/destroy_menu/pipboy/sentry_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/sentry_inactive.res
@@ -5,11 +5,5 @@
 	"ItemNameLabel"
 	{
 		"labelText"			"#TF_Object_Sentry"
-		"fgcolor_override"	"ColorRed"
-	}
-
-	"NumberLabel"
-	{
-		"fgcolor_override"	"ColorRed"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res b/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res
index 58caa71..be3e807 100644
--- a/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res
@@ -5,11 +5,5 @@
 	"ItemNameLabel"
 	{
 		"labelText"			"#TF_Object_Tele_Entrance_360"
-		"fgcolor_override"	"ColorRed"
-	}
-
-	"NumberLabel"
-	{
-		"fgcolor_override"	"ColorRed"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res b/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res
index 2f62835..f236327 100644
--- a/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res
@@ -5,11 +5,5 @@
 	"ItemNameLabel"
 	{
 		"labelText"			"#TF_Object_Tele_Exit_360"
-		"fgcolor_override"	"ColorRed"
-	}
-
-	"NumberLabel"
-	{
-		"fgcolor_override"	"ColorRed"
 	}
 }
\ No newline at end of file