CastingEssentials Support

- Added support for CastingEssentials features like team scores, medigun info, player status effects and loadout icons.
- Updated the match HUD and the look of the player list.
- Fixed the in-game chat moving when changing classes.

17 files changed, 785 insertions, 95 deletions

diff --git a/materials/vgui/replay/thumbnails/deadshield.vmt b/materials/vgui/replay/thumbnails/deadshield.vmt
new file mode 100644
index 0000000..8ce4252
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/deadshield.vmt
@@ -0,0 +1,8 @@
+"UnlitGeneric"
+{
+	"$basetexture" "vgui\replay\thumbnails\deadshield"
+	"$translucent" "1"
+	"$vertexcolor" "1"
+	"$ignorez" "1"
+	"%keywords" "tf"
+}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/deadshield.vtf b/materials/vgui/replay/thumbnails/deadshield.vtf
new file mode 100644
index 0000000..61d0a37
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/deadshield.vtf
diff --git a/materials/vgui/replay/thumbnails/kritz.vmt b/materials/vgui/replay/thumbnails/kritz.vmt
new file mode 100644
index 0000000..d1a01e4
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/kritz.vmt
@@ -0,0 +1,8 @@
+"UnlitGeneric"
+{
+	"$basetexture" "vgui\replay\thumbnails\kritz"
+	"$translucent" "1"
+	"$vertexcolor" "1"
+	"$ignorez" "1"
+	"%keywords" "tf"
+}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/kritz.vtf b/materials/vgui/replay/thumbnails/kritz.vtf
new file mode 100644
index 0000000..17c7237
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/kritz.vtf
diff --git a/materials/vgui/replay/thumbnails/quickfix.vmt b/materials/vgui/replay/thumbnails/quickfix.vmt
new file mode 100644
index 0000000..4d75b7c
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/quickfix.vmt
@@ -0,0 +1,8 @@
+"UnlitGeneric"
+{
+	"$basetexture" "vgui\replay\thumbnails\quickfix"
+	"$translucent" "1"
+	"$vertexcolor" "1"
+	"$ignorez" "1"
+	"%keywords" "tf"
+}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/quickfix.vtf b/materials/vgui/replay/thumbnails/quickfix.vtf
new file mode 100644
index 0000000..2579835
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/quickfix.vtf
diff --git a/materials/vgui/replay/thumbnails/uber.vmt b/materials/vgui/replay/thumbnails/uber.vmt
new file mode 100644
index 0000000..3c92c09
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/uber.vmt
@@ -0,0 +1,8 @@
+"UnlitGeneric"
+{
+	"$basetexture" "vgui\replay\thumbnails\uber"
+	"$translucent" "1"
+	"$vertexcolor" "1"
+	"$ignorez" "1"
+	"%keywords" "tf"
+}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/uber.vtf b/materials/vgui/replay/thumbnails/uber.vtf
new file mode 100644
index 0000000..d3f88c9
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/uber.vtf
diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res
index 45c6a89..a80fd62 100644
--- a/resource/ui/hudmatchstatus.res
+++ b/resource/ui/hudmatchstatus.res
@@ -142,7 +142,7 @@
 	{
 		"fieldName"		"RoundCounter"
 		"xpos"			"cs-0.5"
-		"ypos"			"-2"
+		"ypos"			"0"
 		"zpos"			"1"
 		"wide"			"300"
 		"tall"			"100"
@@ -207,11 +207,11 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"ObjectiveStatusTimePanel"
-		"xpos"				"c-55"
+		"xpos"				"c-40"
 		"ypos"				"0"
 		"zpos"				"2"
-		"wide"				"110"
-		"tall"				"150"
+		"wide"				"75"
+		"tall"				"50"
 		"visible"			"0"
 		"enabled"			"1"
 		"delta_item_x"			"22"
@@ -219,7 +219,7 @@
 		"delta_item_end_y"		"70"
 		"PositiveColor"			"ColorGreen"
 		"NegativeColor"			"ColorRed"
-		"delta_lifetime"		"1.5"
+		"delta_lifetime"		"1"
 		"delta_item_font"		"HudFontMedium"
 
 		if_match
@@ -235,11 +235,11 @@
 			"fieldName"		"TimePanelValue"
 			"font"			"HudFontMediumSmall"
 			"fgcolor"		"TanLight"
-			"xpos"			"25"
+			"xpos"			"15"
 			"ypos"			"0"
 			"zpos"			"3"
 			"wide"			"50"
-			"tall"			"24"
+			"tall"			"25"
 			"visible"		"1"
 			"enabled"		"1"
 			"textAlignment"	"center"
@@ -247,9 +247,9 @@
 
 			if_match
 			{
-				"xpos"			"cs-0.5"
-				"ypos"			"13"
-				"tall"			"10"
+				"xpos"			"15"
+				"ypos"			"10"
+				"tall"			"15"
 				"font"			"HudFontSmall"
 			}
 		}
