More support for new modes

2 files changed, 52 insertions, 88 deletions

diff --git a/resource/ui/HudTeamGoalTournament.res b/resource/ui/HudTeamGoalTournament.res
index 12e33ca..93f6195 100644
--- a/resource/ui/HudTeamGoalTournament.res
+++ b/resource/ui/HudTeamGoalTournament.res
@@ -1,80 +1,5 @@
-"Resource/UI/HudTeamGoal.res"

+"Resource/UI/HudTeamGoalTournament.res"

 {

-	"HudTeamGoalBG"

-	{

-		"ControlName"		"CTFImagePanel"

-		"fieldName"		"HudTeamGoalBG"

-		"xpos"			"9999"

-		"ypos"			"9999"

-		"zpos"			"-1"

-		"wide"			"320"

-		"tall"			"150"

-		"autoResize"		"0"

-		"pinCorner"		"0"

-		"visible"		"1"

-		"enabled"		"1"

-		"image"			"../hud/death_panel_blue_bg"

-		"scaleImage"		"1"

-		"teambg_2"		"../hud/death_panel_red_bg"

-		"teambg_3"		"../hud/death_panel_blue_bg"

-	}

-	"SwitchLabel"

-	{	

-		"ControlName"		"Label"

-		"fieldName"		"SwitchLabel"

-		"font"			"HudFontSmallBold"

-		"xpos"			"9999"

-		"ypos"			"9999"

-		"zpos"			"1"

-		"wide"			"220"	[$WIN32]

-		"wide"			"180"	[$X360]

-		"tall"			"15"

-		"autoResize"		"0"

-		"pinCorner"		"0"

-		"visible"		"1"

-		"enabled"		"1"

-		"wrap"			"1"

-		"labelText"		"#TF_teamswitch_attackers"

-		"textAlignment"		"North"

-	}

-	"GoalLabel"

-	{	

-		"ControlName"		"Label"

-		"fieldName"		"GoalLabel"

-		"font"			"HudFontSmall"

-		"xpos"			"9999"

-		"ypos"			"9999"

-		"zpos"			"1"

-		"wide"			"220"

-		"wide_hidef"	"200"

-		"wide_lodef"		"230"

-		"tall"			"55"

-		"tall_lodef"	"60"

-		"autoResize"		"0"

-		"pinCorner"		"0"

-		"visible"		"1"

-		"enabled"		"1"

-		"wrap"			"1"

-		"labelText"		""

-		"textAlignment"		"North"

-	}

-	"GoalImage"

-	{

-		"ControlName"		"CTFImagePanel"

-		"fieldName"		"GoalImage"

-		"xpos"			"9999"

-		"ypos"			"9999"

-		"zpos"			"1"

-		"wide"			"45"

-		"tall"			"45"

-		"autoResize"		"0"

-		"pinCorner"		"0"

-		"visible"		"1"

-		"enabled"		"1"

-		"image"			"../hud/hud_icon_attack"

-		"scaleImage"		"1"

-	}

-

 	"HudStopWatchObjective"

 	{

 		"ControlName"		"EditablePanel"

@@ -83,7 +8,7 @@
 		"ypos"				"99999"

 		"zpos"				"1"

 		"wide"				"275"

-		"tall"				"130"

+		"tall"				"190"

 		"visible"			"0"

 		"enabled"			"1"

 

@@ -95,7 +20,7 @@
 			"ypos"			"0"

 			"zpos"			"-1"

 			"wide"			"275"

-			"tall"			"130"

+			"tall"			"170"

 			"autoResize"		"0"

 			"pinCorner"		"0"

 			"visible"		"1"

@@ -117,7 +42,7 @@
 			"ypos"			"0"

 			"zpos"			"-1"

 			"wide"			"275"

-			"tall"			"80"

+			"tall"			"100"

 			"autoResize"		"0"

 			"pinCorner"		"0"

 			"visible"		"0"

@@ -162,7 +87,7 @@
 			"pinCorner"		"1"

 			"visible"		"1"

 			"enabled"		"1"

-			"labelText"		"They got 3 points in just 20 minutes 43 seconds."

+			"labelText"		""

 			"textAlignment"		"west"

 			"font"			"HudFontSmallestShadow"

 			"maxchars"		"-1"

@@ -193,13 +118,13 @@
 			"xpos"			"25"	[$WIN32]

 			"ypos"			"75"	[$WIN32]

 			"wide"			"225"

-			"tall"			"150"

+			"tall"			"165"

 			"wrap"			"1"

 			"autoResize"		"1"

 			"pinCorner"		"1"

 			"visible"		"1"

 			"enabled"		"1"

-			"labelText"		"They got 3 points in just 20 minutes 43 seconds."

+			"labelText"		""

 			"textAlignment"		"west"

 			"font"			"HudFontSmallestShadow"

 			"maxchars"		"-1"

diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res
index ef75469..32d5703 100644
--- a/resource/ui/hudmatchstatus.res
+++ b/resource/ui/hudmatchstatus.res
@@ -1,8 +1,8 @@
-"Resource/UI/Competitive.res"
+"Resource/UI/HudMatchStatus.res"
 {
 	"HudMatchStatus"
 	{
-		"fieldName"		"RoundSignModel"
+		"fieldName"		"HudMatchStatus"
 		"avatar_width"	"63"
 		"spacer"		"5"
 		"name_width"	"57"
@@ -27,7 +27,7 @@
 		
 		"model"
 		{
-			"modelname"	"models/props_ui/round_banner.mdl"
+			"modelname"	"models/props_ui/banner.mdl"
 			"skin"		"0"
 			"angles_x"	"30"
 			"angles_y"	"180"
@@ -217,9 +217,15 @@
 		"zpos"				"0"
 		"wide"				"365"
 		"tall"				"0"
-
+		"visible"			"0"
+		
 		"proportionaltoaparent"	"1"
 		"border"			"TFFatLineBorder"
+		
+		if_match
+		{
+			"visible"		"1"
+		}
 	}	
 
 	"ObjectiveStatusTimePanel"
@@ -242,7 +248,7 @@
 		"delta_lifetime"		"1.5"
 		"delta_item_font"		"HudFontMedium"
 
-		if_comp
+		if_match
 		{
 			"ypos_minmode"			"0"
 			"delta_item_x"			"35"
@@ -272,7 +278,7 @@
 			"textAlignment"		"center"
 			"labelText"		"0:00"
 
-			if_comp
+			if_match
 			{
 				"proportionaltoparent"	"1"
 
@@ -562,6 +568,12 @@
 		"tall"			"260"
 		"visible"		"1"
 		"enabled"		"1"
+		
+		if_large
+		{
+			"ypos"			"65"
+			"tall"			"385"
+		}
 
 		"BlueTeamBG"
 		{
@@ -655,6 +667,11 @@
 			"linespacing"	"26"
 			"linegap"		"4"
 			//"show_columns"	"1"
+			
+			if_large
+			{
+				"tall"			"315"
+			}
 		}
 		"BluePlayerListBG"
 		{
@@ -670,6 +687,11 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"border"		"TFFatLineBorderClearBG"
+			
+			if_large
+			{
+				"tall"			"325"
+			}			
 		}
 	}
 
@@ -684,6 +706,13 @@
 		"tall"			"260"
 		"visible"		"1"
 		"enabled"		"1"
+		
+		if_large
+		{
+			"ypos"			"65"
+			"tall"			"385"
+		}
+		
 
 		"RedTeamBG"
 		{
@@ -777,6 +806,11 @@
 			"linespacing"	"26"
 			"linegap"		"4"
 			//"show_columns"	"1"
+			
+			if_large
+			{
+				"tall"			"315"
+			}			
 		}
 		"RedPlayerListBG"
 		{
@@ -792,6 +826,11 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"border"		"TFFatLineBorderClearBG"
+			
+			if_large
+			{
+				"tall"			"325"
+			}			
 		}
 	}
 }