Merge pull request #143 from raysfire/update

v2020.0412

1 files changed, 47 insertions, 49 deletions

diff --git a/resource/ui/classloadoutpanel.res b/resource/ui/classloadoutpanel.res
index 20bc07e..d4060ae 100644
--- a/resource/ui/classloadoutpanel.res
+++ b/resource/ui/classloadoutpanel.res
@@ -47,11 +47,14 @@
 			"paintborder"	"1"
 			
 			"model_center_x"	"1"
-			"model_ypos"		"3"
-			"model_tall"		"52"
+			"model_ypos"		"5"
+			"model_tall"		"55"
 			"model_wide"		"82"
-			"text_ypos"			"47"
-			"text_center"		"1"
+			"text_ypos"			"0"
+			"text_forcesize"	"2"
+			"text_center"		"0"
+			"text_yoffset"		"2"
+			"inset_eq_y"		"55"
 			"name_only"			"1"
 			
 			"attriblabel"
@@ -71,17 +74,17 @@
 		"itemoptionpanels_kv"
 		{
 			"ControlName"	"CExButton"
-			"xpos"			"0"
-			"ypos"			"0"
+			"xpos"			"1"
+			"ypos"			"1"
 			"zpos"			"1"
-			"wide"			"12"
-			"tall"			"16"
+			"wide"			"20"
+			"tall"			"20"
 			"autoResize"	"0"
 			"visible"		"0"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labelText"		"+"
-			"font"			"Cerbetica12"
+			"labelText"		"M"
+			"font"			"CustomIcons18"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -89,9 +92,11 @@
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 			"paintbackground"	"0"
-			"defaultFgColor_override"	"ColorWhite"
-			"armedFgColor_override"		"ColorCyan"
-			"depressedFgColor_override"	"ColorCyan"
+			"fgcolor"					"TanLight"
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override"		"TanDark"
+			"depressedFgColor_override" "TanDark"
+			"selectedFgColor_override" 	"TanDark"
 		}
 	}
 	
@@ -102,16 +107,16 @@
 		"font"			"Cerbetica16"
 		"labelText"		">>"
 		"textAlignment"	"west"
-		"xpos"			"c-300"
-		"ypos"			"26"
+		"xpos"			"c-290"
+		"ypos"			"15"
 		"zpos"			"1"
 		"wide"			"20"
-		"tall"			"16"
+		"tall"			"25"
 		"autoResize"	"1"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "200 128 255 255"
+		"fgcolor_override" "ColorPurple"
 	}
 	
 	"ClassLabel"
@@ -121,11 +126,11 @@
 		"font"			"HudFontMediumBold"
 		"labelText"		"#ClassBeingEquipped"
 		"textAlignment"	"west"
-		"xpos"			"c-280"
+		"xpos"			"c-270"
 		"ypos"			"15"
 		"zpos"			"1"
-		"wide"			"240"
-		"tall"			"40"
+		"wide"			"250"
+		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -157,13 +162,13 @@
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"TopLine"
-		"xpos"			"9999"
-		"ypos"			"9999"
+		"xpos"			"c-305"
+		"ypos"			"40"
 		"zpos"			"2"
 		"wide"			"610"
 		"tall"			"10"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"image"			"loadout_dotted_line"
 		"tileImage"		"1"
 		"tileVertically" "0"
@@ -298,7 +303,7 @@
 		"tall"			"75"
 		"autoResize"	"1"
 		"visible"		"0"
-		"bgcolor_override"		"35 35 35 255"
+		"bgcolor_override"		"DarkerGrey"
 		"PaintBackgroundType"	"0"
 	}
 	
@@ -313,29 +318,28 @@
 	{
 		"ControlName"		"CExImageButton"
 		"fieldName"			"RedButton"
-		"xpos"				"c5"
-		"ypos"				"22"
+		"xpos"				"c-166"
+		"ypos"				"c-126"
 		"zpos"				"12"
-		"wide"				"80"
-		"tall"				"20"
+		"wide"				"25"
+		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"RED Team"
+		"labelText"			"R"
 		"textAlignment"		"center"
-		"font"				"Cerbetica16"
+		"font"				"CerbeticaBold28"
 		"scaleImage"		"1"
 		"command"			"sv_cheats 1;r_skin 0"
 		
-		"fgcolor"					"TanLight"
-		"defaultFgColor_override"	"250 68 17 255"
-		"armedFgColor_override"		"ColorCyan"
-		"depressedFgColor_override"	"250 68 17 255"
+		"defaultFgColor_override"	"180 92 77 127"
+		"armedFgColor_override"		"180 92 77 127"
 		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
+		
 		"keyboardinputenabled"	"0"
 		"paintbackground"		"1"
 	}
@@ -344,26 +348,24 @@
 	{
 		"ControlName"		"CExImageButton"
 		"fieldName"			"BlueButton"
-		"xpos"				"c-85"
-		"ypos"				"22"
+		"xpos"				"c-166"
+		"ypos"				"c-99"
 		"zpos"				"12"
-		"wide"				"80"
-		"tall"				"20"
+		"wide"				"25"
+		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"BLU Team"
+		"labelText"			"B"
 		"textAlignment"		"center"
-		"font"				"Cerbetica16"
+		"font"				"CerbeticaBold28"
 		"scaleImage"		"1"
 		"command"			"sv_cheats 1;r_skin 1"
 		
-		"fgcolor"					"TanLight"
-		"defaultFgColor_override"	"0 98 255 255"
-		"armedFgColor_override"		"ColorCyan"
-		"depressedFgColor_override"	"0 98 255 255"
+		"defaultFgColor_override"	"104 124 155 127"
+		"armedFgColor_override"		"104 124 155 127"
 		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -393,8 +395,6 @@
 		"Command"		"characterloadout"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"image_drawcolor"	"TanLight"
-		"image_armedcolor"	"Button Color"
 		
 		"SubImage"
 		{
@@ -433,8 +433,6 @@
 		"Command"		"tauntloadout"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"image_drawcolor"	"TanLight"
-		"image_armedcolor"	"Button Color"
 		
 		"SubImage"
 		{