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

Removed Trader Limits - handled with new vars

Browse Source 
Have to be tested!!!!
This commit is contained in:
He-Man 2018-03-30 05:09:27 +02:00
parent 887fd41b7c
commit 2abcf105b5
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/epoch_code/compile/traders/EPOCH_npcTraderAdd.sqf
View File

@ -57,11 +57,6 @@ if !(isNull EPOCH_lastNPCtradeTarget) then {
}; };
}; };
}; };
_limit = ["CfgTraderLimits", _uiItem, 100] call EPOCH_fnc_returnConfigEntryV2;
if (_itemQty >= _limit) then{
_stockLimit = true;
_allowAdd = false;
};
}; };
if (_uiItem isKindOf "Air" || _uiItem isKindOf "Ship" || _uiItem isKindOf "LandVehicle" || _uiItem isKindOf "Tank") then { if (_uiItem isKindOf "Air" || _uiItem isKindOf "Ship" || _uiItem isKindOf "LandVehicle" || _uiItem isKindOf "Tank") then {
_sizeOut = lbSize _PlayerItemsOutBox; _sizeOut = lbSize _PlayerItemsOutBox;

9
Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf
View File

@ -53,15 +53,13 @@ _TraderItemsClean = {
for "_k" from 1 to (count (_arr select 0)) do { for "_k" from 1 to (count (_arr select 0)) do {
_delete = false; _delete = false;
_item = _arr select 0 select _idx; _item = _arr select 0 select _idx;
_limit = ["CfgTraderLimits", _item, 100] call EPOCH_fnc_returnConfigEntryV2;
_currentStock = (_arr select 1) param[_idx, 0]; _currentStock = (_arr select 1) param[_idx, 0];
if (_currentStock >= (_TraderItemCountPerItem select 0)) then { if (_currentStock >= (_TraderItemCountPerItem select 0)) then {
_currentStock = _TraderItemCountPerItem select 1; _currentStock = _TraderItemCountPerItem select 1;
(_arr select 1) set [_idx,_currentStock]; (_arr select 1) set [_idx,_currentStock];
_arrchanged = true; _arrchanged = true;
}; };
if (_limit == 0 || _currentStock == 0) then { if (_currentStock == 0) then {
// diag_log format ["EPOCH_DEBUG: TraderSlot: %1 | Removed %2 from Trader | _limit: %3 | _currentStock: %4",_i,str _item, _limit,_currentStock];
_arrchanged = true; _arrchanged = true;
_delete = true; _delete = true;
} }
@ -72,11 +70,6 @@ _TraderItemsClean = {
_delete = true; _delete = true;
} }
else { else {
if (_currentStock > _limit) then {
_arrchanged = true;
(_arr select 1) set [_idx,_limit];
_currentStock = _limit;
};
if (_item isKindOf "Air" || _item isKindOf "Ship" || _item isKindOf "LandVehicle" || _item isKindOf "Tank") then { if (_item isKindOf "Air" || _item isKindOf "Ship" || _item isKindOf "LandVehicle" || _item isKindOf "Tank") then {
_newstock = 0; _newstock = 0;
for "_k" from 1 to _currentStock do { for "_k" from 1 to _currentStock do {