Updated scoreboard to show leader avatars when in a 6-stack in matchmaking

8 files changed, 280 insertions, 24 deletions

diff --git a/4_by_3_ratio/ScoreBoard-9s.res b/4_by_3_ratio/ScoreBoard-9s.res
index 22d0af2..cc3e8bc 100644
--- a/4_by_3_ratio/ScoreBoard-9s.res
+++ b/4_by_3_ratio/ScoreBoard-9s.res
@@ -47,6 +47,22 @@
 			"visible"		"0"
 		}
 	}
+	"BlueLeaderAvatar"
+	{
+		"ControlName"	"CAvatarImagePanel"
+		"fieldName"		"BlueLeaderAvatar"
+		"xpos"			"c-295"
+		"ypos"			"144"
+		"ypos"			"239"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}
 	"RedScoreBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -68,6 +84,22 @@
 			"visible"		"0"
 		}
 	}
+	"RedLeaderAvatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"RedLeaderAvatar"
+		"xpos"			"c270"
+		"ypos"			"144"
+		"ypos_minmode"	"239"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}	
 	"MainBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -171,10 +203,10 @@
 
 		}
 	}			
-	"BlueTeamLabel"
+	"BlueTeamLabel1"
 	{
 		"ControlName"		"CExLabel"
-		"fieldName"		"BlueTeamLabel"
+		"fieldName"		"BlueTeamLabel1"
 		"font"			"Cerbetica32"
 		"labelText"		"%blueteamname%"
 		"textAlignment"		"west"
@@ -262,10 +294,10 @@
 			"visible"		"0"
 		}
 	}							
-	"RedTeamLabel"
+	"RedTeamLabel1"
 	{
 		"ControlName"		"CExLabel"
-		"fieldName"		"RedTeamLabel"
+		"fieldName"		"RedTeamLabel1"
 		"font"			"Cerbetica32"
 		"labelText"		"%redteamname%"
 		"textAlignment"		"east"
diff --git a/4_by_3_ratio/ScoreBoard.res b/4_by_3_ratio/ScoreBoard.res
index d7da26c..5ee9390 100644
--- a/4_by_3_ratio/ScoreBoard.res
+++ b/4_by_3_ratio/ScoreBoard.res
@@ -47,6 +47,22 @@
 			"visible"		"0"
 		}
 	}
+	"BlueLeaderAvatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"BlueLeaderAvatar"
+		"xpos"			"c-295"
+		"ypos"			"144"
+		"ypos_minmode"	"279"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}
 	"RedScoreBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -68,6 +84,22 @@
 			"visible"		"0"
 		}
 	}
+	"RedLeaderAvatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"RedLeaderAvatar"
+		"xpos"			"c270"
+		"ypos"			"144"
+		"ypos_minmode"	"279"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}
 	"MainBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -171,10 +203,10 @@
 
 		}
 	}			
-	"BlueTeamLabel"
+	"BlueTeamLabel1"
 	{
 		"ControlName"		"CExLabel"
-		"fieldName"		"BlueTeamLabel"
+		"fieldName"		"BlueTeamLabel1"
 		"font"			"Cerbetica32"
 		"labelText"		"%blueteamname%"
 		"textAlignment"		"west"
@@ -182,7 +214,7 @@
 		"ypos"			"138"
 		"ypos_minmode"	"273"
 		"wide"			"200"
-		"tall"			"34"
+		"tall"			"37"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -262,10 +294,10 @@
 			"visible"		"0"
 		}
 	}							
-	"RedTeamLabel"
+	"RedTeamLabel1"
 	{
 		"ControlName"		"CExLabel"
-		"fieldName"		"RedTeamLabel"
+		"fieldName"		"RedTeamLabel1"
 		"font"			"Cerbetica32"
 		"labelText"		"%redteamname%"
 		"textAlignment"		"east"
@@ -273,7 +305,7 @@
 		"ypos"			"138"
 		"ypos_minmode"	"273"
 		"wide"			"200"
-		"tall"			"35"
+		"tall"			"37"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
diff --git a/minmode/4_by_3_ratio/ScoreBoard-9s.res b/minmode/4_by_3_ratio/ScoreBoard-9s.res
index 22d0af2..cc3e8bc 100644
--- a/minmode/4_by_3_ratio/ScoreBoard-9s.res
+++ b/minmode/4_by_3_ratio/ScoreBoard-9s.res
@@ -47,6 +47,22 @@
 			"visible"		"0"
 		}
 	}
