Updated the backpack and store pages

- Fixed various bugs and inconsistencies in the Item and Store pages.
- Updated the item options icons.

6 files changed, 43 insertions, 109 deletions

diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res
index 05e3a28..ed63d11 100644
--- a/resource/ui/econ/store/v2/storehome_base.res
+++ b/resource/ui/econ/store/v2/storehome_base.res
@@ -52,7 +52,7 @@
 			"wide"			"111"
 			"tall"			"62"
 			"visible"		"0"
-			"bgcolor_override"		"25 25 25 255"
+			"bgcolor_override"		"0 0 0 255"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"0"
 			"paintborder"	"0"
@@ -106,7 +106,7 @@
 			"wide"			"32"
 			"tall"			"25"
 			"visible"		"0"
-			"bgcolor_override"		"ColorBlack"
+			"bgcolor_override"		"0 0 0 255"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"0"
 			"paintborder"	"0"
@@ -269,8 +269,8 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"ReloadSchemeButton"
-		"xpos"			"c-100"
-		"ypos"			"330"
+		"xpos"			"c-400"
+		"ypos"			"350"
 		"zpos"			"25"
 		"wide"			"100"
 		"tall"			"15"
@@ -313,7 +313,7 @@
 		{
 			"wide"				"100"
 			"tall"				"30"
-			"textinsety"		"-5"
+			"textinsety"		"0"
 			"autoResize"		"0"
 			"pinCorner"			"2"
 			"visible"			"1"
@@ -327,7 +327,7 @@
 			"defaultBgColor_override"	"25 25 25 255"
 			"defaultFgColor_override"	"124 114 99 255"
 			"armedBgColor_override"		"0 0 0 100"
-			"armedFgColor_override"		"124 114 99 255"
+			"armedFgColor_override"		"235 227 203 255"
 			"selectedBgColor_override"	"0 0 0 100"
 			"selectedFgColor_override"	"235 227 203 255"
 			
@@ -420,8 +420,8 @@
 		"font"			"Cerbetica14"
 		"labelText"		"%freebackpackspace%"
 		"textAlignment"	"west"
-		"xpos"			"c-237"
-		"ypos"			"312"
+		"xpos"			"c-230"
+		"ypos"			"310"
 		"zpos"			"10"
 		"wide"			"160"
 		"tall"			"20"
@@ -438,7 +438,7 @@
 		"font"			"HudFontSmallBold"
 		"labelText"		"%storecart%"
 		"textAlignment"	"east"
-		"xpos"			"c-238"
+		"xpos"			"c-230"
 		"ypos"			"334"
 		"zpos"			"12"
 		"wide"			"56"
@@ -450,21 +450,13 @@
 		"Command"		"viewcart"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanDark"
-		"border_default"			"ButtonHover"
-		"border_armed"				"ButtonHover"
 	}
 	
 	"CartImage"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"CartImage"
-		"xpos"			"c-233"
+		"xpos"			"c-225"
 		"ypos"			"336"
 		"zpos"			"13"
 		"wide"			"24"
@@ -498,14 +490,6 @@
 		"Command"		"startshopping"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"ButtonHover"
-		"border_armed"				"ButtonHover"
 	}
 	
 	"MarketPlaceButton"
@@ -628,7 +612,7 @@
 		"ypos"			"55"
 		"zpos"			"-5"
 		"wide"			"f0"
-		"tall"			"255"
+		"tall"			"f0"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
diff --git a/resource/ui/econ/store/v2/storepage.res b/resource/ui/econ/store/v2/storepage.res
index dae9486..9a3d8f9 100644
--- a/resource/ui/econ/store/v2/storepage.res
+++ b/resource/ui/econ/store/v2/storepage.res
@@ -325,7 +325,6 @@
 		"paintborder"	"1"
 		"textinsetx"	"100"
 		"border"		"LoadoutItemPopupBorder"
-		"fgcolor"		"243 234 216 255"
 	}
 	
 	"PrevPageButton"
@@ -350,7 +349,7 @@
 		"Command"		"prevpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override" "TanDarker"
+		"defaultBgColor_override" "DarkerGrey"
 	}
 	
 	"CurPageLabel"
@@ -394,7 +393,7 @@
 		"Command"		"nextpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override" "TanDarker"
+		"defaultBgColor_override" "DarkerGrey"
 	}
 	
 	"PriceLabel"
@@ -734,8 +733,6 @@
 		"font"			"HudFontSmallBold"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
 	}
 	
 	"CartImage"
@@ -780,7 +777,7 @@
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"tabPosition"	"0"
 		"labelText"		"RELOADSCHEME"
 		"font"			"HudFontSmallestBold"
diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res
index d0aa382..88c5623 100644
--- a/resource/ui/econ/store/v2/storepanel.res
+++ b/resource/ui/econ/store/v2/storepanel.res
@@ -171,14 +171,6 @@
 		"Command"			"close"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"ButtonHover"
-		"border_armed"				"ButtonHover"
 	}
 	
 	"armory_panel"
@@ -250,7 +242,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"Checkout (&E) >>"
+		"labelText"			"#Store_Checkout"
 		"font"				"HudFontSmallBold"
 		"textAlignment"		"center"
 		"dulltext"			"0"
@@ -259,13 +251,5 @@
 		"Command"			"checkout"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"ButtonHover"
-		"border_armed"				"ButtonHover"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res
index fed93d6..3965863 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel.res
@@ -93,7 +93,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"paintbackground"	"1"
-		"border"			"CyanBorder"
+		"border"			"CyanBorderThick"
 		"bgcolor_override"	"DarkGrey"
 		"PaintBorder"		"1"
 		
