ADD: BR Class 159

jamespetts · May 27, 2024 · 0859993 · 0859993
1 parent d448229
commit 0859993
Show file tree

Hide file tree

Showing 51 changed files with 263 additions and 31 deletions.
diff --git a/Comfort calibration overview.ods b/Comfort calibration overview.ods
diff --git a/text/en.tab b/text/en.tab
@@ -4462,6 +4462,12 @@ br-158-centre
 BR Class 158 "Express Sprinter" DMU (centre)
 br-158-rear
 BR Class 158 "Express Sprinter" DMU (rear)
+br-159-front
+BR Class 159 "South Western Turbo" DMU 
+br-159-centre
+BR Class 159 "South Western Turbo" DMU (centre)
+br-159-rear
+BR Class 159 "South Western Turbo" DMU (rear)
 BR-303Front
 BR Class 303 EMU
 BR-303Pantograph

diff --git a/trains/br-141.dat b/trains/br-141.dat
@@ -159,7 +159,8 @@ Constraint[Prev][7]=br-142-1-rear
 Constraint[Prev][8]=br-144-0-rear
 Constraint[Prev][9]=br-144-1-rear
 Constraint[Prev][10]=BR-170Rear
-Constraint[Prev][11]=none
+Constraint[Prev][11]=br-159-rear
+Constraint[Prev][12]=none
 
 Constraint[Next][0]=br-141-1-rear
 
@@ -229,7 +230,8 @@ Constraint[Next][8]=br-142-1-front
 Constraint[Next][9]=br-144-0-front
 Constraint[Next][10]=br-144-1-front
 Constraint[Next][11]=BR-170Front
-Constraint[Next][12]=none
+Constraint[Next][12]=br-159-front
+Constraint[Next][13]=none
 
 liverytype[0]=wypte-Red-Cream
 

diff --git a/trains/br-142.dat b/trains/br-142.dat
@@ -48,7 +48,8 @@ Constraint[Prev][7]=br-142-1-rear
 Constraint[Prev][8]=br-144-0-rear
 Constraint[Prev][9]=br-144-1-rear
 Constraint[Prev][10]=BR-170Rear
-Constraint[Prev][11]=none
+Constraint[Prev][11]=br-159-rear
+Constraint[Prev][12]=none
 
 Constraint[Next][0]=br-142-rear
 
@@ -147,7 +148,8 @@ Constraint[Next][8]=br-142-1-front
 Constraint[Next][9]=br-144-0-front
 Constraint[Next][10]=br-144-1-front
 Constraint[Next][11]=BR-170Front
-Constraint[Next][12]=none
+Constraint[Next][12]=br-159-front
+Constraint[Next][13]=none
 
 liverytype[0]=GMPTE-orange-brown
 liverytype[1]=Provincial
@@ -241,7 +243,8 @@ Constraint[Prev][7]=br-142-1-rear
 Constraint[Prev][8]=br-144-0-rear
 Constraint[Prev][9]=br-144-1-rear
 Constraint[Prev][10]=BR-170Rear
-Constraint[Prev][11]=none
+Constraint[Prev][11]=br-159-rear
+Constraint[Prev][12]=none
 
 Constraint[Next][0]=br-142-1-rear
 
@@ -379,7 +382,8 @@ Constraint[Next][8]=br-142-1-front
 Constraint[Next][9]=br-144-0-front
 Constraint[Next][10]=br-144-1-front
 Constraint[Next][11]=BR-170Front
-Constraint[Next][12]=none
+Constraint[Next][12]=br-159-front
+Constraint[Next][13]=none
 
 liverytype[0]=Regional-Railways-Standard
 liverytype[1]=GMPTE-orange-brown

diff --git a/trains/br-144.dat b/trains/br-144.dat
@@ -48,7 +48,8 @@ Constraint[Prev][7]=br-142-1-rear
 Constraint[Prev][8]=br-144-0-rear
 Constraint[Prev][9]=br-144-1-rear
 Constraint[Prev][10]=BR-170Rear
-Constraint[Prev][11]=none
+Constraint[Prev][11]=br-159-rear
+Constraint[Prev][12]=none
 
 Constraint[Next][0]=br-144-0-rear
 Constraint[Next][1]=br-144-0-middle
