mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-14 04:02:37 +03:00
Check trade requirements before animation
This commit is contained in:
@@ -32,6 +32,36 @@ while {r_autoTrade} do {
|
|||||||
|
|
||||||
if ((count (magazines player)) > 20) exitWith { cutText [(localize "STR_DAYZ_CODE_2"), "PLAIN DOWN"]; r_autoTrade = false};
|
if ((count (magazines player)) > 20) exitWith { cutText [(localize "STR_DAYZ_CODE_2"), "PLAIN DOWN"]; r_autoTrade = false};
|
||||||
|
|
||||||
|
_canAfford = false;
|
||||||
|
if(_bos == 1) then {
|
||||||
|
|
||||||
|
//sell
|
||||||
|
_qty = {_x == _part_in} count magazines player;
|
||||||
|
if (_qty >= _qty_in) then {
|
||||||
|
_part_inClass = configFile >> "CfgMagazines" >> _part_in;
|
||||||
|
_removed = _removed + ([player,_part_inClass,_qty_in] call BIS_fnc_invRemove);
|
||||||
|
if (_removed == _qty_in) then {
|
||||||
|
_canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
//buy
|
||||||
|
_trade_total = [[_part_in,_qty_in]] call epoch_itemCost;
|
||||||
|
_total_currency = call epoch_totalCurrency;
|
||||||
|
_return_change = _total_currency - _trade_total;
|
||||||
|
if (_return_change >= 0) then {
|
||||||
|
_canAfford = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
if(!_canAfford) exitWith {
|
||||||
|
_qty = {_x == _part_in} count magazines player;
|
||||||
|
_needed = _qty_in - _qty;
|
||||||
|
cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"];
|
||||||
|
r_autoTrade = false
|
||||||
|
};
|
||||||
|
|
||||||
cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"];
|
cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"];
|
||||||
|
|
||||||
@@ -77,34 +107,8 @@ while {r_autoTrade} do {
|
|||||||
|
|
||||||
if (_finished) then {
|
if (_finished) then {
|
||||||
|
|
||||||
_canAfford = false;
|
|
||||||
if(_bos == 1) then {
|
|
||||||
|
|
||||||
//sell
|
|
||||||
_qty = {_x == _part_in} count magazines player;
|
|
||||||
if (_qty >= _qty_in) then {
|
|
||||||
_part_inClass = configFile >> "CfgMagazines" >> _part_in;
|
|
||||||
_removed = _removed + ([player,_part_inClass,_qty_in] call BIS_fnc_invRemove);
|
|
||||||
if (_removed == _qty_in) then {
|
|
||||||
_canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
//buy
|
|
||||||
_trade_total = [[_part_in,_qty_in]] call epoch_itemCost;
|
|
||||||
_total_currency = call epoch_totalCurrency;
|
|
||||||
_return_change = _total_currency - _trade_total;
|
|
||||||
if (_return_change >= 0) then {
|
|
||||||
_canAfford = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
//diag_log format["DEBUG TRADER DONE?: %1", _canAfford];
|
//diag_log format["DEBUG TRADER DONE?: %1", _canAfford];
|
||||||
|
|
||||||
if (_canAfford) then {
|
|
||||||
|
|
||||||
// Continue with trade.
|
// Continue with trade.
|
||||||
if (isNil "_part_in") then { _part_in = "Unknown Item" };
|
if (isNil "_part_in") then { _part_in = "Unknown Item" };
|
||||||
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
|
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
|
||||||
@@ -136,13 +140,6 @@ while {r_autoTrade} do {
|
|||||||
cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
|
cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
|
||||||
};
|
};
|
||||||
dayzTradeResult = nil;
|
dayzTradeResult = nil;
|
||||||
|
|
||||||
} else {
|
|
||||||
_qty = {_x == _part_in} count magazines player;
|
|
||||||
_needed = _qty_in - _qty;
|
|
||||||
cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"];
|
|
||||||
_abort = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
if(_abort) exitWith {r_autoTrade = false};
|
if(_abort) exitWith {r_autoTrade = false};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user