Christmas Update Fixes (incomplete)

5 files changed, 757 insertions, 432 deletions

diff --git a/resource/ui/HudMannVsMachineStatus.res b/resource/ui/HudMannVsMachineStatus.res
index a15f4ba..00ef6cb 100644
--- a/resource/ui/HudMannVsMachineStatus.res
+++ b/resource/ui/HudMannVsMachineStatus.res
@@ -1,261 +1,261 @@
-"Resource/UI/HudMannVsMachineStatus.res"
-{	
-	"WaveStatusPanel"
-	{
-		"ControlName"		"CWaveStatusPanel"
-		"fieldName"			"WaveStatusPanel"
-		"xpos"				"c-300"
-		"ypos"				"0"
-		"zpos"				"0"
-		"wide"				"600"
-		"tall"				"67"
-		"visible"			"1"
-		"enabled"			"1"
-	}
-	
-	"WaveCompleteSummaryPanel"
-	{
-		"ControlName"		"CWaveCompleteSummaryPanel"
-		"fieldName"			"WaveCompleteSummaryPanel"
-		"xpos"				"c-125"
-		"ypos"				"120"
-		"zpos"				"0"
-		"wide"				"400"
-		"tall"				"400"
-		"visible"			"1"
-		"enabled"			"1"
-	}
-	
-	"TankStatusPanel"
-	{
-		"ControlName"		"CTankStatusPanel"
-		"fieldName"			"TankStatusPanel"
-		"xpos"				"0"
-		"ypos"				"0"
-		"zpos"				"0"
-		"wide"				"200"
-		"tall"				"100"
-		"visible"			"1"
-		"enabled"			"1"
-		
-		"pin_to_sibling"               "WaveStatusPanel"
-		"pin_corner_to_sibling"        "4"          
-		"pin_to_sibling_corner"        "6"  
-	}
-	
-	"CurrencyStatusPanel"
-	{
-		"ControlName"		"CCurrencyStatusPanel"
-		"fieldName"			"CurrencyStatusPanel"
-		"xpos"				"c-190"
-		"ypos"				"r90"
-		"wide"				"100"
-		"tall"				"100"
-		"visible" 			"1"
-		"enabled" 			"1"
-	}
-	
-	"InWorldCurrencyPanel"
-	{
-		"ControlName" 		"CInWorldCurrencyStatus"
-		"fieldName" 		"InWorldCurrencyPanel"
-		"xpos"				"c-190"
-		"ypos" 				"r65"
-		"wide" 				"100"
-		"tall" 				"20"
-		"visible" 			"1"
-		"enabled" 			"1"
-	}
-
-
-
-	"WarningSwoop"
-	{
-		"ControlName"	"CWarningSwoop"
-		"fieldName"		"WarningSwoop"
-		"xpos"			"c-12"
-		"ypos"			"0"
-		"zpos"			"10"
-		"wide"			"24"
-		"tall"			"220"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			"../sprites/obj_icons/warning_highlight"
-		"scaleImage"	"1"
-		"time"			"0.3"		
-	}
-	
-	"UpgradeLevelContainer"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"UpgradeLevelContainer"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"640"
-		"tall"			"480"
-		"visible"		"0"
-					
-		"UpgradeProgressTrack"
-		{
-			"ControlName"	"CMvMBombCarrierProgress"
-			"fieldName"		"UpgradeProgressTrack"
-			"xpos"			"c-50"
-			"ypos"			"r35"
-			"wide"			"640"
-			"tall"			"480"
-			"visible"		"1"	
-		}
-		
-		"UpgradeLevel1" 
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"UpgradeLevel1"
-			"xpos"			"c32"
-			"ypos"			"r24"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"image"			"../hud/hud_mvm_bomb_upgrade_1_disabled"
-			"scaleImage"	"1"
-		}
-		
-		"UpgradeLevel2" 
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"UpgradeLevel2"
-			"xpos"			"c32"
-			"ypos"			"r42"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"image"			"../hud/hud_mvm_bomb_upgrade_2_disabled"
-			"scaleImage"	"1"
-		}
-		
-		"UpgradeLevel3" 
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"UpgradeLevel3"
-			"xpos"			"c32"
-			"ypos"			"r60"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"image"			"../hud/hud_mvm_bomb_upgrade_3_disabled"
-			"scaleImage"	"1"
-		}
-
-		"UpgradeLevelBoss" 
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"UpgradeLevelBoss"
-			"xpos"			"c32"
-			"ypos"			"r46"
-			"wide"			"20"
-			"tall"			"40"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"0"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"image"			"../hud/hud_mvm_bomb_upgrade_boss"
-			"scaleImage"	"1"
-		}
-	}
-	
-	"VictorySplash"
-	{
-		"ControlName"		"CVictorySplash"
-		"fieldName"			"VictorySplash"
-		"xpos"				"0"
-		"ypos"				"0"
-		//"zpos"				"102"
-		"wide"				"f0"
-		"tall"				"480"
-		"visible"			"0"
-		"enabled"			"1"			
-	}
-	
-	"VictoryPanelContainer"
-	{
-		"ControlName"	"CMvMVictoryPanelContainer"
-		"fieldName"		"VictoryPanelContainer"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"f0"
-		"tall"			"480"
-		"visible"		"0"
-	}
-	
-	"WaveLossPanel"
-	{
-		"ControlName"	"CMvMWaveLossPanel"
-		"fieldName"		"WaveLossPanel"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"f0"
-		"tall"			"480"
-		"visible"		"0"
-	}
-	
-	"ServerChangeMessage"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"ServerChangeMessage"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"f0"
-		"tall"			"480"
-		"visible"		"0"
-		
-		"Background"
-		{
-			"ControlName"		"ScalableImagePanel"
-			"fieldName"		"Background"
-			"xpos"			"c-150"
-			"ypos"			"400"
-			"wide"			"300"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"../hud/color_panel_red"
-
-			"src_corner_height"	"22"				// pixels inside the image
-			"src_corner_width"	"22"
-		
-			"draw_corner_width"	"5"				// screen size of the corners ( and sides ), proportional
-			"draw_corner_height" 	"5"	
-		}
-	
-		"ServerChangeLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"ServerChangeLabel"
-			"font"			"HudFontSmall"
-			"textAlignment"	"center"
-			"labelText"		"%servermessage%"
-			"xpos"			"c-150"
-			"ypos"			"400"
-			"wide"			"300"
-			"tall"			"20"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor"		"tanlight"		
-		}
-	}
-	
-}
+"Resource/UI/HudMannVsMachineStatus.res"

