Updated matchmaking lobby to be compatible with current beta

1 files changed, 408 insertions, 184 deletions

diff --git a/resource/ui/lobbypanel.res b/resource/ui/lobbypanel.res
index 2f5b997..9ca69c6 100644
--- a/resource/ui/lobbypanel.res
+++ b/resource/ui/lobbypanel.res
@@ -20,6 +20,23 @@
 		"NavToRelay"	"MvMTourOfDutyGroupBox"
 		"NavDown"		"MvMEconItemsGroupBox"
 	}
+	
+	"ModeBackgroundImage"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"ModeBackgroundImage"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"-1"
+		"wide"			"f0"
+		"tall"			"p0.8"
+		"visible"		"0"
+		"enabled"		"1"
+		"mouseinputenabled" "0"
+		"image"			"competitive/comp_background_tier001a"
+		"scaleImage"	"1"
+	}
+
 
 	"QuickplaySearchCriteriaGroupBox"
 	{
@@ -1501,7 +1518,7 @@
 		"fieldName"		"PartyActiveGroupBox"
 		"xpos"			"c+100"
 		"ypos"		"10"
-		"zpos"		"-1"
+		"zpos"		"10"
 		"wide"		"200"
 		"tall"		"330"
 		"visible"	"0"
@@ -1547,7 +1564,7 @@
 				"fieldName"		"InviteButton"
 				"xpos"			"95"
 				"ypos"			"5"
-				"zpos"			"2"
+				"zpos"			"100"
 				"wide"			"100"
 				"tall"			"20"
 				"autoResize"	"0"
@@ -1650,16 +1667,17 @@
 		"wide"		"200"
 		"tall"		"20"
 	}
+
 	"CompetitiveModeGroupBox"
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"CompetitiveModeGroupBox"
-		"xpos"		"c-350"
+		"xpos"		"0"
 		"ypos"		"10"
 		"zpos"		"-1"
 		"wide"		"f0"
 		"tall"		"470"
-		"visible"	"1"
+		"visible"	"0"
 		"enabled"	"1"
 		//"border"	"MainMenuHighlightBorder"
 
@@ -1667,8 +1685,8 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"LadderLabel"
-			"xpos"			"60"
-			"ypos"			"20"
+			"xpos"			"105"
+			"ypos"			"0"
 			"zpos"			"0"
 			"wide"			"50"
 			"tall"			"20"
@@ -1677,7 +1695,7 @@
 			"font"			"HudFontSmallestBold"
 			//"fgcolor_override"	"89 81 71 255"
 			"textAlignment"	"west"
-			"labelText"		"LADDER:"
+			"labelText"		"#TF_Competitive_Ladder"
 		}
 
 		// Dropdown
@@ -1686,8 +1704,8 @@
 			"ControlName"		"ComboBox"
 			"fieldName"			"CompetitiveModeComboBox"
 			"Font"				"HudFontSmallestBold"
-			"xpos"				"130"
-			"ypos"				"21"
+			"xpos"				"155"
+			"ypos"				"1"
 			"zpos"				"0"
 			"wide"				"85"
 			"tall"				"15"
@@ -1702,41 +1720,89 @@
 			"unicode"			"0"
 			"default"			"0"
 		
-			"fgcolor_override"	"235 226 202 255"
+			"fgcolor_override"	"White"
 			"bgcolor_override"	"0 0 0 0"
-			"disabledFgColor_override" "235 226 202 255"
+			"disabledFgColor_override" "White"
 			"disabledBgColor_override" "0 0 0 0"
-			"selectionColor_override" "0 0 0 0"
-			"selectionTextColor_override" "235 226 202 255"
+			"selectionColor_override" "White"
+			"selectionTextColor_override" "White"
 			"defaultSelectionBG2Color_override" "0 0 0 0"
 		}
-
-		"RankLabel"
+		
+		"LadderInfoPanel"
 		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"RankLabel"
