From d1a728894e1a7c5ad8b1eaac96a3706af8664cda Mon Sep 17 00:00:00 2001 From: Alex_BY Date: Tue, 15 Mar 2016 13:23:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D1=8B?= =?UTF-8?q?=20=D0=B3=D1=80=D1=83=D0=B7=D0=BE=D0=B2=D1=8B=D1=85=20=D0=B2?= =?UTF-8?q?=D0=B0=D0=B3=D0=BE=D0=BD=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/vehicle/waggon/1cistern151443.mdl | 2 +- .../model/vehicle/waggon/1cistern151547.mdl | 2 +- .../model/vehicle/waggon/2cistern151443.mdl | 2 +- .../model/vehicle/waggon/2cistern151547.mdl | 2 +- .../model/vehicle/waggon/3cistern151443.mdl | 2 +- .../model/vehicle/waggon/Plat134012.mdl | 18 ++------ .../model/vehicle/waggon/Plat139832.mdl | 18 ++------ res/models/model/vehicle/waggon/Plat1850.mdl | 26 ++--------- .../model/vehicle/waggon/Plat_les134012.mdl | 21 +++------ .../model/vehicle/waggon/Plat_les139832.mdl | 23 +++------- .../model/vehicle/waggon/Plat_les1850.mdl | 7 +-- .../model/vehicle/waggon/Plat_les1860.mdl | 30 +++---------- .../model/vehicle/waggon/Plat_les1869.mdl | 30 +++---------- .../model/vehicle/waggon/Plat_les1875.mdl | 32 +++---------- .../model/vehicle/waggon/Plat_les1903.mdl | 31 +++---------- .../model/vehicle/waggon/Plat_les1919.mdl | 32 +++---------- .../model/vehicle/waggon/Plat_les1933.mdl | 33 +++----------- .../model/vehicle/waggon/boxcar1860.mdl | 4 +- .../model/vehicle/waggon/boxcar1875.mdl | 4 +- .../model/vehicle/waggon/boxcar1892.mdl | 4 +- .../model/vehicle/waggon/boxcar1919.mdl | 4 +- .../model/vehicle/waggon/boxcar1933.mdl | 4 +- .../model/vehicle/waggon/cistern15871.mdl | 2 +- .../model/vehicle/waggon/cistern1860.mdl | 6 +-- .../model/vehicle/waggon/cistern1875.mdl | 6 +-- .../model/vehicle/waggon/cistern1895.mdl | 6 +-- .../model/vehicle/waggon/cistern1919.mdl | 6 +-- .../model/vehicle/waggon/cistern1933.mdl | 6 +-- .../model/vehicle/waggon/hopper11715_bel.mdl | 2 +- .../model/vehicle/waggon/hopper11715_kor.mdl | 2 +- .../model/vehicle/waggon/hopper11715_zel.mdl | 2 +- .../model/vehicle/waggon/hopper19752_kor.mdl | 2 +- .../model/vehicle/waggon/hopper19752_sin.mdl | 2 +- .../vehicle/waggon/hopper199862_krac.mdl | 2 +- .../model/vehicle/waggon/hopper199862_zel.mdl | 2 +- res/models/model/vehicle/waggon/open12515.mdl | 45 ++----------------- .../model/vehicle/waggon/open127531.mdl | 35 ++------------- .../model/vehicle/waggon/open127532.mdl | 35 ++------------- .../model/vehicle/waggon/open127533.mdl | 35 ++------------- .../model/vehicle/waggon/open1297661.mdl | 35 ++------------- .../model/vehicle/waggon/open1297662.mdl | 38 ++-------------- .../model/vehicle/waggon/open1297663.mdl | 35 ++------------- res/models/model/vehicle/waggon/pkv1860.mdl | 13 ++---- res/models/model/vehicle/waggon/pkv1875.mdl | 13 ++---- res/models/model/vehicle/waggon/pkv1900.mdl | 13 ++---- res/models/model/vehicle/waggon/pkv1913.mdl | 13 ++---- res/models/model/vehicle/waggon/pkv1933.mdl | 34 ++------------ 47 files changed, 145 insertions(+), 576 deletions(-) diff --git a/res/models/model/vehicle/waggon/1cistern151443.mdl b/res/models/model/vehicle/waggon/1cistern151443.mdl index aa8268a..506c421 100644 --- a/res/models/model/vehicle/waggon/1cistern151443.mdl +++ b/res/models/model/vehicle/waggon/1cistern151443.mdl @@ -159,7 +159,7 @@ return { carrier = "RAIL", loadConfigs = { {{ type = "OIL", capacity = 60 }, - { type = "GOODS", capacity = 60 }} + } }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/1cistern151547.mdl b/res/models/model/vehicle/waggon/1cistern151547.mdl index 74c1b56..a1af2df 100644 --- a/res/models/model/vehicle/waggon/1cistern151547.mdl +++ b/res/models/model/vehicle/waggon/1cistern151547.mdl @@ -159,7 +159,7 @@ return { carrier = "RAIL", loadConfigs = { {{ type = "OIL", capacity = 68 }, - { type = "GOODS", capacity = 68 }} + } }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/2cistern151443.mdl b/res/models/model/vehicle/waggon/2cistern151443.mdl index 822302c..68ca8ce 100644 --- a/res/models/model/vehicle/waggon/2cistern151443.mdl +++ b/res/models/model/vehicle/waggon/2cistern151443.mdl @@ -159,7 +159,7 @@ return { carrier = "RAIL", loadConfigs = { {{ type = "OIL", capacity = 60 }, - { type = "GOODS", capacity = 60 }} + } }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/2cistern151547.mdl b/res/models/model/vehicle/waggon/2cistern151547.mdl index f84f758..ff7fa52 100644 --- a/res/models/model/vehicle/waggon/2cistern151547.mdl +++ b/res/models/model/vehicle/waggon/2cistern151547.mdl @@ -159,7 +159,7 @@ return { carrier = "RAIL", loadConfigs = { {{ type = "OIL", capacity = 68 }, - { type = "GOODS", capacity = 68 }} + } }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/3cistern151443.mdl b/res/models/model/vehicle/waggon/3cistern151443.mdl index 88eea9c..6788e8e 100644 --- a/res/models/model/vehicle/waggon/3cistern151443.mdl +++ b/res/models/model/vehicle/waggon/3cistern151443.mdl @@ -159,7 +159,7 @@ return { carrier = "RAIL", loadConfigs = { {{ type = "OIL", capacity = 60 }, - { type = "GOODS", capacity = 60 }} + } }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/Plat134012.mdl b/res/models/model/vehicle/waggon/Plat134012.mdl index c498320..5d5f43c 100644 --- a/res/models/model/vehicle/waggon/Plat134012.mdl +++ b/res/models/model/vehicle/waggon/Plat134012.mdl @@ -202,30 +202,18 @@ return { - {{type = "COAL", capacity = 0 }, - - {type = "IRON_ORE", capacity = 0 }, - - {type = "GOODS", capacity = 65, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 10, 11, 12 }, - { 11, 12 }, - { 12 }, - { }, - - } } } } } }, + --{ ... }, --{ ... }, - {{type = "OIL", capacity = 0 }, - {type = "GOODS", capacity = 65, loadIndicators = { + {{type = "GOODS", capacity = 65, loadIndicators = { { type = "DISCRETE", params = { levels = { { 13, 14, 15 }, { 14, 15 }, { 15 }, { }, - } } } } } }, + } } } } } }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/Plat139832.mdl b/res/models/model/vehicle/waggon/Plat139832.mdl index 4b3f213..eaa32a0 100644 --- a/res/models/model/vehicle/waggon/Plat139832.mdl +++ b/res/models/model/vehicle/waggon/Plat139832.mdl @@ -202,30 +202,18 @@ return { - {{type = "COAL", capacity = 0 }, - - {type = "IRON_ORE", capacity = 0 }, - - {type = "GOODS", capacity = 70, loadIndicators = { + {{type = "GOODS", capacity = 70, loadIndicators = { { type = "DISCRETE", params = { levels = { { 13, 14, 15 }, { 14, 15 }, { 15 }, { }, - } } } } } }, + } } } } } }, --{ ... }, --{ ... }, - {{type = "OIL", capacity = 0 }, - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 10, 11, 12 }, - { 11, 12 }, - { 12 }, - { }, - - } } } } } }, + --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/Plat1850.mdl b/res/models/model/vehicle/waggon/Plat1850.mdl index 1807fe1..d2d6a49 100644 --- a/res/models/model/vehicle/waggon/Plat1850.mdl +++ b/res/models/model/vehicle/waggon/Plat1850.mdl @@ -259,13 +259,7 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 16, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 11, 12, 13 }, - { 12, 13 }, - { 13 }, - { }, - } } } } } }, + }, --{ ... }, --{ ... }, @@ -281,14 +275,7 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 16, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 18, 19, 20 }, - { 19, 20 }, - { 20 }, - { }, - - } } } } } }, + }, --{ ... }, --{ ... }, @@ -302,14 +289,7 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 16, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 18, 19, 20 }, - { 19, 20 }, - { 20 }, - { }, - - } } } } } }, + }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/Plat_les134012.mdl b/res/models/model/vehicle/waggon/Plat_les134012.mdl index 04fcd78..099764d 100644 --- a/res/models/model/vehicle/waggon/Plat_les134012.mdl +++ b/res/models/model/vehicle/waggon/Plat_les134012.mdl @@ -218,28 +218,17 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 65, loadIndicators = { + }, + --{ ... }, + --{ ... }, + + { {type = "GOODS", capacity = 65, loadIndicators = { { type = "DISCRETE", params = { levels = { { 12, 13, 14 }, { 13, 14 }, { 14 }, { }, - } } } } } }, - --{ ... }, - --{ ... }, - - {{type = "COAL", capacity = 0 }, - - {type = "IRON_ORE", capacity = 0 }, - - {type = "GOODS", capacity = 65, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 15, 16 }, - { 16 }, - { }, - - } } } } } }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/Plat_les139832.mdl b/res/models/model/vehicle/waggon/Plat_les139832.mdl index 727de0e..31bf726 100644 --- a/res/models/model/vehicle/waggon/Plat_les139832.mdl +++ b/res/models/model/vehicle/waggon/Plat_les139832.mdl @@ -239,7 +239,11 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 70, loadIndicators = { + }, + --{ ... }, + --{ ... }, + + { {type = "GOODS", capacity = 70, loadIndicators = { { type = "DISCRETE", params = { levels = { { 13, 14, 15, 16 }, { 14, 15, 16 }, @@ -247,22 +251,7 @@ return { { 16 }, { }, - } } } } } }, - --{ ... }, - --{ ... }, - - {{type = "COAL", capacity = 0 }, - - {type = "IRON_ORE", capacity = 0 }, - - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 17, 18, 19 }, - { 18, 19 }, - { 19 }, - { }, - - } } } } } }, + } } } } } }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/Plat_les1850.mdl b/res/models/model/vehicle/waggon/Plat_les1850.mdl index abc05d8..fd0256a 100644 --- a/res/models/model/vehicle/waggon/Plat_les1850.mdl +++ b/res/models/model/vehicle/waggon/Plat_les1850.mdl @@ -226,15 +226,16 @@ return { --{ ... }, --{ ... }, - { type = "GOODS", capacity = 16, loadIndicators = { + }, + --{ ... }, + --{ ... }, + {{ type = "GOODS", capacity = 16, loadIndicators = { { type = "DISCRETE", params = { levels = { { 14, 15}, { 15 }, { }, } } } } } }, - --{ ... }, - --{ ... }, }, loadSpeed = 3 diff --git a/res/models/model/vehicle/waggon/Plat_les1860.mdl b/res/models/model/vehicle/waggon/Plat_les1860.mdl index 8fc5323..9c82d77 100644 --- a/res/models/model/vehicle/waggon/Plat_les1860.mdl +++ b/res/models/model/vehicle/waggon/Plat_les1860.mdl @@ -231,40 +231,22 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 32, loadIndicators = { + }, + --{ ... }, + --{ ... }, + + {{type = "GOODS", capacity = 32, loadIndicators = { { type = "DISCRETE", params = { levels = { { 12, 13 }, { 13 }, { }, - } } } } } }, - --{ ... }, - --{ ... }, - - {{type = "COAL", capacity = 0 }, - - {type = "IRON_ORE", capacity = 0 }, - - {type = "GOODS", capacity = 32, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14, 15, 16 }, - { 15, 16 }, - { 16 }, - { }, - } } } } } }, --{ ... }, --{ ... }, - { {type = "OIL", capacity = 0 }, - { type = "GOODS", capacity = 32, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 17, 18 }, - { 18 }, - { }, - - } } } } } }, + --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/Plat_les1869.mdl b/res/models/model/vehicle/waggon/Plat_les1869.mdl index bf6ff3f..b3e0482 100644 --- a/res/models/model/vehicle/waggon/Plat_les1869.mdl +++ b/res/models/model/vehicle/waggon/Plat_les1869.mdl @@ -231,40 +231,22 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 32, loadIndicators = { + }, + --{ ... }, + --{ ... }, + + { {type = "GOODS", capacity = 32, loadIndicators = { { type = "DISCRETE", params = { levels = { { 10, 11 }, { 11 }, { }, - } } } } } }, - --{ ... }, - --{ ... }, - - {{type = "COAL", capacity = 0 }, - - {type = "IRON_ORE", capacity = 0 }, - - {type = "GOODS", capacity = 32, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 12, 13, 14 }, - { 13, 14 }, - { 14 }, - { }, - } } } } } }, --{ ... }, --{ ... }, - {{type = "OIL", capacity = 0 }, - { type = "GOODS", capacity = 32, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 15, 16 }, - { 16 }, - { }, - - } } } } } }, + --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/Plat_les1875.mdl b/res/models/model/vehicle/waggon/Plat_les1875.mdl index 9d05028..d940b2b 100644 --- a/res/models/model/vehicle/waggon/Plat_les1875.mdl +++ b/res/models/model/vehicle/waggon/Plat_les1875.mdl @@ -238,40 +238,22 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 40, loadIndicators = { + }, + --{ ... }, + --{ ... }, + + { {type = "GOODS", capacity = 40, loadIndicators = { { type = "DISCRETE", params = { levels = { { 10, 11 }, { 11 }, { }, - } } } } } }, - --{ ... }, - --{ ... }, - - {{type = "COAL", capacity = 0 }, - - {type = "IRON_ORE", capacity = 0 }, - - {type = "GOODS", capacity = 40, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 12, 13, 14 }, - { 13, 14 }, - { 14 }, - { }, - - } } } } } }, + } } } } }}, --{ ... }, --{ ... }, - {{type = "OIL", capacity = 0 }, - { type = "GOODS", capacity = 40, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 15, 16, 17 }, - { 16, 17 }, - { 17 }, - { }, - } } } } } }, + --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/Plat_les1903.mdl b/res/models/model/vehicle/waggon/Plat_les1903.mdl index 25c16e7..9ed5442 100644 --- a/res/models/model/vehicle/waggon/Plat_les1903.mdl +++ b/res/models/model/vehicle/waggon/Plat_les1903.mdl @@ -245,41 +245,22 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 50, loadIndicators = { + }, + --{ ... }, + --{ ... }, + + { {type = "GOODS", capacity = 50, loadIndicators = { { type = "DISCRETE", params = { levels = { { 10, 11, 12 }, { 11, 12 }, { 12 }, { }, - } } } } } }, - --{ ... }, - --{ ... }, - - {{type = "COAL", capacity = 0 }, - - {type = "IRON_ORE", capacity = 0 }, - - {type = "GOODS", capacity = 50, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 16, 17, 18 }, - { 17, 18 }, - { 18 }, - { }, - - } } } } } }, + } } } } }}, --{ ... }, --{ ... }, - {{type = "OIL", capacity = 0 }, - { type = "GOODS", capacity = 50, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 13, 14, 15 }, - { 14, 15 }, - { 15 }, - { }, - } } } } } }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/Plat_les1919.mdl b/res/models/model/vehicle/waggon/Plat_les1919.mdl index 64702d1..dad5175 100644 --- a/res/models/model/vehicle/waggon/Plat_les1919.mdl +++ b/res/models/model/vehicle/waggon/Plat_les1919.mdl @@ -238,41 +238,23 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 55, loadIndicators = { + }, + --{ ... }, + --{ ... }, + + { {type = "GOODS", capacity = 55, loadIndicators = { { type = "DISCRETE", params = { levels = { { 10, 11, 12 }, { 11, 12 }, { 12 }, { }, - } } } } } }, - --{ ... }, - --{ ... }, - - {{type = "COAL", capacity = 0 }, - - {type = "IRON_ORE", capacity = 0 }, - - {type = "GOODS", capacity = 55, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 15, 16, 17 }, - { 16, 17 }, - { 17 }, - { }, - - } } } } } }, + } } } } } }, --{ ... }, --{ ... }, - {{type = "OIL", capacity = 0 }, - { type = "GOODS", capacity = 55, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 13, 14 }, - { 14 }, - { }, - - } } } } } }, + --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/Plat_les1933.mdl b/res/models/model/vehicle/waggon/Plat_les1933.mdl index 79fee79..9f95b4e 100644 --- a/res/models/model/vehicle/waggon/Plat_les1933.mdl +++ b/res/models/model/vehicle/waggon/Plat_les1933.mdl @@ -253,41 +253,22 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 60, loadIndicators = { + }, + --{ ... }, + --{ ... }, + + { {type = "GOODS", capacity = 60, loadIndicators = { { type = "DISCRETE", params = { levels = { { 13, 14, 15 }, { 14, 15 }, { 15 }, { }, - } } } } } }, + } } } } } }, --{ ... }, --{ ... }, - {{type = "COAL", capacity = 0 }, - - {type = "IRON_ORE", capacity = 0 }, - - {type = "GOODS", capacity = 60, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 19, 20, 21 }, - { 20, 21 }, - { 21 }, - { }, - - } } } } } }, - --{ ... }, - --{ ... }, - - {{type = "OIL", capacity = 0 }, - {type = "GOODS", capacity = 60, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 16, 17, 18 }, - { 17, 18 }, - { 18 }, - { }, - - } } } } } }, + --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/boxcar1860.mdl b/res/models/model/vehicle/waggon/boxcar1860.mdl index f7ecc6a..728b2b6 100644 --- a/res/models/model/vehicle/waggon/boxcar1860.mdl +++ b/res/models/model/vehicle/waggon/boxcar1860.mdl @@ -141,8 +141,8 @@ return { }, metadata = { description = { - name = _("Крытый вагон (1860)"), - description = _("Крытый вагон 1860") + name = _("Крытый вагон"), + description = _("Крытый вагон образца 1860 года, предназначенный для перевозки различных грузов.") }, railVehicle = { topSpeed = 80.0, diff --git a/res/models/model/vehicle/waggon/boxcar1875.mdl b/res/models/model/vehicle/waggon/boxcar1875.mdl index fe69337..906ddf6 100644 --- a/res/models/model/vehicle/waggon/boxcar1875.mdl +++ b/res/models/model/vehicle/waggon/boxcar1875.mdl @@ -141,8 +141,8 @@ return { }, metadata = { description = { - name = _("Крытый вагон (1875)"), - description = _("Крытый вагон 1875") + name = _("Крытый вагон"), + description = _("Крытый вагон образца 1875 года, предназначенный для перевозки различных грузов.") }, railVehicle = { topSpeed = 80.0, diff --git a/res/models/model/vehicle/waggon/boxcar1892.mdl b/res/models/model/vehicle/waggon/boxcar1892.mdl index bed3575..e88e3f1 100644 --- a/res/models/model/vehicle/waggon/boxcar1892.mdl +++ b/res/models/model/vehicle/waggon/boxcar1892.mdl @@ -141,8 +141,8 @@ return { }, metadata = { description = { - name = _("Крытый вагон (1892)"), - description = _("Крытый вагон 1892") + name = _("Крытый вагон"), + description = _("Крытый вагон образца 1892 года, предназначенный для перевозки различных грузов.") }, railVehicle = { topSpeed = 80.0, diff --git a/res/models/model/vehicle/waggon/boxcar1919.mdl b/res/models/model/vehicle/waggon/boxcar1919.mdl index f259010..71b9bd8 100644 --- a/res/models/model/vehicle/waggon/boxcar1919.mdl +++ b/res/models/model/vehicle/waggon/boxcar1919.mdl @@ -141,8 +141,8 @@ return { }, metadata = { description = { - name = _("Крытый вагон (1919)"), - description = _("Крытый вагон 1919") + name = _("Крытый вагон"), + description = _("Крытый вагон образца 1919 года, предназначенный для перевозки различных грузов.") }, railVehicle = { topSpeed = 90.0, diff --git a/res/models/model/vehicle/waggon/boxcar1933.mdl b/res/models/model/vehicle/waggon/boxcar1933.mdl index 5da206a..4262392 100644 --- a/res/models/model/vehicle/waggon/boxcar1933.mdl +++ b/res/models/model/vehicle/waggon/boxcar1933.mdl @@ -141,8 +141,8 @@ return { }, metadata = { description = { - name = _("Крытый вагон (1933)"), - description = _("Крытый вагон 1933") + name = _("Крытый вагон"), + description = _("Крытый вагон образца 1933 года, предназначенный для перевозки различных грузов.") }, railVehicle = { topSpeed = 110.0, diff --git a/res/models/model/vehicle/waggon/cistern15871.mdl b/res/models/model/vehicle/waggon/cistern15871.mdl index 0246a5c..58529ec 100644 --- a/res/models/model/vehicle/waggon/cistern15871.mdl +++ b/res/models/model/vehicle/waggon/cistern15871.mdl @@ -201,7 +201,7 @@ return { carrier = "RAIL", loadConfigs = { {{ type = "OIL", capacity = 120 }, - { type = "GOODS", capacity = 120 }} + } }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/cistern1860.mdl b/res/models/model/vehicle/waggon/cistern1860.mdl index 9fa7522..bea4670 100644 --- a/res/models/model/vehicle/waggon/cistern1860.mdl +++ b/res/models/model/vehicle/waggon/cistern1860.mdl @@ -141,8 +141,8 @@ return { }, metadata = { description = { - name = _("Цистерна (1860)"), - description = _("Цистерна 1860") + name = _("Цистерна"), + description = _("Цистерна образца 1860 года, предназначенная для перевозки нефти и нефтепродуктов.") }, railVehicle = { topSpeed = 80.0, @@ -158,7 +158,7 @@ return { carrier = "RAIL", loadConfigs = { {{ type = "OIL", capacity = 32 }, - { type = "GOODS", capacity = 32 }} + } }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/cistern1875.mdl b/res/models/model/vehicle/waggon/cistern1875.mdl index 3503708..069efa2 100644 --- a/res/models/model/vehicle/waggon/cistern1875.mdl +++ b/res/models/model/vehicle/waggon/cistern1875.mdl @@ -141,8 +141,8 @@ return { }, metadata = { description = { - name = _("Цистерна (1875)"), - description = _("Цистерна 1875") + name = _("Цистерна"), + description = _("Цистерна образца 1875 года, предназначенная для перевозки нефти и нефтепродуктов.") }, railVehicle = { topSpeed = 80.0, @@ -158,7 +158,7 @@ return { carrier = "RAIL", loadConfigs = { {{ type = "OIL", capacity = 40 }, - { type = "GOODS", capacity = 40 }} + } }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/cistern1895.mdl b/res/models/model/vehicle/waggon/cistern1895.mdl index ba6e54f..e2d5faa 100644 --- a/res/models/model/vehicle/waggon/cistern1895.mdl +++ b/res/models/model/vehicle/waggon/cistern1895.mdl @@ -141,8 +141,8 @@ return { }, metadata = { description = { - name = _("Цистерна (1895)"), - description = _("Цистерна 1895") + name = _("Цистерна"), + description = _("Цистерна образца 1895 года, предназначенная для перевозки нефти и нефтепродуктов.") }, railVehicle = { topSpeed = 80.0, @@ -158,7 +158,7 @@ return { carrier = "RAIL", loadConfigs = { {{ type = "OIL", capacity = 48 }, - { type = "GOODS", capacity = 48 }} + } }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/cistern1919.mdl b/res/models/model/vehicle/waggon/cistern1919.mdl index 8953986..4632953 100644 --- a/res/models/model/vehicle/waggon/cistern1919.mdl +++ b/res/models/model/vehicle/waggon/cistern1919.mdl @@ -141,8 +141,8 @@ return { }, metadata = { description = { - name = _("Цистерна (1919)"), - description = _("Цистерна 1919") + name = _("Цистерна"), + description = _("Цистерна образца 1919 года, предназначенная для перевозки нефти и нефтепродуктов.") }, railVehicle = { topSpeed = 90.0, @@ -158,7 +158,7 @@ return { carrier = "RAIL", loadConfigs = { {{ type = "OIL", capacity = 52 }, - { type = "GOODS", capacity = 52 }} + } }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/cistern1933.mdl b/res/models/model/vehicle/waggon/cistern1933.mdl index e04b867..b5d4441 100644 --- a/res/models/model/vehicle/waggon/cistern1933.mdl +++ b/res/models/model/vehicle/waggon/cistern1933.mdl @@ -141,8 +141,8 @@ return { }, metadata = { description = { - name = _("Цистерна (1933)"), - description = _("Цистерна 1933") + name = _("Цистерна"), + description = _("Цистерна образца 1933 года, предназначенная для перевозки нефти и нефтепродуктов.") }, railVehicle = { topSpeed = 110.0, @@ -158,7 +158,7 @@ return { carrier = "RAIL", loadConfigs = { {{ type = "OIL", capacity = 56 }, - { type = "GOODS", capacity = 56 }} + } }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/hopper11715_bel.mdl b/res/models/model/vehicle/waggon/hopper11715_bel.mdl index 76c3c35..120e945 100644 --- a/res/models/model/vehicle/waggon/hopper11715_bel.mdl +++ b/res/models/model/vehicle/waggon/hopper11715_bel.mdl @@ -160,7 +160,7 @@ return { capacities = { { type = "COAL", capacity = 65 }, { type = "IRON_ORE", capacity = 65 }, - { type = "GOODS", capacity = 65 }, + }, loadSpeed = 2 }, diff --git a/res/models/model/vehicle/waggon/hopper11715_kor.mdl b/res/models/model/vehicle/waggon/hopper11715_kor.mdl index e3df9f7..944a9bb 100644 --- a/res/models/model/vehicle/waggon/hopper11715_kor.mdl +++ b/res/models/model/vehicle/waggon/hopper11715_kor.mdl @@ -160,7 +160,7 @@ return { capacities = { { type = "COAL", capacity = 65 }, { type = "IRON_ORE", capacity = 65 }, - { type = "GOODS", capacity = 65 }, + }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/hopper11715_zel.mdl b/res/models/model/vehicle/waggon/hopper11715_zel.mdl index bc4292a..942045e 100644 --- a/res/models/model/vehicle/waggon/hopper11715_zel.mdl +++ b/res/models/model/vehicle/waggon/hopper11715_zel.mdl @@ -160,7 +160,7 @@ return { capacities = { { type = "COAL", capacity = 65 }, { type = "IRON_ORE", capacity = 65 }, - { type = "GOODS", capacity = 65 }, + }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/hopper19752_kor.mdl b/res/models/model/vehicle/waggon/hopper19752_kor.mdl index b1c087d..6fe637b 100644 --- a/res/models/model/vehicle/waggon/hopper19752_kor.mdl +++ b/res/models/model/vehicle/waggon/hopper19752_kor.mdl @@ -160,7 +160,7 @@ return { capacities = { { type = "COAL", capacity = 80 }, { type = "IRON_ORE", capacity = 80 }, - { type = "GOODS", capacity = 80 }, + }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/hopper19752_sin.mdl b/res/models/model/vehicle/waggon/hopper19752_sin.mdl index 2e02788..cb7bf16 100644 --- a/res/models/model/vehicle/waggon/hopper19752_sin.mdl +++ b/res/models/model/vehicle/waggon/hopper19752_sin.mdl @@ -160,7 +160,7 @@ return { capacities = { { type = "COAL", capacity = 80 }, { type = "IRON_ORE", capacity = 80 }, - { type = "GOODS", capacity = 80 }, + }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/hopper199862_krac.mdl b/res/models/model/vehicle/waggon/hopper199862_krac.mdl index 319146b..0a5e963 100644 --- a/res/models/model/vehicle/waggon/hopper199862_krac.mdl +++ b/res/models/model/vehicle/waggon/hopper199862_krac.mdl @@ -160,7 +160,7 @@ return { capacities = { { type = "COAL", capacity = 65 }, { type = "IRON_ORE", capacity = 65 }, - { type = "GOODS", capacity = 65 }, + }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/hopper199862_zel.mdl b/res/models/model/vehicle/waggon/hopper199862_zel.mdl index 19679c1..88629f1 100644 --- a/res/models/model/vehicle/waggon/hopper199862_zel.mdl +++ b/res/models/model/vehicle/waggon/hopper199862_zel.mdl @@ -160,7 +160,7 @@ return { capacities = { { type = "COAL", capacity = 65 }, { type = "IRON_ORE", capacity = 65 }, - { type = "GOODS", capacity = 65 }, + }, loadSpeed = 3 }, diff --git a/res/models/model/vehicle/waggon/open12515.mdl b/res/models/model/vehicle/waggon/open12515.mdl index c94126d..4091266 100644 --- a/res/models/model/vehicle/waggon/open12515.mdl +++ b/res/models/model/vehicle/waggon/open12515.mdl @@ -268,16 +268,7 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 65, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14, 15, 16, 17, 18 }, - { 15, 16, 17, 18 }, - { 16, 17, 18 }, - { 17, 18 }, - { 18 }, - { }, - - } } } } } }, + }, {{type = "IRON_ORE", capacity = 65, loadIndicators = { { type = "DISCRETE", params = { levels = { @@ -290,32 +281,11 @@ return { --{ ... }, - - {type = "GOODS", capacity = 65, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14, 15, 16, 17, 18 }, - { 15, 16, 17, 18 }, - { 16, 17, 18 }, - { 17, 18 }, - { 18 }, - { }, - - } } } } } }, +}, --{ ... }, --{ ... }, - {{type = "OIL", capacity = 0 }, - - - {type = "GOODS", capacity = 65, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14, 15, 16, 17, 18 }, - { 15, 16, 17, 18 }, - { 16, 17, 18 }, - { 17, 18 }, - { 18 }, - { }, - } } } } } }, + --{ ... }, --{ ... }, @@ -331,14 +301,7 @@ return { - {type = "GOODS", capacity = 65, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 21, 22 }, - { 22 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/open127531.mdl b/res/models/model/vehicle/waggon/open127531.mdl index 25b9439..687bd9f 100644 --- a/res/models/model/vehicle/waggon/open127531.mdl +++ b/res/models/model/vehicle/waggon/open127531.mdl @@ -247,13 +247,7 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 69, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14, 15 }, - { 15 }, - { }, - - } } } } } }, + }, --{ ... }, --{ ... }, @@ -269,25 +263,11 @@ return { - {type = "GOODS", capacity = 69, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14, 15 }, - { 15 }, - { }, - - } } } } } }, + }, --{ ... }, --{ ... }, - {{type = "OIL", capacity = 0 }, - - - {type = "GOODS", capacity = 69, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14, 15 }, - { 15 }, - { }, { }, - } } } } } }, + --{ ... }, --{ ... }, @@ -303,14 +283,7 @@ return { - {type = "GOODS", capacity = 69, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 18, 19 }, - { 19 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/open127532.mdl b/res/models/model/vehicle/waggon/open127532.mdl index 45f9813..b7ca191 100644 --- a/res/models/model/vehicle/waggon/open127532.mdl +++ b/res/models/model/vehicle/waggon/open127532.mdl @@ -247,13 +247,7 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 69, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14, 15 }, - { 15 }, - { }, - - } } } } } }, + }, --{ ... }, --{ ... }, @@ -269,25 +263,11 @@ return { - {type = "GOODS", capacity = 69, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14, 15 }, - { 15 }, - { }, - - } } } } } }, + }, --{ ... }, --{ ... }, - {{type = "OIL", capacity = 0 }, - - - {type = "GOODS", capacity = 69, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14, 15 }, - { 15 }, - { }, { }, - } } } } } }, + --{ ... }, --{ ... }, @@ -303,14 +283,7 @@ return { - {type = "GOODS", capacity = 69, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 18, 19 }, - { 19 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/open127533.mdl b/res/models/model/vehicle/waggon/open127533.mdl index b31d5c1..844211e 100644 --- a/res/models/model/vehicle/waggon/open127533.mdl +++ b/res/models/model/vehicle/waggon/open127533.mdl @@ -247,13 +247,7 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 69, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14, 15 }, - { 15 }, - { }, - - } } } } } }, + }, --{ ... }, --{ ... }, @@ -268,25 +262,11 @@ return { --{ ... }, - {type = "GOODS", capacity = 69, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14, 15 }, - { 15 }, - { }, - - } } } } } }, + }, --{ ... }, --{ ... }, - {{type = "OIL", capacity = 0 }, - - - {type = "GOODS", capacity = 69, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14, 15 }, - { 15 }, - { }, { }, - } } } } } }, + --{ ... }, --{ ... }, @@ -302,14 +282,7 @@ return { - {type = "GOODS", capacity = 69, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 18, 19 }, - { 19 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/open1297661.mdl b/res/models/model/vehicle/waggon/open1297661.mdl index 3c01a16..6ff1a8e 100644 --- a/res/models/model/vehicle/waggon/open1297661.mdl +++ b/res/models/model/vehicle/waggon/open1297661.mdl @@ -240,13 +240,7 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, @@ -262,25 +256,11 @@ return { - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, - {{type = "OIL", capacity = 0 }, - - - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14 }, - { }, - { }, - } } } } } }, + --{ ... }, --{ ... }, @@ -296,14 +276,7 @@ return { - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 17, 18 }, - { 18 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/open1297662.mdl b/res/models/model/vehicle/waggon/open1297662.mdl index b211fa3..6ef097e 100644 --- a/res/models/model/vehicle/waggon/open1297662.mdl +++ b/res/models/model/vehicle/waggon/open1297662.mdl @@ -261,13 +261,7 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, @@ -283,25 +277,11 @@ return { - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, - {{type = "OIL", capacity = 0 }, - - - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14 }, - { }, - - } } } } } }, + --{ ... }, --{ ... }, @@ -318,17 +298,7 @@ return { - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 17, 18, 19, 20, 21 }, - { 18, 19, 20, 21, }, - { 19, 20, 21 }, - { 20, 21 }, - { 21 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/open1297663.mdl b/res/models/model/vehicle/waggon/open1297663.mdl index 5dad591..35de30d 100644 --- a/res/models/model/vehicle/waggon/open1297663.mdl +++ b/res/models/model/vehicle/waggon/open1297663.mdl @@ -240,13 +240,7 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, @@ -262,25 +256,11 @@ return { - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, - {{type = "OIL", capacity = 0 }, - - - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 14 }, - { }, - { }, - } } } } } }, + --{ ... }, --{ ... }, @@ -296,14 +276,7 @@ return { - {type = "GOODS", capacity = 70, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 17, 18 }, - { 18 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/pkv1860.mdl b/res/models/model/vehicle/waggon/pkv1860.mdl index 0b31a20..8971337 100644 --- a/res/models/model/vehicle/waggon/pkv1860.mdl +++ b/res/models/model/vehicle/waggon/pkv1860.mdl @@ -183,8 +183,8 @@ return { }, metadata = { description = { - name = _("Полувагон (1860)"), - description = _("Полувагон 1860") + name = _("Полувагон"), + description = _("Полувагон образца 1860 года, предназначенный для перевозки леса и сыпучих грузов.") }, railVehicle = { topSpeed = 80.0, @@ -232,14 +232,7 @@ return { - {type = "GOODS", capacity = 32, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 13 }, - { }, - - - - } } } } } }, + }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/pkv1875.mdl b/res/models/model/vehicle/waggon/pkv1875.mdl index 6fcbd2a..a6285a3 100644 --- a/res/models/model/vehicle/waggon/pkv1875.mdl +++ b/res/models/model/vehicle/waggon/pkv1875.mdl @@ -183,8 +183,8 @@ return { }, metadata = { description = { - name = _("Полувагон (1875)"), - description = _("Полувагон 1875") + name = _("Полувагон"), + description = _("Полувагон образца 1875 года, предназначенный для перевозки леса и сыпучих грузов.") }, railVehicle = { topSpeed = 80.0, @@ -232,14 +232,7 @@ return { - {type = "GOODS", capacity = 40, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 13 }, - { }, - - - - } } } } } }, + }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/pkv1900.mdl b/res/models/model/vehicle/waggon/pkv1900.mdl index 1b2a8d0..e7ac02f 100644 --- a/res/models/model/vehicle/waggon/pkv1900.mdl +++ b/res/models/model/vehicle/waggon/pkv1900.mdl @@ -183,8 +183,8 @@ return { }, metadata = { description = { - name = _("Полувагон (1900)"), - description = _("Полувагон 1900") + name = _("Полувагон"), + description = _("Полувагон образца 1900 года, предназначенный для перевозки леса и сыпучих грузов.") }, railVehicle = { topSpeed = 80.0, @@ -232,14 +232,7 @@ return { - {type = "GOODS", capacity = 48, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 15 }, - { }, - - - - } } } } } }, + }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/pkv1913.mdl b/res/models/model/vehicle/waggon/pkv1913.mdl index 22b78dd..f76dd29 100644 --- a/res/models/model/vehicle/waggon/pkv1913.mdl +++ b/res/models/model/vehicle/waggon/pkv1913.mdl @@ -190,8 +190,8 @@ return { }, metadata = { description = { - name = _("Полувагон (1913)"), - description = _("Полувагон 1913") + name = _("Полувагон"), + description = _("Полувагон образца 1913 года, предназначенный для перевозки леса и сыпучих грузов.") }, railVehicle = { topSpeed = 90.0, @@ -239,14 +239,7 @@ return { - {type = "GOODS", capacity = 55, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 15, 16 }, - { 16 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, diff --git a/res/models/model/vehicle/waggon/pkv1933.mdl b/res/models/model/vehicle/waggon/pkv1933.mdl index 684d90f..44849f1 100644 --- a/res/models/model/vehicle/waggon/pkv1933.mdl +++ b/res/models/model/vehicle/waggon/pkv1933.mdl @@ -234,7 +234,7 @@ return { description = { name = _("Полувагон (12П-153)"), description = _("Четырёхосный открытый вагон, \n" .. - "предназначенный для перевозки \n" .. + "предназначенный для перевозки леса \n" .. "и сыпучих грузов.") }, railVehicle = { @@ -261,17 +261,7 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 60, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 18, 19, 20, 21, 22 }, - { 19, 20, 21, 22 }, - { 20, 21, 22 }, - { 21, 22 }, - { 22 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... }, @@ -285,16 +275,7 @@ return { --{ ... }, --{ ... }, - {type = "GOODS", capacity = 60, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 18, 19, 20, 21, 22 }, - { 19, 20, 21, 22 }, - { 20, 21, 22 }, - { 21, 22 }, - { 22 }, - { }, - - } } } } } }, + }, --{ ... }, --{ ... }, @@ -310,14 +291,7 @@ return { - {type = "GOODS", capacity = 60, loadIndicators = { - { type = "DISCRETE", params = { levels = { - { 16, 17 }, - { 17 }, - { }, - - - } } } } } }, + }, --{ ... }, --{ ... },