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 trader menu server RPT logs partially localized on client

Browse Source
This commit is contained in:
ebaydayz
2017-01-17 14:39:31 -05:00
parent ef5ca5c532
commit 92ee58900c
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGE LOG 1.0.6.1.txt
View File

@@ -58,7 +58,7 @@
[FIXED] Unconscious locked input when running #1860 @icomrade @DeVloek [FIXED] Unconscious locked input when running #1860 @icomrade @DeVloek
[FIXED] Running corpses when the dead player has no primary weapon @icomrade [FIXED] Running corpses when the dead player has no primary weapon @icomrade
[FIXED] "AI" text localized on wrong client in death messages #1867 @LunaCB [FIXED] "AI" text localized on wrong client in death messages #1867 @LunaCB
[FIXED] Container ("Gear/Backpack/Vehicle") text localized on client for trader menu server RPT logs @oiad [FIXED] Trader menu server RPT logs partially localized on clients @oiad
[FIXED] Group icons will not show for units inside the player's vehicle anymore (helis, large planes, etc.). #1865 @schwanzkopfhegel [FIXED] Group icons will not show for units inside the player's vehicle anymore (helis, large planes, etc.). #1865 @schwanzkopfhegel
[FIXED] Lighting fires and building fireplaces not working on platforms raised over the sea #1866 @schwanzkopfhegel [FIXED] Lighting fires and building fireplaces not working on platforms raised over the sea #1866 @schwanzkopfhegel
[FIXED] Bandit1_DZ and Bandit2_DZ were the same. Bandit1_DZ is back to the normal non-camo skin now. #1874 @DeVloek [FIXED] Bandit1_DZ and Bandit2_DZ were the same. Bandit1_DZ is back to the normal non-camo skin now. #1874 @DeVloek

17
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcCurrency.sqf
View File