-			"xpos"			"60"
-			"ypos"			"64"
-			"zpos"			"0"
-			"wide"			"100"
-			"tall"			"20"
-			"visible"		"1"
-			"enabled"		"1"
-			"font"			"HudFontSmallestBold"
-			//"fgcolor_override"	"89 81 71 255"
-			"textAlignment"	"west"
-			"labelText"		"RANK:"
-		}
+			"ControlName"	"EditablePanel"
+			"fieldName"		"LadderInfoPanel"
+			"xpos"			"c-318"
+			"ypos"			"30"
+			"zpos"			"-1"
+			"wide"			"313"
+			"tall"			"285"
+			"PaintBackgroundType"	"0"
+			"paintbackground"		"1"
+			"bgcolor_override"	"25 25 25 200"
+			"border"			"QuickplayBorder"
+
+			"StatsLabel"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"StatsLabel"
+				"xpos"			"135"
+				"ypos"			"10"
+				"zpos"			"-1"
+				"wide"			"150"
+				"tall"			"20"
+				"visible"		"0"
+				"enabled"		"0"
+				"font"			"HudFontSmallBold"
+				"fgcolor_override"	"89 81 71 255"
+				"textAlignment"	"west"
+				"labelText"		"#TF_Competitive_Stats"
+			}
+			
+			// Rank title and icon
+			"RankBG"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"RankBG"
+				"xpos"			"0"
+				"ypos"			"0"
+				"zpos"			"-1"
+				"wide"			"200"
+				"tall"			"200"
+				"visible"		"1"
+				"enabled"		"1"
+				"mouseinputenabled" "0"
+				"image"			"competitive/comp_badge_ui_spotlight"
+				"scaleImage"	"1"
+			}
+
+			"RankLabel"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"RankLabel"
+				"xpos"			"107"
+				"ypos"			"35"
+				"zpos"			"0"
+				"wide"			"100"
+				"tall"			"20"
+				"visible"		"0"
+				"enabled"		"1"
+				"font"			"HudFontSmallBold"
+				//"fgcolor_override"	"89 81 71 255"
+				"textAlignment"	"west"
+				"labelText"		"#TF_Competitive_RankUpper"
+			}
 
 		"RankIcon"
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"RankIcon"
-			"xpos"			"130"
-			"ypos"			"90"
+			"xpos"			"37"
+			"ypos"			"46"
 			"zpos"			"0"
-			"wide"			"100"
-			"tall"			"100"
+			"wide"			"55"
+			"tall"			"55"
 			"visible"		"1"
 			"enabled"		"1"
 			"mouseinputenabled" "0"
@@ -1744,168 +1810,326 @@
 			"scaleImage"	"1"
 		}
 
-		"RankTitle"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"RankTitle"
-			"xpos"			"130"
-			"ypos"			"64"
-			"zpos"			"0"
-			"wide"			"150"
-			"tall"			"20"
-			"visible"		"1"
-			"enabled"		"1"
-			"font"			"HudFontSmallBold"
-			"fgcolor_override"	"Base Color"
-			"textAlignment"	"west"
-			"labelText"		"%ranktitle%"
-		}
+			"RankNumber"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"RankNumber"
+				"xpos"			"100"
+				"ypos"			"30"
+				"zpos"			"0"
+				"wide"			"30"
+				"tall"			"20"
+				"visible"		"1"
+				"enabled"		"1"
+				"font"			"HudFontSmallBold"
+				//"fgcolor_override"	"250 114 45 255"
+				"textAlignment"	"west"
+				"labelText"		"%ranknumber%"
+			}
 
-		"LevelLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"RankLabel"
-			"xpos"			"60"
-			"ypos"			"44"
-			"zpos"			"0"
-			"wide"			"100"
-			"tall"			"20"
-			"visible"		"1"
-			"enabled"		"1"
-			"font"			"HudFontSmallestBold"
-			//"fgcolor_override"	"89 81 71 255"
-			"textAlignment"	"west"
-			"labelText"		"LEVEL:"
-		}
+			"RankTitle"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"RankTitle"
+				"xpos"			"115"
+				"ypos"			"30"
+				"zpos"			"0"
+				"wide"			"150"
+				"tall"			"20"
+				"visible"		"1"
+				"enabled"		"1"
+				"font"			"HudFontSmallBold"
+				//"fgcolor_override"	"250 114 45 255"
+				"textAlignment"	"west"
+				"labelText"		"%ranktitle%"
+			}
 
