KBNHud v419A2: Inconceivable Edition

I fixed all remaining scoreboard issues left over from last night's update. At least on my end.
Jotunn · Feb 2, 2016 · 8fa4287 · 8fa4287
1 parent d17a6cf
commit 8fa4287
Show file tree

Hide file tree

Showing 11 changed files with 299 additions and 182 deletions.
diff --git a/KBNHud/resource/ClientScheme.res b/KBNHud/resource/ClientScheme.res
@@ -3284,7 +3284,7 @@ Scheme
 			"1"
 			{
 				"name"		"Verdana"
-				"tall"		"9"
+				"tall"		"10"
 				"weight"	"0"
 				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
 				"yres"		"480 599"
@@ -3293,7 +3293,7 @@ Scheme
 			"2"
 			{
 				"name"		"Maven Pro Medium"
-				"tall"		"11"
+				"tall"		"12"
 				"weight"	"0"
 				//"range"		"0x0000 0x017F"	Basic Latin, Latin-1 Supplement, Latin Extended-A
 				"yres"		"600 1199"
@@ -3302,7 +3302,7 @@ Scheme
 			"3"
 			{
 				"name"		"Verdana"
-				"tall"		"14"
+				"tall"		"15"
 				"weight"	"0"
 				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
 				"yres"		"1200 6000"

diff --git a/KBNHud/resource/ui/HudObjectiveStatus.res b/KBNHud/resource/ui/HudObjectiveStatus.res
@@ -6,7 +6,7 @@
 		"fieldName"				"ObjectiveStatusTimePanel"
 		"xpos"					"c-55"
 		"ypos"					"-8"
-		"ypos_minmode"			"-11"
+		"ypos_minmode"			"-8"
 		"zpos"					"1"
 		"wide"					"110"
 		"tall"					"150"

diff --git a/KBNHud/resource/ui/MainMenuOverride.res b/KBNHud/resource/ui/MainMenuOverride.res
@@ -327,7 +327,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"KBNHudLabel"
 		"font"			"HudFontMediumSmallBold"
-		"labelText"		"KBNHud v419"
+		"labelText"		"KBNHud v419A2"
 		"textAlignment"	"west"
 		"xpos"			"20"
 		"ypos"			"61"

diff --git a/KBNHud/resource/ui/ScoreBoard.res b/KBNHud/resource/ui/ScoreBoard.res
@@ -110,27 +110,51 @@
 	}							
 	"BlueTeamLabel"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"		"BlueTeamLabel"
-		"font"			"MavenProBold12"
-		"fgcolor" "255 255 255 255"
-		"labelText"		"%blueteamname%"
+		"ControlName"			"CExLabel"
+		"fieldName"			"BlueTeamLabel"
+		"font"				"MavenProBold16"
+		"labelText"			"%blueteamname%"
 		"textAlignment"		"west"
-		"xpos"			"50"
-		"xpos_minmode"		"5"
-		"xpos_hidef"		"40"
-		"ypos"			"125"
+		"xpos"				"90"
+		"xpos_minmode"		"40"
+		"ypos"				"125"
 		"ypos_minmode"		"83"
-		"wide"			"140"
-		"tall"			"18"
-		"autoResize"		"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-	if_mvm
-        {
-            "visible"   "0"
-        }"enabled"	"1"
+		"wide"				"200"
+		"tall"				"18"
+		"autoResize"			"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"fgcolor"			"White"
+
+		if_mvm
+		{
+			"visible"		"0"
+		}
 	}							
+	"BlueTeamImage"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"BlueTeamImage"
+		"xpos"			"45"
+		"xpos_minmode"		"5"
+		"ypos"			"115"
+		"ypos_minmode"		"80"
+		"zpos"			"20"
+		"wide"			"40"
+		"wide_minmode"	"30"
+		"tall"			"40"
+		"tall_minmode"	"30"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../hud/team_blue"
+		"scaleImage"		"1"
+
+		if_mvm
+		{
+			"visible"		"0"
+		}
+	}
 	"BlueTeamScore"
 	{
 		"ControlName"		"CExLabel"
@@ -186,14 +210,13 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"BlueTeamPlayerCount"
-		"font"			"m0refont16"
+		"font"			"MavenProBold10"
 		"font_minmode"		"MavenProBold10"
 		"fgcolor" "255 255 255 255"
 		"labelText"		"%blueteamplayercount%"
 		"textAlignment"		"east"
-		"xpos"			"125"
-		"xpos_minmode"		"55"
-		"xpos_hidef"		"100"
+		"xpos"			"140"
+		"xpos_minmode"		"90"
 		"ypos"			"125"
 		"ypos_minmode"		"83"
 		"wide"			"100"
@@ -208,27 +231,51 @@
 	}							
 	"RedTeamLabel"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"		"RedTeamLabel"
-		"font"			"MavenProBold12"
-		"fgcolor" "255 255 255 255"
-		"labelText"		"%redteamname%"
+		"ControlName"			"CExLabel"
+		"fieldName"			"RedTeamLabel"
+		"font"				"MavenProBold16"
+		"labelText"			"%redteamname%"
 		"textAlignment"		"east"
-		"textAlignment_minmode"	"west"
-		"xpos"			"410"
-		"xpos_minmode"		"5"
+		"textAlignment_minmode"		"west"
+		"xpos"			"380"
+		"xpos_minmode"		"40"
 		"ypos"			"125"
