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 2125db50d..d2cf13652 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf @@ -32,23 +32,23 @@ if (Z_SingleCurrency) then { "
" + "%9: %2
" + "%10: %3
" + - "%12: %6 %4
" + - "%11: %5 %7
" + + "%12: %6 %7
" + + "%11: %5 %4
" + "%14: %8
", _picture, _display, _class, CurrencyName, if (_sellPrice >= 0) then {[_sellPrice] call BIS_fnc_numberText;} else {"";}, - if (_buyPrice >= 0) then {[_buyPrice] call BIS_fnc_numberText;} else {"";}, - CurrencyName, + if (_buyPrice >= 0) then {[_buyPrice] call BIS_fnc_numberText;} else {localize "STR_EPOCH_TRADE_UNBUYABLE";}, + if (_buyPrice >= 0) then {CurrencyName} else {""}, _transportMaxMagazines, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", "\z\addons\dayz_code\gui\gear\gear_ui_slots_items_white.paa", - localize "STR_EPOCH_CARGO_SPACE" + localize "STR_EPOCH_CARGO_SPACE" ]; } else { _picSell = ""; @@ -60,6 +60,8 @@ if (Z_SingleCurrency) then { if (_buyPrice >= 0) then { _picBuy = getText (configFile >> 'CfgMagazines' >> _buyCurrency >> 'picture'); _buyCurrency = getText (configFile >> 'CfgMagazines' >> _buyCurrency >> 'displayName'); + } else { + _buyCurrency = ""; }; _formattedText = format [ @@ -74,7 +76,7 @@ if (Z_SingleCurrency) then { _class, _buyCurrency, if (_sellPrice >= 0) then {_sellPrice} else {"";}, - if (_buyPrice >= 0) then {_buyPrice} else {"";}, + if (_buyPrice >= 0) then {_buyPrice} else {localize "STR_EPOCH_TRADE_UNBUYABLE";}, _sellCurrency, _transportMaxMagazines, localize "STR_EPOCH_NAME", 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 1aac58bbc..546dec199 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf @@ -57,19 +57,20 @@ if (Z_SingleCurrency) then { "
" + "%8: %2
" + "%9: %3
" + - "%11: %6 %7
" + + "%11: %6 %12
" + "%10: %5 %7
", _picture, _display, _class, 'lazy', if (_sellPrice >= 0) then {[_sellPrice] call BIS_fnc_numberText;} else {"";}, - if (_buyPrice >= 0) then {[_buyPrice] call BIS_fnc_numberText;} else {"";}, + if (_buyPrice >= 0) then {[_buyPrice] call BIS_fnc_numberText;} else {localize "STR_EPOCH_TRADE_UNBUYABLE";}, CurrencyName, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", - localize "STR_EPOCH_PLAYER_291" + localize "STR_EPOCH_PLAYER_291", + if (_buyPrice >= 0) then {CurrencyName} else {""} ]; } else { _picSell = ""; @@ -81,7 +82,10 @@ if (Z_SingleCurrency) then { if (_buyPrice >= 0) then { _picBuy = getText (configFile >> "CfgMagazines" >> _buyCurrency >> "picture"); _buyCurrency = getText (configFile >> "CfgMagazines" >> _buyCurrency >> "displayName"); + } else { + _buyCurrency = ""; }; + _formattedText = format [ "
" + "%11: %2
" + @@ -93,7 +97,7 @@ if (Z_SingleCurrency) then { _class, 'lazy', if (_sellPrice >= 0) then {_sellPrice} else {"";}, - if (_buyPrice >= 0) then {_buyPrice} else {"";}, + if (_buyPrice >= 0) then {_buyPrice} else {localize "STR_EPOCH_TRADE_UNBUYABLE";}, _sellCurrency, _picSell, _buyCurrency, 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 faed7eabd..054e0ffab 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf @@ -117,7 +117,7 @@ if (Z_SingleCurrency) then { "
" + "%10: %2
" + "%11: %3
" + - "%13: %6 %7
" + + "%13: %6 %27
" + "%12: %5 %7
" + "%14: %8 %9 %4
" + "%17: %18 %24: %25
" + // Armor / Seats @@ -127,7 +127,7 @@ if (Z_SingleCurrency) then { _class, _transportmaxBackpacks, if (_sellPrice >= 0) then {[_sellPrice] call BIS_fnc_numberText;} else {"";}, - if (_buyPrice >= 0) then {[_buyPrice] call BIS_fnc_numberText;} else {"";}, + if (_buyPrice >= 0) then {[_buyPrice] call BIS_fnc_numberText;} else {localize "STR_EPOCH_TRADE_UNBUYABLE";}, CurrencyName, _transportMaxWeapons, _transportMaxMagazines, @@ -147,7 +147,8 @@ if (Z_SingleCurrency) then { _maxSpeed, localize "STR_EPOCH_SEATS", _seats, - "\z\addons\dayz_code\gui\gear\gear_ui_slots_backpacks_white.paa" + "\z\addons\dayz_code\gui\gear\gear_ui_slots_backpacks_white.paa", + if (_buyPrice >= 0) then {CurrencyName} else {""} ]; } else { _picSell = ""; @@ -159,6 +160,8 @@ if (Z_SingleCurrency) then { if (_buyPrice >= 0) then { _picBuy = getText (configFile >> 'CfgMagazines' >> _buyCurrency >> 'picture'); _buyCurrency = getText (configFile >> 'CfgMagazines' >> _buyCurrency >> 'displayName'); + } else { + _buyCurrency = ""; }; _formattedText = format [ @@ -175,7 +178,7 @@ if (Z_SingleCurrency) then { _class, _transportmaxBackpacks, if (_sellPrice >= 0) then {_sellPrice} else {"";}, - if (_buyPrice >= 0) then {_buyPrice} else {"";}, + if (_buyPrice >= 0) then {_buyPrice} else {localize "STR_EPOCH_TRADE_UNBUYABLE";}, _buyCurrency, _transportMaxWeapons, _transportMaxMagazines, 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 497ae2a91..47ff426d4 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf @@ -66,19 +66,20 @@ if (Z_SingleCurrency) then { "
" + "%8: %2
" + "%9: %3
" + - "%11: %6 %7
" + + "%11: %6 %12
" + "%10: %5 %7
", _picture, _display, _class, _magText, if (_sellPrice >= 0) then {[_sellPrice] call BIS_fnc_numberText;} else {"";}, - if (_buyPrice >= 0) then {[_buyPrice] call BIS_fnc_numberText;} else {"";}, + if (_buyPrice >= 0) then {[_buyPrice] call BIS_fnc_numberText;} else {localize "STR_EPOCH_TRADE_UNBUYABLE";}, CurrencyName, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", - localize "STR_EPOCH_PLAYER_291" + localize "STR_EPOCH_PLAYER_291", + if (_buyPrice >= 0) then {CurrencyName} else {""} ]; } else { _picSell = ""; @@ -90,7 +91,10 @@ if (Z_SingleCurrency) then { if (_buyPrice >= 0) then { _picBuy = getText (configFile >> 'CfgMagazines' >> _buyCurrency >> 'picture'); _buyCurrency = getText (configFile >> 'CfgMagazines' >> _buyCurrency >> 'displayName'); + } else { + _buyCurrency = ""; }; + _formattedText = format [ "
" + "%11: %2
" + @@ -102,7 +106,7 @@ if (Z_SingleCurrency) then { _class, _magText, if (_sellPrice >= 0) then {_sellPrice} else {"";}, - if (_buyPrice >= 0) then {_buyPrice} else {"";}, + if (_buyPrice >= 0) then {_buyPrice} else {localize "STR_EPOCH_TRADE_UNBUYABLE";}, _sellCurrency, _buyCurrency, _picSell, diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 5bf0c5e8d..429efe683 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -13471,6 +13471,11 @@ Motorrad M1030 (Grün) Мотоцикл M1030 (Зелёный) + + Submarine + U-Boot + Подводная лодка + RHIB (M2) НЛЖК (M2) @@ -13478,7 +13483,7 @@ RHIB (MK 19) НЛЖК (MK 19) - + PBX Rubber Boat Моторная лодка ПВХ @@ -28943,6 +28948,11 @@ Etwas Wechselgeld ist in deinem Inventar verborgen. Reduziere die Gegenstände in deinem Inventar, um das Wechselgeld sichtbar zu machen! Некоторые изменения скрыты в вашем инвентаре. Уменьшите количество предметов в инвентаре, чтобы увидеть изменения! + + Unbuyable + Nicht kaufbar + Невозможно купить +