@@ -162,7 +163,6 @@ upgrade[0]=br-144-1-rear
 Constraint[Prev][0]=br-144-0-front
 Constraint[Prev][1]=br-144-0-middle
 
-
 # BSI multiple working.
 Constraint[Next][0]=br-150-front
 Constraint[Next][1]=br-153
@@ -176,7 +176,8 @@ Constraint[Next][8]=br-142-1-front
 Constraint[Next][9]=br-144-0-front
 Constraint[Next][10]=br-144-1-front
 Constraint[Next][11]=BR-170Front
-Constraint[Next][12]=none
+Constraint[Next][12]=br-159-front
+Constraint[Next][13]=none
 
 liverytype[0]=WYPTE-Red-Cream
 
@@ -241,7 +242,8 @@ Constraint[Prev][7]=br-142-1-rear
 Constraint[Prev][8]=br-144-0-rear
 Constraint[Prev][9]=br-144-1-rear
 Constraint[Prev][10]=BR-170Rear
-Constraint[Prev][11]=none
+Constraint[Prev][11]=br-159-rear
+Constraint[Prev][12]=none
 
 Constraint[Next][0]=br-144-1-rear
 Constraint[Next][1]=br-144-1-middle
@@ -355,7 +357,6 @@ increase_maintenance_after_years=26
 Constraint[Prev][0]=br-144-1-front
 Constraint[Prev][1]=br-144-1-middle
 
-
 # BSI multiple working.
 Constraint[Next][0]=br-150-front
 Constraint[Next][1]=br-153
@@ -369,7 +370,8 @@ Constraint[Next][8]=br-142-1-front
 Constraint[Next][9]=br-144-0-front
 Constraint[Next][10]=br-144-1-front
 Constraint[Next][11]=BR-170Front
-Constraint[Next][12]=none
+Constraint[Next][12]=br-159-front
+Constraint[Next][13]=none
 
 liverytype[0]=WYPTE-Red-Cream
 

diff --git a/trains/br-150.dat b/trains/br-150.dat
@@ -48,7 +48,8 @@ Constraint[Prev][7]=br-142-1-rear
 Constraint[Prev][8]=br-144-0-rear
 Constraint[Prev][9]=br-144-1-rear
 Constraint[Prev][10]=BR-170Rear
-Constraint[Prev][11]=none
+Constraint[Prev][11]=br-159-rear
+Constraint[Prev][12]=none
 
 Constraint[Next][0]=br-150-rear
 Constraint[Next][1]=br-150-centre
@@ -214,7 +215,8 @@ Constraint[Next][8]=br-142-1-front
 Constraint[Next][9]=br-144-0-front
 Constraint[Next][10]=br-144-1-front
 Constraint[Next][11]=BR-170Front
-Constraint[Next][12]=none
+Constraint[Next][12]=br-159-front
+Constraint[Next][13]=none
 
 liverytype[0]=Provincial
 liverytype[1]=Sprinter

diff --git a/trains/br-153.dat b/trains/br-153.dat
@@ -40,7 +40,7 @@ comfort[1]=92
 
 upgrade[0]=br-153-trolley
 
-#BSI multiple working
+# BSI multiple working
 Constraint[Prev][0]=br-150-rear
 Constraint[Prev][1]=br-153
 Constraint[Prev][2]=br-153-trolley
@@ -52,7 +52,8 @@ Constraint[Prev][7]=br-142-1-rear
 Constraint[Prev][8]=br-144-0-rear
 Constraint[Prev][9]=br-144-1-rear
 Constraint[Prev][10]=BR-170Rear
-Constraint[Prev][11]=none
+Constraint[Prev][11]=br-159-rear
+Constraint[Prev][12]=none
 
 Constraint[Next][0]=br-150-front
 Constraint[Next][1]=br-153
@@ -66,7 +67,8 @@ Constraint[Next][8]=br-142-1-front
 Constraint[Next][9]=br-144-0-front
 Constraint[Next][10]=br-144-1-front
 Constraint[Next][11]=BR-170Front
-Constraint[Next][12]=none
+Constraint[Next][12]=br-159-front
+Constraint[Next][13]=none
 
 liverytype[0]=Regional-Railways-Standard
 liverytype[1]=One
@@ -133,6 +135,7 @@ catering_level=1
 
 upgrade[0]=br-153
 
+# BSI multiple working
 Constraint[Prev][0]=br-150-rear
 Constraint[Prev][1]=br-153
 Constraint[Prev][2]=br-153-trolley