+	"BlueLeaderAvatar"
+	{
+		"ControlName"	"CAvatarImagePanel"
+		"fieldName"		"BlueLeaderAvatar"
+		"xpos"			"c-295"
+		"ypos"			"144"
+		"ypos"			"239"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}
 	"RedScoreBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -68,6 +84,22 @@
 			"visible"		"0"
 		}
 	}
+	"RedLeaderAvatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"RedLeaderAvatar"
+		"xpos"			"c270"
+		"ypos"			"144"
+		"ypos_minmode"	"239"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}	
 	"MainBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -171,10 +203,10 @@
 
 		}
 	}			
-	"BlueTeamLabel"
+	"BlueTeamLabel1"
 	{
 		"ControlName"		"CExLabel"
-		"fieldName"		"BlueTeamLabel"
+		"fieldName"		"BlueTeamLabel1"
 		"font"			"Cerbetica32"
 		"labelText"		"%blueteamname%"
 		"textAlignment"		"west"
@@ -262,10 +294,10 @@
 			"visible"		"0"
 		}
 	}							
-	"RedTeamLabel"
+	"RedTeamLabel1"
 	{
 		"ControlName"		"CExLabel"
-		"fieldName"		"RedTeamLabel"
+		"fieldName"		"RedTeamLabel1"
 		"font"			"Cerbetica32"
 		"labelText"		"%redteamname%"
 		"textAlignment"		"east"
diff --git a/minmode/4_by_3_ratio/ScoreBoard.res b/minmode/4_by_3_ratio/ScoreBoard.res
index d7da26c..5ee9390 100644
--- a/minmode/4_by_3_ratio/ScoreBoard.res
+++ b/minmode/4_by_3_ratio/ScoreBoard.res
@@ -47,6 +47,22 @@
 			"visible"		"0"
 		}
 	}
+	"BlueLeaderAvatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"BlueLeaderAvatar"
+		"xpos"			"c-295"
+		"ypos"			"144"
+		"ypos_minmode"	"279"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}
 	"RedScoreBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -68,6 +84,22 @@
 			"visible"		"0"
 		}
 	}
+	"RedLeaderAvatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"RedLeaderAvatar"
+		"xpos"			"c270"
+		"ypos"			"144"
+		"ypos_minmode"	"279"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}
 	"MainBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -171,10 +203,10 @@
 
 		}
 	}			
-	"BlueTeamLabel"
+	"BlueTeamLabel1"
 	{
 		"ControlName"		"CExLabel"
-		"fieldName"		"BlueTeamLabel"
+		"fieldName"		"BlueTeamLabel1"
 		"font"			"Cerbetica32"
 		"labelText"		"%blueteamname%"
 		"textAlignment"		"west"
@@ -182,7 +214,7 @@
 		"ypos"			"138"
 		"ypos_minmode"	"273"
 		"wide"			"200"
-		"tall"			"34"
+		"tall"			"37"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -262,10 +294,10 @@
 			"visible"		"0"
 		}
 	}							
-	"RedTeamLabel"
+	"RedTeamLabel1"
 	{
 		"ControlName"		"CExLabel"
-		"fieldName"		"RedTeamLabel"
+		"fieldName"		"RedTeamLabel1"
 		"font"			"Cerbetica32"
 		"labelText"		"%redteamname%"
 		"textAlignment"		"east"
@@ -273,7 +305,7 @@
 		"ypos"			"138"
 		"ypos_minmode"	"273"
 		"wide"			"200"
-		"tall"			"35"
+		"tall"			"37"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
diff --git a/minmode/resource/ui/ScoreBoard-9s.res b/minmode/resource/ui/ScoreBoard-9s.res
index c050f62..cc3e8bc 100644
--- a/minmode/resource/ui/ScoreBoard-9s.res
+++ b/minmode/resource/ui/ScoreBoard-9s.res
@@ -47,6 +47,22 @@
 			"visible"		"0"
 		}
 	}
