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 2c2780a98..3af56afb5 100644
--- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf
+++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf
@@ -1,5 +1,6 @@
private ['_item', '_type','_picture',"_class","_display","_transportMaxWeapons","_transportMaxMagazines","_transportmaxBackpacks"
-,"_buyPrice","_sellPrice","_buyCurrency","_sellCurrency","_formattedText"
+,"_buyPrice","_sellPrice","_buyCurrency","_sellCurrency","_formattedText","_fuelCapacity","_maxSpeed","_armor","_seats","_weapons",
+"_weapons2","_config","_wepText","_turret","_text"
];
#include "defines.sqf";
@@ -10,11 +11,11 @@ _picture = _item select 4;
_class = _item select 0;
_display = _item select 3;
-_fuelCapacity = nil;
-_maxSpeed = nil;
-_armor = nil;
-_seats = nil;
-_weapons = nil;
+_fuelCapacity = 0;
+_maxSpeed = 0;
+_armor = 0;
+_seats = 0;
+_weapons = [];
_transportMaxWeapons = 0;
_transportMaxMagazines = 0;
@@ -35,18 +36,85 @@ if (Z_Selling) then {
_sellCurrency = _item select 8;
};
-if ( isNumber (configFile >> 'CfgVehicles' >> _class >> 'transportMaxWeapons')) then {
- _transportMaxWeapons = getNumber (configFile >> 'CfgVehicles' >> _class >> 'transportMaxWeapons');
+_config = configFile >> 'CfgVehicles' >> _class;
+
+if (isNumber (_config >> 'transportMaxWeapons')) then {
+ _transportMaxWeapons = getNumber (_config >> 'transportMaxWeapons');
};
-if ( isNumber (configFile >> 'CfgVehicles' >> _class >> 'transportMaxMagazines')) then {
- _transportMaxMagazines = getNumber (configFile >> 'CfgVehicles' >> _class >> 'transportMaxMagazines');
+if (isNumber (_config >> 'transportMaxMagazines')) then {
+ _transportMaxMagazines = getNumber (_config >> 'transportMaxMagazines');
};
-if ( isNumber (configFile >> 'CfgVehicles' >> _class >> 'transportMaxBackpacks')) then {
- _transportmaxBackpacks = getNumber (configFile >> 'CfgVehicles' >> _class >> 'transportMaxBackpacks');
+if (isNumber (_config >> 'transportMaxBackpacks')) then {
+ _transportmaxBackpacks = getNumber (_config >> 'transportMaxBackpacks');
};
+if (isNumber (_config >> 'fuelCapacity')) then {
+ _fuelCapacity = getNumber (_config >> 'fuelCapacity');
+};
+
+if (isNumber (_config >> 'maxSpeed')) then {
+ _maxSpeed = getNumber (_config >> 'maxSpeed');
+};
+
+if (isNumber (_config >> 'armor')) then {
+ _armor = getNumber (_config >> 'armor');
+};
+
+if (isNumber (_config >> 'transportSoldier')) then {
+ _seats = getNumber (_config >> 'transportSoldier');
+};
+
+{
+ if ((isNumber (_config >> _x)) && {getNumber (_config >> _x) > 0}) then {
+ _seats = _seats + 1;
+ };
+} forEach ["hasDriver","hasGunner","hasCommander"];
+
+if (isArray (_config >> 'weapons')) then {
+ _weapons = getArray (_config >> 'weapons');
+};
+
+{
+ _turret = _x;
+ if (isArray (_config >> 'Turrets' >> _turret >> 'weapons')) then {
+ {
+ _weapons set [count _weapons,_x];
+ } forEach (getArray (_config >> 'Turrets' >> _turret >> 'weapons'));
+ };
+ {
+ if ((isNumber (_config >> 'Turrets' >> _turret >> _x)) && {getNumber (_config >> 'Turrets' >> _turret >> _x) > 0}) then {
+ _seats = _seats + 1;
+ };
+ } forEach ["hasDriver","hasGunner","hasCommander"];
+} forEach ["MainTurret","BackTurret","SideTurret","RightDoorGun","BackDoorGun","LeftDoorGun","AGS30_Turret","PK_Turret"];
+
+// Get weapon display names
+_weapons2 = [];
+{
+ if !(["horn",_x] call fnc_inString) then {
+ _text = getText (configFile >> 'CfgWeapons' >> _x >> 'displayName');
+ if (_text in _weapons2) then {
+ _index = _weapons2 find _text;
+ _weapons2 set [_index,_text + "x2"];
+ } else {
+ _weapons2 set [count _weapons2,_text];
+ };
+ };
+} forEach _weapons;
+
+if (count _weapons2 < 1) then {_weapons2 = [localize "STR_EPOCH_NONE"];};
+
+_wepText = "";
+{
+ if (_forEachIndex > 0) then {
+ _wepText = _wepText + ', ' + _x;
+ } else {
+ _wepText = _wepText + _x;
+ };
+} forEach _weapons2;
+
if (Z_SingleCurrency) then {
_formattedText = format [
"![]()
" +
@@ -56,8 +124,14 @@ if (Z_SingleCurrency) then {
"%13: %6 %7
" +
"%14: %9
" +
"%15: %8
" +
- "%16: %4
"
- , _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"
+ "%16: %4
" +
+ "%17: %18
" + // Armor
+ //"%19: %20
" + // Fuel
+ "%21%22: %23
" + // MaxSpeed
+ "%24: %25
" + // Seats
+ "%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
];
@@ -75,8 +149,14 @@ if (Z_SingleCurrency) then {
"%16: %6 ![]()
%7
" +
"%17: %8
" +
"%18: %9
" +
- "%19: %4
"
- , _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"
+ "%19: %4
" +
+ "%20: %21
" + // Armor
+ //"%22: %23
" + // Fuel
+ "%24%25: %26
" + // MaxSpeed
+ "%27: %28
" + // Seats
+ "%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
];
diff --git a/SQF/dayz_code/compile/player_traderMenuConfig.sqf b/SQF/dayz_code/compile/player_traderMenuConfig.sqf
index ae35f1aa8..f5335a7d3 100644
--- a/SQF/dayz_code/compile/player_traderMenuConfig.sqf
+++ b/SQF/dayz_code/compile/player_traderMenuConfig.sqf
@@ -212,7 +212,7 @@ TraderDialogBuy = {
private ["_index", "_item", "_data"];
_index = _this select 0;
if (_index < 0) exitWith {
- localize "str_epoch_player_6" call dayz_rollingMessages;
+ localize "STR_EPOCH_PLAYER_106" call dayz_rollingMessages;
};
_item = TraderItemList select _index;
_data = [_item select 0, _item select 3, 1, _item select 2, "buy", _item select 4, _item select 1, _item select 8];
@@ -224,7 +224,7 @@ TraderDialogSell = {
private ["_index", "_item", "_data"];
_index = _this select 0;
if (_index < 0) exitWith {
- localize "str_epoch_player_6" call dayz_rollingMessages;
+ localize "STR_EPOCH_PLAYER_106" call dayz_rollingMessages;
};
_item = TraderItemList select _index;
_data = [_item select 6, _item select 0, _item select 5, 1, "sell", _item select 1, _item select 7, _item select 8];
diff --git a/SQF/dayz_code/compile/player_traderMenuHive.sqf b/SQF/dayz_code/compile/player_traderMenuHive.sqf
index 1f5bbb885..88de6f66d 100644
--- a/SQF/dayz_code/compile/player_traderMenuHive.sqf
+++ b/SQF/dayz_code/compile/player_traderMenuHive.sqf
@@ -201,7 +201,7 @@ TraderDialogBuy = {
private ["_index", "_item", "_data"];
_index = _this select 0;
if (_index < 0) exitWith {
- localize "str_epoch_player_6" call dayz_rollingMessages;
+ localize "STR_EPOCH_PLAYER_106" call dayz_rollingMessages;
};
_item = TraderItemList select _index;
_data = [_item select 0, _item select 3, 1, _item select 2, "buy", _item select 4, _item select 1, _item select 8];
@@ -213,7 +213,7 @@ TraderDialogSell = {
private ["_index", "_item", "_data"];
_index = _this select 0;
if (_index < 0) exitWith {
- localize "str_epoch_player_6" call dayz_rollingMessages;
+ localize "STR_EPOCH_PLAYER_106" call dayz_rollingMessages;
};
_item = TraderItemList select _index;
_data = [_item select 6, _item select 0, _item select 5, 1, "sell", _item select 1, _item select 7, _item select 8];
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index b515aaaf4..135e6fd69 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -10793,15 +10793,6 @@
Un joueur veut vous marquer comme amical(e). Pour accepter, marquez ce joueur comme amical(e).
Jiný hráč si vás chce označit jako přítele. K příjmutí, označte hráče jako přítele.
-
- Trading canceled.
- Handel abgebrochen.
- Торговля отменена.
-
- Handel is afgebroken
- Échange annulé.
- Obchodování přerušeno.
-
Cannot access gear in a locked vehicle.
Es kann nicht auf das Inventar bei verschlossenen Fahrzeugen zugegriffen werden.
@@ -12712,12 +12703,14 @@
Walk
- Laufen
- Пешком
- Walk
- Walk
- Walk
- Jít
+ Marcher
+ Caminar
+ Cammina
+ Gyaloglás
+ Marsz
+ Идти
+ Gehen
+ Chůze
Run
@@ -12992,20 +12985,24 @@
Buy
Kaufen
+ Compra
+ Comprar
+ Acheter
+ Kup
Купить
-
-
-
- Koupit
+ Kup
+ Megvesz
Sell
Verkaufen
- Продать
-
-
-
+ Vendi
+ Vender
+ Vendre
Prodat
+ Продать
+ Sprzedaj
+ Elad
Buy For
@@ -15544,7 +15541,10 @@
Транспорт
Vehículo
Véhicule
- Vozidlo
+ Vozidlo
+ Veicolo
+ Pojazd
+ Jármű
Backpack
@@ -15636,10 +15636,13 @@
Nothing
- Nichts
- Ничего
- Nada
+ Ничего
Rien
+ Nada
+ Niente
+ Semmi
+ Nic
+ Nichts
Nic
@@ -15775,16 +15778,30 @@
Отладка: Что-то пошло не так в процессе оплаты. Пожалуйста, сообщите об этой проблеме.
- You could not buy these items because the container lacks space to hold them.
- Вы могли бы всё это купить, но места не хватает, поэтому покупка отменена.
+ Cannot buy: No empty slots!
+ Kauf nicht möglich: Keine freien Slots
+ Impossibile comprare: nessuno slot vuoto!
+ No puedes comprar: ¡no hay huecos libres!
+ Achat impossible : aucun emplacement vide !
+ Nelze koupit: Není volné místo!
+ Нет пустых ячеек!
+ Nie można kupić: brak wolnych miejsc!
+ Nem vásárolhatsz! Nincs üres hely!
You need %1 %2 to buy all these items.
Вам нужно %1 %2 для покупки.
-
- You need more money to buy all these items.
- Вам нужно больше денег, чтобы купить это.
+
+ Cannot buy: Not enough money!
+ Kauf nicht möglich: Nicht genug Geld!
+ Impossibile comprare: servono più soldi!
+ No puedes comprar: ¡no tienes suficiente dinero!
+ Achat impossible : argent insuffisant !
+ Nelze koupit: Nemáte dost peněz!
+ Недостаточно средств!
+ Nie można kupić: za mało pieniędzy!
+ Nem tudod megvenni: Nincs elég pénzed!
Selected %1
@@ -15846,9 +15863,12 @@
Name
Name
Имя
- Nombre
- Prénom
+ Nome
+ Nombrar
+ Nom
Jméno
+ Nazwa
+ Név
Class
@@ -15870,6 +15890,14 @@
Bags
Рюкзаков
+
+ Seats
+ Sitze
+ места
+ Asientos
+ Des places
+ Sedadla
+
your gear
вашего снаряжения
@@ -17060,11 +17088,14 @@
Special Forces
- Special Forces
- Силы особого назначения
- Special Forces
- Special Forces
- Special Forces
+ Силы особого назначения
+ Forces spéciales
+ Fuerzas especiales
+ Forze speciali
+ Különleges erők
+ Oddziały specjalne
+ Spezialeinheiten
+ Speciální jednotky
Desert Camo
@@ -17116,19 +17147,25 @@
Marksman
- Marksman
- Меткий стрелок
- Marksman
- Marksman
- Marksman
+ Меткий стрелок
+ Scharfschütze
+ Tiratore scelto
+ Tirador
+ Tireur d'élite
+ Ostřelovač
+ Snajper
+ Lövész
Team Leader
- Team Leader
- Лидер группы
- Team Leader
- Team Leader
- Team Leader
+ Лидер группы
+ Team-Anführer
+ Capogruppo
+ Líder de equipo
+ Chef d'équipe
+ Velitel týmu
+ Dowódca drużyny
+ Csapatvezető
Smuggler
@@ -17149,18 +17186,24 @@
General
General
- Генерал
+ Генерал
+ Général
General
- General
- General
+ Generale
+ Tábornok
+ Generał
+ Generál
Crewman
- Crewman
- Член команды
- Crewman
- Crewman
- Crewman
+ Член команды
+ Besatzungsmitglied
+ Membro equipaggio
+ Miembro de la tripulación
+ Membre équipage
+ Posádka
+ Członek załogi
+ Legénység
Boss
@@ -17182,9 +17225,12 @@
Cooper
Cooper
Купер
+ Cooper
Cooper
Cooper
Cooper
+ Cooper
+ Cooper
Travis
@@ -17210,5 +17256,71 @@
Steve
Steve
+
+ Armor
+ Panzer
+ Blindati
+ Blindado
+ Blindé
+ Obrněnci
+ Бронетехника
+ Pancerne
+ Páncélos
+
+
+ Fuel
+ Treibstoff
+ Carburante
+ Combustible
+ Carburant
+ Palivo
+ Топливо
+ Paliwo
+ Üzemanyag
+
+
+ Max
+ Max
+ Max
+ Máximo
+ Max
+ Max
+ Максимум
+ Maks.
+ Max
+
+
+ Speed
+ Geschwindigkeit
+ Velocità
+ Velocidad
+ Vitesse
+ Rychlost
+ Скорость
+ Szybkość
+ Sebesség
+
+
+ Weapons
+ Waffen
+ Armi
+ Armas
+ Armement
+ Zbraně
+ Оружие
+ Uzbrojenie
+ Fegyverek
+
+
+ None
+ Keine
+ Nessuna
+ Ninguna
+ Néant
+ Není
+ Нет
+ Brak
+ Nincs
+