diff --git a/text/en.tab b/text/en.tab index cbbce0367..4255a28a4 100644 --- a/text/en.tab +++ b/text/en.tab @@ -2988,6 +2988,8 @@ BR-Class87 BR Class 87 BR-Class88 BR Class 88 "Vossloh Euro Dual" +BR-Class89 +BR Class 89 BR-Class90 BR Class 90 BR-Class91 diff --git a/trains/br-cl86.dat b/trains/br-cl86.dat index f477dbcad..442eea6fe 100644 --- a/trains/br-cl86.dat +++ b/trains/br-cl86.dat @@ -31,10 +31,10 @@ way_constraint_permissive[2]=2 # TDM Constraint[Prev][0]=BR-Class86 Constraint[Prev][1]=BR-Class87 -Constraint[Prev][2]=BR-Class90 -Constraint[Prev][3]=BR-Class91 -Constraint[Prev][4]=none -# Also class 89 +Constraint[Prev][2]=BR-Class89 +Constraint[Prev][3]=BR-Class90 +Constraint[Prev][4]=BR-Class91 +Constraint[Prev][5]=none liverytype[0]=BR-Revised liverytype[1]=BR-Blue diff --git a/trains/br-cl87.dat b/trains/br-cl87.dat index 91a78bf32..26f4e35ca 100644 --- a/trains/br-cl87.dat +++ b/trains/br-cl87.dat @@ -32,10 +32,10 @@ way_constraint_permissive[2]=2 # TDM Constraint[Prev][0]=BR-Class86 Constraint[Prev][1]=BR-Class87 -Constraint[Prev][2]=BR-Class90 -Constraint[Prev][3]=BR-Class91 -Constraint[Prev][4]=none -# Also class 89 +Constraint[Prev][2]=BR-Class89 +Constraint[Prev][3]=BR-Class90 +Constraint[Prev][4]=BR-Class91 +Constraint[Prev][5]=none liverytype[0]=BR-Blue liverytype[1]=IC-Executive diff --git a/trains/br-cl89.dat b/trains/br-cl89.dat new file mode 100644 index 000000000..8ac00a994 --- /dev/null +++ b/trains/br-cl89.dat @@ -0,0 +1,72 @@ +# https://en.wikipedia.org/wiki/British_Rail_Class_89 +obj=vehicle +name=BR-Class89 +engine_type=electric +speed=200 +gear=80 +power=4286 +tractive_effort=205 +copyright=Kieron/Rollmaterial +intro_year=1986 +intro_month=6 +retire_year=1995 +retire_month=4 +waytype=track +freight=None +payload=0 +length=11 +brake_force=65 +rolling_resistance=14 + +weight=105 +axle_load=17 +cost=8755000 +runningcost=602 +fixed_cost=15760 +# Likley to be difficult to find a sound effect for this. +sound=treacher-rail-class-87.wav + +can_lead_from_rear=0 +bidirectional=1 +way_constraint_permissive[2]=2 + +# TDM +Constraint[Prev][0]=BR-Class86 +Constraint[Prev][1]=BR-Class87 +Constraint[Prev][2]=BR-Class89 +Constraint[Prev][3]=BR-Class90 +Constraint[Prev][4]=BR-Class91 +Constraint[Prev][5]=none + +liverytype[0]=IC-Executive +liverytype[1]=IC-Swallow +liverytype[2]=GNER + +EmptyImage[E][0]=./locomotives/br-cl89-ic-exec_E.0 +EmptyImage[SE][0]=./locomotives/br-cl89-ic-exec_SE.0 +EmptyImage[S][0]=./locomotives/br-cl89-ic-exec_S.0 +EmptyImage[SW][0]=./locomotives/br-cl89-ic-exec_SW.0 +EmptyImage[W][0]=./locomotives/br-cl89-ic-exec_W.0 +EmptyImage[NW][0]=./locomotives/br-cl89-ic-exec_NW.0 +EmptyImage[N][0]=./locomotives/br-cl89-ic-exec_N.0 +EmptyImage[NE][0]=./locomotives/br-cl89-ic-exec_NE.0 + +EmptyImage[E][1]=./locomotives/br-cl89-ic-swallow_E.0 +EmptyImage[SE][1]=./locomotives/br-cl89-ic-swallow_SE.0 +EmptyImage[S][1]=./locomotives/br-cl89-ic-swallow_S.0 +EmptyImage[SW][1]=./locomotives/br-cl89-ic-swallow_SW.0 +EmptyImage[W][1]=./locomotives/br-cl89-ic-swallow_W.0 +EmptyImage[NW][1]=./locomotives/br-cl89-ic-swallow_NW.0 +EmptyImage[N][1]=./locomotives/br-cl89-ic-swallow_N.0 +EmptyImage[NE][1]=./locomotives/br-cl89-ic-swallow_NE.0 + +EmptyImage[E][2]=./locomotives/br-cl89-gner_E.0 +EmptyImage[SE][2]=./locomotives/br-cl89-gner_SE.0 +EmptyImage[S][2]=./locomotives/br-cl89-gner_S.0 +EmptyImage[SW][2]=./locomotives/br-cl89-gner_SW.0 +EmptyImage[W][2]=./locomotives/br-cl89-gner_W.0 +EmptyImage[NW][2]=./locomotives/br-cl89-gner_NW.0 +EmptyImage[N][2]=./locomotives/br-cl89-gner_N.0 +EmptyImage[NE][2]=./locomotives/br-cl89-gner_NE.0 + +-- diff --git a/trains/br-cl90.dat b/trains/br-cl90.dat index 5e5463f62..2a1d176e7 100644 --- a/trains/br-cl90.dat +++ b/trains/br-cl90.dat @@ -33,10 +33,10 @@ way_constraint_permissive[2]=2 # TDM Constraint[Prev][0]=BR-Class86 Constraint[Prev][1]=BR-Class87 -Constraint[Prev][2]=BR-Class90 -Constraint[Prev][3]=BR-Class91 -Constraint[Prev][4]=none -# Also class 89 +Constraint[Prev][2]=BR-Class89 +Constraint[Prev][3]=BR-Class90 +Constraint[Prev][4]=BR-Class91 +Constraint[Prev][5]=none liverytype[0]=IC-Swallow liverytype[1]=GNER diff --git a/trains/br-cl91.dat b/trains/br-cl91.dat index 6e5617848..213a7ff18 100644 --- a/trains/br-cl91.dat +++ b/trains/br-cl91.dat @@ -31,10 +31,10 @@ way_constraint_permissive[2]=2 # TDM Constraint[Prev][0]=BR-Class86 Constraint[Prev][1]=BR-Class87 -Constraint[Prev][2]=BR-Class90 -Constraint[Prev][3]=BR-Class91 -Constraint[Prev][4]=none -# Also class 89 +Constraint[Prev][2]=BR-Class89 +Constraint[Prev][3]=BR-Class90 +Constraint[Prev][4]=BR-Class91 +Constraint[Prev][5]=none liverytype[0]=IC-Swallow liverytype[1]=GNER diff --git a/trains/locomotives/br-cl87-b_E.png b/trains/locomotives/br-cl87-b_E.png index e5702595f..fa5bf5306 100644 Binary files a/trains/locomotives/br-cl87-b_E.png and b/trains/locomotives/br-cl87-b_E.png differ diff --git a/trains/locomotives/br-cl87-b_N.png b/trains/locomotives/br-cl87-b_N.png index d0f6077de..51ea1bf5c 100644 Binary files a/trains/locomotives/br-cl87-b_N.png and b/trains/locomotives/br-cl87-b_N.png differ diff --git a/trains/locomotives/br-cl87-b_NE.png b/trains/locomotives/br-cl87-b_NE.png index 2f489137f..9066e1191 100644 Binary files a/trains/locomotives/br-cl87-b_NE.png and b/trains/locomotives/br-cl87-b_NE.png differ diff --git a/trains/locomotives/br-cl87-b_NW.png b/trains/locomotives/br-cl87-b_NW.png index b924961ca..e9ae20690 100644 Binary files a/trains/locomotives/br-cl87-b_NW.png and b/trains/locomotives/br-cl87-b_NW.png differ diff --git a/trains/locomotives/br-cl87-b_S.png b/trains/locomotives/br-cl87-b_S.png index 4e024098a..c3b38ea8f 100644 Binary files a/trains/locomotives/br-cl87-b_S.png and b/trains/locomotives/br-cl87-b_S.png differ diff --git a/trains/locomotives/br-cl87-b_SE.png b/trains/locomotives/br-cl87-b_SE.png index 01e0127e2..1cb20c275 100644 Binary files a/trains/locomotives/br-cl87-b_SE.png and b/trains/locomotives/br-cl87-b_SE.png differ diff --git a/trains/locomotives/br-cl87-b_SW.png b/trains/locomotives/br-cl87-b_SW.png index 4458c2e24..cb6c74530 100644 Binary files a/trains/locomotives/br-cl87-b_SW.png and b/trains/locomotives/br-cl87-b_SW.png differ diff --git a/trains/locomotives/br-cl87-b_W.png b/trains/locomotives/br-cl87-b_W.png index e723a3f20..3bb5d5a01 100644 Binary files a/trains/locomotives/br-cl87-b_W.png and b/trains/locomotives/br-cl87-b_W.png differ diff --git a/trains/locomotives/br-cl87-ic-exec_E.png b/trains/locomotives/br-cl87-ic-exec_E.png index c40b69993..05f15eacc 100644 Binary files a/trains/locomotives/br-cl87-ic-exec_E.png and b/trains/locomotives/br-cl87-ic-exec_E.png differ diff --git a/trains/locomotives/br-cl87-ic-exec_N.png b/trains/locomotives/br-cl87-ic-exec_N.png index b2d1e508c..97f7073d9 100644 Binary files a/trains/locomotives/br-cl87-ic-exec_N.png and b/trains/locomotives/br-cl87-ic-exec_N.png differ diff --git a/trains/locomotives/br-cl87-ic-exec_NE.png b/trains/locomotives/br-cl87-ic-exec_NE.png index 885fafee6..18f8ed473 100644 Binary files a/trains/locomotives/br-cl87-ic-exec_NE.png and b/trains/locomotives/br-cl87-ic-exec_NE.png differ diff --git a/trains/locomotives/br-cl87-ic-exec_NW.png b/trains/locomotives/br-cl87-ic-exec_NW.png index f4f0bd16b..d0ccd1ff7 100644 Binary files a/trains/locomotives/br-cl87-ic-exec_NW.png and b/trains/locomotives/br-cl87-ic-exec_NW.png differ diff --git a/trains/locomotives/br-cl87-ic-exec_S.png b/trains/locomotives/br-cl87-ic-exec_S.png index e51b8b7da..4228d533c 100644 Binary files a/trains/locomotives/br-cl87-ic-exec_S.png and b/trains/locomotives/br-cl87-ic-exec_S.png differ diff --git a/trains/locomotives/br-cl87-ic-exec_SE.png b/trains/locomotives/br-cl87-ic-exec_SE.png index 8524d12bc..f3c29f4b3 100644 Binary files a/trains/locomotives/br-cl87-ic-exec_SE.png and b/trains/locomotives/br-cl87-ic-exec_SE.png differ diff --git a/trains/locomotives/br-cl87-ic-exec_SW.png b/trains/locomotives/br-cl87-ic-exec_SW.png index 848250178..69240c662 100644 Binary files a/trains/locomotives/br-cl87-ic-exec_SW.png and b/trains/locomotives/br-cl87-ic-exec_SW.png differ diff --git a/trains/locomotives/br-cl87-ic-exec_W.png b/trains/locomotives/br-cl87-ic-exec_W.png index 3b771484c..db61658e5 100644 Binary files a/trains/locomotives/br-cl87-ic-exec_W.png and b/trains/locomotives/br-cl87-ic-exec_W.png differ diff --git a/trains/locomotives/br-cl87-ic-swallow_E.png b/trains/locomotives/br-cl87-ic-swallow_E.png index 7c78c7270..69bcc5cfd 100644 Binary files a/trains/locomotives/br-cl87-ic-swallow_E.png and b/trains/locomotives/br-cl87-ic-swallow_E.png differ diff --git a/trains/locomotives/br-cl87-ic-swallow_N.png b/trains/locomotives/br-cl87-ic-swallow_N.png index c0ed998ac..f7db9521d 100644 Binary files a/trains/locomotives/br-cl87-ic-swallow_N.png and b/trains/locomotives/br-cl87-ic-swallow_N.png differ diff --git a/trains/locomotives/br-cl87-ic-swallow_NE.png b/trains/locomotives/br-cl87-ic-swallow_NE.png index 6798291ee..4d8754040 100644 Binary files a/trains/locomotives/br-cl87-ic-swallow_NE.png and b/trains/locomotives/br-cl87-ic-swallow_NE.png differ diff --git a/trains/locomotives/br-cl87-ic-swallow_NW.png b/trains/locomotives/br-cl87-ic-swallow_NW.png index d1aa8df8a..6898c478a 100644 Binary files a/trains/locomotives/br-cl87-ic-swallow_NW.png and b/trains/locomotives/br-cl87-ic-swallow_NW.png differ diff --git a/trains/locomotives/br-cl87-ic-swallow_S.png b/trains/locomotives/br-cl87-ic-swallow_S.png index ea2353bbd..1c31733ac 100644 Binary files a/trains/locomotives/br-cl87-ic-swallow_S.png and b/trains/locomotives/br-cl87-ic-swallow_S.png differ diff --git a/trains/locomotives/br-cl87-ic-swallow_SE.png b/trains/locomotives/br-cl87-ic-swallow_SE.png index 425c73bf7..1dca65510 100644 Binary files a/trains/locomotives/br-cl87-ic-swallow_SE.png and b/trains/locomotives/br-cl87-ic-swallow_SE.png differ diff --git a/trains/locomotives/br-cl87-ic-swallow_SW.png b/trains/locomotives/br-cl87-ic-swallow_SW.png index 1a1db0590..3f6113802 100644 Binary files a/trains/locomotives/br-cl87-ic-swallow_SW.png and b/trains/locomotives/br-cl87-ic-swallow_SW.png differ diff --git a/trains/locomotives/br-cl87-ic-swallow_W.png b/trains/locomotives/br-cl87-ic-swallow_W.png index 69b30d7d2..66fec8bb9 100644 Binary files a/trains/locomotives/br-cl87-ic-swallow_W.png and b/trains/locomotives/br-cl87-ic-swallow_W.png differ diff --git a/trains/locomotives/br-cl87-vt_E.png b/trains/locomotives/br-cl87-vt_E.png index a7dcb57f9..96d285058 100644 Binary files a/trains/locomotives/br-cl87-vt_E.png and b/trains/locomotives/br-cl87-vt_E.png differ diff --git a/trains/locomotives/br-cl87-vt_N.png b/trains/locomotives/br-cl87-vt_N.png index b7c563a79..d37b2b48e 100644 Binary files a/trains/locomotives/br-cl87-vt_N.png and b/trains/locomotives/br-cl87-vt_N.png differ diff --git a/trains/locomotives/br-cl87-vt_NE.png b/trains/locomotives/br-cl87-vt_NE.png index d4f3bd7c0..30296a00e 100644 Binary files a/trains/locomotives/br-cl87-vt_NE.png and b/trains/locomotives/br-cl87-vt_NE.png differ diff --git a/trains/locomotives/br-cl87-vt_NW.png b/trains/locomotives/br-cl87-vt_NW.png index 4a4f19538..c956cafa1 100644 Binary files a/trains/locomotives/br-cl87-vt_NW.png and b/trains/locomotives/br-cl87-vt_NW.png differ diff --git a/trains/locomotives/br-cl87-vt_S.png b/trains/locomotives/br-cl87-vt_S.png index 00b1de43e..a185ef892 100644 Binary files a/trains/locomotives/br-cl87-vt_S.png and b/trains/locomotives/br-cl87-vt_S.png differ diff --git a/trains/locomotives/br-cl87-vt_SE.png b/trains/locomotives/br-cl87-vt_SE.png index baeabecf4..6ade3eb45 100644 Binary files a/trains/locomotives/br-cl87-vt_SE.png and b/trains/locomotives/br-cl87-vt_SE.png differ diff --git a/trains/locomotives/br-cl87-vt_SW.png b/trains/locomotives/br-cl87-vt_SW.png index 4281b3eed..c66b2d4b1 100644 Binary files a/trains/locomotives/br-cl87-vt_SW.png and b/trains/locomotives/br-cl87-vt_SW.png differ diff --git a/trains/locomotives/br-cl87-vt_W.png b/trains/locomotives/br-cl87-vt_W.png index ffef1d63e..173d6d3d5 100644 Binary files a/trains/locomotives/br-cl87-vt_W.png and b/trains/locomotives/br-cl87-vt_W.png differ diff --git a/trains/locomotives/br-cl89-gner_E.png b/trains/locomotives/br-cl89-gner_E.png new file mode 100644 index 000000000..bb61f3583 Binary files /dev/null and b/trains/locomotives/br-cl89-gner_E.png differ diff --git a/trains/locomotives/br-cl89-gner_N.png b/trains/locomotives/br-cl89-gner_N.png new file mode 100644 index 000000000..f72c56d27 Binary files /dev/null and b/trains/locomotives/br-cl89-gner_N.png differ diff --git a/trains/locomotives/br-cl89-gner_NE.png b/trains/locomotives/br-cl89-gner_NE.png new file mode 100644 index 000000000..ec38b6ce3 Binary files /dev/null and b/trains/locomotives/br-cl89-gner_NE.png differ diff --git a/trains/locomotives/br-cl89-gner_NW.png b/trains/locomotives/br-cl89-gner_NW.png new file mode 100644 index 000000000..fb0d4a75f Binary files /dev/null and b/trains/locomotives/br-cl89-gner_NW.png differ diff --git a/trains/locomotives/br-cl89-gner_S.png b/trains/locomotives/br-cl89-gner_S.png new file mode 100644 index 000000000..6e79566b2 Binary files /dev/null and b/trains/locomotives/br-cl89-gner_S.png differ diff --git a/trains/locomotives/br-cl89-gner_SE.png b/trains/locomotives/br-cl89-gner_SE.png new file mode 100644 index 000000000..bbdfca5cd Binary files /dev/null and b/trains/locomotives/br-cl89-gner_SE.png differ diff --git a/trains/locomotives/br-cl89-gner_SW.png b/trains/locomotives/br-cl89-gner_SW.png new file mode 100644 index 000000000..d415f2c24 Binary files /dev/null and b/trains/locomotives/br-cl89-gner_SW.png differ diff --git a/trains/locomotives/br-cl89-gner_W.png b/trains/locomotives/br-cl89-gner_W.png new file mode 100644 index 000000000..552d39133 Binary files /dev/null and b/trains/locomotives/br-cl89-gner_W.png differ diff --git a/trains/locomotives/br-cl89-ic-exec_E.png b/trains/locomotives/br-cl89-ic-exec_E.png new file mode 100644 index 000000000..1541fa8a5 Binary files /dev/null and b/trains/locomotives/br-cl89-ic-exec_E.png differ diff --git a/trains/locomotives/br-cl89-ic-exec_N.png b/trains/locomotives/br-cl89-ic-exec_N.png new file mode 100644 index 000000000..1969e0c46 Binary files /dev/null and b/trains/locomotives/br-cl89-ic-exec_N.png differ diff --git a/trains/locomotives/br-cl89-ic-exec_NE.png b/trains/locomotives/br-cl89-ic-exec_NE.png new file mode 100644 index 000000000..c6bc2ca50 Binary files /dev/null and b/trains/locomotives/br-cl89-ic-exec_NE.png differ diff --git a/trains/locomotives/br-cl89-ic-exec_NW.png b/trains/locomotives/br-cl89-ic-exec_NW.png new file mode 100644 index 000000000..2097d80f1 Binary files /dev/null and b/trains/locomotives/br-cl89-ic-exec_NW.png differ diff --git a/trains/locomotives/br-cl89-ic-exec_S.png b/trains/locomotives/br-cl89-ic-exec_S.png new file mode 100644 index 000000000..f3ea3b467 Binary files /dev/null and b/trains/locomotives/br-cl89-ic-exec_S.png differ diff --git a/trains/locomotives/br-cl89-ic-exec_SE.png b/trains/locomotives/br-cl89-ic-exec_SE.png new file mode 100644 index 000000000..cb39f047b Binary files /dev/null and b/trains/locomotives/br-cl89-ic-exec_SE.png differ diff --git a/trains/locomotives/br-cl89-ic-exec_SW.png b/trains/locomotives/br-cl89-ic-exec_SW.png new file mode 100644 index 000000000..36bb281e7 Binary files /dev/null and b/trains/locomotives/br-cl89-ic-exec_SW.png differ diff --git a/trains/locomotives/br-cl89-ic-exec_W.png b/trains/locomotives/br-cl89-ic-exec_W.png new file mode 100644 index 000000000..a02740be3 Binary files /dev/null and b/trains/locomotives/br-cl89-ic-exec_W.png differ diff --git a/trains/locomotives/br-cl89-ic-swallow_E.png b/trains/locomotives/br-cl89-ic-swallow_E.png new file mode 100644 index 000000000..c1e48393e Binary files /dev/null and b/trains/locomotives/br-cl89-ic-swallow_E.png differ diff --git a/trains/locomotives/br-cl89-ic-swallow_N.png b/trains/locomotives/br-cl89-ic-swallow_N.png new file mode 100644 index 000000000..a55944d4b Binary files /dev/null and b/trains/locomotives/br-cl89-ic-swallow_N.png differ diff --git a/trains/locomotives/br-cl89-ic-swallow_NE.png b/trains/locomotives/br-cl89-ic-swallow_NE.png new file mode 100644 index 000000000..2aff8c7f5 Binary files /dev/null and b/trains/locomotives/br-cl89-ic-swallow_NE.png differ diff --git a/trains/locomotives/br-cl89-ic-swallow_NW.png b/trains/locomotives/br-cl89-ic-swallow_NW.png new file mode 100644 index 000000000..3bc39b089 Binary files /dev/null and b/trains/locomotives/br-cl89-ic-swallow_NW.png differ diff --git a/trains/locomotives/br-cl89-ic-swallow_S.png b/trains/locomotives/br-cl89-ic-swallow_S.png new file mode 100644 index 000000000..9b8a648fa Binary files /dev/null and b/trains/locomotives/br-cl89-ic-swallow_S.png differ diff --git a/trains/locomotives/br-cl89-ic-swallow_SE.png b/trains/locomotives/br-cl89-ic-swallow_SE.png new file mode 100644 index 000000000..9a22bd51a Binary files /dev/null and b/trains/locomotives/br-cl89-ic-swallow_SE.png differ diff --git a/trains/locomotives/br-cl89-ic-swallow_SW.png b/trains/locomotives/br-cl89-ic-swallow_SW.png new file mode 100644 index 000000000..7ce1e70fd Binary files /dev/null and b/trains/locomotives/br-cl89-ic-swallow_SW.png differ diff --git a/trains/locomotives/br-cl89-ic-swallow_W.png b/trains/locomotives/br-cl89-ic-swallow_W.png new file mode 100644 index 000000000..2af85b000 Binary files /dev/null and b/trains/locomotives/br-cl89-ic-swallow_W.png differ