+{	

+	"WaveStatusPanel"

+	{

+		"ControlName"		"CWaveStatusPanel"

+		"fieldName"			"WaveStatusPanel"

+		"xpos"				"c-300"

+		"ypos"				"0"

+		"zpos"				"0"

+		"wide"				"600"

+		"tall"				"67"

+		"visible"			"1"

+		"enabled"			"1"

+	}

+	

+	"WaveCompleteSummaryPanel"

+	{

+		"ControlName"		"CWaveCompleteSummaryPanel"

+		"fieldName"			"WaveCompleteSummaryPanel"

+		"xpos"				"c-125"

+		"ypos"				"120"

+		"zpos"				"0"

+		"wide"				"400"

+		"tall"				"400"

+		"visible"			"1"

+		"enabled"			"1"

+	}

+	

+	"BossStatusPanel"

+	{

+		"ControlName"		"CMvMBossStatusPanel"

+		"fieldName"			"MvMBossStatusPanel"

+		"xpos"				"0"

+		"ypos"				"0"

+		"zpos"				"0"

+		"wide"				"200"

+		"tall"				"100"

+		"visible"			"1"

+		"enabled"			"1"

+		

+		"pin_to_sibling"               "WaveStatusPanel"

+		"pin_corner_to_sibling"        "4"          

+		"pin_to_sibling_corner"        "6"  

+	}

+	

+	"CurrencyStatusPanel"

+	{

+		"ControlName"		"CCurrencyStatusPanel"

+		"fieldName"			"CurrencyStatusPanel"

+		"xpos"				"c-190"

+		"ypos"				"r90"

+		"wide"				"100"

+		"tall"				"100"

+		"visible" 			"1"

+		"enabled" 			"1"

+	}

+	

+	"InWorldCurrencyPanel"

+	{

+		"ControlName" 		"CInWorldCurrencyStatus"

+		"fieldName" 		"InWorldCurrencyPanel"

+		"xpos"				"c-190"

+		"ypos" 				"r65"

+		"wide" 				"100"

+		"tall" 				"20"

+		"visible" 			"1"

+		"enabled" 			"1"

+	}

+

+

+

+	"WarningSwoop"

+	{

+		"ControlName"	"CWarningSwoop"

+		"fieldName"		"WarningSwoop"

+		"xpos"			"c-12"

+		"ypos"			"0"

+		"zpos"			"10"

+		"wide"			"24"

+		"tall"			"220"

+		"visible"		"0"

+		"enabled"		"1"

+		"image"			"../sprites/obj_icons/warning_highlight"

+		"scaleImage"	"1"

+		"time"			"0.3"		

+	}

+	

+	"UpgradeLevelContainer"

+	{

+		"ControlName"	"EditablePanel"

+		"fieldName"		"UpgradeLevelContainer"

+		"xpos"			"0"

+		"ypos"			"0"

+		"wide"			"640"

+		"tall"			"480"

+		"visible"		"0"

+					

+		"UpgradeProgressTrack"

+		{

+			"ControlName"	"CMvMBombCarrierProgress"

+			"fieldName"		"UpgradeProgressTrack"

+			"xpos"			"c-50"

+			"ypos"			"r35"

+			"wide"			"640"

+			"tall"			"480"

+			"visible"		"1"	

+		}

+		

+		"UpgradeLevel1" 

+		{

+			"ControlName"	"ImagePanel"

+			"fieldName"		"UpgradeLevel1"

+			"xpos"			"c32"

+			"ypos"			"r24"

+			"wide"			"20"

+			"tall"			"20"

+			"autoResize"	"0"

+			"pinCorner"		"0"

+			"visible"		"1"

+			"enabled"		"1"

+			"tabPosition"	"0"

+			"image"			"../hud/hud_mvm_bomb_upgrade_1_disabled"

+			"scaleImage"	"1"

+		}

+		

+		"UpgradeLevel2" 

+		{

+			"ControlName"	"ImagePanel"

+			"fieldName"		"UpgradeLevel2"

+			"xpos"			"c32"

+			"ypos"			"r42"

+			"wide"			"20"

+			"tall"			"20"

+			"autoResize"	"0"

+			"pinCorner"		"0"

+			"visible"		"1"

+			"enabled"		"1"

+			"tabPosition"	"0"

+			"image"			"../hud/hud_mvm_bomb_upgrade_2_disabled"

+			"scaleImage"	"1"

+		}

+		

+		"UpgradeLevel3" 

+		{

+			"ControlName"	"ImagePanel"

+			"fieldName"		"UpgradeLevel3"

+			"xpos"			"c32"

+			"ypos"			"r60"

+			"wide"			"20"

+			"tall"			"20"

+			"autoResize"	"0"

+			"pinCorner"		"0"

+			"visible"		"1"

+			"enabled"		"1"

+			"tabPosition"	"0"

+			"image"			"../hud/hud_mvm_bomb_upgrade_3_disabled"

+			"scaleImage"	"1"

+		}

+

+		"UpgradeLevelBoss" 

+		{

+			"ControlName"	"ImagePanel"

+			"fieldName"		"UpgradeLevelBoss"

+			"xpos"			"c32"

+			"ypos"			"r46"

+			"wide"			"20"

+			"tall"			"40"

+			"autoResize"	"0"

+			"pinCorner"		"0"

+			"visible"		"0"

+			"enabled"		"1"

+			"tabPosition"	"0"

+			"image"			"../hud/hud_mvm_bomb_upgrade_boss"

+			"scaleImage"	"1"

+		}

+	}

+	

+	"VictorySplash"

+	{

+		"ControlName"		"CVictorySplash"

+		"fieldName"			"VictorySplash"

+		"xpos"				"0"

+		"ypos"				"0"

+		//"zpos"				"102"

+		"wide"				"f0"

+		"tall"				"480"

+		"visible"			"0"

+		"enabled"			"1"			

+	}

+	

+	"VictoryPanelContainer"

+	{

+		"ControlName"	"CMvMVictoryPanelContainer"

+		"fieldName"		"VictoryPanelContainer"

+		"xpos"			"0"

+		"ypos"			"0"

+		"wide"			"f0"

+		"tall"			"480"

+		"visible"		"0"

+	}

+	

+	"WaveLossPanel"

+	{

+		"ControlName"	"CMvMWaveLossPanel"

+		"fieldName"		"WaveLossPanel"

+		"xpos"			"0"

+		"ypos"			"0"

+		"wide"			"f0"

+		"tall"			"480"

+		"visible"		"0"

+	}

+	

+	"ServerChangeMessage"

+	{

+		"ControlName"	"EditablePanel"

+		"fieldName"		"ServerChangeMessage"

+		"xpos"			"0"

+		"ypos"			"0"

+		"wide"			"f0"

+		"tall"			"480"

+		"visible"		"0"

+		

+		"Background"

+		{

+			"ControlName"		"ScalableImagePanel"

+			"fieldName"		"Background"

+			"xpos"			"c-150"

+			"ypos"			"400"

+			"wide"			"300"

+			"tall"			"20"

+			"autoResize"	"0"

+			"pinCorner"		"0"

+			"visible"		"1"

+			"enabled"		"1"

+			"image"			"../hud/color_panel_red"

+

+			"src_corner_height"	"22"				// pixels inside the image

+			"src_corner_width"	"22"

+		

+			"draw_corner_width"	"5"				// screen size of the corners ( and sides ), proportional

+			"draw_corner_height" 	"5"	

+		}

+	

+		"ServerChangeLabel"

+		{

+			"ControlName"	"CExLabel"

+			"fieldName"		"ServerChangeLabel"

+			"font"			"HudFontSmall"

+			"textAlignment"	"center"

+			"labelText"		"%servermessage%"

+			"xpos"			"c-150"

+			"ypos"			"400"

+			"wide"			"300"

+			"tall"			"20"

+			"visible"		"1"

+			"enabled"		"1"

+			"fgcolor"		"tanlight"		

+		}

+	}

+	

+}

