Fix

George-VB · Dec 31, 2023 · 2e13dfc · 2e13dfc
1 parent 6ab107f
commit 2e13dfc
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 39 deletions.
diff --git a/lang/english.lng b/lang/english.lng
@@ -2317,6 +2317,7 @@ STR_PURCHASE_HINT_FACTORY_AMMENDORF                   :VEB Waggonbau Ammendorf (
 STR_PURCHASE_HINT_FACTORY_ARAD                        :The Wagons Factory of Arad (Romania)
 STR_PURCHASE_HINT_FACTORY_ASTANA                      :JSC Lokomotiv Kurastyru Zauyty (Astana, Kazakhstan)
 STR_PURCHASE_HINT_FACTORY_AVONSIDE                    :Avonside Engine Company (Bristol, England)
+STR_PURCHASE_HINT_FACTORY_AZOVMASH_A2023              :Azovmash ({PUSH_COLOUR}{CREAM}Production discontinued{POP_COLOUR})
 STR_PURCHASE_HINT_FACTORY_AZOVMASH_AUSSR              :Azovmash (Mariupol, Ukraine)
 STR_PURCHASE_HINT_FACTORY_AZOVMASH_OLD                :Mariupol works
 STR_PURCHASE_HINT_FACTORY_AZOVMASH_ZHDANOV            :Zhdanov heavy machinery plant
@@ -2445,6 +2446,7 @@ STR_PURCHASE_HINT_FACTORY_SORMOVO_A1922               :Krasnoe Sormovo (Nizhny N
 STR_PURCHASE_HINT_FACTORY_SORMOVO_A1932               :Krasnoe Sormovo (Gorky)
 STR_PURCHASE_HINT_FACTORY_SORMOVO_B1922               :Sormovo plant (Nizhny Novgorod)
 STR_PURCHASE_HINT_FACTORY_STAKHANOV_CBW               :Stakhanov railway car building works
+STR_PURCHASE_HINT_FACTORY_STAKHANOV_CBW_AMAIDAN       :Stakhanov railway car building works ({PUSH_COLOUR}{CREAM}Production discontinued{POP_COLOUR})
 STR_PURCHASE_HINT_FACTORY_STAKHANOV_CBW_AUSSR         :Stakhanov railway car building works (Ukraine)
 STR_PURCHASE_HINT_FACTORY_SVERDLOVSK_CRP              :Sverdlovsk car-repair plant
 STR_PURCHASE_HINT_FACTORY_TAMBOV                      :Ryazan-Ural railway workshops (Tambov)

diff --git a/lang/russian.lng b/lang/russian.lng
@@ -2293,6 +2293,7 @@ STR_PURCHASE_HINT_FACTORY_AMMENDORF                   :Ваггонбау Амм
 STR_PURCHASE_HINT_FACTORY_ARAD                        :Вагоностроительный завод Арада (Румыния)
 STR_PURCHASE_HINT_FACTORY_ASTANA                      :«Локомотив курастыру зауыты» (Астана, Казахстан)
 STR_PURCHASE_HINT_FACTORY_AVONSIDE                    :Завод Авонзид (Бристоль, Англия)
+STR_PURCHASE_HINT_FACTORY_AZOVMASH_A2023              :Азовмаш ({PUSH_COLOUR}{CREAM}завод прекратил производство{POP_COLOUR})
 STR_PURCHASE_HINT_FACTORY_AZOVMASH_AUSSR              :Азовмаш (Мариуполь, Украина)
 STR_PURCHASE_HINT_FACTORY_AZOVMASH_OLD                :Мариупольский завод
 STR_PURCHASE_HINT_FACTORY_AZOVMASH_ZHDANOV            :Ждановский завод тяжёлого машиностроения
@@ -2421,6 +2422,7 @@ STR_PURCHASE_HINT_FACTORY_SORMOVO_A1922               :Завод «Красно
 STR_PURCHASE_HINT_FACTORY_SORMOVO_A1932               :Завод «Красное Сормово» (Горький)
 STR_PURCHASE_HINT_FACTORY_SORMOVO_B1922               :Сормовский завод (Нижний Новгород)
 STR_PURCHASE_HINT_FACTORY_STAKHANOV_CBW               :Стахановский вагоностроительный завод
+STR_PURCHASE_HINT_FACTORY_STAKHANOV_CBW_AMAIDAN       :Стахановский вагоностроительный завод ({PUSH_COLOUR}{CREAM}завод прекратил производство{POP_COLOUR})
 STR_PURCHASE_HINT_FACTORY_STAKHANOV_CBW_AUSSR         :Стахановский вагоностроительный завод (Украина)
 STR_PURCHASE_HINT_FACTORY_SVERDLOVSK_CRP              :Свердловский вагоноремонтный завод
 STR_PURCHASE_HINT_FACTORY_TAMBOV                      :Вагонные мастерские Рязано-Уральской ЖД (Тамбов)

diff --git a/src/code-templates-strings.pnml b/src/code-templates-strings.pnml
@@ -2728,7 +2728,8 @@ switch (FEAT_TRAINS, SELF, name##_additional_text, current_year <= to)
 // Изменяемые названия предприятий
 #define fact_azovmach() (current_year < 1948 ? string(STR_PURCHASE_HINT_FACTORY_AZOVMASH_OLD)      :  \
                         (current_year < 1989 ? string(STR_PURCHASE_HINT_FACTORY_AZOVMASH_ZHDANOV)  :  \
-                                               string(STR_PURCHASE_HINT_FACTORY_AZOVMASH_AUSSR)))     \
+                         current_year < 2023 ? string(STR_PURCHASE_HINT_FACTORY_AZOVMASH_AUSSR)    :  \
+                                               string(STR_PURCHASE_HINT_FACTORY_AZOVMASH_A2023)))     \
 
 #define fact_baltiskysp() (current_year < 1991 ? string(STR_PURCHASE_HINT_FACTORY_BALTISKY_PLANT)  :       \
                                                   string(STR_PURCHASE_HINT_FACTORY_BALTISKY_PLANT_AUSSR))  \