-		"LevelProgress"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"LevelLabel"
-			"xpos"			"130"
-			"ypos"			"44"
-			"zpos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"visible"		"1"
-			"enabled"		"1"
-			"font"			"HudFontSmallBold"
-			"fgcolor_override"	"Base Color"
-			"textAlignment"	"west"
-			"labelText"		"%level%"
-		}
+			// Progress meter
+			"RankLevelLabel"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"RankLevelLabel"
+				"xpos"			"20"
+				"ypos"			"75"
+				"zpos"			"0"
+				"wide"			"100"
+				"tall"			"20"
+				"visible"		"0"
+				"enabled"		"1"
+				"font"			"HudFontSmallestBold"
+				//"fgcolor_override"	"89 81 71 255"
+				"textAlignment"	"west"
+				"labelText"		"#TF_Competitive_Next"
+			}
 
-		"LevelProgressMeter"
-		{	
-			"ControlName"	"ContinuousProgressBar"
-			"fieldName"		"LevelProgressMeter"
-			"font"			"HudFontSmallestBold"
-			"xpos"			"145"
-			"ypos"			"49"
-			"zpos"			"2"
-			"wide"			"90"
-			"tall"			"9"				
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}	
+			"RankLevel"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"RankLevel"
+				"xpos"			"55"
+				"ypos"			"75"
+				"zpos"			"0"
+				"wide"			"20"
+				"tall"			"20"
+				"visible"		"0"
+				"enabled"		"1"
+				"font"			"HudFontSmallBold"
+				"fgcolor_override"	"250 114 45 255"
+				"textAlignment"	"west"
+				"labelText"		"%ranklevel%"
+			}
 
-		// Default image
-		"ModeImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ModeImage"
-			"xpos"			"85"
-			"ypos"			"75"
-			"zpos"			"0"
-			"wide"			"130"
-			"tall"			"130"
-			"visible"		"0"
-			"enabled"		"1"
-			"mouseinputenabled" "0"
-			"image"			"main_menu/meta_cityonfire512"
-			"scaleImage"	"1"
-		}
+			"NextRankLevel"
+			{
+				"ControlName"	"CExLabel"
+				"fieldName"		"NextRankLevel"
+				"xpos"			"285"
+				"ypos"			"75"
+				"zpos"			"0"
+				"wide"			"100"
+				"tall"			"20"
+				"visible"		"0"
+				"enabled"		"1"
+				"font"			"HudFontSmallBold"
+				"fgcolor_override"	"250 114 45 255"
+				"textAlignment"	"west"
+				"labelText"		"%nextranklevel%"
+			}
 
-		"Leaderboard6v6"
-		{
-			"ControlName"	"CLadderLobbyLeaderboard"
-			"fieldName"		"Leaderboard6v6"
-			"xpos"			"c-20"
-			"ypos"			"20"
-			"zpos"			"0"
-			"wide"			"350"
-			"tall"			"300"
-			"visible"		"1"
-			"enabled"		"1"
-			"mouseinputenabled" "1"
-			"scaleImage"	"1"
-			"entry_step"	"24"
-		}
+			"RankProgressMeter"
+			{	
+				"ControlName"	"ContinuousProgressBar"
+				"fieldName"		"RankProgressMeter"
+				"font"			"HudFontSmallestBold"
+				"xpos"			"100"
+				"ypos"			"50"
+				"zpos"			"2"
+				"wide"			"185"
+				"tall"			"10"				
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"textAlignment"	"center"
+				"dulltext"		"0"
+				"brighttext"	"0"
+				"fgcolor_override"	"132 229 37 255"
+			}
 