diff --git a/resource/ui/HudMedicCharge.res b/resource/ui/HudMedicCharge.res
index b2f86fd..4f6b432 100644
--- a/resource/ui/HudMedicCharge.res
+++ b/resource/ui/HudMedicCharge.res
@@ -75,6 +75,49 @@
 		"fillcolor" 		"255 255 255 50"

 	}

 	

+	"IndividualChargesLabel"

+	{

+		"ControlName"	"CExLabel"

+		"fieldName" 	"IndividualChargesLabel"

+		"xpos" 			"74"

+		"ypos" 			"120"

+		"zpos" 			"2"

+		"wide" 			"75"

+		"tall" 			"32"

+		"autoResize" 	"1"

+		"pinCorner" 	"2"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"tabPosition" 	"0"

+		"labelText" 	"#TF_IndividualUberchargesMinHUD"

+		"textAlignment" "center"

+		"dulltext"		"0"

+		"brighttext" 	"0"

+		"font" 			"CerbeticaBold32"

+	}

+	

+	"IndividualChargesLabelShadow"

+	{

+		"ControlName"	"CExLabel"

+		"fieldName" 	"IndividualChargesLabelShadow"

+		"xpos" 			"75"

+		"ypos" 			"121"

+		"zpos" 			"2"

+		"wide" 			"75"

+		"tall" 			"32"

+		"autoResize" 	"1"

+		"pinCorner" 	"2"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"tabPosition" 	"0"

+		"labelText" "#TF_IndividualUberchargesMinHUD"

+		"textAlignment" "center"

+		"dulltext"		"0"

+		"brighttext" 	"0"

+		"font" 			"CerbeticaBold32"

+		"fgcolor"		"TransparentBlack"

+	}

