Merge pull request #143 from raysfire/update

v2020.0412

5 files changed, 123 insertions, 124 deletions

diff --git a/resource/ui/destroy_menu/base_active.res b/resource/ui/destroy_menu/base_active.res
index 98f74b6..2d8f4a8 100644
--- a/resource/ui/destroy_menu/base_active.res
+++ b/resource/ui/destroy_menu/base_active.res
@@ -5,10 +5,10 @@
 		"ControlName"		"CExLabel"
 		"fieldName"			"ItemNameLabel"
 		"font"				"CerbeticaBold12"
-		"xpos"				"15"
-		"ypos"				"2"
+		"xpos"				"0"
+		"ypos"				"10"
 		"zpos"				"1"
-		"wide"				"70"
+		"wide"				"100"
 		"tall"				"15"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -24,27 +24,27 @@
 	{
 		"ControlName"		"CIconPanel"
 		"fieldName"			"ItemBackground"
-		"xpos"				"9999"
-		"ypos"				"9999"
+		"xpos"				"4"
+		"ypos"				"14"
 		"zpos"				"0"
 		"wide"				"98"
 		"tall"				"105"
-		"visible"			"1"
-		"enabled"			"1"
+		"visible"			"0"
+		"enabled"			"0"
 		"scaleImage"		"1"
-		"icon"				"hud_menu_item_bg_outline"
-		"iconColor"			"ProgressOffWhite"
+		"icon"				"hud_menu_item_bg"
+		"iconColor"			"Black"
 	}
 	
 	"BuildingIcon"
 	{
 		"ControlName"		"CIconPanel"
 		"fieldName"			"BuildingIcon"
-		"xpos"				"10"
-		"ypos"				"12"
+		"xpos"				"22"
+		"ypos"				"43"
 		"zpos"				"2"
-		"wide"				"80"
-		"tall"				"80"
+		"wide"				"56"
+		"tall"				"56"
 		"visible"			"1"
 		"enabled"			"1"
 		"scaleImage"		"1"
@@ -56,11 +56,11 @@
 	{
 		"ControlName"		"CIconPanel"
 		"fieldName"			"DestroyIcon"
-		"xpos"				"13"
-		"ypos"				"18"
-		"zpos"				"1"
-		"wide"				"70"
-		"tall"				"70"
+		"xpos"				"22"
+		"ypos"				"43"
+		"zpos"				"2"
+		"wide"				"56"
+		"tall"				"56"
 		"visible"			"1"
 		"enabled"			"1"
 		"scaleImage"		"1"
@@ -72,11 +72,11 @@
 	{
 		"ControlName"		"CIconPanel"
 		"fieldName"			"NumberBg"
-		"xpos"				"0"
-		"ypos"				"0"
+		"xpos"				"41"
+		"ypos"				"106"
 		"zpos"				"0"
-		"wide"				"0"
-		"tall"				"0"
+		"wide"				"18"
+		"tall"				"18"
 		"visible"			"0"
 		"enabled"			"0"
 		"scaleImage"		"1"
@@ -91,10 +91,10 @@
 		"font"				"CerbeticaBold20"
 		"fgcolor"			"TanLight"
 		"xpos"				"0"
-		"ypos"				"95"
+		"ypos"				"105"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"18"
+		"tall"				"20"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
diff --git a/resource/ui/destroy_menu/base_inactive.res b/resource/ui/destroy_menu/base_inactive.res
index 0424ff4..82099ff 100644
--- a/resource/ui/destroy_menu/base_inactive.res
+++ b/resource/ui/destroy_menu/base_inactive.res
@@ -5,10 +5,10 @@
 		"ControlName"		"CExLabel"
 		"fieldName"			"ItemNameLabel"
 		"font"				"CerbeticaBold12"
-		"xpos"				"15"
-		"ypos"				"2"
+		"xpos"				"0"
+		"ypos"				"10"
 		"zpos"				"1"
-		"wide"				"70"
+		"wide"				"100"
 		"tall"				"15"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -18,34 +18,34 @@
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
-		"fgcolor_override"	"ColorRed"
+		"fgcolor"			"ColorRed"
 	}
 	
 	"ItemBackground"
 	{
 		"ControlName"		"CIconPanel"
 		"fieldName"			"ItemBackground"
-		"xpos"				"9999"
-		"ypos"				"9999"
+		"xpos"				"4"
+		"ypos"				"14"
 		"zpos"				"0"
 		"wide"				"98"
 		"tall"				"105"
-		"visible"			"1"
-		"enabled"			"1"
+		"visible"			"0"
+		"enabled"			"0"
 		"scaleImage"		"1"
 		"icon"				"hud_menu_item_bg_outline"
-		"iconColor"			"ProgressOffWhiteTransparent"
+		"iconColor"			"Black"
 	}
 	
 	"NotBuiltLabel"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"NotBuiltLabel"
-		"font"				"CerbeticaBold20"
-		"xpos"				"10"
-		"ypos"				"48"
+		"font"				"CerbeticaBold16"
+		"xpos"				"0"
+		"ypos"				"60"
 		"zpos"				"2"
-		"wide"				"80"
+		"wide"				"100"
 		"tall"				"18"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -53,44 +53,42 @@
 		"enabled"			"1"
 		"labelText"			"#TF_NotBuilt"
 		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
+		"fgcolor"			"ColorRed"
 	}
 	
 	"UnavailableLabel"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"UnavailableLabel"
-		"font"				"CerbeticaBold20"
-		"xpos"				"10"
-		"ypos"				"48"
+		"font"				"CerbeticaBold16"
+		"xpos"				"0"
+		"ypos"				"60"
 		"zpos"				"2"
-		"wide"				"80"
+		"wide"				"100"
 		"tall"				"18"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"0"
 		"enabled"			"1"
 		"labelText"			"#Hud_Menu_Build_Unavailable"
-		"textAlignment"		"Center"
-		"dulltext"			"0"
-		"brighttext"		"0"
+		"textAlignment"		"center"
+		"fgcolor"			"ColorRed"
 	}
 	
 	"NumberBg"
 	{
 		"ControlName"		"CIconPanel"
 		"fieldName"			"NumberBg"
-		"xpos"				"9999"
-		"ypos"				"9999"
+		"xpos"				"41"
+		"ypos"				"106"
 		"zpos"				"0"
 		"wide"				"18"
 		"tall"				"18"
-		"visible"			"1"
-		"enabled"			"1"
+		"visible"			"0"
+		"enabled"			"0"
 		"scaleImage"		"1"
 		"icon"				"ico_key_blank"
-		"iconColor"			"255 255 255 128"
+		"iconColor"			"White"
 	}
 	
 	"NumberLabel"
