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

1 files changed, 6 insertions, 80 deletions

diff --git a/resource/ui/huditemeffectmeter_killstreak.res b/resource/ui/huditemeffectmeter_killstreak.res
index 741c8fa..cb7755b 100644
--- a/resource/ui/huditemeffectmeter_killstreak.res
+++ b/resource/ui/huditemeffectmeter_killstreak.res
@@ -1,118 +1,44 @@
-"Resource/UI/HudItemEffectMeter_Demoman.res"
+#base "huditemeffectmeter_demoman.res"
+
+"Resource/UI/HudItemEffectMeter_Killstreak.res"
 {
 	HudItemEffectMeter
 	{
-		"fieldName"			"HudItemEffectMeter"
-		"visible"			"1"
-		"enabled"			"1"
 		"xpos"				"c-225"
 		"ypos"				"c133"
 		"xpos_minmode"		"c-162"
 		"ypos_minmode"		"298"
 		"wide"				"100"
 		"tall"				"50"
-		"MeterFG"			"White"
-		"MeterBG"			"Gray"
-	}
-	
-	"ItemEffectMeterBG"
-	{
-		"ControlName"		"CTFImagePanel"
-		"fieldName"			"ItemEffectMeterBG"
-		"xpos"				"9999"
-		"ypos"				"9999"
-		"zpos"				"0"
-		"wide"				"76"
-		"tall"				"44"
-		"visible"			"1"
-		"enabled"			"1"
-		"image"				"../hud/misc_ammo_area_blue"
-		"scaleImage"		"1"
 	}
 	
 	"ItemEffectMeterLabel"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ItemEffectMeterLabel"
 		"xpos"				"0"
+		"xpos_minmode"		"0"
 		"ypos"				"27"
 		"zpos"				"2"
 		"wide"				"100"
-		"autoResize"		"1"
-		"pinCorner"			"2"
 		"visible"			"0"
 		"enabled"			"0"
-		"tabPosition"		"0"
 		"labelText"			"#TF_KillStreak"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
 		"font"				"Cerbetica9"
 	}
-
-	"ItemEffectMeter"
-	{	
-		"ControlName"		"ContinuousProgressBar"
-		"fieldName"			"ItemEffectMeter"
-		"font"				"Default"
-		"xpos"				"0"
-		"ypos"				"20"
-		"zpos"				"2"
-		"wide"				"100"
-		"tall"				"6"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"0"
-		"enabled"			"0"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-	}					
 	
 	"ItemEffectMeterCount"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ItemEffectMeterCount"
 		"xpos"				"0"
 		"ypos"				"10"
-		"zpos"				"2"
+		"xpos_minmode"		"0"
+		"ypos_minmode"		"10"
 		"wide"				"100"
 		"tall"				"25"
-		"pinCorner"			"2"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"%progresscount%"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"font"				"CerbeticaBold28"
-		"font_minmode"		"CerbeticaBold16"
 	}
 	
 	"ItemEffectMeterCountShadow"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ItemEffectMeterCountShadow"
-		"xpos"				"-1"
-		"ypos"				"-1"
 		"zpos"				"1"
 		"wide"				"100"
 		"tall"				"25"
-		"pinCorner"			"2"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"%progresscount%"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"font"				"CerbeticaBold28"
-		"font_minmode"		"CerbeticaBold16"
-		"fgcolor_override"	"TransparentBlack"
-
-		"pin_to_sibling"		"ItemEffectMeterCount"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 }
\ No newline at end of file