Backend Changes

- Fixed certain colors not being enforced from the customizable files
- Backend cleanup. Colors are assigned to their schema name.
- Updated the PDA and killstreak count's use of #base.
- Removed the Smissmas promo from the Mann Co. Store

9 files changed, 50 insertions, 98 deletions

diff --git a/resource/ui/destroy_menu/pipboy/dispenser_active.res b/resource/ui/destroy_menu/pipboy/dispenser_active.res
index b16705d..52c9f0b 100644
--- a/resource/ui/destroy_menu/pipboy/dispenser_active.res
+++ b/resource/ui/destroy_menu/pipboy/dispenser_active.res
@@ -1,24 +1,25 @@
-#base "../dispenser_active.res"
+#base "../base_active.res"
 
 "Resource/UI/destroy_menu/dispenser_active.res"
 {
 	"ItemNameLabel"
 	{
-		"fgcolor"		"ColorGreen"
+		"labelText"			"#TF_Object_Dispenser"
+		"fgcolor_override"	"ColorGreen"
 	}
 	
-	"DestroyIcon"
+	"BuildingIcon"
 	{
-		"iconColor"		"ColorGreen"
+		"icon"				"obj_status_dispenser"
 	}
 	
-	"BuildingIcon"	
+	"DestroyIcon"
 	{
-		"iconColor"		"ColorGreen"
+		"iconColor"			"ColorGreen"
 	}
 	
 	"NumberLabel"
 	{
-		"fgcolor"		"ColorGreen"
+		"fgcolor_override"	"ColorGreen"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/destroy_menu/pipboy/dispenser_inactive.res b/resource/ui/destroy_menu/pipboy/dispenser_inactive.res
index 9538284..3cc7bd2 100644
--- a/resource/ui/destroy_menu/pipboy/dispenser_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/dispenser_inactive.res
@@ -1,24 +1,15 @@
-#base "../dispenser_inactive.res"
+#base "../base_inactive.res"
 
 "Resource/UI/build_menu/dispenser_inactive.res"
 {
 	"ItemNameLabel"
 	{
-		"fgcolor"		"ColorGreen"
-	}
-	
-	"NotBuiltLabel"
-	{
-		"fgcolor"		"ColorGreen"
-	}
-	
-	"UnavailableLabel"
-	{
-		"fgcolor"		"ColorGreen"
+		"labelText"			"#TF_Object_Dispenser"
+		"fgcolor_override"	"ColorRed"
 	}
 	
 	"NumberLabel"
 	{
-		"fgcolor"		"ColorGreen"
+		"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 8743044..4578c26 100644
--- a/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res
+++ b/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res
@@ -18,22 +18,6 @@
 		"tileImage"			"1"
 		"drawcolor"			"192 192 192 255"
 	}
-	"BackgroundEngineer"
-	{
-		"ControlName"		"CTFImagePanel"
-		"fieldName"			"BackgroundEngineer"
-		"xpos"				"9999"
-		"ypos"				"9999"
-		"zpos"				"-1"
-		"wide"				"40"
-		"tall"				"40"
-		"visible"			"1"
-		"enabled"			"1"
-		"scaleImage"		"1"	
-		"image"				"pipboy_engineer"
-		"tileImage"			"0"
-		"tileVertically"	"0"
-	}
 	
 	"DestroyIcon"
 	{
diff --git a/resource/ui/destroy_menu/pipboy/sentry_active.res b/resource/ui/destroy_menu/pipboy/sentry_active.res
index a30673c..3ec3ffe 100644
--- a/resource/ui/destroy_menu/pipboy/sentry_active.res
+++ b/resource/ui/destroy_menu/pipboy/sentry_active.res
@@ -1,24 +1,25 @@
-#base "../sentry_active.res"
+#base "../base_active.res"
 
 "Resource/UI/destroy_menu/sentry_active.res"
 {
 	"ItemNameLabel"
 	{
-		"fgcolor"		"ColorGreen"
+		"labelText"			"#TF_Object_Sentry"
+		"fgcolor_override"	"ColorGreen"
 	}
 	
-	"DestroyIcon"	
+	"BuildingIcon"
 	{
-		"iconColor"		"ColorGreen"
+		"icon"				"obj_status_sentrygun_1"
 	}
 	
-	"BuildingIcon"	
+	"DestroyIcon"
 	{
-		"iconColor"		"ColorGreen"
+		"iconColor"			"ColorGreen"
 	}
 	
 	"NumberLabel"
 	{
-		"fgcolor"		"ColorGreen"
+		"fgcolor_override"	"ColorGreen"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/destroy_menu/pipboy/sentry_inactive.res b/resource/ui/destroy_menu/pipboy/sentry_inactive.res
index aaedbae..5170b91 100644
--- a/resource/ui/destroy_menu/pipboy/sentry_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/sentry_inactive.res
@@ -1,24 +1,15 @@
-#base "../sentry_inactive.res"
+#base "../base_inactive.res"
 
 "Resource/UI/destroy_menu/sentry_inactive.res"
 {
 	"ItemNameLabel"
 	{
-		"fgcolor"			"ColorGreen"
-	}
-	
-	"NotBuiltLabel"
-	{
-		"fgcolor"			"ColorGreen"
-	}
-	
-	"UnavailableLabel"
-	{
-		"fgcolor"			"ColorGreen"
+		"labelText"			"#TF_Object_Sentry"
+		"fgcolor_override"	"ColorRed"
 	}
 	
 	"NumberLabel"
 	{
-		"fgcolor"			"ColorGreen"
+		"fgcolor_override"	"ColorRed"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/destroy_menu/pipboy/tele_entrance_active.res b/resource/ui/destroy_menu/pipboy/tele_entrance_active.res
index 7d534c6..0d4f9f7 100644
--- a/resource/ui/destroy_menu/pipboy/tele_entrance_active.res
+++ b/resource/ui/destroy_menu/pipboy/tele_entrance_active.res
@@ -1,24 +1,25 @@
-#base "../tele_entrance_active.res"
+#base "../base_active.res"
 
 "Resource/UI/destroy_menu/tele_entrance_active.res"
 {
 	"ItemNameLabel"
 	{
-		"fgcolor"		"ColorGreen"
+		"labelText"			"#TF_Object_Tele_Entrance_360"
+		"fgcolor_override"	"ColorGreen"
 	}
 	
-	"DestroyIcon"	
+	"BuildingIcon"
 	{
-		"iconColor"		"ColorGreen"
+		"icon"				"obj_status_tele_entrance"
 	}
-		
-	"BuildingIcon"	
+	
+	"DestroyIcon"
 	{
-		"iconColor"		"ColorGreen"
+		"iconColor"			"ColorGreen"
 	}
 	
 	"NumberLabel"
 	{
-		"fgcolor"		"ColorGreen"
+		"fgcolor_override"	"ColorGreen"
 	}
 }
\ 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 948b64a..50a9c72 100644
--- a/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res
@@ -1,24 +1,15 @@
-#base "../tele_entrance_inactive.res"
+#base "../base_inactive.res"
 
 "Resource/UI/build_menu/tele_entrance_inactive.res"
 {
 	"ItemNameLabel"
 	{
-		"fgcolor"			"ColorGreen"
-	}
-	
-	"NotBuiltLabel"
-	{
-		"fgcolor"			"ColorGreen"
-	}
-	
-	"UnavailableLabel"
-	{
-		"fgcolor"			"ColorGreen"
+		"labelText"			"#TF_Object_Tele_Entrance_360"
+		"fgcolor_override"	"ColorRed"
 	}
 	
 	"NumberLabel"
 	{
-		"fgcolor"			"ColorGreen"
+		"fgcolor_override"	"ColorRed"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/destroy_menu/pipboy/tele_exit_active.res b/resource/ui/destroy_menu/pipboy/tele_exit_active.res
index f2a24a8..308ae65 100644
--- a/resource/ui/destroy_menu/pipboy/tele_exit_active.res
+++ b/resource/ui/destroy_menu/pipboy/tele_exit_active.res
@@ -1,24 +1,25 @@
-#base "../tele_exit_active.res"
+#base "../base_active.res"
 
 "Resource/UI/destroy_menu/tele_exit_active.res"
 {
 	"ItemNameLabel"
 	{
-		"fgcolor"		"ColorGreen"
+		"labelText"			"#TF_Object_Tele_Exit_360"
+		"fgcolor_override"	"ColorGreen"
 	}
 	
-	"DestroyIcon"	
+	"BuildingIcon"	
 	{
-		"iconColor"		"ColorGreen"
+		"icon"				"obj_status_tele_exit"
 	}
-		
-	"BuildingIcon"	
+	
+	"DestroyIcon"
 	{
-		"iconColor"		"ColorGreen"
+		"iconColor"			"ColorGreen"
 	}
 	
 	"NumberLabel"
 	{
-		"fgcolor"		"ColorGreen"
+		"fgcolor_override"	"ColorGreen"
 	}
 }
\ 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 936a295..a5a3e34 100644
--- a/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res
@@ -1,24 +1,15 @@
-#base "../tele_exit_inactive.res"
+#base "../base_inactive.res"
 
 "Resource/UI/build_menu/tele_exit_inactive.res"
 {
 	"ItemNameLabel"
 	{
-		"fgcolor"			"ColorGreen"
-	}
-	
-	"NotBuiltLabel"
-	{
-		"fgcolor"			"ColorGreen"
-	}
-	
-	"UnavailableLabel"
-	{
-		"fgcolor"			"ColorGreen"
+		"labelText"			"#TF_Object_Tele_Exit_360"
+		"fgcolor_override"	"ColorRed"
 	}
 	
 	"NumberLabel"
 	{
-		"fgcolor"			"ColorGreen"
+		"fgcolor_override"	"ColorRed"
 	}
 }
\ No newline at end of file