-		"Leaderboard9v9"
-		{
-			"ControlName"	"CLadderLobbyLeaderboard"
-			"fieldName"		"Leaderboard9v9"
-			"xpos"			"c-20"
-			"ypos"			"20"
-			"zpos"			"0"
-			"wide"			"350"
-			"tall"			"300"
-			"visible"		"1"
-			"enabled"		"1"
-			"mouseinputenabled" "1"
-			"scaleImage"	"1"
-			"entry_step"	"24"
-		}
+			"RankProgressMeterBG"
+			{
+				"ControlName"	"EditablePanel"
+				"fieldName"		"RankProgressMeterBG"
+				"xpos"			"99"
+				"ypos"			"49"
+				"zpos"			"-1"
+				"wide"			"187"
+				"tall"			"12"
+				"PaintBackgroundType"	"0"
+				"paintbackground"		"1"
+				"bgcolor_override"	"75 75 75 200"
+				//"border"			"QuickplayBorder"
+			}
 
-		"StatsLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"StatsLabel"
-			"xpos"			"55"
-			"ypos"			"195"
-			"zpos"			"0"
-			"wide"			"245"
-			"tall"			"24"
-			"visible"		"1"
-			"enabled"		"1"
-			"font"			"Cerbetica24"
-			"fgcolor_override"	"TanLight"
-			"textAlignment"	"center"
-			"labelText"		"Stats"
-		}
+			"StatsButton"
+			{
+				"ControlName"	"CExButton"
+				"fieldName"		"StatsButton"
+				"xpos"			"50"
+				"ypos"			"110"
+				"zpos"			"1"
+				"wide"			"105"
+				"tall"			"16"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"tabPosition"	"0"
+				"labelText"		"#TF_Competitive_Stats_Season"
+				"font"			"HudFontSmallBold"
+				"textAlignment"	"center"
+				"dulltext"		"0"
+				"brighttext"	"0"
+				"Command"		"stats_season"
+				"button_activation_type"	"1"	// only on press
+				"sound_depressed"	"UI/buttonclick.wav"
+				"sound_released"	"UI/buttonclickrelease.wav"
+			}
 