@@ -110,7 +110,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"paintborder"	"1"
-			"border"		"CyanBorder"
+			"border"		"NoBorder"
 			"bgcolor_override"	"Grey"
 		}
 		
@@ -348,8 +348,6 @@
 					"command"		"viewwikipage"
 					"sound_depressed"	"UI/buttonclick.wav"
 					"sound_released"	"UI/buttonclickrelease.wav"
-					"border_default"	"ButtonHover"
-					"border_armed"		"ButtonHover"
 				}
 				
 				"TradableLabel"
@@ -500,7 +498,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"render_texture" "0"
+		"render_texture"	"0"
 		"fov"			"40"
 		"allow_rot"		"1"
 		"paintbackground" "1"		
@@ -926,8 +924,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		"<"
-		"font"			"CerbeticaBold18"
+		"labelText"		"&A"
+		"font"			"MenuArrows"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -954,8 +952,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		">"
-		"font"			"CerbeticaBold18"
+		"labelText"		"&D"
+		"font"			"MenuArrows"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -1005,8 +1003,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		"<"
-		"font"			"CerbeticaBold18"
+		"labelText"		"&A"
+		"font"			"MenuArrows"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -1034,8 +1032,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		">"
-		"font"			"CerbeticaBold18"
+		"labelText"		"&D"
+		"font"			"MenuArrows"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -1388,7 +1386,7 @@
 		"armedFgColor_override" "Blank"
 		"depressedFgColor_override" "Blank"
 		"image_drawcolor"	"White"
-		"image_armedcolor"	"ColorRed"
+		"image_armedcolor"	"255 0 0 255"
 		
 		"SubImage"
 		{
@@ -1420,7 +1418,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		"Back"
+		"labelText"		"#TF_BackCarat"
 		"font"			"CerbeticaBold14"
 		"textAlignment"	"center"
 		"dulltext"		"0"
@@ -1429,9 +1427,6 @@
 		"Command"		"close"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"fgcolor"			"White"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
 	}
 	
 	"TryItOutButton"
@@ -1447,7 +1442,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		"Try It Out"
+		"labelText"		"#Store_TryItOut"
 		"font"			"CerbeticaBold14"
 		"textAlignment"	"center"
 		"dulltext"		"0"
@@ -1456,9 +1451,6 @@
 		"Command"		"tryitout"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"fgcolor"			"White"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
 	}
 	
 	"AddToCartButton"
@@ -1483,9 +1475,6 @@
 		"Command"		"addtocart"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"fgcolor"			"White"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
 	}
 	
 	"mouseoveritempanel"
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
index 31add8b..4aa2e3d 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
@@ -45,7 +45,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"paintbackground"	"1"
-		"border"			"CyanBorder"
+		"border"			"CyanBorderThick"
 		"bgcolor_override"	"DarkGrey"
 		"PaintBorder"		"1"
 		
@@ -138,11 +138,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"CerbeticaBold16"
+		"font"			"CerbeticaBold18"
 		"labelText"		"%selectiontitle%"
 		"textAlignment"	"center"
 		"xpos"			"c-130"
-		"ypos"			"c-124"
+		"ypos"			"c-130"
 		"wide"			"260"
 		"tall"			"33"
 		"autoResize"	"1"
@@ -264,8 +264,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		"<"
-		"font"			"CerbeticaBold18"
+		"labelText"		"&A"
+		"font"			"MenuArrows"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -288,8 +288,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		">"
-		"font"			"CerbeticaBold18"
+		"labelText"		"&D"
+		"font"			"MenuArrows"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -335,8 +335,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		"<"
-		"font"			"CerbeticaBold18"
+		"labelText"		"&A"
+		"font"			"MenuArrows"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -359,8 +359,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		">"
-		"font"			"CerbeticaBold18"
+		"labelText"		"&D"
+		"font"			"MenuArrows"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -458,7 +458,7 @@
 		"autoResize"	"1"
 		"pinCorner"		"0"
 		"visible"		"0"
-		"enabled"		"0"
+		"enabled"		"1"
 		"wrap"			"1"
 		"centerwrap"	"1"
 	}
@@ -477,7 +477,7 @@
 		"autoResize"	"1"
 		"pinCorner"		"0"
 		"visible"		"0"
-		"enabled"		"0"
+		"enabled"		"1"
 		"wrap"			"1"
 		"centerwrap"	"1"
 	}
@@ -508,7 +508,7 @@
 		"paintbackground"	"0"
 		
 		"image_drawcolor"	"White"
-		"image_armedcolor"	"ColorRed"
+		"image_armedcolor"	"255 0 0 255"
 		
 		"SubImage"
 		{
@@ -549,8 +549,6 @@
 		"Command"		"close"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
 	}
 	
 	"AddToCartButton"
@@ -575,7 +573,5 @@
 		"Command"		"addtocart"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/store/v2/storeviewcartpanel.res b/resource/ui/econ/store/v2/storeviewcartpanel.res
index b71b307..b331c4e 100644
--- a/resource/ui/econ/store/v2/storeviewcartpanel.res
+++ b/resource/ui/econ/store/v2/storeviewcartpanel.res
@@ -506,14 +506,6 @@
 		"Command"		"close"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"ButtonHover"
-		"border_armed"				"ButtonHover"
 	}
 	
 	"CheckoutButton"
@@ -539,13 +531,5 @@
 		"Command"		"checkout"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"ButtonHover"
-		"border_armed"				"ButtonHover"
 	}
 }
\ No newline at end of file