@@ -1,8 +1,9 @@
private ["_GemTotal","_GemTotal2","_ItemAmethyst","_ItemCitrine","_ItemEmerald","_ItemObsidian","_ItemRuby","_ItemSapphire","_ItemTopaz","_array","_briefcase_100oz","_fontSize","_gem","_gold_10oz","_gold_10oz_a","_gold_10oz_b","_gold_1oz","_gold_1oz_a","_gold_1oz_b","_noIMG","_pic","_silver_10oz","_silver_10oz_a","_silver_10oz_b","_silver_1oz","_silver_1oz_a","_silver_1oz_b","_string","_total","_value"]; private ["_GemTotal","_GemTotal2","_ItemAmethyst","_ItemCitrine","_ItemEmerald","_ItemObsidian","_ItemRuby","_ItemSapphire","_ItemTopaz","_array","_briefcase_100oz","_fontSize","_gem","_gold_10oz","_gold_10oz_a","_gold_10oz_b","_gold_1oz","_gold_1oz_a","_gold_1oz_b","_noIMG","_pic","_silver_10oz","_silver_10oz_a","_silver_10oz_b","_silver_1oz","_silver_1oz_a","_silver_1oz_b","_string","_total","_value","_localize"];
_total = _this select 0; _total = _this select 0;
_noIMG = _this select 1; _noIMG = _this select 1;
_fontSize = if (count _this > 2) then {_this select 2} else {1}; _fontSize = if (count _this > 2) then {_this select 2} else {1};
_localize = count _this < 4; //Do not localize for server RPT log
_array = []; _array = [];
_string = ""; _string = "";
@@ -94,7 +95,7 @@ _silver_1oz = (_silver_1oz_a - _silver_1oz_b);
{ //sort gems so they display on total price in order of descending worth { //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 { if (!isNil {call compile format["_%1",_x]} && {(call compile format["_%1",_x]) > 0}) then {
if (_noIMG) then { if (_noIMG) then {
_pic = getText (configFile >> 'CfgMagazines' >> _x >> 'displayName'); _pic = if (_localize) then {getText (configFile >> 'CfgMagazines' >> _x >> 'displayName')} else {_x};
_array set [count _array, format["%1 %2",(call compile format["_%1",_x]),_pic]]; _array set [count _array, format["%1 %2",(call compile format["_%1",_x]),_pic]];
} else { } else {
_pic = getText (configFile >> 'CfgMagazines' >> _x >> 'picture'); _pic = getText (configFile >> 'CfgMagazines' >> _x >> 'picture');
@@ -105,11 +106,11 @@ _silver_1oz = (_silver_1oz_a - _silver_1oz_b);
if (_noIMG) then { if (_noIMG) then {
if (_briefcase_100oz >= 2) then { if (_briefcase_100oz >= 2) then {
_array set [count _array, format["%1 %2s",_briefcase_100oz,localize "STR_EPOCH_BRIEFCASE"]]; _array set [count _array, format["%1 %2s",_briefcase_100oz,if (_localize) then {localize "STR_EPOCH_BRIEFCASE"} else {"Briefcase"}]];
}; };
if (_briefcase_100oz == 1) then { if (_briefcase_100oz == 1) then {
_array set [count _array, format["%1 %2",_briefcase_100oz,localize "STR_EPOCH_BRIEFCASE"]]; _array set [count _array, format["%1 %2",_briefcase_100oz,if (_localize) then {localize "STR_EPOCH_BRIEFCASE"} else {"Briefcase"}]];
}; };
} else { } else {
if (_briefcase_100oz > 0) then { if (_briefcase_100oz > 0) then {
@@ -120,7 +121,7 @@ if (_noIMG) then {
if (_gold_10oz > 0) then { if (_gold_10oz > 0) then {
if (_noIMG) then { if (_noIMG) then {
_array set [count _array, format["%1 %2",_gold_10oz,localize "STR_EPOCH_10OZGOLD"]]; _array set [count _array, format["%1 %2",_gold_10oz,if (_localize) then {localize "STR_EPOCH_10OZGOLD"} else {"10oz Gold"}]];
} else { } else {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemGoldBar10oz' >> 'picture'); _pic = getText (configFile >> 'CfgMagazines' >> 'ItemGoldBar10oz' >> 'picture');
_string = format["%3<t size='%4'>%1x</t><img image='%2'/>",_gold_10oz,_pic, _string,_fontSize]; _string = format["%3<t size='%4'>%1x</t><img image='%2'/>",_gold_10oz,_pic, _string,_fontSize];
@@ -128,7 +129,7 @@ if (_gold_10oz > 0) then {
}; };
if (_gold_1oz > 0) then { if (_gold_1oz > 0) then {
if (_noIMG) then { if (_noIMG) then {
_array set [count _array, format["%1 %2",_gold_1oz,localize "STR_EPOCH_GOLD"]]; _array set [count _array, format["%1 %2",_gold_1oz,if (_localize) then {localize "STR_EPOCH_GOLD"} else {"Gold"}]];
} else { } else {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemGoldBar' >> 'picture'); _pic = getText (configFile >> 'CfgMagazines' >> 'ItemGoldBar' >> 'picture');
_string = format["%3<t size='%4'>%1x</t><img image='%2'/>",_gold_1oz,_pic, _string,_fontSize]; _string = format["%3<t size='%4'>%1x</t><img image='%2'/>",_gold_1oz,_pic, _string,_fontSize];
@@ -136,7 +137,7 @@ if (_gold_1oz > 0) then {
}; };
if (_silver_10oz > 0) then { if (_silver_10oz > 0) then {
if (_noIMG) then { if (_noIMG) then {
_array set [count _array, format["%1 %2",_silver_10oz,localize "STR_EPOCH_10OZSILVER"]]; _array set [count _array, format["%1 %2",_silver_10oz,if (_localize) then {localize "STR_EPOCH_10OZSILVER"} else {"10oz Silver"}]];
} else { } else {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemSilverBar10oz' >> 'picture'); _pic = getText (configFile >> 'CfgMagazines' >> 'ItemSilverBar10oz' >> 'picture');
_string = format["%3<t size='%4'>%1x</t><img image='%2'/>",_silver_10oz,_pic, _string,_fontSize]; _string = format["%3<t size='%4'>%1x</t><img image='%2'/>",_silver_10oz,_pic, _string,_fontSize];
@@ -144,7 +145,7 @@ if (_silver_10oz > 0) then {
}; };
if (_silver_1oz > 0) then { if (_silver_1oz > 0) then {
if (_noIMG) then { if (_noIMG) then {
_array set [count _array, format["%1 %2",_silver_1oz,localize "STR_EPOCH_SILVER"]]; _array set [count _array, format["%1 %2",_silver_1oz,if (_localize) then {localize "STR_EPOCH_SILVER"} else {"Silver"}]];
} else { } else {
_pic = getText (configFile >> 'CfgMagazines' >> 'ItemSilverBar' >> 'picture'); _pic = getText (configFile >> 'CfgMagazines' >> 'ItemSilverBar' >> 'picture');
_string = format["%3<t size='%4'>%1x</t><img image='%2'/>",_silver_1oz,_pic, _string,_fontSize]; _string = format["%3<t size='%4'>%1x</t><img image='%2'/>",_silver_1oz,_pic, _string,_fontSize];

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

@@ -12,7 +12,7 @@ _Z_logTrade = {
case 1 : {"vehicle"}; case 1 : {"vehicle"};
case 2 : {"gear"}; case 2 : {"gear"};
}; };
_price = if (Z_singleCurrency) then {format ["%1 %2",[_price] call BIS_fnc_numberText,CurrencyName]} else {[_price,true] call Z_calcCurrency}; _price = if (Z_singleCurrency) then {format ["%1 %2",[_price] call BIS_fnc_numberText,CurrencyName]} else {[_price,true,1,1] call Z_calcCurrency};
// Log to client RPT // Log to client RPT
if (_buyOrSell == "buy") then { if (_buyOrSell == "buy") then {