+	"BlueLeaderAvatar"
+	{
+		"ControlName"	"CAvatarImagePanel"
+		"fieldName"		"BlueLeaderAvatar"
+		"xpos"			"c-295"
+		"ypos"			"144"
+		"ypos"			"239"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}
 	"RedScoreBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -68,6 +84,22 @@
 			"visible"		"0"
 		}
 	}
+	"RedLeaderAvatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"RedLeaderAvatar"
+		"xpos"			"c270"
+		"ypos"			"144"
+		"ypos_minmode"	"239"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}	
 	"MainBG"
 	{
 		"ControlName"		"ImagePanel"
diff --git a/minmode/resource/ui/ScoreBoard.res b/minmode/resource/ui/ScoreBoard.res
index 5098511..5ee9390 100644
--- a/minmode/resource/ui/ScoreBoard.res
+++ b/minmode/resource/ui/ScoreBoard.res
@@ -47,6 +47,22 @@
 			"visible"		"0"
 		}
 	}
+	"BlueLeaderAvatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"BlueLeaderAvatar"
+		"xpos"			"c-295"
+		"ypos"			"144"
+		"ypos_minmode"	"279"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}
 	"RedScoreBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -68,6 +84,22 @@
 			"visible"		"0"
 		}
 	}
+	"RedLeaderAvatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"RedLeaderAvatar"
+		"xpos"			"c270"
+		"ypos"			"144"
+		"ypos_minmode"	"279"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}
 	"MainBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -182,7 +214,7 @@
 		"ypos"			"138"
 		"ypos_minmode"	"273"
 		"wide"			"200"
-		"tall"			"34"
+		"tall"			"37"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -273,7 +305,7 @@
 		"ypos"			"138"
 		"ypos_minmode"	"273"
 		"wide"			"200"
-		"tall"			"35"
+		"tall"			"37"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
diff --git a/resource/ui/ScoreBoard-9s.res b/resource/ui/ScoreBoard-9s.res
index c050f62..cc3e8bc 100644
--- a/resource/ui/ScoreBoard-9s.res
+++ b/resource/ui/ScoreBoard-9s.res
@@ -47,6 +47,22 @@
 			"visible"		"0"
 		}
 	}
+	"BlueLeaderAvatar"
+	{
+		"ControlName"	"CAvatarImagePanel"
+		"fieldName"		"BlueLeaderAvatar"
+		"xpos"			"c-295"
+		"ypos"			"144"
+		"ypos"			"239"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}
 	"RedScoreBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -68,6 +84,22 @@
 			"visible"		"0"
 		}
 	}
+	"RedLeaderAvatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"RedLeaderAvatar"
+		"xpos"			"c270"
+		"ypos"			"144"
+		"ypos_minmode"	"239"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}	
 	"MainBG"
 	{
 		"ControlName"		"ImagePanel"
diff --git a/resource/ui/ScoreBoard.res b/resource/ui/ScoreBoard.res
index 5098511..5ee9390 100644
--- a/resource/ui/ScoreBoard.res
+++ b/resource/ui/ScoreBoard.res
@@ -47,6 +47,22 @@
 			"visible"		"0"
 		}
 	}
+	"BlueLeaderAvatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"BlueLeaderAvatar"
+		"xpos"			"c-295"
+		"ypos"			"144"
+		"ypos_minmode"	"279"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}
 	"RedScoreBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -68,6 +84,22 @@
 			"visible"		"0"
 		}
 	}
+	"RedLeaderAvatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"RedLeaderAvatar"
+		"xpos"			"c270"
+		"ypos"			"144"
+		"ypos_minmode"	"279"
+		"zpos"			"5"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"	"1"	
+		"color_outline"	"52 48 45 255"
+	}
 	"MainBG"
 	{
 		"ControlName"		"ImagePanel"
@@ -182,7 +214,7 @@
 		"ypos"			"138"
 		"ypos_minmode"	"273"
 		"wide"			"200"
-		"tall"			"34"
+		"tall"			"37"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -273,7 +305,7 @@
 		"ypos"			"138"
 		"ypos_minmode"	"273"
 		"wide"			"200"
-		"tall"			"35"
+		"tall"			"37"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"