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, 20 insertions, 22 deletions

diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res
index e16237b..3e85ebd 100644
--- a/resource/ui/hudmatchstatus.res
+++ b/resource/ui/hudmatchstatus.res
@@ -90,8 +90,8 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"CountdownLabelShadow"
 		"font"			"HudFontGiant"
-		"xpos"			"cs-0.48"
-		"ypos"			"cs-0.08"
+		"xpos"			"-2"
+		"ypos"			"-2"
 		"wide"			"40"
 		"tall"			"40"
 		"zpos"			"4"
@@ -104,12 +104,10 @@
 		"textAlignment"	"center"
 		"fgcolor"		"TransparentBlack"
 		"proportionaltoparent"	"1"
-
-		if_readymode
-		{
-			"xpos"			"300"
-			"ypos"			"130"
-		}
+		
+		"pin_to_sibling"		"CountdownLabel"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 
 	"FrontParticlePanel"
@@ -285,8 +283,8 @@
 		"delta_item_x"			"22"
 		"delta_item_start_y"	"50"
 		"delta_item_end_y"		"70"
-		"PositiveColor"			"0 255 0 255"
-		"NegativeColor"			"255 0 0 255"
+		"PositiveColor"			"ColorGreen"
+		"NegativeColor"			"ColorRed"
 		"delta_lifetime"		"1.5"
 		"delta_item_font"		"HudFontMedium"
 
@@ -295,8 +293,8 @@
 			"delta_item_x"			"35"
 			"delta_item_start_y"	"12"
 			"delta_item_end_y"		"50"
-			"PositiveColor"			"0 255 0 255"
-			"NegativeColor"			"255 0 0 255"
+			"PositiveColor"			"ColorGreen"
+			"NegativeColor"			"ColorRed"
 			"delta_lifetime"		"1.5"
 			"delta_item_font"		"HudFontMediumSmall"
 		}
@@ -340,7 +338,7 @@
 		"tall"			"75"
 		"visible"		"1"
 		"enabled"		"1"
-
+		
 		"max_size"		"19"
 		"6v6_gap"		"1"
 		"12v12_gap"		"1"
@@ -349,7 +347,7 @@
 		"team1_base_x"		"c-45"
 		"team1_max_expand"	"133"
 
-		"team2_grow_dir" 	"east"
+		"team2_grow_dir"	"east"
 		"team2_base_x"		"c47"
 		"team2_max_expand"	"133"
 
@@ -360,7 +358,7 @@
 			"tall"			"50"
 			"zpos"			"1"
 
-			"color_portrait_bg_red"	"119 62 61 255"
+			"color_portrait_bg_red"		"119 62 61 255"
 			"color_portrait_bg_blue"	"62 81 101 255"
 			"color_portrait_bg_red_dead"	"79 54 52 255"
 			"color_portrait_bg_blue_dead"	"44 49 51 255"
@@ -416,7 +414,7 @@
 				"proportionaltoparent"	"1"
 			}
 			"healthbar"
-			{	
+			{
 				"ControlName"	"ContinuousProgressBar"
 				"fieldName"		"healthbar"
 				"font"			"Default"
@@ -424,7 +422,7 @@
 				"ypos"			"19"
 				"zpos"			"5"
 				"wide"			"f0"
-				"tall"			"3"				
+				"tall"			"3"
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"1"
@@ -444,7 +442,7 @@
 				"ypos"			"19"
 				"zpos"			"6"
 				"wide"			"f0"
-				"tall"			"3"				
+				"tall"			"3"
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"1"
@@ -487,7 +485,7 @@
 				"visible"		"0"
 				"enabled"		"1"
 				"image"			"../HUD/tournament_panel_brown"
-
+				
 				"src_corner_height"	"22"
 				"src_corner_width"	"22"
 				"draw_corner_width"	"3"
@@ -541,7 +539,7 @@
 				"visible"		"0"
 				"labelText"		"%chargeamount%"
 				"textAlignment"	"north"
-				"fgcolor"		"0 255 0 255"
+				"fgcolor"		"ColorGreen"
 			}
 			"specindex"
 			{
@@ -558,7 +556,7 @@
 				"visible"		"0"
 				"labelText"		"%specindex%"
 				"textAlignment"	"north-west"
-				//"fgcolor"		"235 226 202 255"
+				//"fgcolor"		"TanLight"
 			}
 			"DeathPanel"
 			{
@@ -585,7 +583,7 @@
 				"tall"			"p0.15"
 				"visible"		"0"
 				"enabled"		"1"
-				"image"			"../HUD/comp_player_status_skull"	
+				"image"			"../HUD/comp_player_status_skull"
 				"scaleImage"	"1"
 				"proportionaltoparent"	"1"	
 			}