Christmas Update Fixes (incomplete)

7 files changed, 331 insertions, 10 deletions

diff --git a/minmode/resource/ClientScheme.res b/minmode/resource/ClientScheme.res
index 6f3ca1b..c4f9543 100644
--- a/minmode/resource/ClientScheme.res
+++ b/minmode/resource/ClientScheme.res
@@ -2905,19 +2905,18 @@ Scheme
 				"antialias"	 "1"

 			}

 		}

-		"CerbeticaBoldOutline24"

+		"CerbeticaBold24"

 		{

 			"1"

 			{

 				"name"		 "Cerbetica"

 				"tall" 		 "24"

-				"weight"	 "800"

+				"weight" 	 "800"

 				"additive"	 "0"

 				"antialias"	 "1"

-				"outline"	 "1"

 			}

 		}

-		"CerbeticaBold24"

+		"CerbeticaBoldOutline24"

 		{

 			"1"

 			{

@@ -2926,6 +2925,7 @@ Scheme
 				"weight"	 "800"

 				"additive"	 "0"

 				"antialias"	 "1"

+				"outline"	 "1"

 			}

 		}

 		"CerbeticaBold28"

diff --git a/minmode/resource/GameMenu.res b/minmode/resource/GameMenu.res
index 39a94d6..090558c 100644
--- a/minmode/resource/GameMenu.res
+++ b/minmode/resource/GameMenu.res
@@ -3,7 +3,7 @@
 

 	"VersionNumber"

 	{

-		"label" "rayshud v3.0" 

+		"label" "rayshud v3.01" 

 		"command" "toggleconsole"

 		"subimage" ""

 		"OnlyAtMenu" "0"

diff --git a/minmode/resource/ui/HudMannVsMachineStatus.res b/minmode/resource/ui/HudMannVsMachineStatus.res
index eb1a22a..00ef6cb 100644
--- a/minmode/resource/ui/HudMannVsMachineStatus.res
+++ b/minmode/resource/ui/HudMannVsMachineStatus.res
@@ -26,10 +26,10 @@
 		"enabled"			"1"

 	}

 	

-	"TankStatusPanel"

+	"BossStatusPanel"

 	{

-		"ControlName"		"CTankStatusPanel"

-		"fieldName"			"TankStatusPanel"

+		"ControlName"		"CMvMBossStatusPanel"

+		"fieldName"			"MvMBossStatusPanel"

 		"xpos"				"0"

 		"ypos"				"0"

 		"zpos"				"0"

diff --git a/minmode/resource/ui/HudMedicCharge.res b/minmode/resource/ui/HudMedicCharge.res
index aa6ea35..6c9eb05 100644
--- a/minmode/resource/ui/HudMedicCharge.res
+++ b/minmode/resource/ui/HudMedicCharge.res
@@ -74,6 +74,48 @@
 		"enabled"		"1"

 		"fillcolor" 		"255 255 255 50"

 	}

+	"IndividualChargesLabel"

+	{

+		"ControlName"	"CExLabel"

+		"fieldName" 	"IndividualChargesLabel"

+		"xpos" 			"124"

+		"ypos" 			"45"

+		"zpos" 			"2"

+		"wide" 			"60"

+		"tall" 			"32"

+		"autoResize" 	"1"

+		"pinCorner" 	"2"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"tabPosition" 	"0"

+		"labelText" 	"#TF_IndividualUberchargesMinHUD"

+		"textAlignment" "center"

+		"dulltext"		"0"

+		"brighttext" 	"0"

+		"font" 			"CerbeticaBold20"

+	}

+	

+	"IndividualChargesLabelShadow"

+	{

+		"ControlName"	"CExLabel"

+		"fieldName" 	"IndividualChargesLabelShadow"

+		"xpos" 			"125"

+		"ypos" 			"46"

+		"zpos" 			"2"

+		"wide" 			"60"

+		"tall" 			"32"

+		"autoResize" 	"1"

+		"pinCorner" 	"2"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"tabPosition" 	"0"

+		"labelText" "#TF_IndividualUberchargesMinHUD"

+		"textAlignment" "center"

+		"dulltext"		"0"

+		"brighttext" 	"0"

+		"font" 			"CerbeticaBold20"

+		"fgcolor"		"TransparentBlack"

+	}

 	

 	"ChargeMeter"

 	{	

@@ -95,6 +137,82 @@
 		"bgcolor" 		"32 32 32 128"

 		"fgcolor" 		"TanLight"

 	}

+	"ChargeMeter1"

+	{

+		"ControlName" 		"ContinuousProgressBar"

+		"fieldName" 		"ChargeMeter1"

+		"font" 				"Default"

+		"xpos" 				"64"

+		"ypos" 				"76"

+		"zpos"				"2"

+		"wide" 				"28"

+		"tall" 				"10"

+		"autoResize" 		"0"

+		"pinCorner" 		"0"

+		"visible" 			"1"

+		"enabled" 			"1"

+		"textAlignment" 	"Left"

+		"dulltext" 			"0"

+		"brighttext" 		"0"

+	

+	}

+

+	"ChargeMeter2"

+	{

+		"ControlName" 		"ContinuousProgressBar"

+		"fieldName" 		"ChargeMeter2"

+		"font" 				"Default"

+		"xpos" 				"94"

+		"ypos" 				"76"

+		"zpos" 				"2"

+		"wide" 				"28"

+		"tall" 				"10"

+		"autoResize" 		"0"

+		"pinCorner"			"0"

+		"visible" 			"1"

+		"enabled"			"1"

+		"textAlignment" 	"Left"

+		"dulltext" 			"0"

+		"brighttext" 		"0"

+	}

+

+	"ChargeMeter3"

