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

Fix extra spaces in Advanced Trading RPT log

Browse Source 
Also fixed missing space in systemChat message.
This commit is contained in:
ebaydayz
2016-07-29 11:09:42 -04:00
parent ba3677f13d
commit b408e76c55
3 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcDefaultCurrencyNoImg.sqf
View File

@@ -92,27 +92,60 @@ _silver_1oz = (_silver_1oz_a - _silver_1oz_b);
{ //sort gems so they display on total price in order of descending worth
if (!isNil {call compile format["_%1",_x]} && {(call compile format["_%1",_x]) > 0}) then {
_dname = getText (configFile >> 'CfgMagazines' >> _x >> 'displayName');
_string = format["%2 %1 %3",(call compile format["_%1",_x]), _string,_dname];
if (_string == "") then {
_string = format["%1 %2",(call compile format["_%1",_x]),_dname];
} else {
_string = format["%2 %1 %3",(call compile format["_%1",_x]),_string,_dname];
};
};
} count DZE_GemList;
if (_briefcase_100oz >= 2) then {
_string = format["%2 %1 %3s",_briefcase_100oz,_string,localize "STR_EPOCH_BRIEFCASE"];
if (_string == "") then {
_string = format["%1 %2s",_briefcase_100oz,localize "STR_EPOCH_BRIEFCASE"];
} else {
_string = format["%2 %1 %3s",_briefcase_100oz,_string,localize "STR_EPOCH_BRIEFCASE"];
};
};
if (_briefcase_100oz == 1) then {
_string = format["%2 %1 %3",_briefcase_100oz,_string,localize "STR_EPOCH_BRIEFCASE"];
if (_string == "") then {
_string = format["%1 %2",_briefcase_100oz,localize "STR_EPOCH_BRIEFCASE"];
} else {
_string = format["%2 %1 %3",_briefcase_100oz,_string,localize "STR_EPOCH_BRIEFCASE"];
};
};
if (_gold_10oz > 0) then {
_string = format["%2 %1 %3",_gold_10oz,_string,localize "STR_EPOCH_10OZGOLD"];
if (_string == "") then {
_string = format["%1 %2",_gold_10oz,localize "STR_EPOCH_10OZGOLD"];
} else {
_string = format["%2 %1 %3",_gold_10oz,_string,localize "STR_EPOCH_10OZGOLD"];
};
};
if (_gold_1oz > 0) then {
_string = format["%2 %1 %3",_gold_1oz,_string,localize "STR_EPOCH_GOLD"];
if (_string == "") then {
_string = format["%1 %2",_gold_1oz,localize "STR_EPOCH_GOLD"];
} else {
_string = format["%2 %1 %3",_gold_1oz,_string,localize "STR_EPOCH_GOLD"];
};
};
if (_silver_10oz > 0) then {
_string = format["%2 %1 %3",_silver_10oz,_string,localize "STR_EPOCH_10OZSILVER"];
if (_string == "") then {
_string = format["%1 %2",_silver_10oz,localize "STR_EPOCH_10OZSILVER"];
} else {
_string = format["%2 %1 %3",_silver_10oz,_string,localize "STR_EPOCH_10OZSILVER"];
};
};
if (_silver_1oz > 0) then {
_string = format["%2 %1 %3",_silver_1oz, _string,localize "STR_EPOCH_SILVER"];
if (_string == "") then {
_string = format["%1 %2",_silver_1oz,localize "STR_EPOCH_SILVER"];
} else {
_string = format["%2 %1 %3",_silver_1oz,_string,localize "STR_EPOCH_SILVER"];
};
};
_string

4
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_logTrade.sqf
View File

@@ -25,9 +25,9 @@ _Z_logTrade = {
};
} else {
if (_buyOrSell == "buy") then {
diag_log format["%5: Bought %4 x %1 into %7 at %2 for%3",_className,inTraderCity,_tcost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
diag_log format["%5: Bought %4 x %1 into %7 at %2 for %3",_className,inTraderCity,_tcost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
} else {
diag_log format["%5: Sold %4 x %1 from %7 at %2 for%3",_className,inTraderCity,_tcost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
diag_log format["%5: Sold %4 x %1 from %7 at %2 for %3",_className,inTraderCity,_tcost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
};
};

6
SQF/dayz_code/stringtable.xml
View File

@@ -16257,12 +16257,12 @@
<Russian>Продажа завершена.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_BUY_SUCCESS">
<English>Trade successful, you paid:%1.</English>
<English>Trade successful, you paid: %1.</English>
<Russian>Продано! С вас %1.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_SELL_SUCCESS">
<English>Trade successful, you received:%1.</English>
<Russian>Продажа завершена. Получено:%1</Russian>
<English>Trade successful, you received: %1.</English>
<Russian>Продажа завершена. Получено: %1</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_SUCCESS_COINS">
<English>Trade successful, you paid %1 %2.</English>