+	

 	"ChargeMeter"

 	{	

 		"ControlName"	"ContinuousProgressBar"

@@ -96,6 +139,83 @@
 		"fgcolor" 		"TanLight"

 	}

 

+	"ChargeMeter1"

+	{

+		"ControlName" 		"ContinuousProgressBar"

+		"fieldName" 		"ChargeMeter1"

+		"font" 				"Default"

+		"xpos" 				"2"

+		"ypos" 				"102"

+		"zpos"				"2"

+		"wide" 				"35"

+		"tall" 				"16"

+		"autoResize" 		"0"

+		"pinCorner" 		"0"

+		"visible" 			"1"

+		"enabled" 			"1"

+		"textAlignment" 	"Left"

+		"dulltext" 			"0"

+		"brighttext" 		"0"

+	

+	}

+

+	"ChargeMeter2"

+	{

+		"ControlName" 		"ContinuousProgressBar"

+		"fieldName" 		"ChargeMeter2"

+		"font" 				"Default"

+		"xpos" 				"39"

+		"ypos" 				"102"

+		"zpos" 				"2"

+		"wide" 				"35"

+		"tall" 				"16"

+		"autoResize" 		"0"

+		"pinCorner"			"0"

+		"visible" 			"1"

+		"enabled"			"1"

+		"textAlignment" 	"Left"

+		"dulltext" 			"0"

+		"brighttext" 		"0"

+	}

