Moved customization files

12 files changed, 109 insertions, 106 deletions

diff --git a/#customizations/_stock/classselection.res b/resource/ui/classselection-base.res
index fc413d4..fc413d4 100644
--- a/#customizations/_stock/classselection.res
+++ b/resource/ui/classselection-base.res
diff --git a/resource/ui/classselection.res b/resource/ui/classselection.res
index 554d6aa..e4d6de5 100644
--- a/resource/ui/classselection.res
+++ b/resource/ui/classselection.res
@@ -1,2 +1,2 @@
 "#base" "../../#customizations/_enabled/classselection-center.res"
-"#base" "../../#customizations/_stock/classselection.res"
\ No newline at end of file
+"#base" "classselection-base.res"
\ No newline at end of file
diff --git a/#customizations/_stock/hudplayerclass.res b/resource/ui/hudplayerclass-base.res
index 641ed86..641ed86 100644
--- a/#customizations/_stock/hudplayerclass.res
+++ b/resource/ui/hudplayerclass-base.res
diff --git a/resource/ui/hudplayerclass.res b/resource/ui/hudplayerclass.res
index 3fb6e4b..22784b2 100644
--- a/resource/ui/hudplayerclass.res
+++ b/resource/ui/hudplayerclass.res
@@ -1,2 +1,2 @@
 "#base" "../../#customizations/_enabled/hudplayerclass-left.res"
-"#base" "../../#customizations/_stock/hudplayerclass.res"
\ No newline at end of file
+"#base" "hudplayerclass-base.res"
\ No newline at end of file
diff --git a/#customizations/_stock/hudplayerhealth.res b/resource/ui/hudplayerhealth-base.res
index b514365..7b6daf6 100644
--- a/#customizations/_stock/hudplayerhealth.res
+++ b/resource/ui/hudplayerhealth-base.res
@@ -64,10 +64,10 @@
 		"scaleImage"	"1"
 	}
 
-	"PlayerStatusHealthValue"
+	"PlayerHealthValue"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValue"
+		"fieldName"		"PlayerHealthValue"
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"5"
@@ -82,10 +82,10 @@
 		"fgcolor"		"Health Normal"
 	}
 
-	"PlayerStatusHealthValueShadow"
+	"PlayerHealthValueShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValueShadow"
+		"fieldName"		"PlayerHealthValueShadow"
 		"xpos"			"-2"
 		"ypos"			"-2"
 		"zpos"			"5"
@@ -99,7 +99,7 @@
 		"font_minmode"	"Cerbetica32"
 		"fgcolor"		"0 0 0 200"
 
-		"pin_to_sibling"		"PlayerStatusHealthValue"
+		"pin_to_sibling"		"PlayerHealthValue"
 		"pin_corner_to_sibling"	"PIN_TOPLEFT"
 		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
diff --git a/resource/ui/hudplayerhealth.res b/resource/ui/hudplayerhealth.res
index 63963c8..3911be6 100644
--- a/resource/ui/hudplayerhealth.res
+++ b/resource/ui/hudplayerhealth.res
@@ -1,3 +1,3 @@
 "#base" "../../#customizations/_enabled/hudplayerhealth-broesel.res"
 "#base" "../../#customizations/_enabled/hudplayerhealth-cross.res"
-"#base" "../../#customizations/_stock/hudplayerhealth.res"
\ No newline at end of file
+"#base" "hudplayerhealth-base.res"
\ No newline at end of file
diff --git a/#customizations/_stock/mainmenuoverride.res b/resource/ui/mainmenuoverride-base.res
index b6b14ee..b6b14ee 100644
--- a/#customizations/_stock/mainmenuoverride.res
+++ b/resource/ui/mainmenuoverride-base.res
diff --git a/resource/ui/mainmenuoverride.res b/resource/ui/mainmenuoverride.res
index 05b56ba..ce6889c 100644
--- a/resource/ui/mainmenuoverride.res
+++ b/resource/ui/mainmenuoverride.res
@@ -1,6 +1,6 @@
 "#base" "../../resource/preload.res"
 "#base" "../../#customizations/_enabled/mainmenuoverride-classic.res"