@@ -269,15 +269,15 @@
 
 		"max_size"		"19"
 		"6v6_gap"		"2"
-		"12v12_gap"		"1"
+		"12v12_gap"		"2"
 
 		"team1_grow_dir" 	"west"
-		"team1_base_x"		"c-45"
-		"team1_max_expand"	"133"
+		"team1_base_x"		"c-30"
+		"team1_max_expand"	"200"
 
 		"team2_grow_dir"	"east"
-		"team2_base_x"		"c47"
-		"team2_max_expand"	"133"
+		"team2_base_x"		"c30"
+		"team2_max_expand"	"200"
 
 		"playerpanels_kv"
 		{
@@ -320,8 +320,8 @@
 				"xpos"			"cs-0.5"
 				"ypos"			"0"
 				"zpos"			"3"
-				"wide"			"19"
-				"tall"			"19"
+				"wide"			"20"
+				"tall"			"20"
 				"visible"		"1"
 				"enabled"		"1"
 				"image"			"../hud/class_scoutred"
@@ -406,7 +406,7 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"respawntime"
-				"font"			"HudFontSmallest"
+				"font"			"HudFontSmallBold"
 				"xpos"			"cs-0.5"
 				"ypos"			"0"
 				"zpos"			"5"
diff --git a/resource/ui/hudobjectivetimepanel.res b/resource/ui/hudobjectivetimepanel.res
index 6f0f9c6..f36ed61 100644
--- a/resource/ui/hudobjectivetimepanel.res
+++ b/resource/ui/hudobjectivetimepanel.res
@@ -4,11 +4,11 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"TimePanelBG"
-		"xpos"				"25"
+		"xpos"				"15"
 		"ypos"				"0"
 		"zpos"				"2"
 		"wide"				"50"
-		"tall"				"24"
+		"tall"				"25"
 		"visible"			"1"
 		"enabled"			"1"
 		"bgcolor_override"	"TransparentBlack"
@@ -30,24 +30,19 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"WaitingForPlayersLabel"
-		"xpos"				"25"
-		"ypos"				"20"
+		"xpos"				"15"
+		"ypos"				"25"
 		"zpos"				"5"
 		"wide"				"50"
-		"tall"				"24"
-		"visible"			"0"
+		"tall"				"15"
+		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"#game_WaitingForPlayers"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"wrap"				"0"
-		"font"				"HudFontSmall"
-
-		if_match
-		{
-			"xpos"			"30"
-		}
+		"font"				"ScoreboardVerySmall"
 	}
 	"WaitingForPlayersBG"
 	{
@@ -60,12 +55,12 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"OvertimeLabel"
-		"xpos"				"25"
-		"ypos"				"32"
+		"xpos"				"15"
+		"ypos"				"25"
 		"zpos"				"5"
 		"wide"				"50"
-		"tall"				"24"
-		"visible"			"0"
+		"tall"				"15"
+		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"#game_Overtime"
 		"textAlignment"		"center"
@@ -73,11 +68,6 @@
 		"brighttext"		"0"
 		"wrap"				"0"
 		"font"				"HudFontSmall"
-
-		if_match
-		{
-			"xpos"			"30"
-		}
 	}
 	"OvertimeBG"
 	{
@@ -103,12 +93,12 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"SetupLabel"
-		"xpos"				"25"
-		"ypos"				"20"
+		"xpos"				"15"
+		"ypos"				"25"
 		"zpos"				"5"
 		"wide"				"50"
-		"tall"				"24"
-		"visible"			"0"
+		"tall"				"15"
+		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"#game_Setup"
 		"textAlignment"		"center"
@@ -116,11 +106,6 @@
 		"brighttext"		"0"
 		"wrap"				"0"
 		"font"				"HudFontSmall"
-
-		if_match
-		{
-			"xpos"			"30"
-		}
 	}
 	"SetupBG"
 	{
@@ -133,12 +118,12 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ServerTimeLimitLabel"
-		"xpos"				"25"
-		"ypos"				"20"
+		"xpos"				"15"
+		"ypos"				"25"
 		"zpos"				"5"
 		"wide"				"50"
-		"tall"				"24"
-		"visible"			"0"
+		"tall"				"15"
+		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"%servertimeleft%"
 		"textAlignment"		"center"
@@ -147,11 +132,6 @@
 		"wrap"				"0"
 		"font"				"HudFontSmallest"
 
-		if_match
-		{
-			"xpos"			"30"
-		}
-
 		if_mvm
 		{
 			"xpos"			"9999"
diff --git a/resource/ui/hudstopwatch.res b/resource/ui/hudstopwatch.res
index 98e32f0..e4c702c 100644
--- a/resource/ui/hudstopwatch.res
+++ b/resource/ui/hudstopwatch.res
@@ -7,7 +7,7 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"0"
-		"wide"			"80"
+		"wide"			"90"
 		"tall"			"15"
 		"visible"		"1"
 		"enabled"		"1"
@@ -26,7 +26,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"ObjectiveStatusTimePanel"
-		"xpos"			"55"
+		"xpos"			"60"
 		"ypos"			"0"
 		"zpos"			"1"
 		"wide"			"25"
@@ -66,7 +66,7 @@
 		"font"			"HudFontSmallest"
 		"labelText"		"%scoretobeat%"
 		"textAlignment"	"center"
-		"xpos"			"0"
+		"xpos"			"5"
 		"ypos"			"0"
 		"zpos"			"1"
 		"wide"			"15"
@@ -84,7 +84,7 @@
 		"font"			"HudFontSmallest"
 		"labelText"		"points in"
 		"textAlignment"	"center"
-		"xpos"			"15"
+		"xpos"			"20"
 		"ypos"			"0"
 		"zpos"			"1"
 		"wide"			"40"
@@ -100,13 +100,13 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"StopWatchLabel"
-		"font"			"HudFontSmallest"
+		"font"			"Cerbetica10"
 		"labelText"		"%stopwatchlabel%"
 		"textAlignment"	"center"
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"1"
-		"wide"			"80"
+		"wide"			"90"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
diff --git a/resource/ui/mediguninfo.res b/resource/ui/mediguninfo.res
new file mode 100644
index 0000000..c3740dc
--- /dev/null
+++ b/resource/ui/mediguninfo.res
@@ -0,0 +1,27 @@
+"Resource/UI/MedigunInfo.res"
+{
+	"MedigunInfo"
+	{
+		"ControlName"	"Frame"
+		"fieldName"		"MedigunInfo"
+		"xpos"			"0"
+		"ypos"			"20"
+		"wide"			"f0"
+		"tall"			"f0"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"
+
+		"red_base_x"	"0"
+		"red_base_y"	"c15"
+		"red_offset_x"	"0"
+		"red_offset_y"	"18"
+
+		"blu_base_x"	"0"
+		"blu_base_y"	"c-5"
+		"blu_offset_x"	"0"
+		"blu_offset_y"	"-18"
+	}
+}
\ No newline at end of file
diff --git a/resource/ui/medigunpanel.res b/resource/ui/medigunpanel.res
new file mode 100644
index 0000000..d54b8ef
--- /dev/null
+++ b/resource/ui/medigunpanel.res
@@ -0,0 +1,330 @@
+"Resource/UI/MedigunPanel.res"
+{
+	"MedigunPanel"
+	{
+		"ControlName"	"Frame"
+		"fieldName"		"MedigunPanel"
+		"wide"			"160"
+		"tall"			"17"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"
+
+		"player-dead" {
+			//"visible"	"0"
+		}
+	}
+
+	"PanelCover"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"PanelCover"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"1"
+		"wide"			"f0"
+		"tall"			"f0"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"fillcolor"		"TransparentBlack"
+
+		"player-dead" {
+			//"visible"	"0"
+		}
+		"team-red"  {
+			"xpos"		"0"
+		}
+	}
+
+	"MedigunPanelBackground"
+	{
+		"ControlName" 	"ScalableImagePanel"
+		"fieldName" 	"MedigunPanelBackground"
+		"xpos" 			"0"
+		"ypos"			"0"
+		"zpos" 			"1"
+		"wide" 			"f0"
+		"tall" 			"20"
+		"autoResize" 	"0"
+		"pinCorner"		"0"
+		"visible" 		"0"
+		"enabled" 		"0"
+		"proportionaltoparent"	"1"
+		"image"			"../HUD/color_panel_brown"
+
+		"scaleImage"			"1"
+		"src_corner_height"		"22"	// pixels inside the image
+		"src_corner_width"		"22"
+		"draw_corner_width"		"0"		// screen size of the corners ( and sides ), proportional
+		"draw_corner_height"	"0"
+
+		"player-alive"
+		{
+			"team-red"  {
+				"image"		"../HUD/color_panel_red"
+			}
+			"team-blu"  {
+				"image"		"../HUD/color_panel_blu"
+			}
+		}
+	}
+
+	"MedigunPanelChargeTypeIcon"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"MedigunPanelChargeTypeIcon"
+		"xpos"			"29"
+		"ypos"			"2"
+		"zpos"			"2"
+		"wide"			"14"
+		"tall"			"14"
+		"visible"		"1"
+		"enabled"		"1"
+		"scaleImage"	"1"
+		"image"			"replay/thumbnails/uber"
+
+		"team-red" {
+			"drawcolor"	"188 66 66 255"
+		}
+		"team-blu" {
+			"drawcolor"	"79 117 144 255"
+		}
+
+		"player-alive"
+		{
+			"medigun-kritzkrieg" {
+				"image"		"replay/thumbnails/kritz"
+			}
+
+			"medigun-quickfix" {
+				"image"		"replay/thumbnails/quickfix"
+			}
+
+			"medigun-vaccinator" {
+				"ypos"		"0"
+				"wide"		"17"
+				"tall"		"17"
+				"drawcolor_override"	""
+
+				"team-red"
+				{
+					"resist-bullet" {
+						"image" "../HUD/defense_buff_bullet_red"
+					}
+					"resist-explosive" {
+						"image" "../HUD/defense_buff_explosion_red"
+					}
+					"resist-fire" {
+						"image" "../HUD/defense_buff_fire_red"
+					}
+				}
+
+				"team-blu"
+				{
+					"resist-bullet" {
+						"image" "../HUD/defense_buff_bullet_blue"
+					}
+					"resist-explosive" {
+						"image" "../HUD/defense_buff_explosion_blue"
+					}
+					"resist-fire" {
+						"image" "../HUD/defense_buff_fire_blue"
+					}
+				}
+			}
+		}
+
+		"player-dead"
+		{
+			"wide"		"16"
+			"drawcolor_override"	"130 130 130 225"
+			"image"		"replay/thumbnails/deadshield"
+		}
+	}
+
+	"MedigunPanelChargeLabel"
+    {
+        "ControlName"	"VariableLabel"
+        "fieldName"		"MedigunPanelChargeLabel"
+        "xpos"			"0"
+        "ypos"			"0"
+        "zpos"			"2"
+        "wide"			"24"
+		"tall"			"18"
+        "autoResize"	"1"
+        "visible"		"1"
+        "enabled"		"1"
+        "labelText"		"%charge%"
+        "tabPosition"	"0"
+        "textAlignment"	"center"
+        "dulltext"		"0"
+        "brighttext"	"0"
+        "font"			"Cerbetica16"
+        "fgcolor"		"TanLight"
+
+        "medigun-vaccinator" {
+            "labelText"	"%charges%"
+        }
+
+        "player-dead" {
+            "visible"	"0"
+        }
+    }
+	"MedigunPanelChargeLabelShadow"
+	{
+		"ControlName"	"VariableLabel"
+		"fieldName"		"MedigunPanelChargeLabelShadow"
+		"xpos"			"-1"
+        "ypos"			"-2"
+        "zpos"			"2"
+        "wide"			"24"
+		"tall"			"18"
+        "autoResize"	"1"
+        "visible"		"1"
+        "enabled"		"1"
+        "labelText"		"%charge%"
+        "tabPosition"	"0"
+        "textAlignment"	"center"
+        "dulltext"		"0"
+        "brighttext"	"0"
+        "font"			"Cerbetica16"
+		"fgcolor_override"	"TransparentBlack"
+
+		"pin_to_sibling" 		"MedigunPanelChargeLabel"
+		"pin_corner_to_sibling" "PIN_TOPLEFT"
+		"pin_to_sibling_corner" "PIN_TOPLEFT"
+
+		"player-dead" {
+			"visible"   "0"
+		}
+	}
+
+	"MedigunPanelChargeMeter"
+    {
+        "ControlName"		"ImageProgressBar"
+        "fieldName"			"MedigunPanelChargeMeter"
+        "font"				"Default"
+        "xpos"				"49"
+        "ypos"				"0"
+        "zpos"				"2"
+		"wide"				"112"
+		"tall"				"18"
+        "autoResize"		"0"
+        "pinCorner"			"0"
+        "visible"			"1"
+        "enabled"			"1"
+        "textAlignment"		"Left"
+        "dulltext"			"0"
+        "brighttext"		"0"
+		"bgcolor_override"	"38 55 63 255"
+		"fgcolor_override"	"57 92 120 255"
+        "direction"			"east"
+        "variable"			"charge"
+
+        "medigun-vaccinator" {
+            "visible"       "0"
+        }
+
+        "player-dead" {
+            "visible"       "0"
+        }
+		"team-red" {
+			"bgcolor_override"	"89 24 23 255"
+			"fgcolor_override"	"157 49 47 255"
+		}
+    }
+
+	"MedigunPanelNameLabel"
+	{
+		"ControlName"	"VariableLabel"
+		"fieldName"		"MedigunPanelNameLabel"
+		"xpos"			"50"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"80"
+		"tall"			"18"
+		"autoResize"	"1"
+		"labelText"		"#TF_Weapon_Medigun"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"
+		"textAlignment"	"west"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"textinsetx"	"6"
+		"font"			"HudFontSmall"
+		"fgcolor_override"		"TanLight"
+		"proportionaltoparent"	"1"
+
+		"medigun-medigun" {
+			"labelText"	"#TF_Weapon_Medigun"
+		}
+
+		"medigun-kritzkrieg" {
+			"labelText"	"#TF_Unique_Achievement_Medigun1"
+		}
+
+		"medigun-quickfix" {
+			"labelText"	"#TF_Unique_MediGun_QuickFix"
+		}
+
+		"medigun-vaccinator" {
+			"labelText"	"#TF_Weapon_Medigun_Resist"
+		}
+
+		"player-dead" {
+			"visible"	"0"
+		}
+	}
+
+	"MedigunPanelNameLabelShadow"
+	{
+		"ControlName"	"VariableLabel"
+		"fieldName"		"MedigunPanelNameLabelShadow"
+		"xpos"			"-1"
+		"ypos"			"-1"
+		"zpos"			"3"
+		"wide"			"80"
+		"tall"			"18"
+		"autoResize"	"1"
+		"labelText"		"#TF_Weapon_Medigun"
+		"visible"		"0"
+		"enabled"		"0"
+		"tabPosition"	"0"
+		"textAlignment"	"west"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"textinsetx"	"6"
+		"font"			"HudFontSmall"
+		"fgcolor_override"		"TransparentBlack"
+		"proportionaltoparent"	"1"
+
+		"pin_to_sibling" 		"MedigunPanelNameLabel"
+		"pin_corner_to_sibling" "PIN_TOPLEFT"
+		"pin_to_sibling_corner" "PIN_TOPLEFT"
+
+		"medigun-medigun" {
+			"labelText"	"TF_Weapon_Medigun"
+		}
+
+		"medigun-kritzkrieg" {
+			"labelText"	"#TF_Unique_Achievement_Medigun1"
+		}
+
+		"medigun-quickfix" {
+			"labelText"	"#TF_Unique_MediGun_QuickFix"
+		}
+
+		"medigun-vaccinator" {
+			"labelText"	"#TF_Weapon_Medigun_Resist"
+		}
+
+		"player-dead" {
+			"visible"	"0"
+		}
+	}
+}
\ No newline at end of file
diff --git a/resource/ui/spectatortournament.res b/resource/ui/spectatortournament.res
index 96ced69..7ba9cfd 100644
--- a/resource/ui/spectatortournament.res
+++ b/resource/ui/spectatortournament.res
@@ -13,19 +13,20 @@
 		"enabled"				"1"
 
 		"team1_player_base_offset_x"	"0"