+

+	"ChargeMeter3"

+		{

+			"ControlName" 	"ContinuousProgressBar"

+			"fieldName" 	"ChargeMeter3"

+			"font" 			"Default"

+			"xpos" 			"76"

+			"ypos" 			"102"

+			"zpos" 			"2"

+			"wide" 			"35"

+			"tall" 			"16"

+			"autoResize" 	"0"

+			"pinCorner"		"0"

+			"visible" 		"1"

+			"enabled" 		"1"

+			"textAlignment" "Left"

+			"dulltext" 		"0"

+			"brighttext" 	"0"

+		}

+

+	"ChargeMeter4"

+	{

+		"ControlName" 	"ContinuousProgressBar"

+		"fieldName" 	"ChargeMeter4"

+		"font" 			"Default"

+		"xpos"			"113"

+		"ypos" 			"102"

+		"zpos" 			"2"

+		"wide" 			"35"

+		"tall" 			"16"

+		"autoResize" 	"0"

+		"pinCorner" 	"0"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"textAlignment" "Left"

+		"dulltext" 		"0"

+		"brighttext" 	"0"

+	}

+

 	"ChargeMeterLabel"

 	{

 		"ControlName"	"CExLabel"

@@ -130,5 +250,19 @@
 		"enabled"		"1"

 		"image"			"../hud/ico_health_cluster"

 		"scaleImage"	"1"	

-	}		

+	}

+

+	"ResistIcon"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"ResistIcon"

+		"xpos" 			"0"

+		"ypos"			"0"

+		"wide" 			"24"

+		"tall" 			"24"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"image" 		"../HUD/defense_buff_bullet_blue"

+		

+	}	

 }

diff --git a/resource/ui/HudPlayerHealth-cross.res b/resource/ui/HudPlayerHealth-cross.res
index 479ecaa..dd8c181 100644
--- a/resource/ui/HudPlayerHealth-cross.res
+++ b/resource/ui/HudPlayerHealth-cross.res
@@ -134,6 +134,101 @@
 		"image"			"../vgui/marked_for_death"

 		"fgcolor"		"TanDark"

 	}

+	"PlayerStatus_MedicUberBulletResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicUberBulletResistImage"

+		"xpos" 			"100"

+		"ypos" 			"0"

+		"zpos" 			"7"

+		"wide" 			"31"

+		"tall" 			"31"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

+		"image"			"../HUD/defense_buff_bullet_blue"

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicUberBlastResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicUberBlastResistImage"

+		"xpos" 			"100"

+		"ypos" 			"0"

+		"zpos" 			"7"

+		"wide" 			"31"

+		"tall" 			"31"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

+		"image"			"../HUD/defense_buff_explosion_blue"

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicUberFireResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicUberFireResistImage"

+		"xpos" 			"100"

+		"ypos" 			"0"

+		"zpos" 			"7"

+		"wide" 			"31"

+		"tall" 			"31"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

+		"image"			"../HUD/defense_buff_fire_blue"

+		"fgcolor" 		"TanDark"

+	}

+	

+	"PlayerStatus_MedicSmallBulletResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicSmallBulletResistImage"

+		"xpos" 			"100"

+		"ypos" 			"0"

+		"zpos" 			"7"

+		"wide" 			"31"

+		"tall" 			"31"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

+		"image"			"../HUD/defense_buff_bullet_blue"

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicSmallBlastResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicSmallBlastResistImage"

+		"xpos" 			"100"

+		"ypos" 			"0"

+		"zpos" 			"7"

+		"wide" 			"31"