+		{

+			"ControlName" 	"ContinuousProgressBar"

+			"fieldName" 	"ChargeMeter3"

+			"font" 			"Default"

+			"xpos" 			"124"

+			"ypos" 			"76"

+			"zpos" 			"2"

+			"wide" 			"28"

+			"tall" 			"10"

+			"autoResize" 	"0"

+			"pinCorner"		"0"

+			"visible" 		"1"

+			"enabled" 		"1"

+			"textAlignment" "Left"

+			"dulltext" 		"0"

+			"brighttext" 	"0"

+		}

+

+	"ChargeMeter4"

+	{

+		"ControlName" 	"ContinuousProgressBar"

+		"fieldName" 	"ChargeMeter4"

+		"font" 			"Default"

+		"xpos"			"154"

+		"ypos" 			"76"

+		"zpos" 			"2"

+		"wide" 			"28"

+		"tall" 			"10"

+		"autoResize" 	"0"

+		"pinCorner" 	"0"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"textAlignment" "Left"

+		"dulltext" 		"0"

+		"brighttext" 	"0"

+	}

 

 	"ChargeMeterLabel"

 	{

@@ -130,5 +248,18 @@
 		"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/minmode/resource/ui/HudPlayerHealth-cross.res b/minmode/resource/ui/HudPlayerHealth-cross.res
index 9a49ca7..d0f18aa 100644
--- a/minmode/resource/ui/HudPlayerHealth-cross.res
+++ b/minmode/resource/ui/HudPlayerHealth-cross.res
@@ -150,6 +150,101 @@
 		"image"			"../vgui/marked_for_death"

 		"fgcolor"		"TanDark"

 	}

+	"PlayerStatus_MedicUberBulletResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicUberBulletResistImage"

+		"xpos" 			"115"

+		"ypos" 			"15"

+		"zpos" 			"7"

+		"wide" 			"24"

+		"tall" 			"24"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

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

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicUberBlastResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicUberBlastResistImage"

+		"xpos" 			"115"

+		"ypos" 			"15"

+		"zpos" 			"7"

+		"wide" 			"24"

+		"tall" 			"24"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

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

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicUberFireResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicUberFireResistImage"

+		"xpos" 			"115"

+		"ypos" 			"15"

+		"zpos" 			"7"

+		"wide" 			"24"

+		"tall" 			"24"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

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

+		"fgcolor" 		"TanDark"

+	}

+	

+	"PlayerStatus_MedicSmallBulletResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicSmallBulletResistImage"

+		"xpos" 			"115"

+		"ypos" 			"15"

+		"zpos" 			"7"

+		"wide" 			"24"

+		"tall" 			"24"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

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

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicSmallBlastResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicSmallBlastResistImage"

+		"xpos" 			"115"

+		"ypos" 			"15"

+		"zpos" 			"7"

+		"wide" 			"24"

+		"tall" 			"24"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

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

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicSmallFireResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicSmallFireResistImage"

+		"xpos" 			"115"

+		"ypos" 			"15"

+		"zpos" 			"7"

+		"wide" 			"24"

+		"tall" 			"24"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

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

+		"fgcolor" 		"TanDark"

+	}

 	

 		"PlayerStatus_WheelOfDoom"

 	{

diff --git a/minmode/resource/ui/HudPlayerHealth.res b/minmode/resource/ui/HudPlayerHealth.res
index 929ba6c..79a9fe2 100644
--- a/minmode/resource/ui/HudPlayerHealth.res
+++ b/minmode/resource/ui/HudPlayerHealth.res
@@ -150,6 +150,101 @@
 		"image"			"../vgui/marked_for_death"

 		"fgcolor"		"TanDark"

 	}

+	"PlayerStatus_MedicUberBulletResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicUberBulletResistImage"

+		"xpos" 			"115"

+		"ypos" 			"15"

+		"zpos" 			"7"

+		"wide" 			"24"

+		"tall" 			"24"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

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

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicUberBlastResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicUberBlastResistImage"

+		"xpos" 			"115"

+		"ypos" 			"15"

+		"zpos" 			"7"

+		"wide" 			"24"

+		"tall" 			"24"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

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

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicUberFireResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicUberFireResistImage"

+		"xpos" 			"115"

+		"ypos" 			"15"

+		"zpos" 			"7"

+		"wide" 			"24"

+		"tall" 			"24"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

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

+		"fgcolor" 		"TanDark"

+	}

+	

+	"PlayerStatus_MedicSmallBulletResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicSmallBulletResistImage"

+		"xpos" 			"115"

+		"ypos" 			"15"

+		"zpos" 			"7"

+		"wide" 			"24"

+		"tall" 			"24"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

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

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicSmallBlastResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicSmallBlastResistImage"

+		"xpos" 			"115"

+		"ypos" 			"15"

+		"zpos" 			"7"

+		"wide" 			"24"

+		"tall" 			"24"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

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

+		"fgcolor" 		"TanDark"

+	}	

+	

+	"PlayerStatus_MedicSmallFireResistImage"

+	{

+		"ControlName" 	"ImagePanel"

+		"fieldName" 	"PlayerStatus_MedicSmallFireResistImage"

+		"xpos" 			"115"

+		"ypos" 			"15"

+		"zpos" 			"7"

+		"wide" 			"24"

+		"tall" 			"24"

+		"visible" 		"1"

+		"enabled" 		"1"

+		"scaleImage" 	"1"

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

+		"fgcolor" 		"TanDark"

+	}

 	

 		"PlayerStatus_WheelOfDoom"

 	{

diff --git a/minmode/resource/ui/MainMenuOverride.res b/minmode/resource/ui/MainMenuOverride.res
index 4a5863e..fb86881 100644
--- a/minmode/resource/ui/MainMenuOverride.res
+++ b/minmode/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"