diff --git a/src/data/generatorData.json b/src/data/generatorData.json index e2693cc..77886ed 100644 --- a/src/data/generatorData.json +++ b/src/data/generatorData.json @@ -57,7 +57,8 @@ "wheat": ["206Sh_PKP_Ugpps:wheat_3", "206Sh_PKPC_Ugpps:wheat_3"], "corn": ["206Sh_PKP_Ugpps:corn_3", "206Sh_PKPC_Ugpps:corn_3"], "fodder": ["206Sh_PKP_Ugpps:forage_3", "206Sh_PKPC_Ugpps:forage_3"], - "vehicles": ["426Z:tank_01", "426Z:truck_01", "426Z:vehicles_01"], + "military": ["426Z:tank_01", "426Z:truck_01", "426Z:vehicles_01"], + "vehicles_nysa": ["424Z:vehicles_nysa", "426Z:vehicles_02"], "carbide": ["421S:carbide_01"], "sensitive": ["425S:all", "421S:carbide_01"], "steel": ["401Ze:steel_01", "401Ze:steel_02"], diff --git a/src/locales/en.json b/src/locales/en.json index c815722..31543c3 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -251,7 +251,8 @@ "corn": "corn", "fodder": "fodder", "carbide": "carbide", - "vehicles": "vehicles", + "vehicles_nysa": "vehicles (nysa)", + "military": "vehicles (military)", "sensitive": "sensitive", "steel": "steel", "gas": "gas", diff --git a/src/locales/pl.json b/src/locales/pl.json index 1e85626..f6362b8 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -251,7 +251,8 @@ "corn": "kukurydza", "fodder": "pasza", "carbide": "karbid", - "vehicles": "pojazdy", + "vehicles_nysa": "pojazdy (nysa)", + "military": "pojazdy (wojsko)", "sensitive": "wrażliwe", "steel": "stal", "gas": "gaz", @@ -334,7 +335,7 @@ "Luban_XH_short": "krótki wagon mieszkalny", "Luban_XH_long": "długi wagon mieszkalny", "Luban_XH_workshop": "wagon warsztatowy", - "EDK80": "dźwig kolejowy" + "EDK80": "żuraw kolejowy" }, "cargo-warnings": { "title": "Skład z dodatkowymi uwagami przewozowymi:", @@ -343,7 +344,7 @@ "warning_un1965_tn": "TN: gazy węglowodorowe skroplone - puste cysterny (UN 1965)", "warning_un1202_tn": "TN: olej napędowy (UN 1202)", "warning_military_pn": "PN: transport wojskowy", - "warning_edk80_pn": "PN: dźwig kolejowy EDK80" + "warning_edk80_pn": "PN: żuraw kolejowy EDK80" }, "migrate-info": { "line-1": "Pojazdownik zostaje przeniesiony na nową domenę - {0}! Możesz korzystać z obecnej strony, jednak nie będzie ona otrzymywać już aktualizacji i w przyszłości zostanie wyłączona!", diff --git a/src/utils/vehicleUtils.ts b/src/utils/vehicleUtils.ts index 7f65656..10aa33e 100644 --- a/src/utils/vehicleUtils.ts +++ b/src/utils/vehicleUtils.ts @@ -177,7 +177,7 @@ export function getCargoWarnings(stockList: IStock[]) { else if (stockVehicle.vehicleRef.type.startsWith('WB117')) warnings.add(stockVehicle.cargo ? 'warning_un1965_twr' : 'warning_un1965_tn'); else if (stockVehicle.vehicleRef.type.startsWith('445Rb')) warnings.add('warning_un1202_tn'); else if (stockVehicle.vehicleRef.type.startsWith('EDK80')) warnings.add('warning_edk80_pn'); - else if (stockVehicle.cargo && /^(tank|vehicles|truck)/.test(stockVehicle.cargo.id)) warnings.add('warning_military_pn'); + else if (stockVehicle.cargo && /^(tank|vehicles_01|truck)/.test(stockVehicle.cargo.id)) warnings.add('warning_military_pn'); }); return warnings;