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

Add handling of magazine overflow in AdvTrade and free slot icons

Browse Source 
- Added proper handling of pistol mags and regular mags in gear to
prevent magazine overflow
- Added pre-check if return change will overflow gear + backpack free
space. If change will not fit in gear + backpack free space then buy is
prevented with a message notifying the player. In the case of a sale it
proceeds anyway, but notifies player if overflow occurs (see comments in
returnChange)
- Consolidated duplicate code for calculating free space and returning
cargo of an object into new calcFreeSpace
- Old calculateFreeSpace renamed to displayFreeSpace
- Added Weps/Mags/Bags icons to free slot numbers display
This commit is contained in:
ebaydayz
2016-07-31 18:38:39 -04:00
parent d7cb2b446e
commit a5be49c546
20 changed files with 359 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SQF/dayz_code/stringtable.xml
View File

@@ -16187,7 +16187,7 @@
<Russian>Вы можете купить в снаряжение: оружия-%1, пистолетов-%2, инструментов-%3.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_MAGS_FULL">
<English>You can only buy %1 magazines into your gear.</English>
<English>You can only buy %1 regular magazines and %2 pistol magazines into your gear.</English>
<Russian>Вы можете купить предметов в снаряжение: %1.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_VEHICLE_WEPS">
@@ -16270,6 +16270,9 @@
<Polish>Nie można kupić: brak wolnych miejsc!</Polish>
<Hungarian>Nem vásárolhatsz! Nincs üres hely!</Hungarian>
</Key>
<Key ID="STR_EPOCH_TRADE_GEAR_AND_BAG_FULL">
<English>Cannot buy: Not enough empty slots in your gear or bag to accept change!</English>
</Key>
<Key ID="STR_EPOCH_TRADE_NEED_COINS">
<English>You need %1 %2 to buy all these items.</English>
<Russian>Вам нужно %1 %2 для покупки.</Russian>
@@ -16299,6 +16302,12 @@
<Key ID="STR_EPOCH_TRADE_TOTAL_SPACE_SUCCEEDED">
<English>Total space succeeded: Mag=1, Tool=1, Side=5, Primary=10 slots and your bag capacity is %1 where you tried %2 slots.</English>
</Key>
<Key ID="STR_EPOCH_TRADE_CHANGE_IN_BACKPACK">
<English>Some change was added to your backpack.</English>
</Key>
<Key ID="STR_EPOCH_TRADE_CHANGE_OVERFLOW">
<English>Some change is hidden in the overflow slots of your gear.</English>
</Key>
<Key ID="STR_EPOCH_APLOTFORLIFE_TAKE_OWNERSHIP">
<English>Take Ownership: %1 objects ownership changed.</English>
</Key>