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

7 files changed, 56 insertions, 27 deletions

diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res
index 925f857..05e3a28 100644
--- a/resource/ui/econ/store/v2/storehome_base.res
+++ b/resource/ui/econ/store/v2/storehome_base.res
@@ -18,6 +18,7 @@
 		"bgcolor_override"				"DarkGrey"
 		"infocus_bgcolor_override"		"DarkGrey"
 		"outoffocus_bgcolor_override"	"DarkGrey"
+		
 		"item_controls_xoffset"	"2"
 		"item_controls_yoffset"	"2"
 		"max_cart_model_panels"	"8"
@@ -54,7 +55,7 @@
 			"bgcolor_override"		"25 25 25 255"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"0"
-			"paintborder"			"0"
+			"paintborder"	"0"
 			"model_xpos"	"24"
 			"model_ypos"	"6"
 			"model_wide"	"71"
@@ -76,7 +77,6 @@
 				"allow_rot"				"0"
 				"inventory_image_type"	"1"
 			}
-			
 			"use_item_sounds" "1"		
 		}
 		
@@ -106,10 +106,10 @@
 			"wide"			"32"
 			"tall"			"25"
 			"visible"		"0"
-			"bgcolor_override"		"0 0 0 255"
+			"bgcolor_override"		"ColorBlack"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"0"
-			"paintborder"			"0"
+			"paintborder"	"0"
 			
 			"model_xpos"	"2"
 			"model_ypos"	"2"
diff --git a/resource/ui/econ/store/v2/storehome_premium.res b/resource/ui/econ/store/v2/storehome_premium.res
new file mode 100644
index 0000000..2989ef1
--- /dev/null
+++ b/resource/ui/econ/store/v2/storehome_premium.res
@@ -0,0 +1,31 @@
+#base "StoreHome_Base.res"
+
+"Resource/UI/StoreHome_Premium.res"
+{
+	"PremiumCallout"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"PremiumCallout"
+		"xpos"			"c-323"
+		"ypos"			"c-45"
+		"zpos"			"-1"
+		"wide"			"300"
+		"tall"			"300"
+		"visible"		"1"
+		"enabled"		"1"
+	
+		"MannCoImage"
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"MannCoImage"
+			"wide"			"420"
+			"tall"			"220"
+			"visible"		"0"
+			"enabled"		"1"
+			"scaleImage"	"1"
+			"xpos"			"15"
+			"ypos"			"0"
+			"zpos"			"0"
+		}
+	}
+}
\ No newline at end of file
diff --git a/resource/ui/econ/store/v2/storepage.res b/resource/ui/econ/store/v2/storepage.res
index da0542d..dae9486 100644
--- a/resource/ui/econ/store/v2/storepage.res
+++ b/resource/ui/econ/store/v2/storepage.res
@@ -48,7 +48,7 @@
 			"wide"			"111"
 			"tall"			"62"
 			"visible"		"0"
-			"bgcolor_override"		"0 0 0 255"
+			"bgcolor_override"		"ColorBlack"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
@@ -74,7 +74,6 @@
 				"allow_rot"				"0"
 				"inventory_image_type" "1"
 			}
-			
 			"use_item_sounds" "1"
 		}
 		
@@ -103,7 +102,7 @@
 			"wide"			"32"
 			"tall"			"25"
 			"visible"		"0"
-			"bgcolor_override"		"0 0 0 255"
+			"bgcolor_override"		"ColorBlack"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res
index 994e991..d0aa382 100644
--- a/resource/ui/econ/store/v2/storepanel.res
+++ b/resource/ui/econ/store/v2/storepanel.res
@@ -138,7 +138,7 @@
 			"font"				"Cerbetica20"
 			"ypos"				"50"
 			"selectedcolor"		"TanLight"