-		"StatLine"
-		{
-			"ControlName"		"EditablePanel"
-			"fieldName"			"StatLine"
-			"xpos"				"p0.05"
-			"ypos"				"215"
-			"zpos"				"1"
-			"wide"				"240"
-			"tall"				"2"
-			"visible"			"0"
-			"proportionaltoparent" "1"
-			"bgcolor_override"	"89 81 71 255"
+			"MatchStatsButton"
+			{
+				"ControlName"	"CExButton"
+				"fieldName"		"MatchStatsButton"
+				"xpos"			"160"
+				"ypos"			"110"
+				"zpos"			"1"
+				"wide"			"105"
+				"tall"			"16"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"tabPosition"	"0"
+				"labelText"		"#TF_Competitive_Stats_Match"
+				"font"			"HudFontSmallBold"
+				"textAlignment"	"center"
+				"dulltext"		"0"
+				"brighttext"	"0"
+				"bgcolor_override"	"89 81 71 255"
+				"Command"		"stats_match"
+				"button_activation_type"	"1"	// only on press
+				"sound_depressed"	"UI/buttonclick.wav"
+				"sound_released"	"UI/buttonclickrelease.wav"
+			}
+
+			"StatLine"
+			{
+				"ControlName"		"EditablePanel"
+				"fieldName"			"StatLine"
+				"xpos"				"15"
+				"ypos"				"125"
+				"zpos"				"1"
+				"wide"				"p0.9"
+				"tall"				"2"
+				"visible"			"1"
+				"proportionaltoparent" "1"
+				"bgcolor_override"	"89 81 71 255"
+			}
+
+			"StatList"
+			{
+				"ControlName"	"SectionedListPanel"
+				"fieldName"		"StatList"
+				"xpos"			"10"
+				"ypos"			"125"
+				"zpos"			"2"
+				"wide"			"330"
+				"tall"			"150"
+				"visible"		"1"
+				"linespacing"	"16"
+				"linegap"		"2"
+				"bgcolor_override"	"0 0 0 0"
+			}
+
+			"GoldMedalIcon"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"GoldMedalIcon"
+				"xpos"			"231"
+				"ypos"			"139"
+				"zpos"			"0"
+				"wide"			"18"
+				"tall"			"18"
+				"visible"		"1"
+				"enabled"		"1"
+				"mouseinputenabled" "0"
+				"image"			"competitive/competitive_coin_gold"
+				"scaleImage"	"1"
+			}
+
+			"SilverMedalIcon"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"SilverMedalIcon"
+				"xpos"			"251"
+				"ypos"			"139"
+				"zpos"			"0"
+				"wide"			"18"
+				"tall"			"18"
+				"visible"		"1"
+				"enabled"		"1"
+				"mouseinputenabled" "0"
+				"image"			"competitive/competitive_coin_silver"
+				"scaleImage"	"1"
+			}
+
+			"BronzeMedalIcon"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"BronzeMedalIcon"
+				"xpos"			"270"
+				"ypos"			"139"
+				"zpos"			"0"
+				"wide"			"18"
+				"tall"			"18"
+				"visible"		"1"
+				"enabled"		"1"
+				"mouseinputenabled" "0"
+				"image"			"competitive/competitive_coin_bronze"
+				"scaleImage"	"1"
+			}
+
+			"MedalsHelpButton"
+			{
+				"ControlName"	"CExButton"
+				"fieldName"		"MedalsHelpButton"
+				"xpos"			"292"
+				"ypos"			"144"
+				"zpos"			"3"
+				"wide"			"12"
+				"tall"			"12"
+				"autoResize"	"0"
+				"pinCorner"		"3"
+				"visible"		"1"
+				"enabled"		"1"
+				"tabPosition"	"0"
+				"labelText"		"?"
+				"font"			"HudFontSmallBold"
+				"textAlignment"	"center"
+				"dulltext"		"0"
+				"brighttext"	"0"
+				"command"		"medals_help"
+				"button_activation_type"	"1"	// only on press
+				"sound_depressed"	"UI/buttonclick.wav"
+				"sound_released"	"UI/buttonclickrelease.wav"
+			}
 		}
 
-		"StatList"
+		"LeaderboardPanel"
 		{
-			"ControlName"	"SectionedListPanel"
-			"fieldName"		"StatList"
-			"xpos"			"55"
-			"ypos"			"210"
-			"zpos"			"0"
-			"wide"			"245"
-			"tall"			"150"
-			"autoresize"	"3"
-			"linespacing"	"16"
-			"bgcolor_override"	"46 43 42 0"
+			"ControlName"	"EditablePanel"
+			"fieldName"		"LeaderboardPanel"
+			"xpos"			"c5"
+			"ypos"			"30"
+			"zpos"			"-1"
+			"wide"			"313"
+			"tall"			"285"
+			"PaintBackgroundType"	"0"
+			"paintbackground"		"1"
+			"bgcolor_override"	"25 25 25 200"
+			"border"			"QuickplayBorder"
+
+			"Leaderboard6v6"
+			{
+				"ControlName"	"CLadderLobbyLeaderboard"
+				"fieldName"		"Leaderboard6v6"
+				"xpos"			"-10"
+				"ypos"			"5"
+				"zpos"			"0"
+				"wide"			"320"
+				"tall"			"275"
+				"visible"		"1"
+				"enabled"		"1"
+				"mouseinputenabled" "0"
+				"scaleImage"	"1"
+				"entry_step"	"23"
+			}
+
+			"Leaderboard9v9"
+			{
+				"ControlName"	"CLadderLobbyLeaderboard"
+				"fieldName"		"Leaderboard9v9"
+				"xpos"			"-10"
+				"ypos"			"5"
+				"zpos"			"0"
+				"wide"			"320"
+				"tall"			"275"
+				"visible"		"1"
+				"enabled"		"1"
+				"mouseinputenabled" "0"
+				"scaleImage"	"1"
+				"entry_step"	"23"
+			}
 		}
 	}
 }