diff --git a/Comfort calibration overview.ods b/Comfort calibration overview.ods index 02caceeed..f678e93ae 100644 Binary files a/Comfort calibration overview.ods and b/Comfort calibration overview.ods differ diff --git a/depots/old-train-depot.dat b/depots/old-train-depot.dat index d2f34f2d3..79ae86b45 100644 --- a/depots/old-train-depot.dat +++ b/depots/old-train-depot.dat @@ -162,7 +162,7 @@ class_proportion_jobs[3]=3 class_proportion_jobs[4]=0 traction_type[0]=diesel intro_year=1933 -intro_month=12 +intro_month=10 retire_year=1958 retire_month=6 allow_underground=0 diff --git a/text/en.tab b/text/en.tab index 321cd7293..5e913e76f 100644 --- a/text/en.tab +++ b/text/en.tab @@ -6862,6 +6862,8 @@ LNWR-57ft-non-cor LNWR nine compartment carriage (third class) ac-railbus AC Railbus +leyland-railbus +Leyland Railbus BR-Derby-Lightweight-DTCL BR Derby Lightweight DMU (driving trailer - rear) BR-Derby-Lightweight-DMCL diff --git a/trains/ac-railbus.dat b/trains/ac-railbus.dat index d3a8417c1..6a04c9f90 100644 --- a/trains/ac-railbus.dat +++ b/trains/ac-railbus.dat @@ -3,6 +3,8 @@ obj=vehicle name=ac-railbus engine_type=diesel smoke=Diesel +# See the driving instructions here - max. 57.55mph +# https://railcar.co.uk/type/ac-cars-railbus/numbering speed=92 power=110 gear=50 @@ -16,9 +18,10 @@ waytype=track freight=Passagiere payload[0]=0 payload[1]=46 -overcrowded_capacity=52 +overcrowded_capacity=40 length=6 +# https://railcar.co.uk/data/diagrams/614.jpg weight=11.2 axles=2 cost=348000 diff --git a/trains/leyland-railbus.dat b/trains/leyland-railbus.dat new file mode 100644 index 000000000..d2639b364 --- /dev/null +++ b/trains/leyland-railbus.dat @@ -0,0 +1,87 @@ +# https://en.wikipedia.org/wiki/LMS_railcars +# See also Hamilton-Ellis p. 456 +obj=vehicle +name=leyland-railbus +engine_type=diesel +smoke=Diesel +# Guessed +speed=90 +power=71 +gear=50 +tractive_effort=21 +copyright=JamesPetts +intro_year=1933 +intro_month=10 +retire_year=1958 +retire_month=7 +waytype=track +freight=Passagiere +payload[0]=0 +payload[1]=40 +overcrowded_capacity=32 +length=7 + +# https://en.wikipedia.org/wiki/LMS_railcars +weight=10.2 +axles=2 +cost=333000 +runningcost=71 +fixed_cost=5500 +# TODO: Find a suitable sound for this +#sound= + +can_lead_from_rear=1 +bidirectional=0 + +# A single door each side +min_loading_time=15 +max_loading_time=72 + +comfort[0]=0 +comfort[1]=48 + +Constraint[Prev][0]=none + +Constraint[Next][0]=none + +liverytype[0]=LMS-Standard +liverytype[1]=WW2-Austerity +liverytype[2]=BR-Revised +liverytype[3]=BR-Blue + +EmptyImage[E][0]=./railcars/leyland-railbus-lms_E.0.0 +EmptyImage[SE][0]=./railcars/leyland-railbus-lms_SE.0.0 +EmptyImage[S][0]=./railcars/leyland-railbus-lms_S.0.0 +EmptyImage[SW][0]=./railcars/leyland-railbus-lms_SW.0.0 +EmptyImage[W][0]=./railcars/leyland-railbus-lms_W.0.0 +EmptyImage[NW][0]=./railcars/leyland-railbus-lms_NW.0.0 +EmptyImage[N][0]=./railcars/leyland-railbus-lms_N.0.0 +EmptyImage[NE][0]=./railcars/leyland-railbus-lms_NE.0.0 + +EmptyImage[E][1]=./railcars/leyland-railbus-austerity_E.0.0 +EmptyImage[SE][1]=./railcars/leyland-railbus-austerity_SE.0.0 +EmptyImage[S][1]=./railcars/leyland-railbus-austerity_S.0.0 +EmptyImage[SW][1]=./railcars/leyland-railbus-austerity_SW.0.0 +EmptyImage[W][1]=./railcars/leyland-railbus-austerity_W.0.0 +EmptyImage[NW][1]=./railcars/leyland-railbus-austerity_NW.0.0 +EmptyImage[N][1]=./railcars/leyland-railbus-austerity_N.0.0 +EmptyImage[NE][1]=./railcars/leyland-railbus-austerity_NE.0.0 + +EmptyImage[E][2]=./railcars/leyland-railbus-g_E.0.0 +EmptyImage[SE][2]=./railcars/leyland-railbus-g_SE.0.0 +EmptyImage[S][2]=./railcars/leyland-railbus-g_S.0.0 +EmptyImage[SW][2]=./railcars/leyland-railbus-g_SW.0.0 +EmptyImage[W][2]=./railcars/leyland-railbus-g_W.0.0 +EmptyImage[NW][2]=./railcars/leyland-railbus-g_NW.0.0 +EmptyImage[N][2]=./railcars/leyland-railbus-g_N.0.0 +EmptyImage[NE][2]=./railcars/leyland-railbus-g_NE.0.0 + +EmptyImage[E][3]=./railcars/leyland-railbus-b_E.0.0 +EmptyImage[SE][3]=./railcars/leyland-railbus-b_SE.0.0 +EmptyImage[S][3]=./railcars/leyland-railbus-b_S.0.0 +EmptyImage[SW][3]=./railcars/leyland-railbus-b_SW.0.0 +EmptyImage[W][3]=./railcars/leyland-railbus-b_W.0.0 +EmptyImage[NW][3]=./railcars/leyland-railbus-b_NW.0.0 +EmptyImage[N][3]=./railcars/leyland-railbus-b_N.0.0 +EmptyImage[NE][3]=./railcars/leyland-railbus-b_NE.0.0 + diff --git a/trains/railcars/leyland-railbus-austerity_E.png b/trains/railcars/leyland-railbus-austerity_E.png new file mode 100644 index 000000000..3357dcf37 Binary files /dev/null and b/trains/railcars/leyland-railbus-austerity_E.png differ diff --git a/trains/railcars/leyland-railbus-austerity_N.png b/trains/railcars/leyland-railbus-austerity_N.png new file mode 100644 index 000000000..e8e060f08 Binary files /dev/null and b/trains/railcars/leyland-railbus-austerity_N.png differ diff --git a/trains/railcars/leyland-railbus-austerity_NE.png b/trains/railcars/leyland-railbus-austerity_NE.png new file mode 100644 index 000000000..aa4bcebb3 Binary files /dev/null and b/trains/railcars/leyland-railbus-austerity_NE.png differ diff --git a/trains/railcars/leyland-railbus-austerity_NW.png b/trains/railcars/leyland-railbus-austerity_NW.png new file mode 100644 index 000000000..999b89511 Binary files /dev/null and b/trains/railcars/leyland-railbus-austerity_NW.png differ diff --git a/trains/railcars/leyland-railbus-austerity_S.png b/trains/railcars/leyland-railbus-austerity_S.png new file mode 100644 index 000000000..493cfe365 Binary files /dev/null and b/trains/railcars/leyland-railbus-austerity_S.png differ diff --git a/trains/railcars/leyland-railbus-austerity_SE.png b/trains/railcars/leyland-railbus-austerity_SE.png new file mode 100644 index 000000000..f154915a8 Binary files /dev/null and b/trains/railcars/leyland-railbus-austerity_SE.png differ diff --git a/trains/railcars/leyland-railbus-austerity_SW.png b/trains/railcars/leyland-railbus-austerity_SW.png new file mode 100644 index 000000000..0260a4612 Binary files /dev/null and b/trains/railcars/leyland-railbus-austerity_SW.png differ diff --git a/trains/railcars/leyland-railbus-austerity_W.png b/trains/railcars/leyland-railbus-austerity_W.png new file mode 100644 index 000000000..4e3fd9e50 Binary files /dev/null and b/trains/railcars/leyland-railbus-austerity_W.png differ diff --git a/trains/railcars/leyland-railbus-b_E.png b/trains/railcars/leyland-railbus-b_E.png new file mode 100644 index 000000000..e2f1eafcc Binary files /dev/null and b/trains/railcars/leyland-railbus-b_E.png differ diff --git a/trains/railcars/leyland-railbus-b_N.png b/trains/railcars/leyland-railbus-b_N.png new file mode 100644 index 000000000..c6bced1b7 Binary files /dev/null and b/trains/railcars/leyland-railbus-b_N.png differ diff --git a/trains/railcars/leyland-railbus-b_NE.png b/trains/railcars/leyland-railbus-b_NE.png new file mode 100644 index 000000000..6dbc83f93 Binary files /dev/null and b/trains/railcars/leyland-railbus-b_NE.png differ diff --git a/trains/railcars/leyland-railbus-b_NW.png b/trains/railcars/leyland-railbus-b_NW.png new file mode 100644 index 000000000..773bb0240 Binary files /dev/null and b/trains/railcars/leyland-railbus-b_NW.png differ diff --git a/trains/railcars/leyland-railbus-b_S.png b/trains/railcars/leyland-railbus-b_S.png new file mode 100644 index 000000000..14252a08b Binary files /dev/null and b/trains/railcars/leyland-railbus-b_S.png differ diff --git a/trains/railcars/leyland-railbus-b_SE.png b/trains/railcars/leyland-railbus-b_SE.png new file mode 100644 index 000000000..4f7ff5084 Binary files /dev/null and b/trains/railcars/leyland-railbus-b_SE.png differ diff --git a/trains/railcars/leyland-railbus-b_SW.png b/trains/railcars/leyland-railbus-b_SW.png new file mode 100644 index 000000000..d53a500ea Binary files /dev/null and b/trains/railcars/leyland-railbus-b_SW.png differ diff --git a/trains/railcars/leyland-railbus-b_W.png b/trains/railcars/leyland-railbus-b_W.png new file mode 100644 index 000000000..15a9de04d Binary files /dev/null and b/trains/railcars/leyland-railbus-b_W.png differ diff --git a/trains/railcars/leyland-railbus-g_E.png b/trains/railcars/leyland-railbus-g_E.png new file mode 100644 index 000000000..e67fff975 Binary files /dev/null and b/trains/railcars/leyland-railbus-g_E.png differ diff --git a/trains/railcars/leyland-railbus-g_N.png b/trains/railcars/leyland-railbus-g_N.png new file mode 100644 index 000000000..67b9cdb59 Binary files /dev/null and b/trains/railcars/leyland-railbus-g_N.png differ diff --git a/trains/railcars/leyland-railbus-g_NE.png b/trains/railcars/leyland-railbus-g_NE.png new file mode 100644 index 000000000..8030e1c0c Binary files /dev/null and b/trains/railcars/leyland-railbus-g_NE.png differ diff --git a/trains/railcars/leyland-railbus-g_NW.png b/trains/railcars/leyland-railbus-g_NW.png new file mode 100644 index 000000000..8e20efa90 Binary files /dev/null and b/trains/railcars/leyland-railbus-g_NW.png differ diff --git a/trains/railcars/leyland-railbus-g_S.png b/trains/railcars/leyland-railbus-g_S.png new file mode 100644 index 000000000..188770906 Binary files /dev/null and b/trains/railcars/leyland-railbus-g_S.png differ diff --git a/trains/railcars/leyland-railbus-g_SE.png b/trains/railcars/leyland-railbus-g_SE.png new file mode 100644 index 000000000..47ea0d232 Binary files /dev/null and b/trains/railcars/leyland-railbus-g_SE.png differ diff --git a/trains/railcars/leyland-railbus-g_SW.png b/trains/railcars/leyland-railbus-g_SW.png new file mode 100644 index 000000000..9982f4d8f Binary files /dev/null and b/trains/railcars/leyland-railbus-g_SW.png differ diff --git a/trains/railcars/leyland-railbus-g_W.png b/trains/railcars/leyland-railbus-g_W.png new file mode 100644 index 000000000..22999f61e Binary files /dev/null and b/trains/railcars/leyland-railbus-g_W.png differ diff --git a/trains/railcars/leyland-railbus-lms_E.png b/trains/railcars/leyland-railbus-lms_E.png new file mode 100644 index 000000000..cbe81c407 Binary files /dev/null and b/trains/railcars/leyland-railbus-lms_E.png differ diff --git a/trains/railcars/leyland-railbus-lms_N.png b/trains/railcars/leyland-railbus-lms_N.png new file mode 100644 index 000000000..ff978f23e Binary files /dev/null and b/trains/railcars/leyland-railbus-lms_N.png differ diff --git a/trains/railcars/leyland-railbus-lms_NE.png b/trains/railcars/leyland-railbus-lms_NE.png new file mode 100644 index 000000000..49badaec2 Binary files /dev/null and b/trains/railcars/leyland-railbus-lms_NE.png differ diff --git a/trains/railcars/leyland-railbus-lms_NW.png b/trains/railcars/leyland-railbus-lms_NW.png new file mode 100644 index 000000000..8aaeb3bfb Binary files /dev/null and b/trains/railcars/leyland-railbus-lms_NW.png differ diff --git a/trains/railcars/leyland-railbus-lms_S.png b/trains/railcars/leyland-railbus-lms_S.png new file mode 100644 index 000000000..5a92ae778 Binary files /dev/null and b/trains/railcars/leyland-railbus-lms_S.png differ diff --git a/trains/railcars/leyland-railbus-lms_SE.png b/trains/railcars/leyland-railbus-lms_SE.png new file mode 100644 index 000000000..831a751f5 Binary files /dev/null and b/trains/railcars/leyland-railbus-lms_SE.png differ diff --git a/trains/railcars/leyland-railbus-lms_SW.png b/trains/railcars/leyland-railbus-lms_SW.png new file mode 100644 index 000000000..6e04eeb1a Binary files /dev/null and b/trains/railcars/leyland-railbus-lms_SW.png differ diff --git a/trains/railcars/leyland-railbus-lms_W.png b/trains/railcars/leyland-railbus-lms_W.png new file mode 100644 index 000000000..0f888a46d Binary files /dev/null and b/trains/railcars/leyland-railbus-lms_W.png differ