+		"tall" 			"31"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

+		"image"			"../HUD/defense_buff_explosion_blue"

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicSmallFireResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicSmallFireResistImage"

+		"xpos" 			"100"

+		"ypos" 			"0"

+		"zpos" 			"7"

+		"wide" 			"31"

+		"tall" 			"31"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

+		"image"			"../HUD/defense_buff_fire_blue"

+		"fgcolor" 		"TanDark"

+	}

 	"PlayerStatusMarkedForDeathSilentImage"

 	{

 		"ControlName"	"ImagePanel"

diff --git a/resource/ui/HudPlayerHealth.res b/resource/ui/HudPlayerHealth.res
index d533b50..640ddc6 100644
--- a/resource/ui/HudPlayerHealth.res
+++ b/resource/ui/HudPlayerHealth.res
@@ -1,169 +1,265 @@
-"Resource/UI/HudPlayerHealth.res"
-{	
-	// player health data
-	"HudPlayerHealth"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"HudPlayerHealth"
-		"xpos"			"c-288"		
-		"ypos"			"c45"	
-		"xpos"			"32"
-		"zpos"			"2"
-		"wide"			"250"
-		"tall"			"120"
-		"visible"		"1"
-		"enabled"		"1"	
-		"HealthBonusPosAdj"	"35"
-		"HealthDeathWarning"	"0.49"
-		"HealthDeathWarningColor"	"HUDDeathWarning"
-	}	
-	"PlayerStatusHealthImage"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"PlayerStatusHealthImage"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"4"
-		"wide"			"70"
-		"tall"			"70"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"	
-	}		
-	"PlayerStatusHealthImageBG"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"PlayerStatusHealthImageBG"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"3"
-		"wide"			"55"
-		"tall"			"55"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"../hud/health_bg"
-		"scaleImage"	"1"	
-	}	
-	"PlayerStatusHealthBonusImage"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"PlayerStatusHealthBonusImage"
-		"xpos"			"116"
-		"ypos"			"18"
-		"zpos"			"2"
-		"wide"			"68"	
-		"tall"			"68"	
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			"../hud/health_over_bg"
-		"scaleImage"	"1"	
-	}
-	"PlayerStatusHealthValue"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValue"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"5"
-		"wide"			"300"
-		"tall"			"100"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"%Health%"
-		"textAlignment"	"center"	
-		"font"			"CerbeticaBold56"
-		"fgcolor"		"TanLight"
-	}
-	"PlayerStatusHealthValueShadow"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValueShadow"
-		"xpos"			"2"
-		"ypos"			"2"
-		"zpos"			"5"
-		"wide"			"300"
-		"tall"			"100"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"%Health%"
-		"textAlignment"	"center"	
-		"font"			"CerbeticaBold56"
-		"fgcolor"		"TransparentBlack"
-	}			
-	"PlayerStatusBleedImage"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"PlayerStatusBleedImage"
-		"xpos"			"100"
-		"ypos"			"0"
-		"zpos"			"7"
-		"wide"			"32"
-		"tall"			"32"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"	
-		"image"			"../vgui/bleed_drop"
-		"fgcolor"		"TanDark"
-	}		
-	"PlayerStatusMilkImage"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"PlayerStatusMilkImage"
-		"xpos"			"100"
-		"ypos"			"0"
-		"zpos"			"7"
-		"wide"			"32"
-		"tall"			"32"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"	
-		"image"			"../vgui/bleed_drop"
-		"fgcolor"		"TanDark"
-	}
-	"PlayerStatusMarkedForDeathImage"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"PlayerStatusMarkedForDeathImage"
-		"xpos"			"100"
-		"ypos"			"0"
-		"zpos"			"7"
-		"wide"			"32"
-		"tall"			"32"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"	
-		"image"			"../vgui/marked_for_death"
-		"fgcolor"		"TanDark"
-	}
-	"PlayerStatusMarkedForDeathSilentImage"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"PlayerStatusMarkedForDeathSilentImage"
-		"xpos"			"100"
-		"ypos"			"0"
-		"zpos"			"7"
-		"wide"			"31"
-		"tall"			"31"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"	
-		"image"			"../vgui/marked_for_death"
-		"fgcolor"		"TanDark"
-	}
-	
-		"PlayerStatus_WheelOfDoom"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"PlayerStatus_WheelOfDoom"
-		"xpos"			"100"
-		"ypos"			"0"
-		"zpos"			"7"
-		"wide"			"32"
-		"tall"			"32"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"	
-		"image"			"../signs/death_wheel_whammy"
-		"fgcolor"		"TanDark"
-	}
-}
+"Resource/UI/HudPlayerHealth.res"