-"#base" "../../#customizations/_stock/mainmenuoverride.res"
+"#base" "mainmenuoverride-base.res"
 #base "../../resource/tools.res"
 
 "Resource/UI/MainMenuOverride.res"
diff --git a/#customizations/_stock/scoreboard.res b/resource/ui/scoreboard-base.res
index ad97352..ad97352 100644
--- a/#customizations/_stock/scoreboard.res
+++ b/resource/ui/scoreboard-base.res
diff --git a/resource/ui/scoreboard.res b/resource/ui/scoreboard.res
index fe68e38..bf73016 100644
--- a/resource/ui/scoreboard.res
+++ b/resource/ui/scoreboard.res
@@ -1,2 +1,2 @@
 "#base" "../../#customizations/_enabled/scoreboard-minimal.res"
-"#base" "../../#customizations/_stock/scoreboard.res"
\ No newline at end of file
+"#base" "scoreboard-base.res"
\ No newline at end of file
diff --git a/#customizations/_stock/teammenu.res b/resource/ui/teammenu-base.res
index 9368fb8..1957ec3 100644
--- a/#customizations/_stock/teammenu.res
+++ b/resource/ui/teammenu-base.res
@@ -12,8 +12,8 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"255 0 0 255"
 		"tabPosition"	"0"
+		"fgcolor"		"255 0 0 255"
 	}
 	"SidePanelBG"
 	{
@@ -27,7 +27,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
-		"fillcolor"		"0 0 0 120"
+		"fillcolor"		"0 0 0 100"
 	}
 
 	"SysMenu"
@@ -65,10 +65,10 @@
 		"ControlName"	"Label"
 		"fieldName"		"SelectTeamLabel"
 		"xpos"			"0"
-		"ypos"			"15"
+		"ypos"			"c-75"
 		"zpos"			"1"
 		"wide"			"255"
-		"tall"			"30"
+		"tall"			"25"
 		"labelText"		"#TF_SelectATeam"
 		"textAlignment"	"center"
 		"font"			"Cerbetica32"
