From 49f3e7214381fb0ffc21c6046fbe36f17412a2c5 Mon Sep 17 00:00:00 2001 From: George Date: Wed, 24 Apr 2024 03:01:49 +0300 Subject: [PATCH] #238 United wagons and cars. WIP --- compile.bat | 2 +- src/PNMLs_usage | 522 +++++++++++++++--------------- src/cars/cars-header.pnml | 2 + src/code-templates.pnml | 6 + src/electric/electric-header.pnml | 3 - src/header.pnml | 65 +++- src/wagons/wagons-cargos.pnml | 31 ++ src/wagons/wagons-header.pnml | 2 + src/wagons/wagons-list.pnml | 231 +++++++++++++ src/wagons/wagons-sort-order.pnml | 11 +- src/wagons/wagons-xussr.pnml | 273 +--------------- src/xussr.pnml | 9 + 12 files changed, 611 insertions(+), 546 deletions(-) create mode 100644 src/wagons/wagons-cargos.pnml create mode 100644 src/wagons/wagons-list.pnml diff --git a/compile.bat b/compile.bat index 6846a3ae8..0e0149932 100644 --- a/compile.bat +++ b/compile.bat @@ -92,7 +92,7 @@ goto :EOF :WriteCustomTags echo VERSION :%REPO_REVISION% echo MIN_COMPATIBLE_REVISION:%MIN_COMPATIBLE_REVISION% -echo TITLE :xUSSR Railway Set 0.9-dev.r%REPO_REVISION% +echo TITLE :xUSSR Railway Set 0.8.2.r%REPO_REVISION% echo FILENAME :%NMLNAME%.grf goto :EOF diff --git a/src/PNMLs_usage b/src/PNMLs_usage index 8e1c8eecd..67d6de56b 100644 --- a/src/PNMLs_usage +++ b/src/PNMLs_usage @@ -362,7 +362,7 @@ src/diesel/vme1-group.pnml -> (src/diesel/diesel-xussr.pnml) src/diesel/vme1-type1958.pnml -> (src/diesel/diesel-xussr.pnml) src/diesel/vme1-type1959.pnml -> (src/diesel/diesel-xussr.pnml) src/diesel/vme1-type1961_use.pnml -> (src/diesel/diesel-xussr.pnml) -src/disable-origin.pnml -> (src/cars/cars-xussr.pnml), (src/diesel/diesel-xussr.pnml), (src/dmu/dmu-xussr.pnml), (src/electric/electric-xussr.pnml), (src/emu/emu-xussr.pnml), (src/steam/steam-xussr.pnml), (src/subway/subway-xussr.pnml), (src/wagons/wagons-xussr.pnml), (src/xussr.pnml) +src/disable-origin.pnml -> (src/cars/cars-xussr.pnml), (src/diesel/diesel-xussr.pnml), (src/dmu/dmu-xussr.pnml), (src/electric/electric-xussr.pnml), (src/emu/emu-xussr.pnml), (src/steam/steam-xussr.pnml), (src/subway/subway-xussr.pnml), (src/xussr.pnml) src/dmu/ach2-group.pnml -> (src/dmu/dmu-xussr.pnml) src/dmu/ach2.pnml -> (src/dmu/dmu-xussr.pnml) src/dmu/as1a.pnml -> (src/dmu/dmu-xussr.pnml) @@ -969,32 +969,32 @@ src/subway/subway-sort-order.pnml -> (src/subway/subway-xussr.pnml) src/subway/subway-xussr.pnml -> (src/subway/subway-xussr.pnml) src/template.pnml -> (src/addon/xussr-addon.pnml), (src/cars/cars-xussr.pnml), (src/diesel/diesel-xussr.pnml), (src/dmu/dmu-xussr.pnml), (src/electric/electric-xussr.pnml), (src/emu/emu-xussr.pnml), (src/steam/steam-xussr.pnml), (src/wagons/wagons-xussr.pnml), (src/xussr.pnml) src/template_v2.pnml -> (src/subway/subway-xussr.pnml) -src/wagons/boxcars/11-066-type1960.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/11-066-type1979_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/11-1807.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/11-2135-01_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/11-2135.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/11-217.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/11-270.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/11-274.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/11-280.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/11-38.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/11-k251-type1948.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/11-k251-type1957.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/boxcars-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/livestock/11-240.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/livestock/11-261.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/livestock/11-c001.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/livestock/11-k253.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/livestock/boxcars-lvst-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/type1846.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/type1875_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/type1891.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/type1905_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/type1911.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/type1925.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/boxcars/type1926can.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes-all.pnml -> (src/addon/xussr-addon.pnml), (src/cars/cars-xussr.pnml), (src/electric/electric-xussr.pnml), (src/emu/emu-xussr.pnml), (src/wagons/wagons-xussr.pnml) +src/wagons/boxcars/11-066-type1960.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/11-066-type1979_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/11-1807.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/11-2135-01_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/11-2135.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/11-217.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/11-270.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/11-274.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/11-280.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/11-38.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/11-k251-type1948.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/11-k251-type1957.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/boxcars-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/livestock/11-240.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/livestock/11-261.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/livestock/11-c001.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/livestock/11-k253.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/livestock/boxcars-lvst-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/type1846.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/type1875_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/type1891.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/type1905_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/type1911.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/type1925.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/boxcars/type1926can.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/cargoes-all.pnml -> (src/addon/xussr-addon.pnml), (src/cars/cars-xussr.pnml), (src/electric/electric-xussr.pnml), (src/emu/emu-xussr.pnml), (src/wagons/wagons-cargos.pnml) src/wagons/cargoes-capacity-box.pnml -> (src/addon/xussr-addon.pnml), (src/emu/emu-xussr.pnml), (src/wagons/cargoes-capacity.pnml) src/wagons/cargoes-capacity-cont.pnml -> (src/wagons/cargoes-capacity.pnml) src/wagons/cargoes-capacity-flatbed.pnml -> (src/wagons/cargoes-capacity.pnml) @@ -1002,245 +1002,247 @@ src/wagons/cargoes-capacity-gondola.pnml -> (src/electric/electric-xussr.pnml), src/wagons/cargoes-capacity-hopper.pnml -> (src/wagons/cargoes-capacity.pnml) src/wagons/cargoes-capacity-ref.pnml -> (src/wagons/cargoes-capacity.pnml) src/wagons/cargoes-capacity-tank.pnml -> (src/wagons/cargoes-capacity.pnml) -src/wagons/cargoes-capacity.pnml -> (src/cars/cars-xussr.pnml), (src/wagons/wagons-xussr.pnml) +src/wagons/cargoes-capacity.pnml -> (src/cars/cars-xussr.pnml), (src/wagons/wagons-cargos.pnml) src/wagons/cargoes-loadspeed-box.pnml -> (src/addon/xussr-addon.pnml), (src/cars/cars-xussr.pnml), (src/emu/emu-xussr.pnml), (src/wagons/cargoes-loadspeed.pnml) src/wagons/cargoes-loadspeed-cont.pnml -> (src/wagons/cargoes-loadspeed.pnml) src/wagons/cargoes-loadspeed-flatbed.pnml -> (src/electric/electric-xussr.pnml), (src/wagons/cargoes-loadspeed.pnml) src/wagons/cargoes-loadspeed-hopper.pnml -> (src/wagons/cargoes-loadspeed.pnml) src/wagons/cargoes-loadspeed-tank.pnml -> (src/wagons/cargoes-loadspeed.pnml) -src/wagons/cargoes-loadspeed.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes-open-templates.pnml -> (src/electric/electric-xussr.pnml), (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes-refit.pnml -> (src/cars/cars-xussr.pnml), (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes-weight.pnml -> (src/cars/cars-xussr.pnml), (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes10/cargoes.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes11/cargoes.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes12/cargoes.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes12/container/containers.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes13/cargoes.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes14/cargoes.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes5/cargoes-flatbed.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes5/cargoes.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes6/cargoes-flatbed.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes6/cargoes-gondola.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes6/cargoes.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes7/cargoes-gondola.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes8/cargoes-crates.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes8/cargoes-flatbed.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes8/cargoes-gondola.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes8/cargoes.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes8/container/containers.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes9/cargoes-flatbed.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes9/cargoes-gondola.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/cargoes9/cargoes.pnml -> (src/wagons/wagons-xussr.pnml) +src/wagons/cargoes-loadspeed.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes-open-templates.pnml -> (src/electric/electric-xussr.pnml), (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes-refit.pnml -> (src/cars/cars-xussr.pnml), (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes-weight.pnml -> (src/cars/cars-xussr.pnml), (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes10/cargoes.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes11/cargoes.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes12/cargoes.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes12/container/containers.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes13/cargoes.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes14/cargoes.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes5/cargoes-flatbed.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes5/cargoes.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes6/cargoes-flatbed.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes6/cargoes-gondola.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes6/cargoes.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes7/cargoes-gondola.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes8/cargoes-crates.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes8/cargoes-flatbed.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes8/cargoes-gondola.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes8/cargoes.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes8/container/containers.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes9/cargoes-flatbed.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes9/cargoes-gondola.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/cargoes9/cargoes.pnml -> (src/wagons/wagons-cargos.pnml) src/wagons/cargoes9/cargoes7_9/cargoes-gondola.pnml -> (src/electric/electric-xussr.pnml) -src/wagons/cargoes9/container/containers.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/13-36-use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/13-401-type1964.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/13-401-type1971_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/13-401-type1978_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/13-401-type1980_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/13-4012-type1985.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/13-4012-type1992_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/13-4012-type2019_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/13-9808.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/13-n451-use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/13-n453-use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/container/11-n004.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/container/13-470.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/container/13-6954.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/container/13-9004-type1986.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/container/13-9004-type1987_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/container/flatbeds-cont-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/dumpcar/31-634-type1967.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/dumpcar/31-634-type1974_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/dumpcar/31-638-type1971.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/dumpcar/31-638-type1978.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/dumpcar/31-673.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/dumpcar/33-677.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/dumpcar/4vs-50.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/dumpcar/dumpcars-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/dumpcar/vs-50.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/flatbeds-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/type1846.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/type1881.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/type1892.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/type1902.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/type1909_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/type1911_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/type1923.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/type1930.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/wood/13-198-02.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/wood/13-9744.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/wood/23-4000-type1979.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/wood/23-4000-type1980_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/wood/23-4000-type1984_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/flatbeds/wood/flatbeds-wood-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-119.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-132.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-141.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-196-01.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-37.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-515-type1964.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-515-type1977_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-532-type1973.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-532-type1978.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-532-type1979.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-532-type1985_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-726-type1968.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-726-type1974_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-757-type1987.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-757-type1993.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-9046.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-9869.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-p001.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/12-p153.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/gondolas-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/type1914.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/gondolas/type1935.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/cement/11-715-type1964.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/cement/11-715-type1965.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/cement/11-715-type1968.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/cement/11-715-type1972.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/cement/11-715-type1976.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/cement/19-758.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/cement/19-x752.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/cement/20-403.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/cement/25-4001.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/cement/25-4046.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/cement/hoppers-cement-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/fert/11-740.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/fert/19-6978-01_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/fert/19-7017.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/fert/19-923.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/fert/19-9870.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/fert/hoppers-fert-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/grain/11-739.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/grain/19-6978.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/grain/19-7017-03_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/grain/19-752.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/grain/19-756.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/grain/19-9870-01_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/hoppers/grain/hoppers-grain-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/16-1807-04.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/mk4-417.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/mk4-420.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/mk4-424-type1971.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/mk4-424-type1977.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/refrigerators-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/rs1-type1965.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/rs1-type1973_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/rs4-type1979.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/rs4-type1983_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/rs5.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/th-4-200.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/type1862_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/type1895.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/type1905.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/type1928.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/type1932.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/type1937-fruit.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/type1937.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/type1948-fruit.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/type1948.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/type1951.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/type1954.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/type1955.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/refrigerators/v-41.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/special/11-259.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/special/13-4107.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/special/17-486.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/special/17-917.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/special/22-4024.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/special/22-473.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/special/special-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/special/tk8.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/special/type1934.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/15-c862-type1953.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/15-c862-type1957.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/bulk/15-1405-02.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/bulk/15-1405-type1961.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/bulk/15-1405-type1977_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/bulk/15-1405-type1992.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/bulk/15-1449.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/bulk/15-884.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/bulk/15-c853.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/bulk/tankers-bulk-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/15-1404.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/15-1482-05.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/15-1482-type1978.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/15-1482-type1981_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/15-1482-type1989_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/15-1487-01.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/15-1487-type1980.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/15-1487-type1989_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/15-1532-type1973.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/15-1532-type1978_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/15-1547-22-type1988.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/15-1547-22-type1993.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/tankers-chem-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/chem/type1931acid.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/food/15-1219-1p.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/food/15-1443p.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/food/15-1522.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/food/15-1593.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/food/15-886.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/food/15-c858.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/food/15-c863p.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/food/tankers-food-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/food/type1858w.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/food/type1892w_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/food/type1908w_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/gas/15-1208.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/gas/15-1408.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/gas/15-1556-03.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/gas/15-1556.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/gas/15-1597-01.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/gas/15-1597.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/gas/15-558s-04.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/gas/8g52.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/gas/902r.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/gas/903r.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/gas/908r.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/gas/tankers-gas-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/gas/type1935cryo.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/oil/15-031.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/oil/15-1210-01.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/oil/15-1566-type1974.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/oil/15-1566-type1975_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/oil/15-1566-type1980_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/oil/15-1566-type1989_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/oil/15-5157-04.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/oil/15-897.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/oil/15-c863.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/oil/tankers-oil-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/oil/type1872o.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/oil/type1889o_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/oil/type1910o.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/petrol/15-1443.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/petrol/15-1500.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/petrol/15-1547-03.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/petrol/15-1547-type1983.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/petrol/15-1547-type1993.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/petrol/15-289.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/petrol/15-871.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/petrol/tankers-petrol-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/petrol/type1875p.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/petrol/type1885p_use.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/petrol/type1908p.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/tankers-gen-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/type1927.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/type1931.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/type1932.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/type1936.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/tankers/type1945.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/vehicles/11-1291.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/vehicles/11-835.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/vehicles/11-k651.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/vehicles/13-479.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/vehicles/vehicles-group.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/wagon2.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/wagons-code-templates-lv-pred.pnml -> (src/wagons/wagons-xussr.pnml) +src/wagons/cargoes9/container/containers.pnml -> (src/wagons/wagons-cargos.pnml) +src/wagons/flatbeds/13-36-use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/13-401-type1964.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/13-401-type1971_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/13-401-type1978_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/13-401-type1980_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/13-4012-type1985.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/13-4012-type1992_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/13-4012-type2019_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/13-9808.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/13-n451-use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/13-n453-use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/container/11-n004.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/container/13-470.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/container/13-6954.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/container/13-9004-type1986.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/container/13-9004-type1987_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/container/flatbeds-cont-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/dumpcar/31-634-type1967.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/dumpcar/31-634-type1974_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/dumpcar/31-638-type1971.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/dumpcar/31-638-type1978.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/dumpcar/31-673.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/dumpcar/33-677.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/dumpcar/4vs-50.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/dumpcar/dumpcars-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/dumpcar/vs-50.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/flatbeds-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/type1846.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/type1881.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/type1892.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/type1902.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/type1909_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/type1911_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/type1923.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/type1930.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/wood/13-198-02.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/wood/13-9744.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/wood/23-4000-type1979.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/wood/23-4000-type1980_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/wood/23-4000-type1984_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/flatbeds/wood/flatbeds-wood-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-119.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-132.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-141.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-196-01.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-37.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-515-type1964.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-515-type1977_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-532-type1973.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-532-type1978.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-532-type1979.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-532-type1985_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-726-type1968.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-726-type1974_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-757-type1987.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-757-type1993.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-9046.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-9869.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-p001.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/12-p153.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/gondolas-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/type1914.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/gondolas/type1935.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/cement/11-715-type1964.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/cement/11-715-type1965.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/cement/11-715-type1968.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/cement/11-715-type1972.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/cement/11-715-type1976.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/cement/19-758.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/cement/19-x752.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/cement/20-403.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/cement/25-4001.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/cement/25-4046.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/cement/hoppers-cement-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/fert/11-740.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/fert/19-6978-01_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/fert/19-7017.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/fert/19-923.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/fert/19-9870.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/fert/hoppers-fert-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/grain/11-739.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/grain/19-6978.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/grain/19-7017-03_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/grain/19-752.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/grain/19-756.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/grain/19-9870-01_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/hoppers/grain/hoppers-grain-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/16-1807-04.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/mk4-417.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/mk4-420.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/mk4-424-type1971.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/mk4-424-type1977.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/refrigerators-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/rs1-type1965.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/rs1-type1973_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/rs4-type1979.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/rs4-type1983_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/rs5.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/th-4-200.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/type1862_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/type1895.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/type1905.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/type1928.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/type1932.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/type1937-fruit.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/type1937.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/type1948-fruit.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/type1948.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/type1951.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/type1954.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/type1955.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/refrigerators/v-41.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/special/11-259.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/special/13-4107.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/special/17-486.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/special/17-917.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/special/22-4024.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/special/22-473.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/special/special-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/special/tk8.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/special/type1934.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/15-c862-type1953.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/15-c862-type1957.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/bulk/15-1405-02.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/bulk/15-1405-type1961.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/bulk/15-1405-type1977_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/bulk/15-1405-type1992.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/bulk/15-1449.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/bulk/15-884.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/bulk/15-c853.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/bulk/tankers-bulk-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/15-1404.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/15-1482-05.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/15-1482-type1978.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/15-1482-type1981_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/15-1482-type1989_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/15-1487-01.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/15-1487-type1980.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/15-1487-type1989_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/15-1532-type1973.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/15-1532-type1978_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/15-1547-22-type1988.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/15-1547-22-type1993.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/tankers-chem-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/chem/type1931acid.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/food/15-1219-1p.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/food/15-1443p.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/food/15-1522.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/food/15-1593.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/food/15-886.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/food/15-c858.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/food/15-c863p.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/food/tankers-food-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/food/type1858w.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/food/type1892w_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/food/type1908w_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/gas/15-1208.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/gas/15-1408.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/gas/15-1556-03.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/gas/15-1556.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/gas/15-1597-01.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/gas/15-1597.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/gas/15-558s-04.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/gas/8g52.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/gas/902r.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/gas/903r.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/gas/908r.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/gas/tankers-gas-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/gas/type1935cryo.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/oil/15-031.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/oil/15-1210-01.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/oil/15-1566-type1974.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/oil/15-1566-type1975_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/oil/15-1566-type1980_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/oil/15-1566-type1989_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/oil/15-5157-04.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/oil/15-897.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/oil/15-c863.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/oil/tankers-oil-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/oil/type1872o.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/oil/type1889o_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/oil/type1910o.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/petrol/15-1443.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/petrol/15-1500.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/petrol/15-1547-03.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/petrol/15-1547-type1983.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/petrol/15-1547-type1993.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/petrol/15-289.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/petrol/15-871.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/petrol/tankers-petrol-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/petrol/type1875p.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/petrol/type1885p_use.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/petrol/type1908p.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/tankers-gen-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/type1927.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/type1931.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/type1932.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/type1936.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/tankers/type1945.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/vehicles/11-1291.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/vehicles/11-835.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/vehicles/11-k651.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/vehicles/13-479.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/vehicles/vehicles-group.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/wagon2.pnml -> (src/wagons/wagons-list.pnml) +src/wagons/wagons-cargos.pnml -> (src/wagons/wagons-xussr.pnml), (src/xussr.pnml) +src/wagons/wagons-code-templates-lv-pred.pnml -> (src/wagons/wagons-cargos.pnml) src/wagons/wagons-header.pnml -> (src/wagons/wagons-xussr.pnml) -src/wagons/wagons-sort-order.pnml -> (src/wagons/wagons-xussr.pnml) +src/wagons/wagons-list.pnml -> (src/wagons/wagons-xussr.pnml), (src/xussr.pnml) +src/wagons/wagons-sort-order.pnml -> (src/wagons/wagons-xussr.pnml), (src/xussr.pnml) src/wagons/wagons-xussr.pnml -> (src/wagons/wagons-xussr.pnml) src/xussr.pnml -> (src/xussr.pnml) diff --git a/src/cars/cars-header.pnml b/src/cars/cars-header.pnml index 498021f71..a4175f5f4 100644 --- a/src/cars/cars-header.pnml +++ b/src/cars/cars-header.pnml @@ -75,3 +75,5 @@ grf } } + +disable_car = 0; diff --git a/src/code-templates.pnml b/src/code-templates.pnml index e67364a9a..fd8761f27 100644 --- a/src/code-templates.pnml +++ b/src/code-templates.pnml @@ -337,6 +337,12 @@ if (disable_acdcemu) { item (FEAT_TRAINS, name) { property { climates_available: #define allow_subway(name) \ if (disable_subway) { item (FEAT_TRAINS, name) { property { climates_available: NO_CLIMATE; } } } \ +#define allow_wagon(name) \ +if (disable_wagon) { item (FEAT_TRAINS, name) { property { climates_available: NO_CLIMATE; } } } \ + +#define allow_car(name) \ +if (disable_car) { item (FEAT_TRAINS, name) { property { climates_available: NO_CLIMATE; } } } \ + // Special cargo support #define use_yeti(name, cargo_allow_refit_list) \ if (yeti_on) { item (FEAT_TRAINS, name) { property { cargo_allow_refit: [cargo_allow_refit_list]; } } } \ diff --git a/src/electric/electric-header.pnml b/src/electric/electric-header.pnml index 0642f17ac..ae509b188 100644 --- a/src/electric/electric-header.pnml +++ b/src/electric/electric-header.pnml @@ -47,7 +47,6 @@ grf def_value: 15; } } - param 5 { new_costs @@ -67,7 +66,6 @@ grf }; } } - param 4 { new_rcosts @@ -87,7 +85,6 @@ grf }; } } - param 2 { disable_acelectric diff --git a/src/header.pnml b/src/header.pnml index b3c569eef..95b578ea3 100644 --- a/src/header.pnml +++ b/src/header.pnml @@ -26,35 +26,80 @@ grf bit: 7; def_value: 0; } + disable_groups + { + name: string(STR_PARAM_DISABLE_GROUPS_NAME); + desc: string(STR_PARAM_DISABLE_GROUPS_DESC); + type: bool; + bit: 4; + def_value: 0; + } } - param 4 + param 1 + { + speed_penalty_percent + { + type: int; + name: string(STR_PARAM_SPEED_PENALTY_PERCENT_NAME); + desc: string(STR_PARAM_SPEED_PENALTY_PERCENT_DESC); + min_value: 0; + max_value: 50; + def_value: 15; + } + } + param 2 { new_costs { type: int; - name: string(STR_PARAM_RCBASE_NAME); - desc: string(STR_PARAM_RCBASE_DESC); + name: string(STR_PARAM_CBASE_NAME); + desc: string(STR_PARAM_CBASE_DESC); min_value: 0; - max_value: 2; + max_value: 3; def_value: 0; names: { 0: string(STR_PARAM_BASE_DEFAULT); 1: string(STR_PARAM_BASE_HALVED); 2: string(STR_PARAM_BASE_QUARTERED); + 3: string(STR_PARAM_BASE_EIGHT); }; } } - param 1 + param 3 { - speed_penalty_percent + new_rcosts { type: int; - name: string(STR_PARAM_SPEED_PENALTY_PERCENT_NAME); - desc: string(STR_PARAM_SPEED_PENALTY_PERCENT_DESC); + name: string(STR_PARAM_RCBASE_NAME); + desc: string(STR_PARAM_RCBASE_DESC); min_value: 0; - max_value: 50; - def_value: 15; + max_value: 3; + def_value: 0; + names: + { + 0: string(STR_PARAM_BASE_DEFAULT); + 1: string(STR_PARAM_BASE_HALVED); + 2: string(STR_PARAM_BASE_QUARTERED); + 3: string(STR_PARAM_BASE_EIGHT); + }; } } } + +#define anystate(GRF_ID) \ +grf_future_status(GRF_ID) || \ +grf_current_status(GRF_ID) \ + +disable_wagon = 0; +if (anystate("Meo\B7")) +{ + disable_wagon = 1; +} + +disable_car = 0; +if (anystate("Meo\B8")) +{ + disable_car = 1; +} + diff --git a/src/wagons/wagons-cargos.pnml b/src/wagons/wagons-cargos.pnml new file mode 100644 index 000000000..4e7e114d8 --- /dev/null +++ b/src/wagons/wagons-cargos.pnml @@ -0,0 +1,31 @@ +// Заголовок грузов +#include "cargoes-all.pnml" +#include "wagons-code-templates-lv-pred.pnml" +#include "cargoes-open-templates.pnml" + +// Грузы для грузовых вагонов +#include "cargoes-capacity.pnml" +#include "cargoes-refit.pnml" +#include "cargoes-loadspeed.pnml" +#include "cargoes-weight.pnml" +#include "cargoes5/cargoes.pnml" +#include "cargoes5/cargoes-flatbed.pnml" +#include "cargoes6/cargoes.pnml" +#include "cargoes6/cargoes-gondola.pnml" +#include "cargoes6/cargoes-flatbed.pnml" +#include "cargoes7/cargoes-gondola.pnml" +#include "cargoes8/cargoes-crates.pnml" +#include "cargoes8/cargoes.pnml" +#include "cargoes8/cargoes-gondola.pnml" +#include "cargoes8/cargoes-flatbed.pnml" +#include "cargoes8/container/containers.pnml" +#include "cargoes9/cargoes.pnml" +#include "cargoes9/cargoes-gondola.pnml" +#include "cargoes9/cargoes-flatbed.pnml" +#include "cargoes9/container/containers.pnml" +#include "cargoes10/cargoes.pnml" +#include "cargoes11/cargoes.pnml" +#include "cargoes12/cargoes.pnml" +#include "cargoes12/container/containers.pnml" +#include "cargoes13/cargoes.pnml" +#include "cargoes14/cargoes.pnml" diff --git a/src/wagons/wagons-header.pnml b/src/wagons/wagons-header.pnml index 89870f21a..63b0912b9 100644 --- a/src/wagons/wagons-header.pnml +++ b/src/wagons/wagons-header.pnml @@ -75,3 +75,5 @@ grf } } + +disable_wagon = 0; diff --git a/src/wagons/wagons-list.pnml b/src/wagons/wagons-list.pnml new file mode 100644 index 000000000..90407d850 --- /dev/null +++ b/src/wagons/wagons-list.pnml @@ -0,0 +1,231 @@ +// Вагоны грузовые +#include "vehicles/11-835.pnml" +#include "vehicles/11-1291.pnml" +#include "vehicles/11-k651.pnml" +#include "vehicles/13-479.pnml" +#include "vehicles/vehicles-group.pnml" +#include "boxcars/livestock/11-240.pnml" +#include "boxcars/livestock/11-261.pnml" +#include "boxcars/livestock/11-c001.pnml" +#include "boxcars/livestock/11-k253.pnml" +#include "boxcars/livestock/boxcars-lvst-group.pnml" +#include "boxcars/11-066-type1960.pnml" +#include "boxcars/11-066-type1979_use.pnml" +#include "boxcars/11-1807.pnml" +#include "boxcars/11-2135.pnml" +#include "boxcars/11-2135-01_use.pnml" +#include "boxcars/11-217.pnml" +#include "boxcars/11-270.pnml" +#include "boxcars/11-274.pnml" +#include "boxcars/11-280.pnml" +#include "boxcars/11-38.pnml" +#include "boxcars/11-k251-type1948.pnml" +#include "boxcars/11-k251-type1957.pnml" +#include "boxcars/type1926can.pnml" +#include "boxcars/type1891.pnml" +#include "boxcars/type1905_use.pnml" +#include "boxcars/type1911.pnml" +#include "boxcars/type1875_use.pnml" +#include "boxcars/type1925.pnml" +#include "boxcars/type1846.pnml" +#include "boxcars/boxcars-group.pnml" +#include "flatbeds/container/11-n004.pnml" +#include "flatbeds/container/13-6954.pnml" +#include "flatbeds/container/13-9004-type1986.pnml" +#include "flatbeds/container/13-9004-type1987_use.pnml" +#include "flatbeds/container/13-470.pnml" +#include "flatbeds/container/flatbeds-cont-group.pnml" +#include "flatbeds/dumpcar/31-634-type1967.pnml" +#include "flatbeds/dumpcar/31-634-type1974_use.pnml" +#include "flatbeds/dumpcar/31-638-type1971.pnml" +#include "flatbeds/dumpcar/31-638-type1978.pnml" +#include "flatbeds/dumpcar/31-673.pnml" +#include "flatbeds/dumpcar/33-677.pnml" +#include "flatbeds/dumpcar/4vs-50.pnml" +#include "flatbeds/dumpcar/vs-50.pnml" +#include "flatbeds/dumpcar/dumpcars-group.pnml" +#include "flatbeds/wood/23-4000-type1979.pnml" +#include "flatbeds/wood/23-4000-type1980_use.pnml" +#include "flatbeds/wood/23-4000-type1984_use.pnml" +#include "flatbeds/wood/13-198-02.pnml" +#include "flatbeds/wood/13-9744.pnml" +#include "flatbeds/wood/flatbeds-wood-group.pnml" +#include "flatbeds/13-401-type1964.pnml" +#include "flatbeds/13-401-type1971_use.pnml" +#include "flatbeds/13-401-type1978_use.pnml" +#include "flatbeds/13-401-type1980_use.pnml" +#include "flatbeds/13-4012-type1985.pnml" +#include "flatbeds/13-4012-type1992_use.pnml" +#include "flatbeds/13-4012-type2019_use.pnml" +#include "flatbeds/13-9808.pnml" +#include "flatbeds/type1930.pnml" +#include "flatbeds/type1846.pnml" +#include "flatbeds/type1881.pnml" +#include "flatbeds/type1892.pnml" +#include "flatbeds/type1902.pnml" +#include "flatbeds/type1909_use.pnml" +#include "flatbeds/type1911_use.pnml" +#include "flatbeds/type1923.pnml" +#include "flatbeds/13-n451-use.pnml" +#include "flatbeds/13-n453-use.pnml" +#include "flatbeds/13-36-use.pnml" +#include "flatbeds/flatbeds-group.pnml" +#include "gondolas/12-119.pnml" +#include "gondolas/12-132.pnml" +#include "gondolas/12-141.pnml" +#include "gondolas/12-196-01.pnml" +#include "gondolas/12-37.pnml" +#include "gondolas/12-515-type1964.pnml" +#include "gondolas/12-515-type1977_use.pnml" +#include "gondolas/12-532-type1973.pnml" +#include "gondolas/12-532-type1978.pnml" +#include "gondolas/12-532-type1979.pnml" +#include "gondolas/12-532-type1985_use.pnml" +#include "gondolas/12-726-type1968.pnml" +#include "gondolas/12-726-type1974_use.pnml" +#include "gondolas/12-757-type1987.pnml" +#include "gondolas/12-757-type1993.pnml" +#include "gondolas/12-9046.pnml" +#include "gondolas/12-9869.pnml" +#include "gondolas/12-p001.pnml" +#include "gondolas/12-p153.pnml" +#include "gondolas/type1914.pnml" +#include "gondolas/type1935.pnml" +#include "gondolas/gondolas-group.pnml" +#include "hoppers/grain/11-739.pnml" +#include "hoppers/grain/19-752.pnml" +#include "hoppers/grain/19-756.pnml" +#include "hoppers/grain/19-6978.pnml" +#include "hoppers/cement/11-715-type1964.pnml" +#include "hoppers/cement/11-715-type1965.pnml" +#include "hoppers/cement/11-715-type1968.pnml" +#include "hoppers/cement/11-715-type1972.pnml" +#include "hoppers/cement/11-715-type1976.pnml" +#include "hoppers/cement/20-403.pnml" +#include "hoppers/cement/25-4001.pnml" +#include "hoppers/cement/25-4046.pnml" +#include "hoppers/cement/19-x752.pnml" +#include "hoppers/cement/19-758.pnml" +#include "hoppers/cement/hoppers-cement-group.pnml" +#include "hoppers/fert/11-740.pnml" +#include "hoppers/fert/19-7017.pnml" +#include "hoppers/grain/19-7017-03_use.pnml" +#include "hoppers/fert/19-9870.pnml" +#include "hoppers/grain/19-9870-01_use.pnml" +#include "hoppers/fert/19-6978-01_use.pnml" +#include "hoppers/fert/19-923.pnml" +#include "hoppers/fert/hoppers-fert-group.pnml" +#include "hoppers/grain/hoppers-grain-group.pnml" +#include "refrigerators/16-1807-04.pnml" +#include "refrigerators/mk4-417.pnml" +#include "refrigerators/mk4-420.pnml" +#include "refrigerators/mk4-424-type1971.pnml" +#include "refrigerators/mk4-424-type1977.pnml" +#include "refrigerators/rs1-type1965.pnml" +#include "refrigerators/rs1-type1973_use.pnml" +#include "refrigerators/rs4-type1979.pnml" +#include "refrigerators/rs4-type1983_use.pnml" +#include "refrigerators/rs5.pnml" +#include "refrigerators/th-4-200.pnml" +#include "refrigerators/v-41.pnml" +#include "refrigerators/type1895.pnml" +#include "refrigerators/type1862_use.pnml" +#include "refrigerators/type1905.pnml" +#include "refrigerators/type1932.pnml" +#include "refrigerators/type1928.pnml" +#include "refrigerators/type1937.pnml" +#include "refrigerators/type1937-fruit.pnml" +#include "refrigerators/type1948.pnml" +#include "refrigerators/type1948-fruit.pnml" +#include "refrigerators/type1951.pnml" +#include "refrigerators/type1954.pnml" +#include "refrigerators/type1955.pnml" +#include "refrigerators/refrigerators-group.pnml" +#include "tankers/bulk/15-1405-type1961.pnml" +#include "tankers/bulk/15-1405-type1992.pnml" +#include "tankers/bulk/15-1405-type1977_use.pnml" +#include "tankers/bulk/15-1405-02.pnml" +#include "tankers/bulk/15-1449.pnml" +#include "tankers/bulk/15-884.pnml" +#include "tankers/bulk/15-c853.pnml" +#include "tankers/bulk/tankers-bulk-group.pnml" +#include "tankers/chem/15-1404.pnml" +#include "tankers/chem/15-1482-type1978.pnml" +#include "tankers/chem/15-1482-type1981_use.pnml" +#include "tankers/chem/15-1482-type1989_use.pnml" +#include "tankers/chem/15-1482-05.pnml" +#include "tankers/chem/15-1487-type1980.pnml" +#include "tankers/chem/15-1487-type1989_use.pnml" +#include "tankers/chem/15-1487-01.pnml" +#include "tankers/chem/15-1532-type1973.pnml" +#include "tankers/chem/15-1532-type1978_use.pnml" +#include "tankers/chem/15-1547-22-type1988.pnml" +#include "tankers/chem/15-1547-22-type1993.pnml" +#include "tankers/chem/type1931acid.pnml" +#include "tankers/chem/tankers-chem-group.pnml" +#include "tankers/food/15-1219-1p.pnml" +#include "tankers/food/15-1443p.pnml" +#include "tankers/food/15-1522.pnml" +#include "tankers/food/15-1593.pnml" +#include "tankers/food/15-886.pnml" +#include "tankers/food/15-c858.pnml" +#include "tankers/food/15-c863p.pnml" +#include "tankers/food/type1858w.pnml" +#include "tankers/food/type1892w_use.pnml" +#include "tankers/food/type1908w_use.pnml" +#include "tankers/food/tankers-food-group.pnml" +#include "tankers/gas/15-1208.pnml" +#include "tankers/gas/15-1408.pnml" +#include "tankers/gas/15-1556.pnml" +#include "tankers/gas/15-1556-03.pnml" +#include "tankers/gas/15-1597.pnml" +#include "tankers/gas/15-1597-01.pnml" +#include "tankers/gas/15-558s-04.pnml" +#include "tankers/gas/8g52.pnml" +#include "tankers/gas/902r.pnml" +#include "tankers/gas/903r.pnml" +#include "tankers/gas/908r.pnml" +#include "tankers/gas/type1935cryo.pnml" +#include "tankers/gas/tankers-gas-group.pnml" +#include "tankers/oil/15-031.pnml" +#include "tankers/oil/15-1210-01.pnml" +#include "tankers/oil/15-1566-type1974.pnml" +#include "tankers/oil/15-1566-type1975_use.pnml" +#include "tankers/oil/15-1566-type1980_use.pnml" +#include "tankers/oil/15-1566-type1989_use.pnml" +#include "tankers/oil/15-5157-04.pnml" +#include "tankers/oil/15-897.pnml" +#include "tankers/oil/15-c863.pnml" +#include "tankers/oil/type1872o.pnml" +#include "tankers/oil/type1889o_use.pnml" +#include "tankers/oil/type1910o.pnml" +#include "tankers/oil/tankers-oil-group.pnml" +#include "tankers/petrol/15-1443.pnml" +#include "tankers/petrol/15-1500.pnml" +#include "tankers/petrol/15-1547-type1983.pnml" +#include "tankers/petrol/15-1547-type1993.pnml" +#include "tankers/petrol/15-1547-03.pnml" +#include "tankers/petrol/15-289.pnml" +#include "tankers/petrol/15-871.pnml" +#include "tankers/petrol/type1875p.pnml" +#include "tankers/petrol/type1885p_use.pnml" +#include "tankers/petrol/type1908p.pnml" +#include "tankers/petrol/tankers-petrol-group.pnml" +#include "tankers/15-c862-type1953.pnml" +#include "tankers/15-c862-type1957.pnml" +#include "tankers/type1927.pnml" +#include "tankers/type1932.pnml" +#include "tankers/type1936.pnml" +#include "tankers/type1931.pnml" +#include "tankers/type1945.pnml" +#include "tankers/tankers-gen-group.pnml" +#include "wagon2.pnml" +#include "special/22-4024.pnml" +#include "special/22-473.pnml" +#include "special/type1934.pnml" +#include "special/11-259.pnml" +#include "special/17-917.pnml" +#include "special/17-486.pnml" +#include "special/13-4107.pnml" +#include "special/tk8.pnml" +#include "special/special-group.pnml" diff --git a/src/wagons/wagons-sort-order.pnml b/src/wagons/wagons-sort-order.pnml index 37de36a41..548e3621b 100644 --- a/src/wagons/wagons-sort-order.pnml +++ b/src/wagons/wagons-sort-order.pnml @@ -1,12 +1,4 @@ - /// sort_vehicles - -// Задаём порядок следования ID ПС для классической сортировки меню покупки -// независимо от порядка включения файлов и декларирования описателей ПС -sort (FEAT_TRAINS, -[ -// модельки - dummy1, dummy2, dummy3, dummy4, dummy5, dummy6, dummy7, -// Крытые вагоны +// Крытые вагоны group_boxcars, boxcar_type1846, boxcar_type1875, boxcar_type1891, boxcar_type1905, boxcar_type1911, boxcar_type1926can, boxcar_type1925, boxcar_11_38, boxcar_11_k251_type1948, boxcar_11_k251_type1957, boxcar_11_066_type1960, boxcar_11_066_type1979, boxcar_11_217, boxcar_11_270, boxcar_11_274, boxcar_11_280, boxcar_11_1807, boxcar_11_2135, boxcar_11_2135_01, @@ -85,4 +77,3 @@ sort (FEAT_TRAINS, gondola_type1934, gondola_22_473, // Полувагоны для руды gondola_22_4024, -]); diff --git a/src/wagons/wagons-xussr.pnml b/src/wagons/wagons-xussr.pnml index 866c537fa..0ba356bf8 100644 --- a/src/wagons/wagons-xussr.pnml +++ b/src/wagons/wagons-xussr.pnml @@ -3,7 +3,6 @@ #include "wagons-header.pnml" #include "../check.pnml" #include "../basecost.pnml" -// #include "../disable-origin.pnml" #include "../cargotable.pnml" #include "../railtypetable.pnml" #include "../definition.pnml" @@ -26,269 +25,19 @@ #include "../graph-templates-wagons.pnml" #include "../graph-templates-mu.pnml" #include "../graph-templates-containers.pnml" -// Заголовок грузов -#include "cargoes-all.pnml" -#include "wagons-code-templates-lv-pred.pnml" -#include "cargoes-open-templates.pnml" -// Грузы для грузовых вагонов -#include "cargoes-capacity.pnml" -#include "cargoes-refit.pnml" -#include "cargoes-loadspeed.pnml" -#include "cargoes-weight.pnml" -#include "cargoes5/cargoes.pnml" -#include "cargoes5/cargoes-flatbed.pnml" -#include "cargoes6/cargoes.pnml" -#include "cargoes6/cargoes-gondola.pnml" -#include "cargoes6/cargoes-flatbed.pnml" -#include "cargoes7/cargoes-gondola.pnml" -#include "cargoes8/cargoes-crates.pnml" -#include "cargoes8/cargoes.pnml" -#include "cargoes8/cargoes-gondola.pnml" -#include "cargoes8/cargoes-flatbed.pnml" -#include "cargoes8/container/containers.pnml" -#include "cargoes9/cargoes.pnml" -#include "cargoes9/cargoes-gondola.pnml" -#include "cargoes9/cargoes-flatbed.pnml" -#include "cargoes9/container/containers.pnml" -#include "cargoes10/cargoes.pnml" -#include "cargoes11/cargoes.pnml" -#include "cargoes12/cargoes.pnml" -#include "cargoes12/container/containers.pnml" -#include "cargoes13/cargoes.pnml" -#include "cargoes14/cargoes.pnml" -// Вагоны грузовые -#include "vehicles/11-835.pnml" -#include "vehicles/11-1291.pnml" -#include "vehicles/11-k651.pnml" -#include "vehicles/13-479.pnml" -#include "vehicles/vehicles-group.pnml" -#include "boxcars/livestock/11-240.pnml" -#include "boxcars/livestock/11-261.pnml" -#include "boxcars/livestock/11-c001.pnml" -#include "boxcars/livestock/11-k253.pnml" -#include "boxcars/livestock/boxcars-lvst-group.pnml" -#include "boxcars/11-066-type1960.pnml" -#include "boxcars/11-066-type1979_use.pnml" -#include "boxcars/11-1807.pnml" -#include "boxcars/11-2135.pnml" -#include "boxcars/11-2135-01_use.pnml" -#include "boxcars/11-217.pnml" -#include "boxcars/11-270.pnml" -#include "boxcars/11-274.pnml" -#include "boxcars/11-280.pnml" -#include "boxcars/11-38.pnml" -#include "boxcars/11-k251-type1948.pnml" -#include "boxcars/11-k251-type1957.pnml" -#include "boxcars/type1926can.pnml" -#include "boxcars/type1891.pnml" -#include "boxcars/type1905_use.pnml" -#include "boxcars/type1911.pnml" -#include "boxcars/type1875_use.pnml" -#include "boxcars/type1925.pnml" -#include "boxcars/type1846.pnml" -#include "boxcars/boxcars-group.pnml" -#include "flatbeds/container/11-n004.pnml" -#include "flatbeds/container/13-6954.pnml" -#include "flatbeds/container/13-9004-type1986.pnml" -#include "flatbeds/container/13-9004-type1987_use.pnml" -#include "flatbeds/container/13-470.pnml" -#include "flatbeds/container/flatbeds-cont-group.pnml" -#include "flatbeds/dumpcar/31-634-type1967.pnml" -#include "flatbeds/dumpcar/31-634-type1974_use.pnml" -#include "flatbeds/dumpcar/31-638-type1971.pnml" -#include "flatbeds/dumpcar/31-638-type1978.pnml" -#include "flatbeds/dumpcar/31-673.pnml" -#include "flatbeds/dumpcar/33-677.pnml" -#include "flatbeds/dumpcar/4vs-50.pnml" -#include "flatbeds/dumpcar/vs-50.pnml" -#include "flatbeds/dumpcar/dumpcars-group.pnml" -#include "flatbeds/wood/23-4000-type1979.pnml" -#include "flatbeds/wood/23-4000-type1980_use.pnml" -#include "flatbeds/wood/23-4000-type1984_use.pnml" -#include "flatbeds/wood/13-198-02.pnml" -#include "flatbeds/wood/13-9744.pnml" -#include "flatbeds/wood/flatbeds-wood-group.pnml" -#include "flatbeds/13-401-type1964.pnml" -#include "flatbeds/13-401-type1971_use.pnml" -#include "flatbeds/13-401-type1978_use.pnml" -#include "flatbeds/13-401-type1980_use.pnml" -#include "flatbeds/13-4012-type1985.pnml" -#include "flatbeds/13-4012-type1992_use.pnml" -#include "flatbeds/13-4012-type2019_use.pnml" -#include "flatbeds/13-9808.pnml" -#include "flatbeds/type1930.pnml" -#include "flatbeds/type1846.pnml" -#include "flatbeds/type1881.pnml" -#include "flatbeds/type1892.pnml" -#include "flatbeds/type1902.pnml" -#include "flatbeds/type1909_use.pnml" -#include "flatbeds/type1911_use.pnml" -#include "flatbeds/type1923.pnml" -#include "flatbeds/13-n451-use.pnml" -#include "flatbeds/13-n453-use.pnml" -#include "flatbeds/13-36-use.pnml" -#include "flatbeds/flatbeds-group.pnml" -#include "gondolas/12-119.pnml" -#include "gondolas/12-132.pnml" -#include "gondolas/12-141.pnml" -#include "gondolas/12-196-01.pnml" -#include "gondolas/12-37.pnml" -#include "gondolas/12-515-type1964.pnml" -#include "gondolas/12-515-type1977_use.pnml" -#include "gondolas/12-532-type1973.pnml" -#include "gondolas/12-532-type1978.pnml" -#include "gondolas/12-532-type1979.pnml" -#include "gondolas/12-532-type1985_use.pnml" -#include "gondolas/12-726-type1968.pnml" -#include "gondolas/12-726-type1974_use.pnml" -#include "gondolas/12-757-type1987.pnml" -#include "gondolas/12-757-type1993.pnml" -#include "gondolas/12-9046.pnml" -#include "gondolas/12-9869.pnml" -#include "gondolas/12-p001.pnml" -#include "gondolas/12-p153.pnml" -#include "gondolas/type1914.pnml" -#include "gondolas/type1935.pnml" -#include "gondolas/gondolas-group.pnml" -#include "hoppers/grain/11-739.pnml" -#include "hoppers/grain/19-752.pnml" -#include "hoppers/grain/19-756.pnml" -#include "hoppers/grain/19-6978.pnml" -#include "hoppers/cement/11-715-type1964.pnml" -#include "hoppers/cement/11-715-type1965.pnml" -#include "hoppers/cement/11-715-type1968.pnml" -#include "hoppers/cement/11-715-type1972.pnml" -#include "hoppers/cement/11-715-type1976.pnml" -#include "hoppers/cement/20-403.pnml" -#include "hoppers/cement/25-4001.pnml" -#include "hoppers/cement/25-4046.pnml" -#include "hoppers/cement/19-x752.pnml" -#include "hoppers/cement/19-758.pnml" -#include "hoppers/cement/hoppers-cement-group.pnml" -#include "hoppers/fert/11-740.pnml" -#include "hoppers/fert/19-7017.pnml" -#include "hoppers/grain/19-7017-03_use.pnml" -#include "hoppers/fert/19-9870.pnml" -#include "hoppers/grain/19-9870-01_use.pnml" -#include "hoppers/fert/19-6978-01_use.pnml" -#include "hoppers/fert/19-923.pnml" -#include "hoppers/fert/hoppers-fert-group.pnml" -#include "hoppers/grain/hoppers-grain-group.pnml" -#include "refrigerators/16-1807-04.pnml" -#include "refrigerators/mk4-417.pnml" -#include "refrigerators/mk4-420.pnml" -#include "refrigerators/mk4-424-type1971.pnml" -#include "refrigerators/mk4-424-type1977.pnml" -#include "refrigerators/rs1-type1965.pnml" -#include "refrigerators/rs1-type1973_use.pnml" -#include "refrigerators/rs4-type1979.pnml" -#include "refrigerators/rs4-type1983_use.pnml" -#include "refrigerators/rs5.pnml" -#include "refrigerators/th-4-200.pnml" -#include "refrigerators/v-41.pnml" -#include "refrigerators/type1895.pnml" -#include "refrigerators/type1862_use.pnml" -#include "refrigerators/type1905.pnml" -#include "refrigerators/type1932.pnml" -#include "refrigerators/type1928.pnml" -#include "refrigerators/type1937.pnml" -#include "refrigerators/type1937-fruit.pnml" -#include "refrigerators/type1948.pnml" -#include "refrigerators/type1948-fruit.pnml" -#include "refrigerators/type1951.pnml" -#include "refrigerators/type1954.pnml" -#include "refrigerators/type1955.pnml" -#include "refrigerators/refrigerators-group.pnml" -#include "tankers/bulk/15-1405-type1961.pnml" -#include "tankers/bulk/15-1405-type1992.pnml" -#include "tankers/bulk/15-1405-type1977_use.pnml" -#include "tankers/bulk/15-1405-02.pnml" -#include "tankers/bulk/15-1449.pnml" -#include "tankers/bulk/15-884.pnml" -#include "tankers/bulk/15-c853.pnml" -#include "tankers/bulk/tankers-bulk-group.pnml" -#include "tankers/chem/15-1404.pnml" -#include "tankers/chem/15-1482-type1978.pnml" -#include "tankers/chem/15-1482-type1981_use.pnml" -#include "tankers/chem/15-1482-type1989_use.pnml" -#include "tankers/chem/15-1482-05.pnml" -#include "tankers/chem/15-1487-type1980.pnml" -#include "tankers/chem/15-1487-type1989_use.pnml" -#include "tankers/chem/15-1487-01.pnml" -#include "tankers/chem/15-1532-type1973.pnml" -#include "tankers/chem/15-1532-type1978_use.pnml" -#include "tankers/chem/15-1547-22-type1988.pnml" -#include "tankers/chem/15-1547-22-type1993.pnml" -#include "tankers/chem/type1931acid.pnml" -#include "tankers/chem/tankers-chem-group.pnml" -#include "tankers/food/15-1219-1p.pnml" -#include "tankers/food/15-1443p.pnml" -#include "tankers/food/15-1522.pnml" -#include "tankers/food/15-1593.pnml" -#include "tankers/food/15-886.pnml" -#include "tankers/food/15-c858.pnml" -#include "tankers/food/15-c863p.pnml" -#include "tankers/food/type1858w.pnml" -#include "tankers/food/type1892w_use.pnml" -#include "tankers/food/type1908w_use.pnml" -#include "tankers/food/tankers-food-group.pnml" -#include "tankers/gas/15-1208.pnml" -#include "tankers/gas/15-1408.pnml" -#include "tankers/gas/15-1556.pnml" -#include "tankers/gas/15-1556-03.pnml" -#include "tankers/gas/15-1597.pnml" -#include "tankers/gas/15-1597-01.pnml" -#include "tankers/gas/15-558s-04.pnml" -#include "tankers/gas/8g52.pnml" -#include "tankers/gas/902r.pnml" -#include "tankers/gas/903r.pnml" -#include "tankers/gas/908r.pnml" -#include "tankers/gas/type1935cryo.pnml" -#include "tankers/gas/tankers-gas-group.pnml" -#include "tankers/oil/15-031.pnml" -#include "tankers/oil/15-1210-01.pnml" -#include "tankers/oil/15-1566-type1974.pnml" -#include "tankers/oil/15-1566-type1975_use.pnml" -#include "tankers/oil/15-1566-type1980_use.pnml" -#include "tankers/oil/15-1566-type1989_use.pnml" -#include "tankers/oil/15-5157-04.pnml" -#include "tankers/oil/15-897.pnml" -#include "tankers/oil/15-c863.pnml" -#include "tankers/oil/type1872o.pnml" -#include "tankers/oil/type1889o_use.pnml" -#include "tankers/oil/type1910o.pnml" -#include "tankers/oil/tankers-oil-group.pnml" -#include "tankers/petrol/15-1443.pnml" -#include "tankers/petrol/15-1500.pnml" -#include "tankers/petrol/15-1547-type1983.pnml" -#include "tankers/petrol/15-1547-type1993.pnml" -#include "tankers/petrol/15-1547-03.pnml" -#include "tankers/petrol/15-289.pnml" -#include "tankers/petrol/15-871.pnml" -#include "tankers/petrol/type1875p.pnml" -#include "tankers/petrol/type1885p_use.pnml" -#include "tankers/petrol/type1908p.pnml" -#include "tankers/petrol/tankers-petrol-group.pnml" -#include "tankers/15-c862-type1953.pnml" -#include "tankers/15-c862-type1957.pnml" -#include "tankers/type1927.pnml" -#include "tankers/type1932.pnml" -#include "tankers/type1936.pnml" -#include "tankers/type1931.pnml" -#include "tankers/type1945.pnml" -#include "tankers/tankers-gen-group.pnml" -#include "wagon2.pnml" -#include "special/22-4024.pnml" -#include "special/22-473.pnml" -#include "special/type1934.pnml" -#include "special/11-259.pnml" -#include "special/17-917.pnml" -#include "special/17-486.pnml" -#include "special/13-4107.pnml" -#include "special/tk8.pnml" -#include "special/special-group.pnml" + +#include "wagons-cargos.pnml" +#include "wagons-list.pnml" // сортировка + +// Задаём порядок следования ID ПС для классической сортировки меню покупки +// независимо от порядка включения файлов и декларирования описателей ПС +sort (FEAT_TRAINS, +[ +// модельки + dummy1, dummy2, dummy3, dummy4, dummy5, dummy6, dummy7, #include "wagons-sort-order.pnml" +]); // #include "wagons-xussr.pnml" // end diff --git a/src/xussr.pnml b/src/xussr.pnml index 6d02cd38c..45d598454 100644 --- a/src/xussr.pnml +++ b/src/xussr.pnml @@ -27,5 +27,14 @@ #include "graph-templates-mu.pnml" #include "graph-templates-containers.pnml" +#include "wagons/wagons-cargos.pnml" +#include "wagons/wagons-list.pnml" + +sort (FEAT_TRAINS, +[ +// модельки + dummy1, dummy2, dummy3, dummy4, dummy5, dummy6, dummy7, +#include "wagons/wagons-sort-order.pnml" +]); // #include "xussr.pnml" // end