diff --git a/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp b/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp index aa31f460a..298bde484 100644 --- a/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp @@ -33,7 +33,7 @@ class AdvancedTrading class RscText_AT2: ZSC_RscText { idc = -1; - text = "Advanced Trading"; + text = $STR_EPOCH_PLAYER_289; x = 0.20 * safezoneW + safezoneX; y = 0.15 * safezoneH + safezoneY; w = 0.60 * safezoneW; @@ -45,7 +45,7 @@ class AdvancedTrading class RscText_Zupa_1: ZSC_RscText { idc = 7408; - text = "Selling from gear."; + text = $STR_EPOCH_TRADE_SELLING_GEAR; x = 0.21 * safezoneW + safezoneX; y = 0.22 * safezoneH + safezoneY; w = 0.38 * safezoneW; @@ -55,7 +55,7 @@ class AdvancedTrading class ZSC_RscButtonMenu_Z1: AT_Zupa_BlueButton { idc = -1; - text = "Gear"; + text = $STR_UI_GEAR; x = 0.21 * safezoneW + safezoneX; y = 0.26 * safezoneH + safezoneY; w = 0.08 * safezoneW; @@ -66,7 +66,7 @@ class AdvancedTrading class ZSC_RscButtonMenu_Z2: AT_Zupa_BlueButton { idc = -1; - text = "Backpack"; + text = $STR_EPOCH_TRADE_BACKPACK; x = 0.31 * safezoneW + safezoneX; y = 0.26 * safezoneH + safezoneY; w = 0.08 * safezoneW; @@ -77,7 +77,7 @@ class AdvancedTrading class ZSC_RscButtonMenu_Z3: AT_Zupa_BlueButton { idc = -1; - text = "Vehicle"; + text = $STR_EPOCH_TRADE_VEHICLE; x = 0.41 * safezoneW + safezoneX; y = 0.26 * safezoneH + safezoneY; w = 0.08 * safezoneW; @@ -88,7 +88,7 @@ class AdvancedTrading class ZSC_RscButtonMenu_Z4: AT_Zupa_BlueButton { idc = 7416; - text = "Sell"; + text = $STR_EPOCH_PLAYER_292; x = 0.51 * safezoneW + safezoneX; y = 0.26 * safezoneH + safezoneY; w = 0.08 * safezoneW; @@ -119,7 +119,7 @@ class AdvancedTrading class RscText_AT8: ZSC_RscText { idc = -1; - text = "Inventory"; + text = $STR_EPOCH_TRADE_INVENTORY; x = 0.21 * safezoneW + safezoneX; y = 0.38 * safezoneH + safezoneY; w = 0.13 * safezoneW; @@ -129,7 +129,7 @@ class AdvancedTrading class RscText_AT9: ZSC_RscText { idc = 7409; - text = "Selling"; + text = $STR_EPOCH_TRADE_SELLING; x = 0.46 * safezoneW + safezoneX; y = 0.38 * safezoneH + safezoneY; w = 0.13 * safezoneW; @@ -281,7 +281,7 @@ class AdvancedTrading class ZSC_RscButtonMenu_ATTFilter: AT_Zupa_BlueButton { idc = -1; - text = "Filter"; + text = $STR_UI_FILTER; x = 0.21 * safezoneW + safezoneX; y = 0.77 * safezoneH + safezoneY; w = 0.13 * safezoneW; @@ -406,7 +406,7 @@ class AdvancedTrading class RscText_AT18: ZSC_RscText { idc = 7410; - text = "Nothing"; + text = $STR_EPOCH_TRADE_NOTHING; x = 0.46 * safezoneW + safezoneX; y = 0.72 * safezoneH + safezoneY; w = 0.13 * safezoneW; @@ -416,7 +416,7 @@ class AdvancedTrading class ZSC_RscButtonMenu_AT16: AT_Zupa_BlueButton { idc = 7435; - text = "Sell"; + text = $STR_EPOCH_PLAYER_292; x = 0.46 * safezoneW + safezoneX; y = 0.77 * safezoneH + safezoneY; w = 0.13 * safezoneW; @@ -427,7 +427,7 @@ class AdvancedTrading class ZSC_RscButtonMenu_AT27: AT_Zupa_BlueButton { idc = 7436; - text = "Buy"; + text = $STR_EPOCH_PLAYER_291; x = 0.46 * safezoneW + safezoneX; y = 0.77 * safezoneH + safezoneY; w = 0.13 * safezoneW; @@ -445,7 +445,7 @@ class AdvancedTrading onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 9000);"; colorBackground[] = {1,1,1,1}; color[] = {0,0,0,1}; - text = "Close"; + text = $STR_UI_CLOSE; }; class RscStrText_AT_PriceInfo: ZSC_RscStructuredText // todo { @@ -460,7 +460,7 @@ class AdvancedTrading class RscText_AT_InfoLabel: ZSC_RscText { idc = -1; - text = " Item info"; + text = $STR_EPOCH_TRADE_DETAILS; x = 0.60 * safezoneW + safezoneX; y = 0.38 * safezoneH + safezoneY; w = 0.20 * safezoneW; diff --git a/SQF/dayz_code/actions/AdvancedTrading/config.sqf b/SQF/dayz_code/actions/AdvancedTrading/config.sqf index 6b13899a0..6f2786daa 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/config.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/config.sqf @@ -1,6 +1,9 @@ +// Moved to dayz_code/configVariables.sqf +/* Z_AT_FolderLocation = '\z\addons\dayz_code\actions\AdvancedTrading'; Z_VehicleDistance = 30; // Distance that a vehicle needs to be to see it's content or to sell it. Z_SingleCurrency = false; // Does your server use a single currency system. Z_AllowTakingMoneyFromBackpack = true; // When buying items with DEFAULT CURRENCY to any inventory. Do you allow the trader to take money from your backpack. Z_AllowTakingMoneyFromVehicle = true; // When buying items with DEFAULT CURRENCY to any inventory. Do you allow the trader to take money from your vehicle. Z_MoneyVariable = "cashMoney"; // If using a Single currency system, change this to whatever currency you are using. +*/ \ No newline at end of file diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_changeBuySell.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_changeBuySell.sqf index 31c573301..56b4d1d93 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_changeBuySell.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_changeBuySell.sqf @@ -2,13 +2,13 @@ Z_Selling = !Z_Selling; if(Z_Selling)then{ - (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_SELLBUYTOGGLE) ctrlSetText "Buy"; - (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText "Selling"; + (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_SELLBUYTOGGLE) ctrlSetText localize "STR_EPOCH_PLAYER_291"; + (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText localize "STR_EPOCH_TRADE_SELLING"; {ctrlShow [_x,true];} forEach [Z_AT_SELLABLELIST,Z_AT_SELLINGLIST,Z_AT_SELLBUTTON,Z_AT_ADDSELLITEMBUTTON,Z_AT_ADDALLSELLITEMBUTTON,Z_AT_REMOVESELLITEMBUTTON,Z_AT_REMOVEALLSELLITEMBUTTON]; // show {ctrlShow [_x,false];} forEach [Z_AT_BUYABLELIST,Z_AT_BUYINGLIST,Z_AT_BUYBUTTON,Z_AT_ADDBUYITEMBUTTON,Z_AT_BUYINGAMOUNT,Z_AT_REMOVEBUYITEMBUTTON,Z_AT_REMOVEALLBUYITEMBUTTON,Z_AT_SLOTSDISPLAY]; // hide }else{ - (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_SELLBUYTOGGLE) ctrlSetText "Sell"; - (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText "Buying"; + (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_SELLBUYTOGGLE) ctrlSetText localize "STR_EPOCH_PLAYER_292"; + (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText localize "STR_EPOCH_TRADE_BUYING"; {ctrlShow [_x,true];} forEach [Z_AT_BUYABLELIST,Z_AT_BUYINGLIST,Z_AT_BUYBUTTON,Z_AT_ADDBUYITEMBUTTON,Z_AT_BUYINGAMOUNT,Z_AT_REMOVEBUYITEMBUTTON,Z_AT_REMOVEALLBUYITEMBUTTON,Z_AT_SLOTSDISPLAY]; // show {ctrlShow [_x,false];} forEach [Z_AT_SELLABLELIST,Z_AT_SELLINGLIST,Z_AT_SELLBUTTON,Z_AT_ADDSELLITEMBUTTON,Z_AT_ADDALLSELLITEMBUTTON,Z_AT_REMOVESELLITEMBUTTON,Z_AT_REMOVEALLSELLITEMBUTTON]; // hide call Z_calcBuyableList; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkArrayInConfig.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkArrayInConfig.sqf index ba8617be4..c93c011c2 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkArrayInConfig.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkArrayInConfig.sqf @@ -117,13 +117,13 @@ if(_total > 0)then{ }; if (Z_SingleCurrency) then { - _ctrltext = format["I would offer %1 %2.", _totalPrice,CurrencyName]; + _ctrltext = format[localize "STR_EPOCH_TRADE_OFFER", _totalPrice,CurrencyName]; ctrlSetText [Z_AT_TRADERLINE2, _ctrltext]; } else { ctrlSetText [Z_AT_TRADERLINE2, '']; }; - _ctrltext = format["I accept %1 items from %2.", count(Z_SellableArray) , _extraText]; + _ctrltext = format[localize "STR_EPOCH_TRADE_ACCEPT", count(Z_SellableArray) , _extraText]; ctrlSetText [Z_AT_TRADERLINE1, _ctrltext]; call Z_fillSellList; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf index d157e1f02..84c5af721 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf @@ -42,13 +42,13 @@ if ( Z_SingleCurrency ) then { _formattedText = format [ "
" + -"Name: %2
" + -"Class: %3
" + -"Sell: %5 %7
" + -"Buy: %6 %4
" + +"%10: %2
" + +"%11: %3
" + +"%12: %5 %7
" + +"%13: %6 %4
" + "Mags: %8
" + "Weaps:%9
" -, _picture, _display, _class, _buyCurrency , _sellPrice, _buyPrice, _sellCurrency, _transportMaxWeapons,_transportMaxMagazines +, _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" ]; (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_ITEMINFO) ctrlSetStructuredText parseText _formattedText; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf index 8a39a1276..70fe6f684 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf @@ -21,11 +21,11 @@ if (Z_Selling) then { if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "Name: %2
" + - "Class: %3
" + - "Sell: %5 %7
" + - "Buy: %6 %7
" - , _picture, _display, _class, 'lazy', _sellPrice, _buyPrice, CurrencyName + "%8: %2
" + + "%9: %3
" + + "%10: %5 %7
" + + "%11: %6 %7
" + , _picture, _display, _class, 'lazy', _sellPrice, _buyPrice, CurrencyName, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291" ]; } else { _picSell = getText (configFile >> 'CfgMagazines' >> _sellCurrency >> 'picture'); @@ -34,11 +34,11 @@ if (Z_SingleCurrency) then { _buyCurrency = getText (configFile >> 'CfgMagazines' >> _buyCurrency >> 'displayName'); _formattedText = format [ "
" + - "Name: %2
" + - "Class: %3
" + - "Sell: %5 %7
" + - "Buy: %6 %9
" - , _picture, _display, _class, 'lazy', _sellPrice, _buyPrice, _sellCurrency , _picSell , _buyCurrency, _picBuy + "%11: %2
" + + "%12: %3
" + + "%13: %5 %7
" + + "%14: %6 %9
" + , _picture, _display, _class, 'lazy', _sellPrice, _buyPrice, _sellCurrency , _picSell , _buyCurrency, _picBuy, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291" ]; }; (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_ITEMINFO) ctrlSetStructuredText parseText _formattedText; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf index 973689659..0084efcc5 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf @@ -50,14 +50,14 @@ if ( isNumber (configFile >> 'CfgVehicles' >> _class >> 'transportMaxBackpacks') if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "Name: %2
" + - "Class: %3
" + - "Sell: %5 %7
" + - "Buy: %6 %7
" + + "%10: %2
" + + "%11: %3
" + + "%12: %5 %7
" + + "%13: %6 %7
" + "Mags: %9
" + "Weaps: %8
" + "Backs: %4
" - , _picture, _display, _class, _transportmaxBackpacks, _sellPrice, _buyPrice, CurrencyName, _transportMaxWeapons,_transportMaxMagazines + , _picture, _display, _class, _transportmaxBackpacks, _sellPrice, _buyPrice, CurrencyName, _transportMaxWeapons,_transportMaxMagazines, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291" ]; @@ -69,14 +69,14 @@ if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "Name: %2
" + - "Class: %3
" + - "Sell: %5 %10
" + - "Buy: %6 %7
" + + "%13: %2
" + + "%14: %3
" + + "%15: %5 %10
" + + "%16: %6 %7
" + "Mags: %8
" + "Weaps: %9
" + "Backs: %4
" - , _picture, _display, _class, _transportmaxBackpacks, _sellPrice, _buyPrice, _buyCurrency, _transportMaxWeapons,_transportMaxMagazines, _sellCurrency, _picSell,_picBuy + , _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" ]; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf index a0fcc0ff4..c404e45c0 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf @@ -40,12 +40,12 @@ _magText = ""; if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "Name: %2
" + - "Class: %3
" + - "Sell: %5 %7
" + - "Buy: %6 %7
" + + "%8: %2
" + + "%9: %3
" + + "%10: %5 %7
" + + "%11: %6 %7
" + "Mags:
%4" - , _picture, _display, _class, _magText, _sellPrice, _buyPrice, CurrencyName + , _picture, _display, _class, _magText, _sellPrice, _buyPrice, CurrencyName, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291" ]; }else { _picSell = getText (configFile >> 'CfgMagazines' >> _sellCurrency >> 'picture'); @@ -55,12 +55,12 @@ if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "Name: %2
" + - "Class: %3
" + - "Sell: %5 %7
" + - "Buy: %6 %8
" + + "%11: %2
" + + "%12: %3
" + + "%13: %5 %7
" + + "%14: %6 %8
" + "Mags:
%4" - , _picture, _display, _class, _magText, _sellPrice, _buyPrice, _sellCurrency, _buyCurrency, _picSell, _picBuy + , _picture, _display, _class, _magText, _sellPrice, _buyPrice, _sellCurrency, _buyCurrency, _picSell, _picBuy, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291" ]; }; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getBackpackItems.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getBackpackItems.sqf index 393303c7b..4a5f0f6d4 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getBackpackItems.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getBackpackItems.sqf @@ -45,9 +45,9 @@ if (!isNull _backpack) then { [_normalMags,_normalWeaps, typeOf _backpack] call Z_checkArrayInConfig; }else{ - _ctrltext = format["I'm not stupid."]; + _ctrltext = localize "STR_EPOCH_TRADE_STUPID"; ctrlSetText [Z_AT_TRADERLINE2, _ctrltext]; - _ctrltext = format["You are not wearing a backpack."]; + _ctrltext = localize "STR_EPOCH_TRADE_NO_BACKPACK"; ctrlSetText [Z_AT_TRADERLINE1, _ctrltext]; }; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getContainer.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getContainer.sqf index 009ffcd14..913c25413 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getContainer.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getContainer.sqf @@ -23,17 +23,17 @@ call Z_calcPrice; if(Z_Selling)then{ switch (_lbIndex) do { case 0: { - ["Selling from backpack."] call Z_filleTradeTitle; + [localize "STR_EPOCH_TRADE_SELLING_BACKPACK"] call Z_filleTradeTitle; Z_SellingFrom = 0; call Z_getBackpackItems; }; case 1: { - ["Selling from vehicle."] call Z_filleTradeTitle; + [localize "STR_EPOCH_TRADE_SELLING_VEHICLE"] call Z_filleTradeTitle; Z_SellingFrom = 1; call Z_getVehicleItems; }; case 2: { - ["Selling from gear."] call Z_filleTradeTitle; + [localize "STR_EPOCH_TRADE_SELLING_GEAR"] call Z_filleTradeTitle; Z_SellingFrom = 2; call Z_getGearItems; }; @@ -42,29 +42,29 @@ if(Z_Selling)then{ _ctrltext = format[" "]; ctrlSetText [Z_AT_TRADERLINE2, _ctrltext]; - _ctrltext = format["These are all the items I'm selling."]; + _ctrltext = localize "STR_EPOCH_TRADE_SELLING_ALL"; ctrlSetText [Z_AT_TRADERLINE1, _ctrltext]; switch (_lbIndex) do { case 0: { Z_SellingFrom = 0; - ["Buying in backpack."] call Z_filleTradeTitle; + [localize "STR_EPOCH_TRADE_BUYING_BACKPACK"] call Z_filleTradeTitle; [0] call Z_calculateFreeSpace; }; case 1: { Z_SellingFrom = 1; - ["Buying in vehicle."] call Z_filleTradeTitle; + [localize "STR_EPOCH_TRADE_BUYING_VEHICLE"] call Z_filleTradeTitle; _canBuyInVehicle = call Z_checkCloseVehicle; if(_canBuyInVehicle)then{ [1] call Z_calculateFreeSpace; }else{ - systemChat format["Get in the driver seat to be able to trade to your vehicle."]; + systemChat localize "STR_EPOCH_PLAYER_245"; (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_SLOTSDISPLAY) ctrlSetText format["%1 / %2 / %3",0,0,0]; }; }; case 2: { Z_SellingFrom = 2; - ["Buying in gear."] call Z_filleTradeTitle; + [localize "STR_EPOCH_TRADE_BUYING_GEAR"] call Z_filleTradeTitle; [2] call Z_calculateFreeSpace; }; }; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf index 250113c22..cbd81cf08 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf @@ -121,7 +121,7 @@ if(_index > -1)then{ _vehCheckArray set [count(_vehCheckArray),[_x select 2, _x select 11]]; }; } else { - systemChat format["Get in the driver seat to be able to trade to your vehicle."]; + systemChat localize "STR_EPOCH_PLAYER_245"; }; }; }; diff --git a/SQF/dayz_code/actions/AdvancedTrading/init.sqf b/SQF/dayz_code/actions/AdvancedTrading/init.sqf index 46033491a..324043892 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/init.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/init.sqf @@ -10,7 +10,7 @@ if(DZE_ActionInProgress) exitWith { localize "str_player_actionslimit" call dayz if(isNil "Z_AdvancedTradingInit")then{ - //#include "config.sqf"; + //#include "config.sqf"; // Moved to dayz_code/configVariables.sqf #include "\z\addons\dayz_code\actions\AdvancedTrading\functions\defines.sqf"; /* Configs that needs to be defined but not changed in config file */ diff --git a/SQF/dayz_code/compile/dze_buildChecks.sqf b/SQF/dayz_code/compile/dze_buildChecks.sqf index ca915cc1d..24d849c35 100644 --- a/SQF/dayz_code/compile/dze_buildChecks.sqf +++ b/SQF/dayz_code/compile/dze_buildChecks.sqf @@ -6,7 +6,8 @@ _item = _this select 1; _toolCheck = _this select 2; _classname = getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "create"); _requireplot = DZE_requireplot; -if(!canbuild) exitWith {DZE_ActionInProgress = false; "Cannot build in a trader city." call dayz_rollingMessages; [false, false];}; +// "Unable to build trader nearby." +if (!canbuild) exitWith {DZE_ActionInProgress = false; format[localize "STR_EPOCH_PLAYER_136",localize "STR_EPOCH_TRADER"] call dayz_rollingMessages; [false, false];}; if(isNumber (configFile >> "CfgVehicles" >> _classname >> "requireplot")) then { _requireplot = getNumber(configFile >> "CfgVehicles" >> _classname >> "requireplot"); diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index 33812c3d2..2609691a5 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -948,7 +948,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur s_player_parts set [count s_player_parts,_buy]; } count (_traderMenu select 1); if (DZE_advancedTrading && DZE_ConfigTrader) then { - _buyV = player addAction ["Advanced Trading", "\z\addons\dayz_code\actions\AdvancedTrading\init.sqf",(_traderMenu select 0), 999, true, false, "",""]; + _buyV = player addAction [format["%1",localize "STR_EPOCH_PLAYER_289"], "\z\addons\dayz_code\actions\AdvancedTrading\init.sqf",(_traderMenu select 0), 999, true, false]; s_player_parts set [count s_player_parts,_buyV]; } else { // Database menu diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index aca06dd46..08f88f3c0 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -15411,5 +15411,173 @@ Briefcase (Contains: 10 x 10oz Silver Bar) Briefcase (Contains: 10 x 10oz Silver Bar) + + Vehicle + Fahrzeug + Средство передвижения + Vehículo + Véhicule + Vozidlo + + + Backpack + Rucksack + Рюкзак + Mochila + Sac à dos + Batoh + + + Inventory + Inventar + инвентарь + Inventario + Inventaire + Inventář + + + Buying + Kauf + покупка + Compra + Achat + Nákupy + + + Selling + Verkauf + продажа + De venta + Vente + Prodejní + + + Selling from gear. + Selling from gear. + Selling from gear. + Selling from gear. + Selling from gear. + Selling from gear. + + + Selling from vehicle. + Selling from vehicle. + Selling from vehicle. + Selling from vehicle. + Selling from vehicle. + Selling from vehicle. + + + Selling from backpack. + Selling from backpack. + Selling from backpack. + Selling from backpack. + Selling from backpack. + Selling from backpack. + + + These are all the items I'm selling. + These are all the items I'm selling. + These are all the items I'm selling. + These are all the items I'm selling. + These are all the items I'm selling. + These are all the items I'm selling. + + + Buying in vehicle. + Buying in vehicle. + Buying in vehicle. + Buying in vehicle. + Buying in vehicle. + Buying in vehicle. + + + Buying in backpack. + Buying in backpack. + Buying in backpack. + Buying in backpack. + Buying in backpack. + Buying in backpack. + + + Buying in gear. + Buying in gear. + Buying in gear. + Buying in gear. + Buying in gear. + Buying in gear. + + + Nothing + Nichts + Ничего + Nada + Rien + Nic + + + Details + Einzelheiten + Детали + Detalles + Détails + Podrobnosti + + + I'm not stupid. + I'm not stupid. + I'm not stupid. + I'm not stupid. + I'm not stupid. + I'm not stupid. + + + You are not wearing a backpack. + You are not wearing a backpack. + You are not wearing a backpack. + You are not wearing a backpack. + You are not wearing a backpack. + You are not wearing a backpack. + + + I would offer %1 %2. + I would offer %1 %2. + I would offer %1 %2. + I would offer %1 %2. + I would offer %1 %2. + I would offer %1 %2. + + + I accept %1 items from %2. + I accept %1 items from %2. + I accept %1 items from %2. + I accept %1 items from %2. + I accept %1 items from %2. + I accept %1 items from %2. + + + Trader + Händler + трейдер + Comerciante + Commerçant + Obchodník + + + Name + Name + имя + Nombre + Prénom + Jméno + + + Class + Klasse + Класс + Clase + Classe + Třída +