@@ -2826,8 +2827,9 @@ switch (FEAT_TRAINS, SELF, name##_additional_text, current_year <= to)
                        (current_year < 1991 ? string(STR_PURCHASE_HINT_FACTORY_SORMOVO_A1932)  :  \
                                             string(STR_PURCHASE_HINT_FACTORY_SORMOVO_A1922))))    \
 
-#define fact_stakhanovcw() (current_year < USSREND ? string(STR_PURCHASE_HINT_FACTORY_STAKHANOV_CBW)  :      \
-                                                     string(STR_PURCHASE_HINT_FACTORY_STAKHANOV_CBW_AUSSR))  \
+#define fact_stakhanovcw() (current_year < USSREND ? string(STR_PURCHASE_HINT_FACTORY_STAKHANOV_CBW)        :  \
+                            current_year < 2014 ?    string(STR_PURCHASE_HINT_FACTORY_STAKHANOV_CBW_AUSSR)  :  \
+                                                     string(STR_PURCHASE_HINT_FACTORY_STAKHANOV_CBW_AMAIDAN))  \
 
 #define fact_tambov() (current_year < 1928 ? string(STR_PURCHASE_HINT_FACTORY_TAMBOV)        :  \
                       (current_year < 2008 ? string(STR_PURCHASE_HINT_FACTORY_TAMBOV_A1928)  :  \

diff --git a/src/wagons/gondolas/12-9046.pnml b/src/wagons/gondolas/12-9046.pnml
@@ -138,19 +138,19 @@ switch (FEAT_TRAINS, SELF, gondola_12_9046_running_cost_factor,
 name_in_group(gondola_12_9046, string(STR_NAME_IN_GROUP, string(STR_NAME_GONDOLAS_SERIES), string(STR_MODEL_NUMBER2, 12, 9046)),
                                string(STR_NAME_IN_GROUP, string(STR_NAME_GONDOLAS_SERIES), string(STR_LONGNAME_GONDOLA_12_9046)))
 
-hint_wagon_with_uspeed_noto(gondola_12_9046,
+hint_wagon_with_uspeed(gondola_12_9046,
      round(PROP_gondola_12_9046_LC), round(PROP_gondola_12_9046_VC),
      string(STR_PURCHASE_HINT_LOADING_SPEED_5TIC),
      string(STR_PURCHASE_HINT_LOADING_SPEED_2TIC),
      STR_PURCHASE_HINT_CAP_001_NORMAL,
      STR_PURCHASE_HINT_WAGON_TYPE_GONDOLA,
-     2004,
+     2004, 2014,
      fact_stakhanovcw())
 
 item (FEAT_TRAINS, gondola_12_9046, 492) {
   property {
     name: string(STR_MODEL_NUMBER2, 12, 9046);
-    vehicle_dates(2004, 2050, 22, 10, 7, PROP_gondola_12_9046_CF)
+    vehicle_dates(2004, 2014, 22, 10, 7, PROP_gondola_12_9046_CF)
     vehicle_wagon(PROP_gondola_12_9046_WT, PROP_gondola_12_9046_SD)
     vehicle_group(group_gondolas)
     cargo_allow_refit: [cargo_all_gondolalist()];

diff --git a/src/wagons/hoppers/17-486.pnml b/src/wagons/hoppers/17-486.pnml
@@ -34,19 +34,19 @@ switch (FEAT_TRAINS, SELF, hopper_17_486_loading_speed,
    STORE_TEMP(4 * SMALL_HATCH, 3)])  // 4 малых разгрузочных люка
 { all_wagons_hopper_loading_speed; }
 
-hint_wagon_with_uspeed_noto(hopper_17_486,
+hint_wagon_with_uspeed(hopper_17_486,
      52, 86,
      calc_loading(52 / (4 * LARGE_HATCH)),
      calc_loading(52 / (4 * SMALL_HATCH)),
      STR_PURCHASE_HINT_CAP_001_NORMAL,
      STR_PURCHASE_HINT_WAGON_TYPE_BUNKER,
-     1988,
+     1988, 2014,
      fact_stakhanovcw())
 
 item (FEAT_TRAINS, hopper_17_486, 617) {
   property {
     name: string(STR_MODEL_NUMBER2, 17, 486);
-    vehicle_dates(1988, 2050, 30, 10, 8, 77)
+    vehicle_dates(1988, 2014, 30, 10, 8, 77)
     vehicle_wagon(30, 120)
     cargo_allow_refit: [cargo_all_flour_bunkerlist()];
   }

diff --git a/src/wagons/hoppers/fert/19-923.pnml b/src/wagons/hoppers/fert/19-923.pnml
@@ -48,19 +48,19 @@ switch (FEAT_TRAINS, SELF, hopper_19_923_loading_speed,
 name_in_group(hopper_19_923, string(STR_NAME_IN_GROUP, string(STR_NAME_HOPPERS_FERT_SERIES), string(STR_MODEL_NUMBER2, 19, 923)),
                              string(STR_NAME_IN_GROUP, string(STR_NAME_HOPPERS_FERT_SERIES), string(STR_LONGNAME_HOPPER_19_923)))
 
-hint_wagon_with_uspeed_noto(hopper_19_923,
+hint_wagon_with_uspeed(hopper_19_923,
      round(PROP_hopper_19_923_LC), round(PROP_hopper_19_923_VC),
      calc_loading(PROP_hopper_19_923_LC / (4 * LARGE_HATCH)),
      calc_loading(PROP_hopper_19_923_LC / (4 * LARGE_HATCH)),
      STR_PURCHASE_HINT_CAP_001_NORMAL,
      STR_PURCHASE_HINT_WAGON_TYPE_HOPPER,
-     1988,
+     1988, 2014,
      fact_stakhanovcw())
 
 item (FEAT_TRAINS, hopper_19_923, 531) {
   property {
     name: string(STR_MODEL_NUMBER2, 19, 923);
-    vehicle_dates(1988, 2050, 26, 10, 7, PROP_hopper_19_923_CF)
+    vehicle_dates(1988, 2014, 26, 10, 7, PROP_hopper_19_923_CF)
     vehicle_wagon(PROP_hopper_19_923_WT, PROP_hopper_19_923_SD)
     vehicle_group(group_hoppers_fert)
     cargo_allow_refit: [cargo_all_fert_hopperlist()];

diff --git a/src/wagons/refrigerators/16-1807-04.pnml b/src/wagons/refrigerators/16-1807-04.pnml
@@ -55,18 +55,18 @@ switch (FEAT_TRAINS, SELF, refrigerator_16_1807_04_loading_speed,
 name_in_group(refrigerator_16_1807_04, string(STR_NAME_IN_GROUP, string(STR_NAME_REFRIGERATORS_SERIES), string(STR_MODEL_NUMBER3, 16, 1807, 4)),
                                        string(STR_NAME_IN_GROUP, string(STR_NAME_REFRIGERATORS_SERIES), string(STR_LONGNAME_REFRIGERATOR_16_1807_04)))
 
-hint_wagon_noto(refrigerator_16_1807_04,
+hint_wagon(refrigerator_16_1807_04,
           round(PROP_refrigerator_16_1807_04_LC), round(PROP_refrigerator_16_1807_04_VC),
           string(STR_PURCHASE_HINT_LOADING_SPEED_4TIC),
           STR_PURCHASE_HINT_CAP_002_SLIGHTLY_SLOW,
           STR_PURCHASE_HINT_WAGON_TYPE_REFRIGERATOR_THERMOS,
-          2011,
+          2011, 2023,
           fact_azovmach())
 
 item (FEAT_TRAINS, refrigerator_16_1807_04, 414) {
   property {
     name: string(STR_MODEL_NUMBER3, 16, 1807, 4);
-    vehicle_dates(2011, 2050, 25, 10, 8, PROP_refrigerator_16_1807_04_CF)
+    vehicle_dates(2011, 2023, 25, 10, 8, PROP_refrigerator_16_1807_04_CF)
     vehicle_wagon(PROP_refrigerator_16_1807_04_WT, PROP_refrigerator_16_1807_04_SD)
     vehicle_group(group_refrigerators)
     cargo_allow_refit: [cargo_all_reflist()];

diff --git a/src/wagons/tankers/bulk/15-1405-02.pnml b/src/wagons/tankers/bulk/15-1405-02.pnml
@@ -48,19 +48,19 @@ switch (FEAT_TRAINS, SELF, tanker_15_1405_02_running_cost_factor,
 name_in_group(tanker_15_1405_02, string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_BULK_SERIES), string(STR_MODEL_NUMBER3, 15, 1405, 2)),
                                  string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_BULK_SERIES), string(STR_LONGNAME_TANKER_15_1405_02)))
 
-hint_wagon_with_uspeed_noto(tanker_15_1405_02,
+hint_wagon_with_uspeed(tanker_15_1405_02,
      round(PROP_tanker_15_1405_02_LC), round(PROP_tanker_15_1405_02_VC),
      calc_loading(61 / (15)),
      calc_loading(61 / (5)),
      STR_PURCHASE_HINT_CAP_001_NORMAL,
      STR_PURCHASE_HINT_WAGON_TYPE_TANK_BULK,
-     1993,
+     1993, 2023,
      fact_azovmach())
 
 item (FEAT_TRAINS, tanker_15_1405_02, 562) {
   property {
     name: string(STR_MODEL_NUMBER3, 15, 1405, 2);
-    vehicle_dates(1993, 2050, 28, 10, 6, PROP_tanker_15_1405_02_CF)
+    vehicle_dates(1993, 2023, 28, 10, 6, PROP_tanker_15_1405_02_CF)
     vehicle_wagon(PROP_tanker_15_1405_02_WT, PROP_tanker_15_1405_02_SD)
     vehicle_group(group_tankers_bulk)
     cargo_allow_refit: [cargo_all_bulk_cargo_tanker()];

diff --git a/src/wagons/tankers/bulk/15-1449.pnml b/src/wagons/tankers/bulk/15-1449.pnml
@@ -48,19 +48,19 @@ switch (FEAT_TRAINS, SELF, tanker_15_1449_running_cost_factor,
 name_in_group(tanker_15_1449, string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_BULK_SERIES), string(STR_MODEL_NUMBER2, 15, 1449)),
                               string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_BULK_SERIES), string(STR_LONGNAME_TANKER_15_1449)))
 
-hint_wagon_with_uspeed_noto(tanker_15_1449,
+hint_wagon_with_uspeed(tanker_15_1449,
      round(PROP_tanker_15_1449_LC), round(PROP_tanker_15_1449_VC),
      calc_loading(62 / (15)),
      calc_loading(62 / (5)),
      STR_PURCHASE_HINT_CAP_001_NORMAL,
      STR_PURCHASE_HINT_WAGON_TYPE_TANK_BULK,
-     1989,
+     1989, 2023,
      fact_azovmach())
 
 item (FEAT_TRAINS, tanker_15_1449, 563) {
   property {
     name: string(STR_MODEL_NUMBER2, 15, 1449);
-    vehicle_dates(1989, 2050, 28, 10, 8, PROP_tanker_15_1449_CF)
+    vehicle_dates(1989, 2023, 28, 10, 8, PROP_tanker_15_1449_CF)
     vehicle_wagon(PROP_tanker_15_1449_WT, PROP_tanker_15_1449_SD)
     vehicle_group(group_tankers_bulk)
     default_cargo_type: SASH;

diff --git a/src/wagons/tankers/bulk/15-c853.pnml b/src/wagons/tankers/bulk/15-c853.pnml
@@ -48,19 +48,19 @@ switch (FEAT_TRAINS, SELF, tanker_15_c853_running_cost_factor,
 name_in_group(tanker_15_c853, string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_BULK_SERIES), string(STR_NAME_TANKER_15_C853)),
                               string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_BULK_SERIES), string(STR_LONGNAME_TANKER_15_C853)))
 
-hint_wagon_with_uspeed_noto(tanker_15_c853,
+hint_wagon_with_uspeed(tanker_15_c853,
      round(PROP_tanker_15_c853_LC), round(PROP_tanker_15_c853_VC),
      calc_loading(58 / (15)),
      calc_loading(58 / (5)),
      STR_PURCHASE_HINT_CAP_001_NORMAL,
      STR_PURCHASE_HINT_WAGON_TYPE_TANK_BULK,
-     1961,
+     1961, 2023,
      fact_azovmach())
 
 item (FEAT_TRAINS, tanker_15_c853, 696) {
   property {
     name: string(STR_NAME_TANKER_15_C853);
-    vehicle_dates(1961, 2050, 28, 10, 6, PROP_tanker_15_c853_CF)
+    vehicle_dates(1961, 2023, 28, 10, 6, PROP_tanker_15_c853_CF)
     vehicle_wagon(PROP_tanker_15_c853_WT, PROP_tanker_15_c853_SD)
     vehicle_group(group_tankers_bulk)
     default_cargo_type: SASH;

diff --git a/src/wagons/tankers/chem/15-1482-05.pnml b/src/wagons/tankers/chem/15-1482-05.pnml
@@ -48,18 +48,18 @@ switch (FEAT_TRAINS, SELF, tanker_15_1482_05_running_cost_factor,
 name_in_group(tanker_15_1482_05, string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_CHEM_SERIES), string(STR_MODEL_NUMBER3, 15, 1482, 05)),
                                  string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_CHEM_SERIES), string(STR_LONGNAME_TANKER_15_1482_05)))
 
-hint_wagon_with_uspeed_noto(tanker_15_1482_05,
+hint_wagon_with_uspeed(tanker_15_1482_05,
           round(PROP_tanker_15_1482_05_LC), round(PROP_tanker_15_1482_05_VC),
           string(STR_PURCHASE_HINT_LOADING_SPEED_4TIC), string(STR_PURCHASE_HINT_LOADING_SPEED_4TIC),
           STR_PURCHASE_HINT_CAP_001_NORMAL,
           STR_PURCHASE_HINT_WAGON_TYPE_TANK,
-          1994,
+          1994, 2023,
           fact_azovmach())
 
 item (FEAT_TRAINS, tanker_15_1482_05, 686) {
   property {
     name: string(STR_MODEL_NUMBER3, 15, 1482, 05);
-    vehicle_dates(1994, 2050, 24, 10, 6, PROP_tanker_15_1482_05_CF)
+    vehicle_dates(1994, 2023, 24, 10, 6, PROP_tanker_15_1482_05_CF)
     vehicle_wagon(PROP_tanker_15_1482_05_WT, PROP_tanker_15_1482_05_SD)
     vehicle_group(group_tankers_chem)
     cargo_allow_refit: [cargo_all_chem_dang_tanker()];

diff --git a/src/wagons/tankers/chem/15-1487-01.pnml b/src/wagons/tankers/chem/15-1487-01.pnml
@@ -48,18 +48,18 @@ switch (FEAT_TRAINS, SELF, tanker_15_1487_01_running_cost_factor,
 name_in_group(tanker_15_1487_01, string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_CHEM_SERIES), string(STR_MODEL_NUMBER3, 15, 1487, 1)),
                                  string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_CHEM_SERIES), string(STR_LONGNAME_TANKER_15_1487_01)))
 
-hint_wagon_with_uspeed_noto(tanker_15_1487_01,
+hint_wagon_with_uspeed(tanker_15_1487_01,
                 round(PROP_tanker_15_1487_01_LC), round(PROP_tanker_15_1487_01_VC),
                 string(STR_PURCHASE_HINT_LOADING_SPEED_4TIC), string(STR_PURCHASE_HINT_LOADING_SPEED_4TIC),
                 STR_PURCHASE_HINT_CAP_001_NORMAL,
                 STR_PURCHASE_HINT_WAGON_TYPE_TANK,
-                1995,
+                1995, 2023,
                 fact_azovmach())
 
 item (FEAT_TRAINS, tanker_15_1487_01, 592) {
   property {
     name: string(STR_MODEL_NUMBER3, 15, 1487, 1);
-    vehicle_dates(1995, 2050, 20, 10, 6, PROP_tanker_15_1487_01_CF)
+    vehicle_dates(1995, 2023, 20, 10, 6, PROP_tanker_15_1487_01_CF)
     vehicle_wagon(PROP_tanker_15_1487_01_WT, PROP_tanker_15_1487_01_SD)
     vehicle_group(group_tankers_chem)
     cargo_allow_refit: [cargo_all_chem_gen_tanker()];

diff --git a/src/wagons/tankers/gas/15-1556-03.pnml b/src/wagons/tankers/gas/15-1556-03.pnml
@@ -48,18 +48,18 @@ switch (FEAT_TRAINS, SELF, tanker_15_1556_03_running_cost_factor,
 name_in_group(tanker_15_1556_03, string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_GAS_SERIES), string(STR_MODEL_NUMBER3, 15, 1556, 3)),
                                  string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_GAS_SERIES), string(STR_LONGNAME_TANKER_15_1556_03)))
 
-hint_wagon_with_uspeed_noto(tanker_15_1556_03,
+hint_wagon_with_uspeed(tanker_15_1556_03,
            round(PROP_tanker_15_1556_03_LC), round(PROP_tanker_15_1556_03_VC),
            string(STR_PURCHASE_HINT_LOADING_SPEED_4TIC), string(STR_PURCHASE_HINT_LOADING_SPEED_4TIC),
            STR_PURCHASE_HINT_CAP_001_NORMAL,
            STR_PURCHASE_HINT_WAGON_TYPE_TANK,
-           1996,
+           1996, 2023,
            fact_azovmach())
 
 item (FEAT_TRAINS, tanker_15_1556_03, 594) {
   property {
     name: string(STR_MODEL_NUMBER3, 15, 1556, 3);
-    vehicle_dates(1996, 2050, 24, 10, 6, PROP_tanker_15_1556_03_CF)
+    vehicle_dates(1996, 2023, 24, 10, 6, PROP_tanker_15_1556_03_CF)
     vehicle_wagon(PROP_tanker_15_1556_03_WT, PROP_tanker_15_1556_03_SD)
     vehicle_group(group_tankers_gas)
     cargo_allow_refit: [cargo_all_gas_chem_tanker()];

diff --git a/src/wagons/tankers/gas/15-1597-01.pnml b/src/wagons/tankers/gas/15-1597-01.pnml
@@ -48,18 +48,18 @@ switch (FEAT_TRAINS, SELF, tanker_15_1597_01_running_cost_factor,
 name_in_group(tanker_15_1597_01, string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_GAS_SERIES), string(STR_MODEL_NUMBER3, 15, 1597, 1)),
                                  string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_GAS_SERIES), string(STR_LONGNAME_TANKER_15_1597_01)))
 
-hint_wagon_with_uspeed_noto(tanker_15_1597_01,
+hint_wagon_with_uspeed(tanker_15_1597_01,
            round(PROP_tanker_15_1597_01_LC), round(PROP_tanker_15_1597_01_VC),
            string(STR_PURCHASE_HINT_LOADING_SPEED_4TIC), string(STR_PURCHASE_HINT_LOADING_SPEED_4TIC),
            STR_PURCHASE_HINT_CAP_001_NORMAL,
            STR_PURCHASE_HINT_WAGON_TYPE_TANK,
-           1995,
+           1995, 2023,
            fact_azovmach())
 
 item (FEAT_TRAINS, tanker_15_1597_01, 637) {
   property {
     name: string(STR_MODEL_NUMBER3, 15, 1597, 1);
-    vehicle_dates(1995, 2050, 40, 10, 6, PROP_tanker_15_1597_01_CF)
+    vehicle_dates(1995, 2023, 40, 10, 6, PROP_tanker_15_1597_01_CF)
     vehicle_wagon(PROP_tanker_15_1597_01_WT, PROP_tanker_15_1597_01_SD)
     vehicle_group(group_tankers_gas)
     cargo_allow_refit: [cargo_all_gas_chem_tanker()];

diff --git a/src/wagons/tankers/petrol/15-1500.pnml b/src/wagons/tankers/petrol/15-1500.pnml
@@ -59,18 +59,18 @@ switch (FEAT_TRAINS, SELF, tanker_15_1500_running_cost_factor,
 name_in_group(tanker_15_1500, string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_PETROL_SERIES), string(STR_MODEL_NUMBER2, 15, 1500)),
                               string(STR_NAME_IN_GROUP, string(STR_NAME_TANKERS_PETROL_SERIES), string(STR_LONGNAME_TANKER_15_1500)))
 
-hint_wagon_with_uspeed_noto(tanker_15_1500,
+hint_wagon_with_uspeed(tanker_15_1500,
                 round(PROP_tanker_15_1500_LC), round(PROP_tanker_15_1500_VC),
                 string(STR_PURCHASE_HINT_LOADING_SPEED_5TIC), string(STR_PURCHASE_HINT_LOADING_SPEED_5TIC),
                 STR_PURCHASE_HINT_CAP_001_NORMAL,
                 STR_PURCHASE_HINT_WAGON_TYPE_TANK,
-                1988,
+                1988, 2023,
                 fact_azovmach())
 
 item (FEAT_TRAINS, tanker_15_1500, 605) {
   property {
     name: string(STR_MODEL_NUMBER2, 15, 1500);
-    vehicle_dates(1988, 2050, 32, 10, 8, PROP_tanker_15_1500_CF)
+    vehicle_dates(1988, 2023, 32, 10, 8, PROP_tanker_15_1500_CF)
     vehicle_wagon(PROP_tanker_15_1500_WT, PROP_tanker_15_1500_SD)
     vehicle_group(group_tankers_petrol)
     cargo_allow_refit: [cargo_all_petr_tanker()];