@@ -144,7 +147,8 @@ Constraint[Prev][7]=br-142-1-rear
 Constraint[Prev][8]=br-144-0-rear
 Constraint[Prev][9]=br-144-1-rear
 Constraint[Prev][10]=BR-170Rear
-Constraint[Prev][11]=none
+Constraint[Prev][11]=br-159-rear
+Constraint[Prev][12]=none
 
 Constraint[Next][0]=br-150-front
 Constraint[Next][1]=br-153
@@ -158,7 +162,8 @@ Constraint[Next][8]=br-142-1-front
 Constraint[Next][9]=br-144-0-front
 Constraint[Next][10]=br-144-1-front
 Constraint[Next][11]=BR-170Front
-Constraint[Next][12]=none
+Constraint[Next][12]=br-159-front
+Constraint[Next][13]=none
 
 liverytype[0]=Regional-Railways-Standard
 liverytype[1]=One

diff --git a/trains/br-156.dat b/trains/br-156.dat
@@ -50,7 +50,8 @@ Constraint[Prev][7]=br-142-1-rear
 Constraint[Prev][8]=br-144-0-rear
 Constraint[Prev][9]=br-144-1-rear
 Constraint[Prev][10]=BR-170Rear
-Constraint[Prev][11]=none
+Constraint[Prev][11]=br-159-rear
+Constraint[Prev][12]=none
 
 Constraint[Next][0]=br-156-rear
 
@@ -129,7 +130,8 @@ Constraint[Prev][7]=br-142-1-rear
 Constraint[Prev][8]=br-144-0-rear
 Constraint[Prev][9]=br-144-1-rear
 Constraint[Prev][10]=BR-170Rear
-Constraint[Prev][11]=none
+Constraint[Prev][11]=br-159-rear
+Constraint[Prev][12]=none
 
 Constraint[Next][0]=br-156-rear
 
@@ -209,7 +211,8 @@ Constraint[Next][8]=br-142-1-front
 Constraint[Next][9]=br-144-0-front
 Constraint[Next][10]=br-144-1-front
 Constraint[Next][11]=BR-170Front
-Constraint[Next][12]=none
+Constraint[Next][12]=br-159-front
+Constraint[Next][13]=none
 
 liverytype[0]=Regional-Railways-Standard
 liverytype[1]=One

diff --git a/trains/br-158.dat b/trains/br-158.dat
@@ -1,4 +1,3 @@
-# TODO: Add Class 159 (with first class)
 obj=vehicle
 name=br-158-front
 engine_type=diesel
@@ -21,7 +20,7 @@ length=12
 brake_force=29
 rolling_resistance=13
 
-weight=38
+weight=38.5
 axles=4
 cost=2100000
 runningcost=78
@@ -48,7 +47,8 @@ Constraint[Prev][7]=br-142-1-rear
 Constraint[Prev][8]=br-144-0-rear
 Constraint[Prev][9]=br-144-1-rear
 Constraint[Prev][10]=BR-170Rear
-Constraint[Prev][11]=none
+Constraint[Prev][11]=br-159-rear
+Constraint[Prev][12]=none
 
 Constraint[Next][0]=br-158-rear
 Constraint[Next][1]=br-158-centre
@@ -88,7 +88,7 @@ length=12
 brake_force=29
 rolling_resistance=13
 
-weight=38
+weight=38.5
 axles=4
 cost=2100000
 runningcost=78
@@ -104,7 +104,6 @@ comfort[0]=0
 comfort[1]=118
 
 Constraint[Prev][0]=br-158-front
-Constraint[Prev][1]=br-158-centre
 
 Constraint[Next][0]=br-158-rear
 
@@ -143,7 +142,7 @@ length=12
 brake_force=29
 rolling_resistance=13
 
-weight=38
+weight=38.5
 axles=4
 cost=2100000
 runningcost=78
@@ -173,7 +172,8 @@ Constraint[Next][8]=br-142-1-front
 Constraint[Next][9]=br-144-0-front
 Constraint[Next][10]=br-144-1-front
 Constraint[Next][11]=BR-170Front
-Constraint[Next][12]=none
+Constraint[Next][12]=br-159-front
+Constraint[Next][13]=none
 
 liverytype[0]=Regional-Railways-Standard