Merge pull request #143 from raysfire/update

v2020.0412

1 files changed, 31 insertions, 77 deletions

diff --git a/resource/ui/itemquickswitch.res b/resource/ui/itemquickswitch.res
index f3eae1d..ea1dd5b 100644
--- a/resource/ui/itemquickswitch.res
+++ b/resource/ui/itemquickswitch.res
@@ -4,10 +4,10 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"ItemQuickSwitchPanel"
-		"xpos"			"c-125"
-		"ypos"			"280"
-		"wide"			"275"
-		"tall"			"160"
+		"xpos"			"c-135"
+		"ypos"			"330"
+		"wide"			"270"
+		"tall"			"140"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -19,23 +19,23 @@
 		
 		"itempanel_xpos"		"0"
 		"itempanel_ydelta"		"0"
-		"border"				"NoBorder"
 		
 		"itemskv"
 		{
-			"wide"			"220"
-			"tall"			"40"
-			"bgcolor_override"		"59 54 48 255"
-			"PaintBackgroundType"	"2"
+			"wide"			"205"
+			"tall"			"35"
+			"bgcolor_override"		"Black"
+			"PaintBackgroundType"	"0"
+			"paintbackground"	"0"
 			"paintborder"	"0"
 			"text_forcesize" "2"
-			"model_xpos"	"25"
-			"model_ypos"	"3"
+			"model_xpos"	"0"
+			"model_ypos"	"0"
 			"model_wide"	"58"
 			"model_tall"	"34"
 			"text_center"	"1"
-			"text_xpos"		"60"
-			"text_wide"		"190"
+			"text_xpos"		"50"
+			"text_wide"		"160"
 			"name_only"		"1"
 			"noitem_textcolor"		"TextColor"
 		}
@@ -45,87 +45,41 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CaratLabel"
-		"font"			"CerbeticaBold12"
-		"labelText"		">>"
-		"textAlignment"	"west"
-		"xpos"			"10"
-		"ypos"			"5"
-		"zpos"			"1"
-		"wide"			"20"
-		"tall"			"15"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fgcolor_override" "200 128 255 255"
+		"xpos"			"9999"
 	}
 	
 	"ClassLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ClassLabel"
-		"font"			"HudFontSmallestBold"
-		"labelText"		"#ClassBeingEquipped"
-		"textAlignment"	"west"
-		"xpos"			"20"
-		"ypos"			"5"
-		"zpos"			"1"
-		"wide"			"60"
-		"tall"			"15"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"xpos"			"9999"
 	}
 
 	"ItemSlotLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemSlotLabel"
-		"font"			"HudFontSmallestBold"
-		"labelText"		"#PrimaryWeapon"
-		"textAlignment"	"west"
-		"xpos"			"80"
-		"ypos"			"5"
-		"zpos"			"1"
-		"wide"			"140"
-		"tall"			"15"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"xpos"			"9999"
 	}
 	
 	"NoItemsLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NoItemsLabel"
-		"font"			"ItemFontNameSmallest"
-		"labelText"		"#NoItemsToEquip"
-		"textAlignment"	"center"
-		"xpos"			"3"
-		"ypos"			"0"
-		"zpos"			"10"
-		"wide"			"220"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"fgcolor_override" "LightRed"
+		"xpos"			"9999"
 	}
 	
 	"TopLine"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"TopLine"
-		"xpos"			"9999"
-		"ypos"			"9999"
+		"xpos"			"5"
+		"ypos"			"20"
 		"zpos"			"2"
 		"wide"			"265"
 		"tall"			"10"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"image"			"loadout_dotted_line"
 		"tileImage"		"1"
 		"tileVertically" "0"
@@ -136,11 +90,11 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"itemcontainerscroller"
 		"xpos"			"5"
-		"ypos"			"30"
-		"wide"			"265"
+		"ypos"			"5"
+		"wide"			"230"
 		"tall"			"125"
-		"PaintBackgroundType"	"2"
-		"fgcolor_override"	"59 54 48 255"
+		"PaintBackgroundType"	"0"
+		"fgcolor_override"	"TanLight"
 		"bgcolor_override"	"200 187 161 0"
 		"autohide_buttons" "1"
 	}
@@ -149,9 +103,9 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"itemcontainer"
-		"xpos"			"30"
+		"xpos"			"0"
 		"ypos"			"0"
-		"wide"			"240"
+		"wide"			"230"
 		"tall"			"125"
 		"PaintBackgroundType"	"2"
 		"bgcolor_override"	"200 187 161 0"
@@ -167,7 +121,7 @@
 			"ypos"			"2"
 			"zpos"			"100"
 			"wide"			"200"
-			"tall"			"40"
+			"tall"			"35"
 			"visible"		"1"
 			"PaintBackgroundType"	"2"
 			"fgcolor_override" "LightRed"
@@ -179,11 +133,11 @@
 	{
 		"ControlName"	"CLoadoutPresetPanel"
 		"FieldName"		"loadout_preset_panel"
-		"xpos"			"5"
-		"ypos"			"33"
+		"xpos"			"240"
+		"ypos"			"15"
 		"zpos"			"20"
 		"wide"			"25"
-		"tall"			"150"
+		"tall"			"110"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"