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

Fix default currency display in Adv. Trading bag item info

Browse Source 
Fixes currency display name and picture not showing when looking at
backpack item info.

Also fixed localized string for weps and mags order reversed in item
info for backpacks and vehicles.
This commit is contained in:
ebaydayz
2016-05-04 12:54:36 -04:00
parent 085b6d32f9
commit 5043fafae4
2 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf
View File

@@ -1,5 +1,5 @@
private ["_item","_picture","_class","_display","_transportMaxWeapons","_transportMaxMagazines","_transportmaxBackpacks","_buyPrice","_sellPrice"
,"_buyCurrency","_sellCurrency","_formattedText"
,"_buyCurrency","_sellCurrency","_formattedText","_picBuy","_picSell"
];
#include "defines.sqf";
@@ -38,17 +38,34 @@ if ( isNumber (configFile >> 'CfgVehicles' >> _class >> 'transportMaxMagazines')
if ( Z_SingleCurrency ) then {
_buyCurrency = CurrencyName;
_sellCurrency = CurrencyName;
_formattedText = format [
"<img image='%1' size='3' align='center'/><br />" +
"<t color='#33BFFF'>%10: </t><t color='#ffffff'>%2</t><br />" +
"<t color='#33BFFF'>%11: </t><t color='#ffffff'>%3</t><br />" +
"<t color='#33BFFF'>%12: </t><t color='#ffffff'>%5 %7</t><br />" +
"<t color='#33BFFF'>%13: </t><t color='#ffffff'>%6 %4</t><br />" +
"<t color='#33BFFF'>%14: </t><t color='#ffffff'>%8</t><br />" +
"<t color='#33BFFF'>%15: </t><t color='#ffffff'>%9</t><br />"
, _picture, _display, _class, _buyCurrency , _sellPrice, _buyPrice, _sellCurrency, _transportMaxWeapons,_transportMaxMagazines, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", localize "STR_EPOCH_WEPS", localize "STR_EPOCH_MAGS"
];
} else {
_picSell = getText (configFile >> 'CfgMagazines' >> _sellCurrency >> 'picture');
_sellCurrency = getText (configFile >> 'CfgMagazines' >> _sellCurrency >> 'displayName');
_picBuy = getText (configFile >> 'CfgMagazines' >> _buyCurrency >> 'picture');
_buyCurrency = getText (configFile >> 'CfgMagazines' >> _buyCurrency >> 'displayName');
_formattedText = format [
"<img image='%1' size='3' align='center'/><br />" +
"<t color='#33BFFF'>%10: </t><t color='#ffffff'>%2</t><br />" +
"<t color='#33BFFF'>%11: </t><t color='#ffffff'>%3</t><br />" +
"<t color='#33BFFF'>%12: </t><t color='#ffffff'>%5 <img image='%16' /> %7</t><br />" +
"<t color='#33BFFF'>%13: </t><t color='#ffffff'>%6 <img image='%17' /> %4</t><br />" +
"<t color='#33BFFF'>%14: </t><t color='#ffffff'>%8</t><br />" +
"<t color='#33BFFF'>%15: </t><t color='#ffffff'>%9</t><br />"
, _picture, _display, _class, _buyCurrency , _sellPrice, _buyPrice, _sellCurrency, _transportMaxWeapons,_transportMaxMagazines, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", localize "STR_EPOCH_WEPS", localize "STR_EPOCH_MAGS", _picSell, _picBuy
];
};
_formattedText = format [
"<img image='%1' size='3' align='center'/><br />" +
"<t color='#33BFFF'>%10: </t><t color='#ffffff'>%2</t><br />" +
"<t color='#33BFFF'>%11: </t><t color='#ffffff'>%3</t><br />" +
"<t color='#33BFFF'>%12: </t><t color='#ffffff'>%5 %7</t><br />" +
"<t color='#33BFFF'>%13: </t><t color='#ffffff'>%6 %4</t><br />" +
"<t color='#33BFFF'>%14: </t><t color='#ffffff'>%8</t><br />" +
"<t color='#33BFFF'>%15: </t><t color='#ffffff'>%9</t><br />"
, _picture, _display, _class, _buyCurrency , _sellPrice, _buyPrice, _sellCurrency, _transportMaxWeapons,_transportMaxMagazines, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", localize "STR_EPOCH_MAGS", localize "STR_EPOCH_WEPS"
];
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_ITEMINFO) ctrlSetStructuredText parseText _formattedText;

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

@@ -76,7 +76,7 @@ if (Z_SingleCurrency) then {
"<t color='#33BFFF'>%17: </t><t color='#ffffff'>%8</t><br />" +
"<t color='#33BFFF'>%18: </t><t color='#ffffff'>%9</t><br />" +
"<t color='#33BFFF'>%19: </t><t color='#ffffff'>%4</t><br />"
, _picture, _display, _class, _transportmaxBackpacks, _sellPrice, _buyPrice, _buyCurrency, _transportMaxWeapons,_transportMaxMagazines, _sellCurrency, _picSell,_picBuy, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", localize "STR_EPOCH_MAGS", localize "STR_EPOCH_WEPS", localize "STR_EPOCH_BAGS"
, _picture, _display, _class, _transportmaxBackpacks, _sellPrice, _buyPrice, _buyCurrency, _transportMaxWeapons,_transportMaxMagazines, _sellCurrency, _picSell,_picBuy, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", localize "STR_EPOCH_WEPS", localize "STR_EPOCH_MAGS", localize "STR_EPOCH_BAGS"
];