+{	

+	// player health data

+	"HudPlayerHealth"

+	{

+		"ControlName"	"EditablePanel"

+		"fieldName"		"HudPlayerHealth"

+		"xpos"			"c-288"		

+		"ypos"			"c45"	

+		"xpos"			"32"

+		"zpos"			"2"

+		"wide"			"250"

+		"tall"			"120"

+		"visible"		"1"

+		"enabled"		"1"	

+		"HealthBonusPosAdj"	"35"

+		"HealthDeathWarning"	"0.49"

+		"HealthDeathWarningColor"	"HUDDeathWarning"

+	}	

+	"PlayerStatusHealthImage"

+	{

+		"ControlName"	"ImagePanel"

+		"fieldName"		"PlayerStatusHealthImage"

+		"xpos"			"9999"

+		"ypos"			"9999"

+		"zpos"			"4"

+		"wide"			"70"

+		"tall"			"70"

+		"visible"		"1"

+		"enabled"		"1"

+		"scaleImage"	"1"	

+	}		

+	"PlayerStatusHealthImageBG"

+	{

+		"ControlName"	"ImagePanel"

+		"fieldName"		"PlayerStatusHealthImageBG"

+		"xpos"			"9999"

+		"ypos"			"9999"

+		"zpos"			"3"

+		"wide"			"55"

+		"tall"			"55"

+		"visible"		"1"

+		"enabled"		"1"

+		"image"			"../hud/health_bg"

+		"scaleImage"	"1"	

+	}	

+	"PlayerStatusHealthBonusImage"

+	{

+		"ControlName"	"ImagePanel"

+		"fieldName"		"PlayerStatusHealthBonusImage"

+		"xpos"			"116"

+		"ypos"			"18"

+		"zpos"			"2"

+		"wide"			"68"	

+		"tall"			"68"	

+		"visible"		"0"

+		"enabled"		"1"

+		"image"			"../hud/health_over_bg"

+		"scaleImage"	"1"	

+	}

+	"PlayerStatusHealthValue"

+	{

+		"ControlName"	"CExLabel"

+		"fieldName"		"PlayerStatusHealthValue"

+		"xpos"			"0"

+		"ypos"			"0"

+		"zpos"			"5"

+		"wide"			"300"

+		"tall"			"100"

+		"visible"		"1"

+		"enabled"		"1"

+		"labelText"		"%Health%"

+		"textAlignment"	"center"	

+		"font"			"CerbeticaBold56"

+		"fgcolor"		"TanLight"

+	}

+	"PlayerStatusHealthValueShadow"

+	{

+		"ControlName"	"CExLabel"

+		"fieldName"		"PlayerStatusHealthValueShadow"

+		"xpos"			"2"

+		"ypos"			"2"

+		"zpos"			"5"

+		"wide"			"300"

+		"tall"			"100"

+		"visible"		"1"

+		"enabled"		"1"

+		"labelText"		"%Health%"

+		"textAlignment"	"center"	

+		"font"			"CerbeticaBold56"

+		"fgcolor"		"TransparentBlack"

+	}			

+	"PlayerStatusBleedImage"

+	{

+		"ControlName"	"ImagePanel"

+		"fieldName"		"PlayerStatusBleedImage"

+		"xpos"			"100"

+		"ypos"			"0"

+		"zpos"			"7"

+		"wide"			"32"

+		"tall"			"32"

+		"visible"		"1"

+		"enabled"		"1"

+		"scaleImage"	"1"	

+		"image"			"../vgui/bleed_drop"

+		"fgcolor"		"TanDark"

+	}		

+	"PlayerStatusMilkImage"

+	{

+		"ControlName"	"ImagePanel"

+		"fieldName"		"PlayerStatusMilkImage"

+		"xpos"			"100"

+		"ypos"			"0"

+		"zpos"			"7"

+		"wide"			"32"

+		"tall"			"32"

+		"visible"		"1"

+		"enabled"		"1"

+		"scaleImage"	"1"	

+		"image"			"../vgui/bleed_drop"

+		"fgcolor"		"TanDark"

+	}

+	"PlayerStatusMarkedForDeathImage"

+	{

+		"ControlName"	"ImagePanel"

+		"fieldName"		"PlayerStatusMarkedForDeathImage"

+		"xpos"			"100"

+		"ypos"			"0"

+		"zpos"			"7"

+		"wide"			"32"

+		"tall"			"32"

+		"visible"		"1"

+		"enabled"		"1"

+		"scaleImage"	"1"	

+		"image"			"../vgui/marked_for_death"

+		"fgcolor"		"TanDark"

+	}

+	"PlayerStatusMarkedForDeathSilentImage"

+	{

+		"ControlName"	"ImagePanel"

+		"fieldName"		"PlayerStatusMarkedForDeathSilentImage"

+		"xpos"			"100"

+		"ypos"			"0"

+		"zpos"			"7"

+		"wide"			"31"

+		"tall"			"31"

+		"visible"		"1"

+		"enabled"		"1"

+		"scaleImage"	"1"	

+		"image"			"../vgui/marked_for_death"

+		"fgcolor"		"TanDark"	

+	}

+	

+	"PlayerStatus_MedicUberBulletResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicUberBulletResistImage"

+		"xpos" 			"100"

+		"ypos" 			"0"

+		"zpos" 			"7"

+		"wide" 			"31"

+		"tall" 			"31"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

+		"image"			"../HUD/defense_buff_bullet_blue"

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicUberBlastResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicUberBlastResistImage"

+		"xpos" 			"100"

+		"ypos" 			"0"

+		"zpos" 			"7"

+		"wide" 			"31"

+		"tall" 			"31"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

+		"image"			"../HUD/defense_buff_explosion_blue"

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicUberFireResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicUberFireResistImage"

+		"xpos" 			"100"

+		"ypos" 			"0"

+		"zpos" 			"7"

+		"wide" 			"31"

+		"tall" 			"31"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

+		"image"			"../HUD/defense_buff_fire_blue"

+		"fgcolor" 		"TanDark"

+	}