-			"unselectedcolor"	"TanDark"	
+			"unselectedcolor"	"TanDark"
 			"paintbackground"	"1"
 			"defaultBgColor_override"		"25 25 25 255"
 			"unselectedBgColor_override"	"10 10 10 255"
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res
index e7f6bd1..fed93d6 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel.res
@@ -42,7 +42,7 @@
 		"Slider"
 		{
 			"PaintBackgroundType"	"0"
-			"fgcolor_override"		"132 132 132 255"
+			"fgcolor_override"		"DullWhite"
 		}
 		
 		"UpButton"
@@ -126,7 +126,7 @@
 			"wide"			"230"
 			"tall"			"15"
 			"autoResize"	"0"
-			"skip_autoresize" "1"
+			"skip_autoresize"	"1"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
@@ -229,7 +229,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"UsedByTextLabel"
@@ -262,7 +262,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"SlotTextLabel"
@@ -366,7 +366,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"TradableTextLabel"
@@ -399,7 +399,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"GiftableTextLabel"
@@ -432,7 +432,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"NameableTextLabel"
@@ -465,7 +465,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"CraftableTextLabel"
@@ -557,7 +557,7 @@
 	"ItemIcon1"
 	{
 		"ControlName"	"CStorePreviewItemIcon"
-		"fieldName"		"ItemIcon1"	
+		"fieldName"		"ItemIcon1"
 		"xpos"			"c-215"
 		"ypos"			"c56"
 		"zpos"			"13"
@@ -588,7 +588,7 @@
 		{
 			"fieldName"		"itempanel"
 			"PaintBackgroundType"	"2"
-			"paintborder"	"0"	
+			"paintborder"	"0"
 			"model_xpos"	"1"
 			"model_ypos"	"2"
 			"model_wide"	"28"
@@ -638,7 +638,7 @@
 		
 		"itempanel"
 		{
-			"fieldName"		"itempanel"	
+			"fieldName"		"itempanel"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
 			"model_xpos"	"1"
@@ -1135,8 +1135,8 @@
 		"default"		"0"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"zoom_toggle"
-		"paintbackground"	"0"	
+		"Command"			"zoom_toggle"
+		"paintbackground"	"0"
 		"image_drawcolor"		"118 107 94 200"
 		"image_armedcolor"		"128 117 104 255"
 		
@@ -1169,13 +1169,12 @@
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		
 		"auto_scale"		"1"
 		"auto_layout"		"1"
 		"selected_button_default"	"0"
 		"auto_layout_vertical_buffer"	"-4"
 		"display_vertically"	"1"
-		"align"				"west"
+		"align"					"west"
 		
 		"ButtonSettings"
 		{
@@ -1201,7 +1200,7 @@
 			
 			"paintbackground"	"0"
 			"paintbackgroundtype"	"0"
-			"defaultBgColor_Override"	"0 0 0 255"
+			"defaultBgColor_Override"	"ColorBlack"
 			
 			"paintborder"		"0"
 			
@@ -1389,7 +1388,7 @@
 		"armedFgColor_override" "Blank"
 		"depressedFgColor_override" "Blank"
 		"image_drawcolor"	"White"
-		"image_armedcolor"	"255 0 0 255"
+		"image_armedcolor"	"ColorRed"
 		
 		"SubImage"
 		{
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
index 2b3750c..31add8b 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
@@ -508,7 +508,7 @@
 		"paintbackground"	"0"
 		
 		"image_drawcolor"	"White"
-		"image_armedcolor"	"255 0 0 255"
+		"image_armedcolor"	"ColorRed"
 		
 		"SubImage"
 		{
diff --git a/resource/ui/econ/store/v2/storeviewcartpanel.res b/resource/ui/econ/store/v2/storeviewcartpanel.res
index 9a73766..b71b307 100644
--- a/resource/ui/econ/store/v2/storeviewcartpanel.res
+++ b/resource/ui/econ/store/v2/storeviewcartpanel.res
@@ -46,7 +46,7 @@
 				"wide"			"400"
 				"tall"			"58"
 				"visible"		"1"
-				"bgcolor_override"		"0 0 0 255"
+				"bgcolor_override"		"ColorBlack"
 				"noitem_textcolor"		"TextColor"
 				"PaintBackgroundType"	"2"
 				"paintborder"	"0"