@@ -98,12 +96,12 @@
 		"ControlName"		"CExLabel"
 		"fieldName"			"NumberLabel"
 		"font"				"CerbeticaBold20"
-		"fgcolor"			"TanLight"
+		"fgcolor"			"ColorRed"
 		"xpos"				"0"
-		"ypos"				"95"
+		"ypos"				"105"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"18"
+		"tall"				"20"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
diff --git a/resource/ui/destroy_menu/dispenser_active.res b/resource/ui/destroy_menu/dispenser_active.res
index 73b5c8f..7359440 100644
--- a/resource/ui/destroy_menu/dispenser_active.res
+++ b/resource/ui/destroy_menu/dispenser_active.res
@@ -5,21 +5,10 @@
 	"ItemNameLabel"
 	{
 		"labelText"			"#TF_Object_Dispenser"
-		"fgcolor_override"	"ColorGreen"
 	}
 	
 	"BuildingIcon"
 	{
 		"icon"				"obj_status_dispenser"
 	}
-	
-	"DestroyIcon"
-	{
-		"iconColor"			"ColorGreen"
-	}
-	
-	"NumberLabel"
-	{
-		"fgcolor_override"	"ColorGreen"
-	}
 }
\ No newline at end of file
diff --git a/resource/ui/destroy_menu/hudmenuengydestroy.res b/resource/ui/destroy_menu/hudmenuengydestroy.res
index 6617725..5dfe62c 100644
--- a/resource/ui/destroy_menu/hudmenuengydestroy.res
+++ b/resource/ui/destroy_menu/hudmenuengydestroy.res
@@ -2,18 +2,16 @@
 {
 	"MainBackground"
 	{
-		"ControlName"		"ImagePanel"
+		"ControlName"		"EditablePanel"
 		"fieldName"			"MainBackground"
-		"xpos"				"50"
-		"ypos"				"10"
+		"xpos"				"0"
+		"ypos"				"20"
 		"zpos"				"0"
 		"wide"				"400"
 		"tall"				"130"
 		"visible"			"1"
 		"enabled"			"1"
-		"scaleImage"		"1"	
-		"icon"				"hud_menu_bg"
-		"fillcolor"			"0 0 0 200"
+		"paintbackground" 	"0"
 	}
 	
 	"DestroyIcon"
@@ -22,14 +20,13 @@
 		"fieldName"			"DestroyIcon"
 		"xpos"				"9999"
 		"ypos"				"9999"
-		"zpos"				"0"
-		"wide"				"64"
-		"tall"				"64"
+		"zpos"				"1"
+		"wide"				"48"
+		"tall"				"48"
 		"visible"			"0"
 		"enabled"			"0"
-		"scaleImage"		"1"	
+		"scaleImage"		"1"
 		"icon"				"ico_demolish"
-		"iconColor"			"White"
 	}
 	
 	"TitleLabel"
@@ -37,11 +34,11 @@
 		"ControlName"		"CExLabel"
 		"fieldName"			"TitleLabel"
 		"font"				"CerbeticaBold32"
-		"xpos"				"68"
-		"ypos"				"-10"
+		"xpos"				"20"
+		"ypos"				"0"
 		"zpos"				"2"
