From 671b2d403046a089e41e8333c729c43da3bcaff2 Mon Sep 17 00:00:00 2001
From: He-Man <He-Man>
Date: Wed, 6 Sep 2017 23:41:55 +0200
Subject: [PATCH] Block BarrelBombs from FavBar + Sort/Pricing adds

---
 .../gui/scripts/favBar/epoch_favBar_draw.sqf     |  2 +-
 Sources/epoch_config/Configs/CfgItemSort.hpp     | 16 ++++++++++++----
 Sources/epoch_config/Configs/CfgPricing.hpp      |  8 ++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Sources/epoch_code/gui/scripts/favBar/epoch_favBar_draw.sqf b/Sources/epoch_code/gui/scripts/favBar/epoch_favBar_draw.sqf
index df406e36..67243a78 100644
--- a/Sources/epoch_code/gui/scripts/favBar/epoch_favBar_draw.sqf
+++ b/Sources/epoch_code/gui/scripts/favBar/epoch_favBar_draw.sqf
@@ -61,7 +61,7 @@ switch _action do {
 		if (rmx_var_favBar_Item in rmx_var_favBar_current) exitWith {"Item already exists in favorites!" call epoch_message; false}; //if duplicate
 		
 		_type = (rmx_var_favBar_Item call BIS_fnc_itemType) select 1;
-		_isBanned = _type in ["BombLauncher", "Cannon", "GrenadeLauncher", "Launcher", "MissileLauncher", "RocketLauncher", "Magazine", "Mortar", "Shotgun","Rocket"];
+		_isBanned = _type in ["BombLauncher", "Cannon", "GrenadeLauncher", "Launcher", "MissileLauncher", "RocketLauncher", "Magazine", "Mortar", "Shotgun","Rocket", "BarrelBomb2_EPOCH_Remote_Mag","BarrelBomb_EPOCH_Remote_Mag"];
 		_isAmmo = _type == "Bullet" && !(rmx_var_favBar_Item in ["EnergyPack","EnergyPackLg"]); 
 		
 		//if (_type in ["AccessoryMuzzle","AccessoryPointer","AccessorySights","AccessoryBipod"]) exitWith {"Attachments are not supported at the moment!" call epoch_message; false};
diff --git a/Sources/epoch_config/Configs/CfgItemSort.hpp b/Sources/epoch_config/Configs/CfgItemSort.hpp
index b92c934f..7df4f755 100644
--- a/Sources/epoch_config/Configs/CfgItemSort.hpp
+++ b/Sources/epoch_config/Configs/CfgItemSort.hpp
@@ -710,7 +710,9 @@ class CfgItemSort
 			"APERSMine_Range_Mag",
 			"APERSBoundingMine_Range_Mag",
 			"SLAMDirectionalMine_Wire_Mag",
-			"APERSTripMine_Wire_Mag"
+			"APERSTripMine_Wire_Mag",
+			"BarrelBomb_EPOCH_Remote_Mag",
+			"BarrelBomb2_EPOCH_Remote_Mag"
 		};
 		Hand[] = {
 			"SmokeShell",
@@ -731,14 +733,14 @@ class CfgItemSort
 			"FAK",
 			"Towelette",
 			"HeatPack",
-			"ColdPack"
+			"ColdPack",
+			"ItemVitamins"
 		};
 
 		Food[] = {
 			"ItemPowderMilk",
 			"ItemRicebox",
 			"ItemCereals",
-			"ItemVitamins",
 			"Pumpkin",
 			"FoodBioMeat",
 			"FoodMeeps",
@@ -772,7 +774,7 @@ class CfgItemSort
 			"ItemSodaMocha",
 			"ItemSodaBurst",
 			"ItemSodaRbull",
-			"ItemSodaAlpinedude"
+			"ItemSodaAlpineDude"
 		};
 		Basebuilding[] = {
 			"CircuitParts",
@@ -857,6 +859,12 @@ class CfgItemSort
 			"ItemVehDoc4",
 
 			// KryptoItems
+			"ItemTinBar10oz",
+			"ItemAluminumBar10oz",
+			"ItemCopperBar10oz",
+			"ItemSilverBar10oz",
+			"ItemBriefcaseSilver100oz",
+			
 			"PartOreGold",
 			"PartOreSilver",
 			"PartOre",
diff --git a/Sources/epoch_config/Configs/CfgPricing.hpp b/Sources/epoch_config/Configs/CfgPricing.hpp
index c381a0e9..1a8c9e82 100644
--- a/Sources/epoch_config/Configs/CfgPricing.hpp
+++ b/Sources/epoch_config/Configs/CfgPricing.hpp
@@ -3078,6 +3078,14 @@ class CfgPricing
     {
         price = 30;
     };
+    class BarrelBomb_EPOCH_Remote_Mag
+    {
+        price = 80;
+    };
+    class BarrelBomb2_EPOCH_Remote_Mag
+    {
+        price = 80;
+    };
     class B_AssaultPack_cbr
     {
         price = 10;