W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-08 09:12:52 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Advanced trading fixes/modifications (#1698)

Browse Source 
* Advanced trading fixes/modifcations

This adds combine currency option to the Advanced trading screen since
@Airwaves man noticed it didn't have a way of doing it.

Updated stringtables with correct "paid" spelling and differing text for
buying/selling.

This also addds proper currency checking/reporting for the log system
that has been introduced, it's untidy but it works, instead of getting
"user bought x for 1000 currency" in a non coins server, it will convert
it to the proper 1 brief 5 10oz gold etc system (uses a new function
z_calcDefaultCurrencyNoImg)

This also adds a check to see if the buy list is empty (as per the
selling list) and returns text to the user informing them.

Re-arranged buy and sell so buy is on top of sell, it's a bit easier to
read then.

* Advanced trading logging change

This was missing from my previous commit, this changes the
server_tradeobject to check if it's being passed a number (single
currency) or text (my logging currency changes)

* Advanced trading rework

Fixes all problems @ebaydayz
This commit is contained in:
oiad
2016-06-22 12:18:41 +12:00
committed by ebaydayz
parent 63d6cfa87b
commit 801145d664
11 changed files with 487 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SQF/dayz_code/stringtable.xml
View File

@@ -15763,9 +15763,11 @@
<English>No info found</English>
<Russian>Нет информации</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_NO_ITEMS">
<English>No items to sell</English>
<Russian>Нет ничего на продажу</Russian>
<Key ID="STR_EPOCH_TRADE_BUY_NO_ITEMS">
<English>No items in buy list</English>
</Key>
<Key ID="STR_EPOCH_TRADE_SELL_NO_ITEMS">
<English>No items in sell list</English>
</Key>
<Key ID="STR_EPOCH_TRADE_DETAILS">
<English>Details</English>
@@ -15870,12 +15872,16 @@
<English>Trade successfull.</English>
<Russian>Продажа завершена.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_SUCCESS">
<English>Trade successfull, payed %1 worth of items.</English>
<Key ID="STR_EPOCH_TRADE_BUY_SUCCESS">
<English>Trade successfull, paid:%1.</English>
<Russian>Продано! С вас %1.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_SELL_SUCCESS">
<English>Trade successfull, received:%1.</English>
<Russian>Продажа завершена. Получено:%1</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_SUCCESS_COINS">
<English>Trade successfull, payed %1 %2.</English>
<English>Trade successfull, paid %1 %2.</English>
<Russian>Продано! С вас %1 %2.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_SUCCESS_CHANGE">