-		"ypos_minmode"		"291"
+		"ypos_minmode"		"290"
 		"wide"			"140"
 		"tall"			"18"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-	if_mvm
-        {
-            "visible"   "0"
-        }
+		"autoResize"			"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"fgcolor"			"White"
+
+		if_mvm
+		{
+			"visible"		"0"
+		}
 	}							
+	"RedTeamImage"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"RedTeamImage"
+		"fieldName"		"BlueTeamImage"
+		"xpos"			"518"
+		"xpos_minmode"		"2"
+		"ypos"			"110"
+		"ypos_minmode"		"283"
+		"zpos"			"20"
+		"wide"			"45"
+		"tall"			"45"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../hud/team_red"
+		"scaleImage"		"1"
+
+		if_mvm
+		{
+			"visible"		"0"
+		}
+	}
 	"RedTeamScore"
 	{
 		"ControlName"		"CExLabel"
@@ -290,14 +337,14 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"RedTeamPlayerCount"
-		"font"			"m0refont16"
+		"font"			"MavenProBold10"
 		"font_minmode"		"MavenProBold10"
 		"fgcolor" "255 255 255 255"
 		"labelText"		"%redteamplayercount%"
 		"textAlignment"		"west"
 		"textAlignment_minmode" "east"
-		"xpos"			"375"
-		"xpos_minmode"		"55"
+		"xpos"			"360"
+		"xpos_minmode"		"90"
 		"xpos_lodef"	"376"
 		"xpos_hidef"	"418"
 		"ypos"			"125"

diff --git a/Overrides/Hit Marker/With Hit Marker (Default)/scripts/hudlayout.res b/Overrides/Hit Marker/With Hit Marker (Default)/scripts/hudlayout.res
@@ -249,10 +249,8 @@
 		"fieldName"		"HudDemomanCharge"
 		"visible"		"1"
 		"enabled"		"1"
-		"xpos"			"c-69"	[$WIN32]
-		"ypos"			"r170"	[$WIN32]
-		"xpos"			"r112"	[$X360]
-		"ypos"			"r45"	[$X360]
+		"xpos"			"c-69"
+		"ypos"			"r177"
 		"zpos"			"1"			// draw in front of ammo
 		"wide"			"120"
 		"tall"			"12"
@@ -349,10 +347,9 @@
 		"fieldName"				"CHudAccountPanel"
 		"xpos"					"c-47"	[$WIN32]
 		"ypos"					"r320"	[$WIN32]
-		"xpos"					"r194"	[$X360]
-		"ypos"					"r174"	[$X360]
+
 		"wide"					"116"
-		"tall"  				"180"
+		"tall"  				"210"
 		"visible" 				"1"
 		"enabled" 				"1"
 		"PaintBackgroundType"	"2"
@@ -1148,9 +1145,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"xpos"			"c-70"	[$WIN32]
-		"ypos"			"r190"	[$WIN32]
-		"xpos"			"r194"	[$X360]
-		"ypos"			"r74"	[$X360]
+		"ypos"			"r180"	[$WIN32]
 		"zpos"			"1"
 		"wide"			"200"
 		"tall"			"50"

diff --git a/Overrides/Hit Marker/Without Hit Marker/scripts/hudlayout.res b/Overrides/Hit Marker/Without Hit Marker/scripts/hudlayout.res
@@ -249,10 +249,8 @@
 		"fieldName"		"HudDemomanCharge"
 		"visible"		"1"
 		"enabled"		"1"
-		"xpos"			"c-69"	[$WIN32]
-		"ypos"			"r170"	[$WIN32]
-		"xpos"			"r112"	[$X360]
-		"ypos"			"r45"	[$X360]
+		"xpos"			"c-69"
+		"ypos"			"r177"
 		"zpos"			"1"			// draw in front of ammo
 		"wide"			"120"
 		"tall"			"12"
@@ -349,10 +347,9 @@
 		"fieldName"				"CHudAccountPanel"
 		"xpos"					"c-47"	[$WIN32]
 		"ypos"					"r320"	[$WIN32]
-		"xpos"					"r194"	[$X360]
-		"ypos"					"r174"	[$X360]
+
 		"wide"					"116"
-		"tall"  				"180"
+		"tall"  				"210"
 		"visible" 				"1"
 		"enabled" 				"1"
 		"PaintBackgroundType"	"2"
@@ -1148,9 +1145,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"xpos"			"c-70"	[$WIN32]
-		"ypos"			"r190"	[$WIN32]
-		"xpos"			"r194"	[$X360]
-		"ypos"			"r74"	[$X360]
+		"ypos"			"r180"	[$WIN32]
 		"zpos"			"1"
 		"wide"			"200"
 		"tall"			"50"

diff --git a/Overrides/Main Menu/Default Menu/resource/ui/MainMenuOverride.res b/Overrides/Main Menu/Default Menu/resource/ui/MainMenuOverride.res
@@ -327,7 +327,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"KBNHudLabel"
 		"font"			"HudFontMediumSmallBold"
-		"labelText"		"KBNHud v419"
+		"labelText"		"KBNHud v419A2"
 		"textAlignment"	"west"
 		"xpos"			"20"
 		"ypos"			"61"