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

2 files changed, 40 insertions, 27 deletions

diff --git a/scripts/hudanimations_custom.txt b/scripts/hudanimations_custom.txt
index 2315e9f..4212bc5 100644
--- a/scripts/hudanimations_custom.txt
+++ b/scripts/hudanimations_custom.txt
@@ -5,7 +5,7 @@ event HudHealthBonusPulse
 	Animate	PlayerStatusHealthBonusImage 		Alpha	"0"					Linear 0.2 0.4
 	
 	Animate PlayerStatusHealthValue				FgColor "Health Buff" 		Accel 0.0 0.0
-	Animate PlayerStatusHealthValueSpectator 	FgColor "Health Buff" 		Accel 0.0 0.0
+	Animate PlayerStatusHealthValueSpectator	FgColor "Health Buff" 		Accel 0.0 0.0
 	Animate PlayerStatusHealthValueFreezePanel 	FgColor "Health Buff" 		Accel 0.0 0.0
 
 	RunEvent HudHealthBonusPulseLoop			0.4
@@ -13,35 +13,35 @@ event HudHealthBonusPulse
 
 event HudHealthBonusPulseStop
 {
+	StopEvent HudHealthBonusPulse				0.0
+	StopEvent HudHealthBonusPulseLoop			0.0
+	
 	Animate PlayerStatusHealthValue				FgColor "Health Normal" 	Accel 0.0 0.0
 	Animate PlayerStatusHealthValueSpectator 	FgColor "Health Normal" 	Accel 0.0 0.0
 	Animate PlayerStatusHealthValueFreezePanel 	FgColor "Health Normal" 	Accel 0.0 0.0
-	
-	StopEvent HudHealthBonusPulse 				0.0
-	StopEvent HudHealthBonusPulseLoop 			0.0
 }
 //==================================================================================
 // Low Health Pulse
 event HudHealthDyingPulse
 {
+	RunEvent HudHealthDyingPulseLoop			0.4
+	
 	Animate	PlayerStatusHealthBonusImage 		Alpha	"255"				Linear 0.0 0.2
 	Animate	PlayerStatusHealthBonusImage 		Alpha	"0"					Linear 0.2 0.2
 	
 	Animate PlayerStatusHealthValue				FgColor	"Health Hurt" 		Accel 0.0 0.0
 	Animate PlayerStatusHealthValueSpectator 	FgColor "Health Hurt" 		Accel 0.0 0.0
 	Animate PlayerStatusHealthValueFreezePanel	FgColor "Health Hurt" 		Accel 0.0 0.0
-	
-	RunEvent HudHealthDyingPulseLoop			0.4
 }
 
 event HudHealthDyingPulseStop
 {
+	StopEvent HudHealthDyingPulse 				0.0
+	StopEvent HudHealthDyingPulseLoop 			0.0
+	
 	Animate PlayerStatusHealthValue				FgColor	"Health Normal" 	Accel 0.0 0.0
 	Animate PlayerStatusHealthValueSpectator 	FgColor "Health Normal" 	Accel 0.0 0.0
 	Animate PlayerStatusHealthValueFreezePanel	FgColor "Health Normal" 	Accel 0.0 0.0
-	
-	StopEvent HudHealthDyingPulse 				0.0
-	StopEvent HudHealthDyingPulseLoop 			0.0
 }
 //==================================================================================
 // Low Ammo Pulse
@@ -59,12 +59,12 @@ event HudLowAmmoPulse
 
 event HudLowAmmoPulseStop
 {
+	StopEvent HudLowAmmoPulse 				0.0
+	StopEvent HudLowAmmoPulseLoop 			0.0
+	
 	Animate AmmoInClip						FgColor	"Ammo In Clip"				Accel 0.0 0.0
 	Animate AmmoInReserve					FgColor	"Ammo In Reserve"			Accel 0.0 0.0
 	Animate AmmoNoClip						FgColor	"Ammo In Clip"				Accel 0.0 0.0
-
-	StopEvent HudLowAmmoPulse 				0.0
-	StopEvent HudLowAmmoPulseLoop 			0.0
 }
 //==================================================================================
 // Ubercharge Meters
@@ -158,6 +158,15 @@ event HudSpyDisguiseFadeOut
 //	Animate PlayerStatusSpyImage			Alpha	"0"							Linear 0.9	0.1
 }
 //==================================================================================
