Merge pull request #173 from raysfire/dev

v2021.0705

1 files changed, 2 insertions, 665 deletions

diff --git a/resource/ui/hudtournament.res b/resource/ui/hudtournament.res
index cabc17e..5b129ef 100644
--- a/resource/ui/hudtournament.res
+++ b/resource/ui/hudtournament.res
@@ -1,665 +1,2 @@
-"Resource/UI/HudTournament.res"
-{
-	HudTournament
-	{
-		"ControlName"			"EditablePanel"
-		"fieldName"				"HudTournament"
-		"xpos"					"0"
-		"ypos"					"25"
-		"wide"					"f0"
-		"tall"					"480"
-		"proportionaltoparent"	"1"
-
-		"team1_player_base_offset_x"	"-75"
-		"team1_player_base_y"			"0"
-		"team1_player_delta_x"			"-47"
-		"team1_player_delta_y"			"0"
-		"team2_player_base_offset_x"	"25"
-		"team2_player_base_y"			"0"
-		"team2_player_delta_x"			"47"
-		"team2_player_delta_y"			"0"
-		"teams_player_delta_x_comp"		"42"
-
-		"avatar_width"					"63"
-		"spacer"						"5"
-		"name_width"					"57"
-		"horiz_inset"					"2"
-
-		if_mvm
-		{
-			"ypos"						"0"
-			"team1_player_base_y"		"66"
-			"team2_player_base_y"		"66"
-			"team2_player_delta_x"		"52"
-		}
-
-		if_competitive
-		{
-			"team1_player_base_y"		"66"
-			"team2_player_base_y"		"66"
-			"team2_player_base_offset_x" "5"
-		}
-
-		if_readymode
-		{
-			"team1_player_base_y"		"66"
-			"team2_player_base_y"		"66"
-			"team2_player_delta_x"		"52"
-			"team2_player_base_offset_x" "5"
-		}
-
-		"ModeImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ModeImage"
-			"xpos"			"cs-0.5"
-			"ypos"			"50"
-			"zpos"			"0"
-			"wide"			"60"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"0"
-			"enabled"		"1"
-			"image"			"competitive/competitive_logo_laurel"
-			"scaleImage"	"1"
-			"proportionaltoparent"	"1"
-
-			if_competitive {
-				"visible"		"1"
-			}
-		}
-
-		"playerpanels_kv"
-		{
-			"visible"		"0"
-			"wide"			"50"
-			"tall"			"35"
-			"zpos"			"1"
-			"color_ready"		"0 255 0 220"
-			"color_notready"	"TransparentBlack"
-
-			"PanelBG"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"PanelBG"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"2"
-				"wide"			"f0"
-				"tall"			"25"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"0"
-				"enabled"		"1"
-				"fillcolor"		"TransparentBlack"
-			}
-
-			"playername"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"playername"
-				"font"			"Cerbetica10"
-				"xpos"			"1"
-				"ypos"			"25"
-				"zpos"			"5"
-				"wide"			"48"
-				"tall"			"10"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%playername%"
-				"textAlignment"	"center"
-			}
-
-			"classimage"
-			{
-				"ControlName"	"CTFClassImage"
-				"fieldName"		"classimage"
-				"xpos"			"1"
-				"ypos"			"1"
-				"zpos"			"3"
-				"wide"			"24"
-				"tall"			"24"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"../hud/class_scoutred"
-				"scaleImage"	"1"
-
-				if_mvm
-				{
-					"image"		"../vgui/hud_connecting"
-				}
-
-				if_competitive
-				{
-					"image"		"../vgui/hud_connecting"
-				}
-
-				if_readymode
-				{
-					"image"		"../vgui/hud_connecting"
-				}
-			}
-
-			"classimagebg"
-			{
-				"ControlName"	"Panel"
-				"fieldName"		"classimagebg"
-				"xpos"			"1"
-				"ypos"			"1"
-				"zpos"			"3"
-				"wide"			"24"
-				"tall"			"24"
-				"visible"		"0"
-				"enabled"		"1"
-				"bgcolor_override"		"TransparentBlack"
-				"PaintBackgroundType"	"0"
-			}
-
-			"HealthIcon"
-			{
-				"ControlName"		"EditablePanel"
-				"fieldName"			"HealthIcon"
-				"xpos"				"22"
-				"ypos"				"-3"
-				"zpos"				"3"
-				"wide"				"32"
-				"tall"				"32"
-				"visible"			"1"
-				"enabled"			"1"
-				"HealthBonusPosAdj"	"10"
-				"HealthDeathWarning"		"0.49"
-				"TFFont"					"HudFontSmallest"
-				"HealthDeathWarningColor"	"HUDDeathWarning"
-				"TextColor"					"HudOffWhite"
-
-				if_readymode
-				{
-					"xpos"			"9999"
-				}
-			}
-
-			"ReadyBG"
-			{
-				"ControlName"	"ScalableImagePanel"
-				"fieldName"		"ReadyBG"
-				"xpos"			"29"
-				"ypos"			"5"
-				"zpos"			"3"
-				"wide"			"16"
-				"tall"			"16"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"0"
-				"enabled"		"0"
-				"image"			"../HUD/tournament_panel_brown"
-
-				"src_corner_height"		"22"			// pixels inside the image
-				"src_corner_width"		"22"
-
-				"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
-				"draw_corner_height" 	"0"
-
-				if_mvm
-				{
-					"visible"			"1"
-				}
-
-				if_competitive
-				{
-					"visible"			"1"
-				}
-
-				if_readymode
-				{
-					"visible"			"1"
-				}
-			}
-
-			"ReadyImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"ReadyImage"
-				"xpos"			"31"
-				"ypos"			"7"
-				"zpos"			"4"
-				"wide"			"12"
-				"tall"			"12"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"0"
-				"enabled"		"1"
-				"image"			"hud/checkmark"
-				"scaleImage"	"1"
-
-				if_mvm
-				{
-					"visible"	"1"
-				}
-
-				if_competitive
-				{
-					"visible"	"1"
-				}
-
-				if_readymode
-				{
-					"visible"	"1"
-				}
-			}
-
-			"respawntime"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"respawntime"
-				"font"			"DefaultSmall"
-				"xpos"			"28"
-				"ypos"			"2"
-				"zpos"			"5"
-				"wide"			"23"
-				"tall"			"10"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%respawntime%"
-				"textAlignment"	"west"
-				//"fgcolor"		"TanLight"
-			}
-
-			"chargeamount"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"chargeamount"
-				"font"			"DefaultSmall"
-				"xpos"			"25"
-				"ypos"			"17"
-				"zpos"			"6"
-				"wide"			"25"
-				"tall"			"15"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%chargeamount%"
-				"textAlignment"	"north"
-				"fgcolor"		"ColorGreen"
-
-				if_mvm
-				{
-					"visible"	"0"
-				}
-			}
-
-			"specindex"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"specindex"
-				"font"			"DefaultVerySmall"
-				"xpos"			"4"
-				"ypos"			"2"
-				"zpos"			"5"
-				"wide"			"50"
-				"tall"			"8"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"0"
-				"labelText"		"%specindex%"
-				"textAlignment"	"north-west"
-				//"fgcolor"		"TanLight"
-			}
-		}
-	}
-
-	"HudTournamentBG"
-	{
-		"ControlName"			"ScalableImagePanel"
-		"fieldName"				"HudTournamentBG"
-		"wide"					"0"
-	}
-
-	"TournamentLabel"
-	{
-		"ControlName"			"Label"
-		"fieldName"				"TournamentLabel"
-		"wide"					"0"
-	}
-
-	"HudTournamentBLUEBG"
-	{
-		"ControlName"			"ScalableImagePanel"
-		"fieldName"				"HudTournamentBLUEBG"
-		"xpos"					"c-125"
-		"ypos"					"0"
-		"zpos"					"-1"
-		"wide"					"125"
-		"tall"					"16"
-		"visible"				"1"
-		"enabled"				"1"
-		"image"					"../HUD/tournament_panel_blu"
-
-		"src_corner_height"		"15"
-		"src_corner_width"		"15"
-		"draw_corner_width"		"0"
-		"draw_corner_height"	"0"
-
-		if_mvm
-		{
-			"visible"			"0"
-		}
-
-		if_competitive
-		{
-			"visible"			"0"
-		}
-
-		if_readymode
-		{
-			"visible"			"0"
-		}
-	}
-
-	"TournamentBLUELabel"
-	{
-		"ControlName"			"Label"
-		"fieldName"				"TournamentBLUELabel"
-		"font"					"HudFontSmall"
-		"xpos"					"-5"
-		"ypos"					"0"
-		"zpos"					"1"
-		"wide"					"65"
-		"tall"					"16"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"				"1"
-		"enabled"				"1"
-		"wrap"					"0"
-		"labelText"				"%bluenamelabel%"
-		"textAlignment"			"west"
-
-		"pin_to_sibling"		"HudTournamentBLUEBG"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
-
-		if_mvm
-		{
-			"visible"			"0"
-		}
-
-		if_competitive
-		{
-			"visible"			"0"
-		}
-
-		if_readymode
-		{
-			"visible"			"0"
-		}
-	}
-
-	"TournamentBLUEStateLabel"
-	{
-		"ControlName"			"Label"
-		"fieldName"				"TournamentBLUEStateLabel"
-		"font"					"HudFontSmallest"
-		"xpos"					"-5"
-		"ypos"					"0"
-		"zpos"					"1"
-		"wide"					"65"
-		"tall"					"16"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"				"1"
-		"enabled"				"1"
-		"wrap"					"0"
-		"labelText"				"%bluestate%"
-		"textAlignment"			"east"
-
-		"pin_to_sibling"		"HudTournamentBLUEBG"
-		"pin_corner_to_sibling"	"PIN_TOPRIGHT"
-		"pin_to_sibling_corner"	"PIN_TOPRIGHT"
-
-		if_mvm
-		{
-			"visible"			"0"
-		}
-
-		if_competitive
-		{
-			"visible"			"0"
-		}
-
-		if_readymode
-		{
-			"visible"			"0"
-		}
-	}
-
-	"HudTournamentREDBG"
-	{
-		"ControlName"			"ScalableImagePanel"
-		"fieldName"				"HudTournamentREDBG"
-		"xpos"					"c0"
-		"ypos"					"0"
-		"zpos"					"-1"
-		"wide"					"125"
-		"tall"					"16"
-		"visible"				"1"
-		"enabled"				"1"
-		"image"					"../HUD/tournament_panel_red"
-
-		"src_corner_height"		"15"
-		"src_corner_width"		"15"
-		"draw_corner_width"		"0"
-		"draw_corner_height"	"0"
-
-		if_mvm
-		{
-			"visible"			"0"
-		}
-		if_competitive
-		{
-			"visible"			"0"
-		}
-		if_readymode
-		{
-			"visible"			"0"
-		}
-	}
-
-	"TournamentREDLabel"
-	{
-		"ControlName"			"Label"
-		"fieldName"				"TournamentREDLabel"
-		"font"					"HudFontSmall"
-		"xpos"					"-5"
-		"ypos"					"0"
-		"zpos"					"1"
-		"wide"					"65"
-		"tall"					"16"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"				"1"
-		"enabled"				"1"
-		"wrap"					"0"
-		"labelText"				"%rednamelabel%"
-		"textAlignment"			"east"
-
-		"pin_to_sibling"		"HudTournamentREDBG"
-		"pin_corner_to_sibling"	"PIN_TOPRIGHT"
-		"pin_to_sibling_corner"	"PIN_TOPRIGHT"
-
-		if_mvm
-		{
-			"visible"			"0"
-		}
-
-		if_competitive
-		{
-			"visible"			"0"
-		}
-
-		if_readymode
-		{
-			"visible"			"0"
-		}
-	}
-
-	"TournamentREDStateLabel"
-	{
-		"ControlName"			"Label"
-		"fieldName"				"TournamentREDStateLabel"
-		"font"					"HudFontSmallest"
-		"xpos"					"-5"
-		"ypos"					"0"
-		"zpos"					"1"
-		"wide"					"65"
-		"tall"					"16"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"				"1"
-		"enabled"				"1"
-		"wrap"					"0"
-		"labelText"				"%redstate%"
-		"textAlignment"			"west"
-
-		"pin_to_sibling"		"HudTournamentREDBG"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
-
-		if_mvm
-		{
-			"visible"			"0"
-		}
-
-		if_competitive
-		{
-			"visible"			"0"
-		}
-
-		if_readymode
-		{
-			"visible"			"0"
-		}
-	}
-
-	"TournamentConditionLabel"
-	{
-		"ControlName"			"CExLabel"
-		"fieldName"				"TournamentConditionLabel"
-		"font"					"HudFontSmallest"
-		"fgcolor"				"TanLight"
-		"xpos"					"c-125"
-		"ypos"					"16"
-		"zpos"					"1"
-		"wide"					"250"
-		"tall"					"14"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"				"1"
-		"enabled"				"1"
-		"wrap"					"0"
-		"labelText"				"%winconditions%"
-		"textAlignment"			"center"
-
-		if_mvm
-		{
-			"visible"			"0"
-		}
-
-		if_competitive
-		{
-			"ypos"				"25"
-		}
-	}
-
-	"HudTournamentBGHelp"
-	{
-		"ControlName"			"ScalableImagePanel"
-		"fieldName"				"HudTournamentBGHelp"
-		"wide"					"0"
-	}
-
-	"TournamentInstructionsLabel"
-	{
-		"ControlName"			"CExLabel"
-		"fieldName"				"TournamentInstructionsLabel"
-		"font"					"HudFontSmallest"
-		"xpos"					"c-125"
-		"ypos"					"30"
-		"wide"					"250"
-		"tall"					"12"
-		"zpos"					"1"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"				"1"
-		"enabled"				"1"
-		"wrap"					"0"
-		"labelText"				"%readylabel%"
-		"textAlignment"			"center"
-
-		if_mvm
-		{
-			"ypos"				"105"
-		}
-
-		if_competitive
-		{
-			"ypos"				"36"
-		}
-	}
-
-	"TournamentReadyHintIcon"
-	{
-		"ControlName"			"CExLabel"
-		"fieldName"				"TournamentReadyHintIcon"
-		"wide"					"0"
-	}
-
-	"CountdownBG"
-	{
-		"ControlName"			"ScalableImagePanel"
-		"fieldName"				"CountdownBG"
-		"wide"					"0"
-	}
-
-	"CountdownLabel"
-	{
-		"ControlName"			"CExLabel"
-		"fieldName"				"CountdownLabel"
-		"font"					"HudFontMedium"
-		"xpos"					"cs-0.5"
-		"ypos"					"cs-0.1"
-		"wide"					"40"
-		"tall"					"40"
-		"zpos"					"4"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"				"0"
-		"enabled"				"1"
-		"wrap"					"0"
-		"labelText"				"%tournamentstatelabel%"
-		"textAlignment"			"center"
-		"proportionaltoparent"	"1"
-	}
-
-	"CountdownLabelShadow"
-	{
-		"ControlName"			"CExLabel"
-		"fieldName"				"CountdownLabelShadow"
-		"font"					"HudFontMedium"
-		"xpos"					"cs-0.49"
-		"ypos"					"cs-0.09"
-		"wide"					"40"
-		"tall"					"40"
-		"zpos"					"3"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"				"0"
-		"enabled"				"1"
-		"wrap"					"0"
-		"labelText"				"%tournamentstatelabel%"
-		"textAlignment"			"center"
-		"fgcolor"				"TransparentBlack"
-		"proportionaltoparent"	"1"
-	}
-}
\ No newline at end of file
+"#base" "../../#customizations/streamermode/hudtournament.res"
+"#base" "hudtournament-base.res"
\ No newline at end of file