W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 20:13:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Forbid buying duplicate tools into gear

Browse Source
This commit is contained in:
ebaydayz
2016-05-08 11:59:25 -04:00
parent 41e653136f
commit c477304571
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_allowBuying.sqf
View File

@@ -2,7 +2,7 @@ private ["_selection","_return","_toBuyWeaps","_toBuyMags","_toBuyBags","_toolsT
,"_currentSec","_currentPrim","_currentTool","_p","_b","_check0","_check1","_check2","_check3","_check4","_mags","_weaps","_bags" ,"_currentSec","_currentPrim","_currentTool","_p","_b","_check0","_check1","_check2","_check3","_check4","_mags","_weaps","_bags"
,"_normalBags","_normalMags","_normalWeaps","_allowedMags","_allowedPrimary","_allowedTools","_allowedSidearm","_allowedWeapons","_allowedBackpacks" ,"_normalBags","_normalMags","_normalWeaps","_allowedMags","_allowedPrimary","_allowedTools","_allowedSidearm","_allowedWeapons","_allowedBackpacks"
,"_totalSpace","_totalNewSpace","_counter","_parentClasses","_alreadyInBackpack","_kinds","_kinds2","_kinds3","_ammmounts","_ammmounts2","_ammmounts3", ,"_totalSpace","_totalNewSpace","_counter","_parentClasses","_alreadyInBackpack","_kinds","_kinds2","_kinds3","_ammmounts","_ammmounts2","_ammmounts3",
"_actualMags" "_actualMags","_toolClasses","_duplicate","_quantity","_tool"
]; ];
_selection = Z_SellingFrom; _selection = Z_SellingFrom;
_return = false; _return = false;
@@ -13,6 +13,7 @@ _toolsToBuy = _this select 3;
_sidearmToBuy = _this select 4; _sidearmToBuy = _this select 4;
_primaryToBuy = _this select 5; _primaryToBuy = _this select 5;
_vehiclesToBuy = _this select 6; _vehiclesToBuy = _this select 6;
_toolClasses = _this select 7;
if (_vehiclesToBuy > 1) exitWith {systemChat localize "STR_EPOCH_TRADE_ONE_VEHICLE"; false;}; if (_vehiclesToBuy > 1) exitWith {systemChat localize "STR_EPOCH_TRADE_ONE_VEHICLE"; false;};
if (_vehiclesToBuy > 0) then { if (_vehiclesToBuy > 0) then {
@@ -50,19 +51,26 @@ if(_selection == 2) then{ //gear
_allowedBackpacks = 1 - _currentBackpacks; _allowedBackpacks = 1 - _currentBackpacks;
_allowedTools = 14; // 12 toolbelt + 1 Binocular + 1 NVG _allowedTools = 14; // 12 toolbelt + 1 Binocular + 1 NVG
_duplicate = false;
{ {
_parentClasses = [(configFile >> "CfgWeapons" >> _x ),true] call BIS_fnc_returnParents; _parentClasses = [(configFile >> "CfgWeapons" >> _x ),true] call BIS_fnc_returnParents;
if( 'ItemCore' in _parentClasses || 'Binocular' in _parentClasses) then { if( 'ItemCore' in _parentClasses || 'Binocular' in _parentClasses) then {
_allowedTools = _allowedTools - 1; _allowedTools = _allowedTools - 1;
if (_x in _toolClasses) then {_duplicate = true;}; // Forbid purchasing duplicate tools into gear
} }
}count (weapons player); }count (weapons player);
{
_tool = _x;
_quantity = {(_tool == _x)} count _toolClasses;
if (_quantity > 1) exitWith {_duplicate = true;}; // Forbid purchasing multiples of the same tool into gear
} forEach _toolClasses;
_check1 = false; _check1 = false;
_check2 = false; _check2 = false;
_check3 = false; _check3 = false;
if( _allowedPrimary >= _primaryToBuy && _allowedSidearm >= _sidearmToBuy && _allowedTools >= _toolsToBuy)then{ if( _allowedPrimary >= _primaryToBuy && _allowedSidearm >= _sidearmToBuy && _allowedTools >= _toolsToBuy && !_duplicate)then{
_check1 = true; _check1 = true;
}else{ }else{
systemChat format[localize "STR_EPOCH_TRADE_GEAR_FULL", _allowedPrimary, _allowedSidearm , _allowedTools]; systemChat format[localize "STR_EPOCH_TRADE_GEAR_FULL", _allowedPrimary, _allowedSidearm , _allowedTools];

7
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_buyItems.sqf
View File

@@ -1,5 +1,5 @@
private ["_magazinesToBuy", "_weaponsToBuy", "_backpacksToBuy", "_toolsToBuy", "_sidearmToBuy", "_primaryToBuy", "_priceToBuy" private ["_magazinesToBuy", "_weaponsToBuy", "_backpacksToBuy", "_toolsToBuy", "_sidearmToBuy", "_primaryToBuy", "_priceToBuy"
,"_enoughMoney", "_myMoney", "_canBuy", "_moneyInfo","_count","_success","_backpack" ,"_enoughMoney", "_myMoney", "_canBuy", "_moneyInfo","_count","_success","_backpack","_toolClasses"
]; ];
_magazinesToBuy = 0; _magazinesToBuy = 0;
@@ -11,6 +11,7 @@ _primaryToBuy = 0;
_vehiclesToBuy = 0; _vehiclesToBuy = 0;
_priceToBuy = 0; _priceToBuy = 0;
_toolClasses = [];
if (Z_SingleCurrency) then { if (Z_SingleCurrency) then {
{ {
@@ -18,6 +19,7 @@ if (Z_SingleCurrency) then {
_parentClasses = [(configFile >> "CfgWeapons" >> (_x select 0)),true] call BIS_fnc_returnParents; _parentClasses = [(configFile >> "CfgWeapons" >> (_x select 0)),true] call BIS_fnc_returnParents;
if( 'ItemCore' in _parentClasses || 'Binocular' in _parentClasses) then { if( 'ItemCore' in _parentClasses || 'Binocular' in _parentClasses) then {
_toolsToBuy = _toolsToBuy + (_x select 9); _toolsToBuy = _toolsToBuy + (_x select 9);
_toolClasses set [count _toolClasses,(_x select 0)];
} else { } else {
_weaponsToBuy = _weaponsToBuy + (_x select 9); _weaponsToBuy = _weaponsToBuy + (_x select 9);
if('PistolCore' in _parentClasses)then { if('PistolCore' in _parentClasses)then {
@@ -47,6 +49,7 @@ if (Z_SingleCurrency) then {
_parentClasses = [(configFile >> "CfgWeapons" >> (_x select 0)),true] call BIS_fnc_returnParents; _parentClasses = [(configFile >> "CfgWeapons" >> (_x select 0)),true] call BIS_fnc_returnParents;
if( 'ItemCore' in _parentClasses || 'Binocular' in _parentClasses) then { if( 'ItemCore' in _parentClasses || 'Binocular' in _parentClasses) then {
_toolsToBuy = _toolsToBuy + (_x select 9); _toolsToBuy = _toolsToBuy + (_x select 9);
_toolClasses set [count _toolClasses,(_x select 0)];
} else { } else {
_weaponsToBuy = _weaponsToBuy + (_x select 9); _weaponsToBuy = _weaponsToBuy + (_x select 9);
if('PistolCore' in _parentClasses)then { if('PistolCore' in _parentClasses)then {
@@ -72,7 +75,7 @@ if (Z_SingleCurrency) then {
} count Z_BuyingArray; } count Z_BuyingArray;
}; };
_canBuy = [_weaponsToBuy,_magazinesToBuy,_backpacksToBuy,_toolsToBuy, _sidearmToBuy, _primaryToBuy,_vehiclesToBuy] call Z_allowBuying; _canBuy = [_weaponsToBuy,_magazinesToBuy,_backpacksToBuy,_toolsToBuy, _sidearmToBuy, _primaryToBuy,_vehiclesToBuy,_toolClasses] call Z_allowBuying;
_myMoney = player getVariable[Z_MoneyVariable,0]; _myMoney = player getVariable[Z_MoneyVariable,0];