@@ -81,10 +81,10 @@
 	{
 		"ControlName"	"CTFTeamButton"
 		"fieldName"		"teambutton0"
-		"xpos"			"10"
-		"ypos"			"c5"
-		"zpos"			"3"
-		"wide"			"245"
+		"xpos"			"0"
+		"ypos"			"15"
+		"zpos"			"1"
+		"wide"			"255"
 		"tall"			"30"
 		"autoResize"	"0"
 		"pinCorner"		"2"
@@ -98,34 +98,33 @@
 		"command"		"jointeam blue"
 		"team"			"3"		// Blue Team
 		"font"			"Cerbetica20"
+		
+		"defaultBgColor_override" 	"Blue"
+		"armedBgColor_override"		"BlueSolid"
+		"depressedBgColor_override" "Blue"
+		"selectedBgColor_override" 	"BlueSolid"
+		
 		"defaultFgColor_override" 	"255 255 255 128"
-		"armedFgColor_override"		"235 226 202 255"
+		"armedFgColor_override"		"TanLight"
 		"depressedFgColor_override" "255 255 255 128"
-		"selectedFgColor_override" 	"235 226 202 255"
-	}
-
-	"BlueTeamBG"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"BlueTeamBG"
-		"xpos"			"0"
-		"ypos"			"c5"
-		"zpos"			"0"
-		"wide"			"255"
-		"tall"			"30"
-		"visible"		"1"
-		"enabled"		"1"
-		"bgcolor_override"		"70 130 180 125"
+		"selectedFgColor_override" 	"TanLight"
+		
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
+		
+		"pin_to_sibling"			"SelectTeamLabel"
+		"pin_corner_to_sibling"		"PIN_TOPLEFT"
+		"pin_to_sibling_corner"		"PIN_BOTTOMLEFT"
 	}
 
 	"teambutton1"
 	{
 		"ControlName"	"CTFTeamButton"
 		"fieldName"		"teambutton1"
-		"xpos"			"10"
-		"ypos"			"c45"
-		"zpos"			"3"
-		"wide"			"245"
+		"xpos"			"0"
+		"ypos"			"5"
+		"zpos"			"1"
+		"wide"			"255"
 		"tall"			"30"
 		"autoResize"	"0"
 		"pinCorner"		"2"
@@ -139,40 +138,39 @@
 		"command"		"jointeam red"
 		"team"			"4"		// Red Team
 		"font"			"Cerbetica20"
+		
+		"defaultBgColor_override" 	"Red"
+		"armedBgColor_override"		"RedSolid"
+		"depressedBgColor_override" "Red"
+		"selectedBgColor_override" 	"RedSolid"
+		
 		"defaultFgColor_override" 	"255 255 255 128"
-		"armedFgColor_override"		"235 226 202 255"
+		"armedFgColor_override"		"TanLight"
 		"depressedFgColor_override" "255 255 255 128"
-		"selectedFgColor_override" 	"235 226 202 255"
-	}
-
-	"RedTeamBG"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"RedTeamBG"
-		"xpos"			"0"
-		"ypos"			"c45"
-		"zpos"			"0"
-		"wide"			"255"
-		"tall"			"30"
-		"visible"		"1"
-		"enabled"		"1"
-		"bgcolor_override"		"205 50 50 153"
+		"selectedFgColor_override" 	"TanLight"
+		
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
+		
+		"pin_to_sibling"			"teambutton0"
+		"pin_corner_to_sibling"		"PIN_TOPLEFT"
+		"pin_to_sibling_corner"		"PIN_BOTTOMLEFT"
 	}
 
 	"teambutton2"
 	{
 		"ControlName"	"CTFTeamButton"
 		"fieldName"		"teambutton2"
-		"xpos"			"10"
-		"ypos"			"c-75"
-		"zpos"			"3"
-		"wide"			"245"
+		"xpos"			"0"
+		"ypos"			"5"
+		"zpos"			"1"
+		"wide"			"255"
 		"tall"			"30"
 		"autoResize"	"0"
 		"pinCorner"		"2"
 		"visible"		"1"
 		"enabled"		"1"
-		"tabPosition"	"3"
+		"tabPosition"	"1"
 		"labelText"		"#TF_Random"
 		"textAlignment"	"center"
 		"dulltext"		"0"
@@ -180,40 +178,39 @@
 		"paintborder"	"0"
 		"command"		"jointeam auto"
 		"font"			"Cerbetica20"
+		
+		"defaultBgColor_override" 	"TransparentBlack"
+		"armedBgColor_override"		"ColorWhite"
+		"depressedBgColor_override" "TransparentBlack"
+		"selectedBgColor_override" 	"ColorWhite"
+		
 		"defaultFgColor_override" 	"255 255 255 128"
-		"armedFgColor_override"		"235 226 202 255"
+		"armedFgColor_override"		"TanDark"
 		"depressedFgColor_override" "255 255 255 128"
-		"selectedFgColor_override" 	"235 226 202 255"
-	}
-
-	"AutoJoinBG"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"AutoJoinBG"
-		"xpos"			"0"
-		"ypos"			"c-75"
-		"zpos"			"0"
-		"wide"			"255"
-		"tall"			"30"
-		"visible"		"1"
-		"enabled"		"1"
-		"bgcolor_override"	"HudBlack"
+		"selectedFgColor_override" 	"TanDark"
+		
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
+		
+		"pin_to_sibling"			"teambutton1"
+		"pin_corner_to_sibling"		"PIN_TOPLEFT"
+		"pin_to_sibling_corner"		"PIN_BOTTOMLEFT"
 	}
 
 	"teambutton3"
 	{
 		"ControlName"	"CTFTeamButton"
 		"fieldName"		"teambutton3"
-		"xpos"			"10"
-		"ypos"			"c-35"
-		"zpos"			"3"
-		"wide"			"245"
+		"xpos"			"0"
+		"ypos"			"5"
+		"zpos"			"1"
+		"wide"			"255"
 		"tall"			"30"
 		"autoResize"	"0"
 		"pinCorner"		"2"
 		"visible"		"1"
 		"enabled"		"1"
-		"tabPosition"	"3"
+		"tabPosition"	"2"
 		"labelText"		"#TF_Spectate"
 		"textAlignment"	"center"
 		"dulltext"		"0"
@@ -221,24 +218,23 @@
 		"paintborder"	"0"
 		"command"		"jointeam spectate"
 		"font"			"Cerbetica20"
+		
+		"defaultBgColor_override" 	"TransparentBlack"
+		"armedBgColor_override"		"ColorWhite"
+		"depressedBgColor_override" "TransparentBlack"
+		"selectedBgColor_override" 	"ColorWhite"
+		
 		"defaultFgColor_override" 	"255 255 255 128"
-		"armedFgColor_override"		"235 226 202 255"
+		"armedFgColor_override"		"TanDark"
 		"depressedFgColor_override" "255 255 255 128"
-		"selectedFgColor_override" 	"235 226 202 255"
-	}
-
-	"SpectateBG"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"SpectateBG"
-		"xpos"			"0"
-		"ypos"			"c-35"
-		"zpos"			"0"
-		"wide"			"255"
-		"tall"			"30"
-		"visible"		"1"
-		"enabled"		"1"
-		"bgcolor_override"	"HudBlack"
+		"selectedFgColor_override" 	"TanDark"
+		
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
+		
+		"pin_to_sibling"			"teambutton2"
+		"pin_corner_to_sibling"		"PIN_TOPLEFT"
+		"pin_to_sibling_corner"		"PIN_BOTTOMLEFT"
 	}
 
 	"MenuBG"
