Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #857 from Ignatz-HeMan/experimental

Browse Source 
Block BarrelBombs from FavBar + Sort/Pricing adds
This commit is contained in:
vbawol 2017-09-06 19:31:10 -05:00 committed by GitHub
commit 649bb5d942
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/epoch_code/gui/scripts/favBar/epoch_favBar_draw.sqf
View File

@ -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 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; _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"]); _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}; //if (_type in ["AccessoryMuzzle","AccessoryPointer","AccessorySights","AccessoryBipod"]) exitWith {"Attachments are not supported at the moment!" call epoch_message; false};

16
Sources/epoch_config/Configs/CfgItemSort.hpp
View File

@ -710,7 +710,9 @@ class CfgItemSort
"APERSMine_Range_Mag", "APERSMine_Range_Mag",
"APERSBoundingMine_Range_Mag", "APERSBoundingMine_Range_Mag",
"SLAMDirectionalMine_Wire_Mag", "SLAMDirectionalMine_Wire_Mag",
"APERSTripMine_Wire_Mag" "APERSTripMine_Wire_Mag",
"BarrelBomb_EPOCH_Remote_Mag",
"BarrelBomb2_EPOCH_Remote_Mag"
}; };
Hand[] = { Hand[] = {
"SmokeShell", "SmokeShell",
@ -731,14 +733,14 @@ class CfgItemSort
"FAK", "FAK",
"Towelette", "Towelette",
"HeatPack", "HeatPack",
"ColdPack" "ColdPack",
"ItemVitamins"
}; };
Food[] = { Food[] = {
"ItemPowderMilk", "ItemPowderMilk",
"ItemRicebox", "ItemRicebox",
"ItemCereals", "ItemCereals",
"ItemVitamins",
"Pumpkin", "Pumpkin",
"FoodBioMeat", "FoodBioMeat",
"FoodMeeps", "FoodMeeps",
@ -772,7 +774,7 @@ class CfgItemSort
"ItemSodaMocha", "ItemSodaMocha",
"ItemSodaBurst", "ItemSodaBurst",
"ItemSodaRbull", "ItemSodaRbull",
"ItemSodaAlpinedude" "ItemSodaAlpineDude"
}; };
Basebuilding[] = { Basebuilding[] = {
"CircuitParts", "CircuitParts",
@ -857,6 +859,12 @@ class CfgItemSort
"ItemVehDoc4", "ItemVehDoc4",
// KryptoItems // KryptoItems
"ItemTinBar10oz",
"ItemAluminumBar10oz",
"ItemCopperBar10oz",
"ItemSilverBar10oz",
"ItemBriefcaseSilver100oz",
"PartOreGold", "PartOreGold",
"PartOreSilver", "PartOreSilver",
"PartOre", "PartOre",

8
Sources/epoch_config/Configs/CfgPricing.hpp
View File

@ -3078,6 +3078,14 @@ class CfgPricing
{ {
price = 30; price = 30;
}; };
class BarrelBomb_EPOCH_Remote_Mag
{
price = 80;
};
class BarrelBomb2_EPOCH_Remote_Mag
{
price = 80;
};
class B_AssaultPack_cbr class B_AssaultPack_cbr
{ {
price = 10; price = 10;