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 ba58e4d8a..377a08990 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf @@ -37,12 +37,12 @@ if (Z_SingleCurrency) then { _sellCurrency = CurrencyName; _formattedText = format [ "
" + - "%10: %2
" + - "%11: %3
" + - "%13: %6 %4
" + - "%12: %5 %7
" + - "%14: %8
" + - "%15: %9
" + "%10: %2
" + + "%11: %3
" + + "%13: %6 %4
" + + "%12: %5 %7
" + + "%14: %8
" + + "%15: %9
" , _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 { @@ -53,12 +53,12 @@ if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "%10: %2
" + - "%11: %3
" + - "%13: %6 %4
" + - "%12: %5 %7
" + - "%14: %8
" + - "%15: %9
" + "%10: %2
" + + "%11: %3
" + + "%13: %6 %4
" + + "%12: %5 %7
" + + "%14: %8
" + + "%15: %9
" , _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 ]; }; 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 de872552b..2010f83c8 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf @@ -53,10 +53,10 @@ _compatibleText = ""; if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "%8: %2
" + - "%9: %3
" + - "%11: %6 %7
" + - "%10: %5 %7
" + "%8: %2
" + + "%9: %3
" + + "%11: %6 %7
" + + "%10: %5 %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 { @@ -66,17 +66,17 @@ if (Z_SingleCurrency) then { _buyCurrency = getText (configFile >> 'CfgMagazines' >> _buyCurrency >> 'displayName'); _formattedText = format [ "
" + - "%11: %2
" + - "%12: %3
" + - "%14: %6 %9
" + - "%13: %5 %7
" + "%11: %2
" + + "%12: %3
" + + "%14: %6 %9
" + + "%13: %5 %7
" , _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" ]; }; if (count _compatible > 0) then { _formattedText = _formattedText + format [ - "%1: %2" + "%1: %2" ,localize "STR_EPOCH_COMPATIBLE",_compatibleText ]; }; 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 7c3fd302f..535f25188 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf @@ -117,16 +117,16 @@ _wepText = ""; if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "%10: %2
" + - "%11: %3
" + - "%13: %6 %7
" + - "%12: %5 %7
" + - "%14/%15/%16: %9/%8/%4
" + - "%17: %18 %24: %25
" + // Armor / Seats - "%21%22: %23 %19: %20
" + // MaxSpeed / Fuel - "%26: %27" // Weapons - , _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", localize "STR_EPOCH_MAGS", localize "STR_EPOCH_WEPS", localize "STR_EPOCH_BAGS", - localize "STR_EPOCH_ARMOR",_armor,localize "STR_EPOCH_FUEL",_fuelCapacity,localize "STR_EPOCH_MAX",localize "STR_EPOCH_SPEED",_maxSpeed,localize "STR_EPOCH_SEATS",_seats,localize "STR_EPOCH_WEAPONS",_wepText + "%10: %2
" + + "%11: %3
" + + "%13: %6 %7
" + + "%12: %5 %7
" + + "%14: %9 %8 %4
" + + "%17: %18 %24: %25
" + // Armor / Seats + "%21 %22: %23 %19: %20
" + // MaxSpeed / Fuel + "%26: %27" // Weapons + , _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", localize "STR_EPOCH_CARGO_SPACE", "\z\addons\dayz_code\gui\gear\gear_ui_slots_weapons_white.paa", "\z\addons\dayz_code\gui\gear\gear_ui_slots_items_white.paa", + localize "STR_EPOCH_ARMOR",_armor,localize "STR_EPOCH_FUEL",_fuelCapacity,localize "STR_EPOCH_MAX",localize "STR_EPOCH_SPEED",_maxSpeed,localize "STR_EPOCH_SEATS",_seats,localize "STR_EPOCH_WEAPONS",_wepText,"\z\addons\dayz_code\gui\gear\gear_ui_slots_backpacks_white.paa" ]; } else { _picSell = getText (configFile >> 'CfgMagazines' >> _sellCurrency >> 'picture'); @@ -136,16 +136,16 @@ if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "%13: %2
" + - "%14: %3
" + - "%16: %6 %7
" + - "%15: %5 %10
" + - "%17/%18/%19: %8/%9/%4
" + - "%20: %21 %27: %28
" + // Armor / Seats - "%24%25: %26 %22: %23
" + // MaxSpeed / Fuel - "%29: %30" // Weapons - , _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", - localize "STR_EPOCH_ARMOR",_armor,localize "STR_EPOCH_FUEL",_fuelCapacity,localize "STR_EPOCH_MAX",localize "STR_EPOCH_SPEED",_maxSpeed,localize "STR_EPOCH_SEATS",_seats,localize "STR_EPOCH_WEAPONS",_wepText + "%13: %2
" + + "%14: %3
" + + "%16: %6 %7
" + + "%15: %5 %10
" + + "%17: %8 %9 %4
" + + "%20: %21 %27: %28
" + // Armor / Seats + "%24 %25: %26 %22: %23
" + // MaxSpeed / Fuel + "%29: %30" // Weapons + , _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_CARGO_SPACE", "\z\addons\dayz_code\gui\gear\gear_ui_slots_weapons_white.paa", "\z\addons\dayz_code\gui\gear\gear_ui_slots_items_white.paa", + localize "STR_EPOCH_ARMOR",_armor,localize "STR_EPOCH_FUEL",_fuelCapacity,localize "STR_EPOCH_MAX",localize "STR_EPOCH_SPEED",_maxSpeed,localize "STR_EPOCH_SEATS",_seats,localize "STR_EPOCH_WEAPONS",_wepText,"\z\addons\dayz_code\gui\gear\gear_ui_slots_backpacks_white.paa" ]; }; 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 00bf0ad25..0bcc661ab 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf @@ -64,10 +64,10 @@ _magText = ""; if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "%8: %2
" + - "%9: %3
" + - "%11: %6 %7
" + - "%10: %5 %7
" + "%8: %2
" + + "%9: %3
" + + "%11: %6 %7
" + + "%10: %5 %7
" , _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 { @@ -78,10 +78,10 @@ if (Z_SingleCurrency) then { _formattedText = format [ "
" + - "%11: %2
" + - "%12: %3
" + - "%14: %6 %8
" + - "%13: %5 %7
" + "%11: %2
" + + "%12: %3
" + + "%14: %6 %8
" + + "%13: %5 %7
" , _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" ]; }; @@ -90,8 +90,8 @@ _parentClasses = [(configFile >> "CfgWeapons" >> _class),true] call BIS_fnc_retu if !("ItemCore" in _parentClasses or "Binocular" in _parentClasses) then { _formattedText = _formattedText + format [ - "%1: %2
" + - "%3: %4" + "%1: %2
" + + "%3: %4" ,localize "STR_EPOCH_ATTACHMENTS",_attachText,localize "STR_EPOCH_MAGS",_magText ]; }; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index f4c565831..e76e99e04 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -16366,6 +16366,9 @@ Classe Třída + + Cargo Space + Mags Предметов