Fixed (somewhat) player-based ready system

1 files changed, 249 insertions, 9 deletions

diff --git a/minmode/resource/ui/HudTournament.res b/minmode/resource/ui/HudTournament.res
index 56b4d70..cc6eade 100644
--- a/minmode/resource/ui/HudTournament.res
+++ b/minmode/resource/ui/HudTournament.res
@@ -43,8 +43,8 @@
 				"autoResize"		"0"
 				"pinCorner"		"0"
 				"fillcolor"		"0 0 0 255"
-				"visible"			"1"
-				"enabled"			"1"
+				"visible"			"0"
+				"enabled"			"0"
 			}
 			
 			"playername"
@@ -73,6 +73,24 @@
 					"fgcolor_override"	"TanLight"
 					"font"				"Cerbetica9"
 				}
+				
+				if_competitive
+				{
+					"xpos"				"4"
+					"ypos"				"25"
+					"wide"				"48"
+					"textAlignment"		"center"
+					"font"				"Cerbetica9"
+				}
+
+				if_readymode
+				{
+					"xpos"				"4"
+					"ypos"				"25"
+					"wide"				"48"
+					"textAlignment"		"center"
+					"font"				"Cerbetica9"
+				}
 			}
 			
 			"classimage"
@@ -97,6 +115,24 @@
 					"tall"			"20"
 					"image"			"../vgui/hud_connecting"
 				}
+				
+				if_competitive
+				{
+					"xpos"			"5"
+					"ypos"			"4"
+					"wide"			"20"
+					"tall"			"20"
+					"image"			"../vgui/hud_connecting"
+				}
+				
+				if_readymode
+				{
+					"xpos"			"5"
+					"ypos"			"4"
+					"wide"			"20"
+					"tall"			"20"
+					"image"			"../vgui/hud_connecting"
+				}
 			}
 			
 			"classimagebg"
@@ -117,14 +153,24 @@
 				{
 					"visible"		"1"
 				}
+				
+				if_competitive
+				{
+					"visible"		"1"
+				}
+
+				if_readymode
+				{
+					"visible"		"1"
+				}
 			}
 			
 			"HealthIcon"
 			{
 				"ControlName"		"EditablePanel"
 				"fieldName"			"HealthIcon"
-				"xpos"				"22"
-				"ypos"				"-3"
+				"xpos"				"3"
+				"ypos"				"6"
 				"zpos"				"3"
 				"wide"				"32"
 				"tall"				"32"
@@ -161,7 +207,17 @@
 				if_mvm
 				{
 					"visible"		"1"
-				}	
+				}
+
+				if_competitive
+				{
+					"visible"		"1"
+				}
+				
+				if_readymode
+				{
+					"visible"		"1"
+				}					
 			}
 			
 			"ReadyImage"
@@ -185,6 +241,16 @@
 				{
 					"visible"		"1"
 				}
+				
+				if_competitive
+				{
+					"visible"		"1"
+				}
+
+				if_readymode
+				{
+					"visible"		"1"
+				}
 			}
 			
 			"respawntime"
@@ -240,7 +306,7 @@
 				"tall"			"8"
 				"autoResize"	"0"
 				"pinCorner"		"0"
-				"visible"		"1"
+				"visible"		"0"
 				"labelText"		"%specindex%"
 				"textAlignment"	"north-west"
 				//"fgcolor"		"235 226 202 255"
@@ -251,6 +317,18 @@
 				"wide"		"55"
 				"tall"		"35"
 			}
+			
+			if_competitive
+			{
+				"wide"		"55"
+				"tall"		"35"
+			}
+
+			if_readymode
+			{
+				"wide"		"55"
+				"tall"		"35"
+			}
 		}
 		
 		if_mvm
@@ -260,9 +338,35 @@
 			"wide"					"500"
 			"tall"					"480"
 
-			"team1_player_base_y"			"66"
+			"team1_player_base_y"			"68"
 			"team2_player_delta_x"			"52"
-		}		
+		}
+
+		if_competitive
+		{
+			"xpos"							"c-125"
+			"ypos"							"0"
+			"wide"							"250"
+			"tall"							"480"
+
+			"team1_player_base_y"			"68"
+			"team2_player_base_y"			"68"
+			"team2_player_delta_x"			"52"
+			"team2_player_base_offset_x"	"5"
+		}
+		
+		if_readymode
+		{
+			"xpos"							"c-125"
+			"ypos"							"0"
+			"wide"							"250"
+			"tall"							"480"
+
+			"team1_player_base_y"			"72"
+			"team2_player_base_y"			"72"
+			"team2_player_delta_x"			"52"
+			"team2_player_base_offset_x"	"5"
+		}			
 	}
 
 	"HudTournamentBackground"