-		"team1_player_base_y"			"255"
+		"team1_player_base_x"			"0"
+		"team1_player_base_y"			"239"
 		"team1_player_delta_x"			"0"
 		"team1_player_delta_y"			"-16"
 
 		"team2_player_base_offset_x"	"0"
-		"team2_player_base_y"			"275"
+		"team2_player_base_y"			"291"
 		"team2_player_delta_x"			"0"
 		"team2_player_delta_y"			"16"
 
 		"playerpanels_kv"
 		{
 			"visible"			"0"
-			"wide"				"156"
+			"wide"				"160"
 			"tall"				"16"
 			"zpos"				"1"
 			"color_ready"		"0 255 0 220"
@@ -64,6 +65,69 @@
 				"proportionaltoparent"	"1"
 			}
 
+			"LoadoutIconsActiveItemRed"
+			{
+				"ControlName"		"ImagePanel"
+				"fieldName"			"LoadoutIconsActiveItemRed"
+				"xpos"				"135"
+				"ypos"				"3"
+				"zpos"				"200"
+				"wide"				"24"
+				"tall"				"11"
+				"visible"			"1"
+				"enabled"			"1"
+				"scaleImage"		"1"
+				"proportionalToParent"	"1"
+				//fillcolor_override 	"255 0 0 32"
+			}
+			"LoadoutIconsActiveItemBlue"
+			{
+				"ControlName"		"ImagePanel"
+				"fieldName"			"LoadoutIconsActiveItemBlue"
+				"xpos"				"135"
+				"ypos"				"3"
+				"zpos"				"200"
+				"wide"				"24"
+				"tall"				"11"
+				"visible"			"1"
+				"enabled"			"1"
+				"scaleImage"		"1"
+				"proportionalToParent"	"1"
+				//fillcolor_override 	"255 0 0 32"
+			}
+
+			"StatusEffectIconRed"
+			{
+				"ControlName"			"ImagePanel"
+				"fieldName"				"StatusEffectIconRed"
+				"xpos"					"27"
+				"ypos"					"1"
+				"zpos"					"200"
+				"wide"					"14"
+				"tall"					"14"
+				"visible"				"0"
+				"enabled"				"1"
+				"scaleImage"			"1"
+				"proportionalToParent"	"1"
+				"image"					""
+			}
+
+			"StatusEffectIconBlue"
+			{
+				"ControlName"			"ImagePanel"
+				"fieldName"				"StatusEffectIconBlue"
+				"xpos"					"27"
+				"ypos"					"1"
+				"zpos"					"200"
+				"wide"					"14"
+				"tall"					"14"
+				"visible"				"0"
+				"enabled"				"1"
+				"scaleImage"			"1"
+				"proportionalToParent" 	"1"
+				"image"					""
+			}
+
 			"PanelLeftFringe"
 			{
 				"ControlName"		"ImagePanel"
@@ -271,9 +335,9 @@
 				"ControlName"		"CExLabel"
 				"fieldName"			"chargeamount"
 				"font"				"HudFontSmallest"
-				"xpos"				"126"
+				"xpos"				"132"
 				"ypos"				"2"
-				"zpos"				"6"
+				"zpos"				"201"
 				"wide"				"25"
 				"tall"				"13"
 				"autoResize"		"0"
@@ -289,8 +353,8 @@
 				"ControlName"		"CExLabel"
 				"fieldName"			"chargeamountBG"
 				"font"				"HudFontSmallest"
-				"xpos"				"127"
-				"ypos"				"3"
+				"xpos"				"-1"
+				"ypos"				"-1"
 				"zpos"				"6"
 				"wide"				"25"
 				"tall"				"13"
@@ -300,6 +364,7 @@
 				"labelText"			"%chargeamount%"
 				"textAlignment"		"east"
 				"fgcolor"			"TransparentBlack"
+				"pin_to_sibling"	"chargeamount"
 			}
 		}
 	}