+
+event HudSnapShotReminderIn
+{
+    RunEvent HudHealthDyingPulseStop 	10.0
+    RunEvent HudHealthBonusPulseStop 	10.0
+    RunEvent HudLowAmmoPulseStop 		10.0
+    RunEvent HudMedicChargedStop 		10.0
+}
+//==================================================================================
 event HudReadyPulse
 {
 	Animate	TournamentInstructionsLabel 	FgColor	"Flashing Uber Color1"				Linear 0.0	0.3
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
index 66217d1..4c7c260 100644
--- a/scripts/hudlayout.res
+++ b/scripts/hudlayout.res
@@ -857,8 +857,8 @@
 		"LargeBoxWide"			"110"
 		"LargeBoxTall"			"77"
 		"BoxGap"				"4"
-		"SelectionNumberXPos" 	"12"
-		"SelectionNumberYPos" 	"4"
+		"SelectionNumberXPos"	"12"
+		"SelectionNumberYPos"	"4"
 		"IconXPos"				"8"
 		"IconYPos"				"0"
 		"TextYPos"				"70"
@@ -935,8 +935,8 @@
 		"ypos"					"246"
 		"ypos_minmode"			"320"
 		"zpos"					"1"
-		"wide"	 				"600"
-		"tall"	 				"50"
+		"wide"					"600"
+		"tall"					"50"
 		"priority"				"100"
 	}
 	
@@ -948,8 +948,8 @@
 		"xpos"					"c-100"
 		"ypos"					"270"
 		"zpos"					"1"
-		"wide"	 				"600"
-		"tall"	 				"50"
+		"wide"					"600"
+		"tall"					"50"
 		"priority"				"40"
 		"x_offset" 				"20"
 		"y_offset" 				"20"
@@ -1022,7 +1022,7 @@
 	
 	HudRoundTimer
 	{
-		"fieldName" 			"HudRoundTimer"
+		"fieldName"				"HudRoundTimer"
 		"xpos"					"c-20"
 		"ypos"					"440"
 		"wide"					"120"
@@ -1100,7 +1100,7 @@
 		"count_ypos"			"8"
 		"icon_texture"			"vgui/hud/icon_commentary"
 		"icon_xpos"				"0"
-		"icon_ypos"				"0"		
+		"icon_ypos"				"0"
 		"icon_width"			"40"
 		"icon_height"			"40"
 		"use_script_bgcolor"	"1"
@@ -1577,7 +1577,7 @@
 		"xpos"				"c-200"
 		"ypos"				"260"
 		"wide"				"400"
-		"tall"				"160"		
+		"tall"				"160"
 	}
 	
 	"HudChat"
@@ -1591,7 +1591,7 @@
 		"ypos"				"275"
 		"wide"	 			"320"
 		"tall"	 			"120"
-		"PaintBackgroundType" "2"
+		"PaintBackgroundType"	"2"
 	}
 	
 	"HudMenuEngyBuild"
@@ -1601,9 +1601,10 @@
 		"enabled" 			"1"
 		"xpos"				"c-250"
 		"ypos"				"c-75"
+		"zpos"				"1"
 		"wide"				"500"
 		"tall"				"200"
-		"PaintBackgroundType" "0"
+		"PaintBackgroundType"	"0"
 	}
 	
 	"HudMenuEngyDestroy"
@@ -1613,9 +1614,10 @@
 		"enabled" 			"1"
 		"xpos"				"c-250"
 		"ypos"				"c-75"
+		"zpos"				"1"
 		"wide"				"500"
 		"tall"				"200"
-		"PaintBackgroundType" "0"
+		"PaintBackgroundType"	"0"
 	}
 	
 	"HudEurekaEffectTeleportMenu"
@@ -1625,9 +1627,10 @@
 		"enabled" 			"1"
 		"xpos"				"c-125"
 		"ypos"				"c-55"
+		"zpos"				"1"
 		"wide"				"500"
 		"tall"				"200"
-		"PaintBackgroundType" "0"
+		"PaintBackgroundType"	"0"
 	}
 	
 	"HudMenuSpyDisguise"
@@ -1637,9 +1640,10 @@
 		"enabled" 			"1"
 		"xpos"				"c90"
 		"ypos"				"c-72"
+		"zpos"				"1"
 		"wide"				"490"
 		"tall"				"220"
-		"PaintBackgroundType" "0"
+		"PaintBackgroundType"	"0"
 	}
 	
 	HudDemomanPipes
@@ -2099,4 +2103,4 @@
 	HudTrainingMsg		{ }
 	TrainingComplete	{ }
 	AnnotationsPanel	{ }
-}
+}
\ No newline at end of file