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

Advance trading gem fixes/localizations (#1771)

Browse Source 
* Advanced trading combine/return change

Fixes combining/returnChange to squash gems into usable currency so they
can properly be used in the economy
Stringtable fixes for duplicates

* Localization additions

More localizations
This commit is contained in:
oiad
2016-10-03 06:06:31 +13:00
committed by ebaydayz
parent f353967abb
commit 9fd2f2270b
5 changed files with 56 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_payDefault.sqf
View File

@@ -28,7 +28,7 @@ if (!_justChecking) then {
if (_totalWorth - _toPay == 0) then { // Money in inventory was exact amount
_success = true;
} else {
_success = [_toPay,_totalWorth,_justChecking,_regularMagsToBuy,_moneyInGear,_moneyInBackpack] call Z_returnChange;
_success = [_toPay,_totalWorth,_justChecking,_regularMagsToBuy,_moneyInGear,_moneyInBackpack,false] call Z_returnChange;
};
_success

32
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_returnChange.sqf
View File

@@ -4,20 +4,46 @@ private ["_return_change","_ItemTopaz","_GemTotal","_GemTotal2","_ItemObsidian",
"_gold_10oz_a","_gold_10oz_b","_briefcase_100oz","_gold_10oz","_gold_1oz_a","_gold_1oz_b","_gold_1oz",
"_silver_10oz_a","_silver_10oz_b","_silver_10oz","_silver_1oz_a","_silver_1oz_b","_silver_1oz",
"_successful","_trade_total","_total_currency","_addRegularMag","_justChecking","_moneyAdded",
"_regularMagsToBuy","_moneyInGear","_moneyInBackpack"];
"_regularMagsToBuy","_moneyInGear","_moneyInBackpack","_part","_worth","_findGem","_combine","_combineOk"];
_successful = false;
_trade_total = _this select 0;
_total_currency = _this select 1;
_justChecking = _this select 2;
_regularMagsToBuy = _this select 3;
_moneyInGear = _this select 4;
_moneyInBackpack = _this select 5;
_combine = _this select 6;
_moneyAdded = 0;
_return_change = 0;
_successful = false;
Z_ChangeInBackpack = false;
Z_ChangeOverflow = false;
_return_change = 0;
if (_combine) then {
_trade_total = 0;
_total_currency = 0;
_inventoryMoney = [];
_combineOk = 1;
{
_part = (configFile >> "CfgMagazines" >> _x);
_worth = (_part >> "worth");
if isNumber (_worth) then {
_combineOk = [player,_part,1] call BIS_fnc_invRemove;
_total_currency = _total_currency + getNumber(_worth);
} else {
_findGem = DZE_GemList find _x;
if (_findGem >= 0) then {
_worth = DZE_GemWorthList select _findGem;
_total_currency = _total_currency + _worth;
_combineOk = [player,_part,1] call BIS_fnc_invRemove;
};
};
if (_combineOk == 0) exitWith { localize "STR_EPOCH_PLAYER_307_FAIL" call dayz_rollingMessages; };
} forEach (magazines player); // Needs to be forEach otherwise count throws a hissy fit with BIS_fnc_invRemove returning a 0
};
if (!Z_Selling) then {
_return_change = _total_currency - _trade_total;
} else {

2
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf
View File

@@ -225,7 +225,7 @@ if (typeName _money == "SCALAR") then {
_success = [player,_money] call SC_fnc_addCoins;
systemChat format[localize "STR_EPOCH_TRADE_SUCCESS_CHANGE",[_money] call BIS_fnc_numberText,CurrencyName];
} else {
_success = [_money,0,false,0,[],[]] call Z_returnChange;
_success = [_money,0,false,0,[],[],false] call Z_returnChange;
_tCost = "";
_tCost = _money call z_calcDefaultCurrencyNoImg;
if (_tCost != "") then { systemChat format[localize "STR_EPOCH_TRADE_SELL_SUCCESS",_tCost]; };