diff --git a/resource/ui/teamscorepanel.res b/resource/ui/teamscorepanel.res
new file mode 100644
index 0000000..8c97120
--- /dev/null
+++ b/resource/ui/teamscorepanel.res
@@ -0,0 +1,256 @@
+/////////////////////////////////////////////////
+// Contributed by https://github.com/Wiethoofd //
+/////////////////////////////////////////////////
+"Resource/UI/TeamScorePanel.res"
+{
+	"TeamScorePanel"
+	{
+		"ControlName"			"EditablePanel"
+		"fieldName"				"TeamScorePanel"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"100"
+		"wide"					"f0"
+		"tall"					"100"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+	}
+
+	"TeamNameBluBG"
+	{
+		"ControlName"			"ImagePanel"
+		"fieldName"				"TeamNameBG"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"0"
+		"wide"					"398"
+		"tall"					"25"
+		"visible"				"1"
+		"enabled"				"1"
+		"fillcolor"				"TransparentBlack"
+	}
+
+	"TeamNameRedBG"
+	{
+		"ControlName"			"ImagePanel"
+		"fieldName"				"TeamNameBG"
+		"xpos"					"c33"
+		"ypos"					"0"
+		"zpos"					"0"
+		"wide"					"f0"
+		"tall"					"25"
+		"visible"				"1"
+		"enabled"				"1"
+		"fillcolor"				"TransparentBlack"
+	}
+
+	"TeamNameBlu"
+	{
+		"ControlName"			"VariableLabel"
+		"fieldName"				"TeamNameBlu"
+		"xpos"					"0"
+		"ypos"					"-3"
+		"zpos"					"1"
+		"wide"					"100"
+		"tall"					"18"
+		"font"					"Cerbetica24"
+		"labelText"				"%blueteamname%"
+		"textinsetx"			"20"
+		"textAlignment"			"east"
+		"visible"				"1"
+		"auto_wide_tocontents"	"1"
+		"fgcolor_override"		"BlueSolid"
+
+		"pin_to_sibling"		"TeamScoreBluBG"
+		"pin_corner_to_sibling"	"PIN_TOPRIGHT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+	}
+
+	"TeamNameBluShadow"
+	{
+		"ControlName"			"VariableLabel"
+		"fieldName"				"TeamNameBluShadow"
+		"xpos"					"-2"
+		"ypos"					"-2"
+		"wide"					"100"
+		"tall"					"18"
+		"font"					"Cerbetica24"
+		"labelText"				"%blueteamname%"
+		"textinsetx"			"20"
+		"textAlignment"			"east"
+		"visible"				"1"
+		"fgcolor_override"		"TransparentBlack"
+		"auto_wide_tocontents"	"1"
+
+		"pin_to_sibling"		"TeamNameBlu"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+	}
+
+	"TeamScoreBluBG"
+	{
+		"ControlName"			"ImagePanel"
+		"fieldName"				"TeamScoreBluBG"
+		"xpos"					"-25"
+		"ypos"					"0"
+		"zpos"					"0"
+		"wide"					"25"
+		"tall"					"25"
+		"fillcolor"				"BlueSolid"
+
+		"pin_to_sibling"		"CenterAnchor"
+		"pin_corner_to_sibling"	"PIN_TOPRIGHT"
+		"pin_to_sibling_corner"	"PIN_TOPRIGHT"
+	}
+
+	"TeamScoreBlu"
+	{
+		"ControlName"			"VariableLabel"
+		"fieldName"				"TeamScoreBlu"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"1"
+		"wide"					"25"
+		"tall"					"25"
+		"font"					"Cerbetica24"
+		"labelText"				"%blueteamscore%"
+		"textAlignment"			"center"
+		"visible"				"1"
+		"fgcolor_override"		"White"
+
+		"pin_to_sibling"		"TeamScoreBluBG"
+		"pin_corner_to_sibling"	"PIN_CENTER_TOP"
+		"pin_to_sibling_corner"	"PIN_CENTER_TOP"
+	}
+
+	"TeamScoreBluShadow"
+	{
+		"ControlName"			"VariableLabel"
+		"fieldName"				"TeamScoreBluShadow"
+		"xpos"					"-2"
+		"ypos"					"-2"
+		"wide"					"25"
+		"tall"					"25"
+		"font"					"Cerbetica24"
+		"labelText"				"%blueteamscore%"
+		"textAlignment"			"center"
+		"visible"				"1"
+		"fgcolor_override"		"TransparentBlack"
+
+		"pin_to_sibling"		"TeamScoreBlu"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+	}
+
+	"CenterAnchor"
+	{
+		"ControlName"			"EditablePanel"
+		"fieldName"				"CenterAnchor"
+		"xpos"					"c0"
+		"ypos"					"0"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"1"
+	}
+
+	"TeamScoreRed"
+	{
+		"ControlName"			"VariableLabel"
+		"fieldName"				"TeamScoreRed"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"2"
+		"wide"					"35"
+		"tall"					"25"
+		"font"					"Cerbetica24"
+		"labelText"				"%redteamscore%"
+		"textAlignment"			"center"
+		"visible"				"1"
+		"fgcolor_override"		"White"
+
+		"pin_to_sibling"		"TeamScoreRedBG"
+		"pin_corner_to_sibling"	"PIN_CENTER_TOP"
+		"pin_to_sibling_corner"	"PIN_CENTER_TOP"
+	}
+
+	"TeamScoreRedShadow"
+	{
+		"ControlName"			"VariableLabel"
+		"fieldName"				"TeamScoreRedShadow"
+		"xpos"					"-2"
+		"ypos"					"-2"
+		"zpos"					"1"
+		"wide"					"35"
+		"tall"					"25"
+		"font"					"Cerbetica24"
+		"labelText"				"%redteamscore%"
+		"textAlignment"			"center"
+		"visible"				"1"
+		"fgcolor_override"		"TransparentBlack"
+
+		"pin_to_sibling"		"TeamScoreRed"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+	}
+
+	"TeamNameRed"
+	{
+		"ControlName"			"VariableLabel"
+		"fieldName"				"TeamNameRed"
+		"xpos"					"0"
+		"ypos"					"-3"
+		"zpos"					"1"
+		"wide"					"100"
+		"tall"					"18"
+		"font"					"Cerbetica24"
+		"labelText"				"%redteamname%"
+		"textinsetx"			"20"
+		"textAlignment"			"west"
+		"visible"				"1"
+		"fgcolor_override"		"RedSolid"
+		"auto_wide_tocontents"	"1"
+
+		"pin_to_sibling"		"TeamScoreRedBG"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPRIGHT"
+	}
+
+	"TeamNameRedShadow"
+	{
+		"ControlName"			"VariableLabel"
+		"fieldName"				"TeamNameRedShadow"
+		"xpos"					"-2"
+		"ypos"					"-2"
+		"wide"					"100"
+		"tall"					"18"
+		"font"					"Cerbetica24"
+		"labelText"				"%redteamname%"
+		"textinsetx"			"20"
+		"textAlignment"			"west"
+		"visible"				"1"
+		"auto_wide_tocontents"	"1"
+		"fgcolor_override"		"TransparentBlack"
+
+		"pin_to_sibling"		"TeamNameRed"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+	}
+
+	"TeamScoreRedBG"
+	{
+		"ControlName"			"ImagePanel"
+		"fieldName"				"TeamScoreRedBG"
+		"xpos"					"-25"
+		"ypos"					"0"
+		"zpos"					"0"
+		"wide"					"25"
+		"tall"					"25"
+		"fillcolor"				"RedSolid"
+		"pin_to_sibling"		"CenterAnchor"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+	}
+}
\ No newline at end of file
diff --git a/scripts/hudanimations_custom.txt b/scripts/hudanimations_custom.txt
index a1b2b6b..c1571a5 100644
--- a/scripts/hudanimations_custom.txt
+++ b/scripts/hudanimations_custom.txt
@@ -124,7 +124,7 @@ event HudMedicChargedStop
 	Animate	ChargeLabel 				FgColor		"Ammo In Clip"		Linear 0.0 0.0001
 }
 //==================================================================================