@@ -289,7 +393,20 @@
 		if_mvm
 		{
 			"visible"		"0"
-		}	
+		}
+
+		if_competitive
+		{
+			"xpos"			"195"
+			"ypos"			"5"
+			"visible"		"0"
+		}
+		
+		if_readymode
+		{
+			"xpos"			"195"
+			"visible"		"0"
+		}		
 	}
 	"TournamentLabel"
 	{	
@@ -313,6 +430,17 @@
 		{
 			"visible"		"0"
 		}
+		if_competitive
+		{
+			"xpos"			"200"
+			"visible"		"0"
+		}
+
+		if_readymode
+		{
+			"xpos"			"200"
+			"visible"		"0"
+		}
 	}
 
 	"HudTournamentBLUEBG"
@@ -340,6 +468,19 @@
 		{
 			"visible"		"0"
 		}
+		
+		if_competitive
+		{
+			"xpos"			"200"
+			"visible"		"0"
+		}
+
+		if_readymode
+		{
+			"xpos"			"200"
+			"visible"		"0"
+		}
+		
 	}
 	"TournamentBLUELabel"
 	{	
@@ -363,6 +504,18 @@
 		{
 			"visible"		"0"
 		}
+		
+		if_competitive
+		{
+			"xpos"			"207"
+			"visible"		"0"
+		}
+
+		if_readymode
+		{
+			"xpos"			"207"
+			"visible"		"0"
+		}
 	}
 	"TournamentBLUEStateLabel"
 	{	
@@ -386,6 +539,18 @@
 		{
 			"visible"		"0"
 		}
+		
+		if_competitive
+		{
+			"xpos"			"251"
+			"visible"		"0"
+		}
+
+		if_readymode
+		{
+			"xpos"			"251"
+			"visible"		"0"
+		}
 	}
 
 	"HudTournamentREDBG"
@@ -413,6 +578,18 @@
 		{
 			"visible"		"0"
 		}
+		
+		if_competitive
+		{
+			"xpos"			"320"
+			"visible"		"0"
+		}
+
+		if_readymode
+		{
+			"xpos"			"320"
+			"visible"		"0"
+		}
 	}
 	"TournamentREDLabel"
 	{	
@@ -436,6 +613,18 @@
 		{
 			"visible"		"0"
 		}
+		
+		if_competitive
+		{
+			"xpos"			"370"
+			"visible"		"0"
+		}
+
+		if_readymode
+		{
+			"xpos"			"370"
+			"visible"		"0"
+		}
 	}
 	"TournamentREDStateLabel"
 	{	
@@ -459,6 +648,19 @@
 		{
 			"visible"		"0"
 		}
+
+		if_competitive
+		{
+			"xpos"			"325"
+			"visible"		"0"
+		}
+
+		if_readymode
+		{
+			"xpos"			"325"
+			"visible"		"0"
+		}
+	
 	}
 	"TournamentConditionLabel"
 	{	
@@ -483,6 +685,7 @@
 		{
 			"visible"		"0"
 		}
+		
 	}
 
 	"HudTournamentBGHelp"
@@ -511,6 +714,16 @@
 		{
 			"visible"		"0"
 		}
+		
+		if_competitive
+		{
+			"visible"		"0"
+		}
+
+		if_readymode
+		{
+			"visible"		"0"
+		}
 	}
 	
 	"HelpBackground"
@@ -560,6 +773,7 @@
 			"tall"			"16"
 			"zpos"			"3"
 		}
+		
 	}
 	
 	"InstructionsBackground"
@@ -623,6 +837,20 @@
 		"wrap"			"0"
 		"labelText"		"%tournamentstatelabel%"
 		"textAlignment"		"center"
+	
+	
+		if_competitive
+		{
+			"xpos"			"300"
+			"ypos"			"130"
+		}
+
+		if_readymode
+		{
+			"xpos"			"300"
+			"ypos"			"130"
+		}
+	
 	}
 	
 	"CountdownLabelShadow"
@@ -643,5 +871,17 @@
 		"labelText"		"%tournamentstatelabel%"
 		"textAlignment"		"center"
 		"fgcolor"		"Black"
+		
+		if_competitive
+		{
+			"xpos"			"300"
+			"ypos"			"130"
+		}
+
+		if_readymode
+		{
+			"xpos"			"300"
+			"ypos"			"130"
+		}
 	}
 }