-		"wide"				"300"
-		"tall"				"38"
+		"wide"				"380"
+		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -61,8 +58,8 @@
 		"xpos"				"-2"
 		"ypos"				"-2"
 		"zpos"				"1"
-		"wide"				"300"
-		"tall"				"38"
+		"wide"				"380"
+		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -101,11 +98,11 @@
 	{
 		"ControlName"		"CEngyDestroyMenuItem"
 		"fieldName"			"active_item_1"
-		"xpos"				"50"
-		"ypos"				"23"
+		"xpos"				"0"
+		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"124"
+		"tall"				"130"
 		"visible"			"1"
 	}
 	
@@ -113,11 +110,11 @@
 	{
 		"ControlName"		"CEngyDestroyMenuItem"
 		"fieldName"			"active_item_2"
-		"xpos"				"150"
-		"ypos"				"23"
+		"xpos"				"100"
+		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"124"
+		"tall"				"130"
 		"visible"			"1"
 	}
 	
@@ -125,11 +122,11 @@
 	{
 		"ControlName"		"CEngyDestroyMenuItem"
 		"fieldName"			"active_item_3"
-		"xpos"				"250"
-		"ypos"				"23"
+		"xpos"				"200"
+		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"124"
+		"tall"				"130"
 		"visible"			"1"
 	}
 	
@@ -137,11 +134,11 @@
 	{
 		"ControlName"		"CEngyDestroyMenuItem"
 		"fieldName"			"active_item_4"
-		"xpos"				"350"
-		"ypos"				"23"
+		"xpos"				"300"
+		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"124"
+		"tall"				"130"
 		"visible"			"1"
 	}
 	
@@ -149,11 +146,11 @@
 	{
 		"ControlName"		"CEngyDestroyMenuItem"
 		"fieldName"			"inactive_item_1"
-		"xpos"				"50"
-		"ypos"				"23"
+		"xpos"				"0"
+		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"124"
+		"tall"				"130"
 		"visible"			"1"
 	}
 	
@@ -161,11 +158,11 @@
 	{
 		"ControlName"		"CEngyDestroyMenuItem"
 		"fieldName"			"inactive_item_2"
-		"xpos"				"150"
-		"ypos"				"23"
+		"xpos"				"100"
+		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"124"
+		"tall"				"130"
 		"visible"			"1"
 	}
 	
@@ -173,11 +170,11 @@
 	{
 		"ControlName"		"CEngyDestroyMenuItem"
 		"fieldName"			"inactive_item_3"
-		"xpos"				"250"
-		"ypos"				"23"
+		"xpos"				"200"
+		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"124"
+		"tall"				"130"
 		"visible"			"1"
 	}
 	
@@ -185,11 +182,11 @@
 	{
 		"ControlName"		"CEngyDestroyMenuItem"
 		"fieldName"			"inactive_item_4"
-		"xpos"				"350"
-		"ypos"				"23"
+		"xpos"				"300"
+		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"124"
+		"tall"				"130"
 		"visible"			"1"
 	}
 	
@@ -197,47 +194,62 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"unavailable_item_1"
-		"xpos"				"50"
-		"ypos"				"23"
+		"xpos"				"0"
+		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"124"
-		"visible"			"0"
+		"tall"				"130"
+		"visible"			"1"
 	}
 	
 	"unavailable_item_2"
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"unavailable_item_2"
-		"xpos"				"150"
-		"ypos"				"23"
+		"xpos"				"100"
+		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"124"
-		"visible"			"0"
+		"tall"				"130"
+		"visible"			"1"
 	}
 	
 	"unavailable_item_3"
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"unavailable_item_3"
-		"xpos"				"250"
-		"ypos"				"23"
+		"xpos"				"200"
+		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"124"
-		"visible"			"0"
+		"tall"				"130"
+		"visible"			"1"
 	}
 	
 	"unavailable_item_4"
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"unavailable_item_4"
-		"xpos"				"350"
-		"ypos"				"23"
+		"xpos"				"300"
+		"ypos"				"20"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"124"
-		"visible"			"0"
+		"tall"				"130"
+		"visible"			"1"
+	}
+	
+	"MenuBG"
+	{
+		"ControlName"		"EditablePanel"
+		"fieldName"			"MenuBG"
+		"xpos"				"0"
+		"ypos"				"20"
+		"zpos"				"1"
+		"wide"				"400"
+		"tall"				"130"
+		"visible"			"1"
+		"enabled"			"1"
+		"bgcolor_override"	"TransparentBlack"
+		"PaintBackgroundType"	"2"
 	}
 }
\ 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 4578c26..3048d1c 100644
--- a/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res
+++ b/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res
@@ -6,8 +6,8 @@
 	{
 		"ControlName"		"CTFImagePanel"
 		"fieldName"			"ItemBackground"
-		"xpos"				"50"
-		"ypos"				"10"
+		"xpos"				"0"
+		"ypos"				"20"
 		"zpos"				"0"
 		"wide"				"400"
 		"tall"				"130"