-// Hitmarker Pulse
+
 event DamagedPlayer
 {
 	StopEvent HitMarker 				0.0
@@ -137,6 +137,7 @@ event HitMarker
 	Animate	CustomCrosshair				FgColor		"Crosshair"			Linear 0.10	0.10001
 }
 //==================================================================================
+
 // Spy Disguise
 event HudSpyDisguiseFadeIn
 {
@@ -162,26 +163,25 @@ event HudSpyDisguiseChanged
 
 event HudSnapShotReminderIn
 {
-    RunEvent DefaultAnimHudSnapShotReminderIn	0.0
-    RunEvent HudHealthBonusPulseStop 			0.0
-    RunEvent HudHealthDyingPulseStop 			0.0
-    RunEvent HudLowAmmoPulseStop 				0.0
-    RunEvent HudMedicChargedStop 				0.0
+    RunEvent HudHealthDyingPulseStop 			10.0
+    RunEvent HudHealthBonusPulseStop 			10.0
+    RunEvent HudLowAmmoPulseStop 				10.0
+    RunEvent HudMedicChargedStop 				10.0
 }
 //==================================================================================
 
-event CompetitiveGame_LowerChatWindow
-{ 
-	Animate HudChat ypos r120 Accel 0 0
+event TeamStatus_PlayerDead
+{
+	SetVisible	respawntime	1	0
 }
 
-event CompetitiveGame_RestoreChatWindow
-{ 
-	Animate HudChat ypos 25 Accel 0 0
+event TeamStatus_PlayerAlive
+{
+	SetVisible	respawntime	0	0.2
 }
 
-event HudTournament_MoveChatWindow
-{
-	RunEvent CompetitiveGame_LowerChatWindow 0
-	RunEvent CompetitiveGame_RestoreChatWindow 0
-}
\ No newline at end of file
+//==================================================================================
+
+event CompetitiveGame_LowerChatWindow { }
+event CompetitiveGame_RestoreChatWindow { }
+event HudTournament_MoveChatWindow { }
\ No newline at end of file
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
index 8135ec8..f5bc2a3 100644
--- a/scripts/hudlayout.res
+++ b/scripts/hudlayout.res
@@ -120,7 +120,7 @@
 
 	HudDemomanCharge
 	{
-		"fieldName"			"HudItemEffectMeter"
+		"fieldName"			"HudDemomanCharge"
 		"visible"			"1"
 		"enabled"			"1"
 		"xpos"				"c-75"
@@ -361,9 +361,9 @@
 	HudRoundTimer
 	{
 		"fieldName"				"HudRoundTimer"
-		"xpos"					"c-20"
+		"xpos"					"0"
 		"ypos"					"440"
-		"wide"					"120"
+		"wide"					"f0"
 		"tall"  				"40"
 		"visible" 				"1"
 		"enabled" 				"1"
@@ -408,8 +408,8 @@
 		"fieldName"				"HudDamageIndicator"
 		"visible" 				"1"
 		"enabled" 				"1"
-		"MinimumWidth" 			"10"
-		"MaximumWidth"			"10"
+		"MinimumWidth" 			"15"
+		"MaximumWidth"			"15"
 		"StartRadius"			"80"
 		"EndRadius"				"80"
 		"MinimumHeight"			"30"
@@ -471,7 +471,7 @@
 		"visible" 				"1"
 		"enabled" 				"1"
 		"xpos"	 				"r592"
-		"ypos"	 				"22"
+		"ypos"	 				"25"
 		"wide"	 				"580"
 		"tall"	 				"468"
 		"MaxDeathNotices"		"5"
@@ -1094,10 +1094,10 @@
 		"fieldName"			"HudStopWatch"
 		"visible"			"1"
 		"enabled"			"1"
-		"xpos"				"c-44"
+		"xpos"				"c-115"
 		"ypos"				"27"
 		"zpos"				"0"
-		"wide"				"80"
+		"wide"				"90"
 		"tall"				"15"
 	}