+	

+	"PlayerStatus_MedicSmallBulletResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicSmallBulletResistImage"

+		"xpos" 			"100"

+		"ypos" 			"0"

+		"zpos" 			"7"

+		"wide" 			"31"

+		"tall" 			"31"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

+		"image"			"../HUD/defense_buff_bullet_blue"

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicSmallBlastResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicSmallBlastResistImage"

+		"xpos" 			"100"

+		"ypos" 			"0"

+		"zpos" 			"7"

+		"wide" 			"31"

+		"tall" 			"31"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

+		"image"			"../HUD/defense_buff_explosion_blue"

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicSmallFireResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicSmallFireResistImage"

+		"xpos" 			"100"

+		"ypos" 			"0"

+		"zpos" 			"7"

+		"wide" 			"31"

+		"tall" 			"31"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

+		"image"			"../HUD/defense_buff_fire_blue"

+		"fgcolor" 		"TanDark"

+	}

+	

+		"PlayerStatus_WheelOfDoom"

+	{

+		"ControlName"	"ImagePanel"

+		"fieldName"		"PlayerStatus_WheelOfDoom"

+		"xpos"			"100"

+		"ypos"			"0"

+		"zpos"			"7"

+		"wide"			"32"

+		"tall"			"32"

+		"visible"		"1"

+		"enabled"		"1"

+		"scaleImage"	"1"	

+		"image"			"../signs/death_wheel_whammy"

+		"fgcolor"		"TanDark"

+	}

+}

diff --git a/resource/ui/MainMenuOverride.res b/resource/ui/MainMenuOverride.res
index 4a5863e..fb86881 100644
--- a/resource/ui/MainMenuOverride.res
+++ b/resource/ui/MainMenuOverride.res
@@ -1499,7 +1499,7 @@
 			"use_proportional_insets" "1"

 			"font"			"CerbeticaBold20"

 			"textAlignment"	"center"

-			"labelText"		"rayshud v3.0"

+			"labelText"		"rayshud v3.01"

 			"dulltext"		"0"

 			"brighttext"	"0"

 			"default"		"1"