@@ -247,7 +243,6 @@
 		"fieldName"		"MenuBG"
 		"xpos"			"0"
 		"ypos"			"0"
-		"zpos"			"0"
 		"wide"			"f0"
 		"tall"			"480"
 		"autoResize"	"0"
@@ -262,10 +257,10 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueCount"
 		"xpos"			"0"
-		"ypos"			"c5"
-		"zpos"			"1"
+		"ypos"			"0"
+		"zpos"			"2"
 		"zpos"			"3"
-		"wide"			"245"
+		"wide"			"20"
 		"tall"			"30"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -276,7 +271,11 @@
 		"dulltext"		"0"
 		"brighttext"	"1"
 		"font"			"Cerbetica20"
-		"fgcolor"		"242 242 242 255"
+		"fgcolor"		"255 255 255 128"
+		
+		"pin_to_sibling"		"teambutton0"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 
 	"RedCount"
@@ -284,9 +283,9 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"RedCount"
 		"xpos"			"0"
-		"ypos"			"c45"
-		"zpos"			"1"
-		"wide"			"245"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"20"
 		"tall"			"30"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -297,7 +296,11 @@
 		"dulltext"		"0"
 		"brighttext"	"1"
 		"font"			"Cerbetica20"
-		"fgcolor"		"242 242 242 255"
+		"fgcolor"		"255 255 255 128"
+		
+		"pin_to_sibling"		"teambutton1"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 
 	"TeamsFullLabel"
diff --git a/resource/ui/teammenu.res b/resource/ui/teammenu.res
index ec202fe..bd5f02b 100644
--- a/resource/ui/teammenu.res
+++ b/resource/ui/teammenu.res
@@ -1,2 +1,2 @@
 "#base" "../../#customizations/_enabled/teammenu-center.res"
-"#base" "../../#customizations/_stock/teammenu.res"
\ No newline at end of file
+"#base" "teammenu-base.res"
\ No newline at end of file