Merge branch 'jp-master' into ncn-integration

neroden · Jun 3, 2024 · 02f3fa1 · 02f3fa1
2 parents a8fcf10 + 6638e75
commit 02f3fa1
Show file tree

Hide file tree

Showing 188 changed files with 439 additions and 234 deletions.
diff --git a/Comfort calibration overview.ods b/Comfort calibration overview.ods
diff --git a/london-underground/1967-tube-stock.dat b/london-underground/1967-tube-stock.dat
@@ -23,7 +23,7 @@ axles=4
 cost=1450000
 runningcost=60
 fixed_cost=7208
-sound=lul-1938-stock-ff3170.wav
+sound=the_bloke33-1972-stock.wav
 
 can_lead_from_rear=1
 bidirectional=0
@@ -87,7 +87,6 @@ cost=750000
 runningcost=0
 fixed_cost=893
 
-
 can_lead_from_rear=0
 bidirectional=1
 
@@ -218,7 +217,6 @@ axles=4
 cost=1450000
 runningcost=60
 fixed_cost=7208
-sound=lul-1938-stock-ff3170.wav
 
 can_lead_from_rear=1
 bidirectional=0

diff --git a/london-underground/1973-tube-stock.dat b/london-underground/1973-tube-stock.dat
@@ -23,7 +23,7 @@ axles=4
 cost=1650000
 runningcost=45
 fixed_cost=7375
-sound=lul-1938-stock-ff3170.wav
+sound=the_bloke33-1972-stock
 
 can_lead_from_rear=1
 bidirectional=0
@@ -349,7 +349,6 @@ axles=4
 cost=1650000
 runningcost=45
 fixed_cost=7375
-sound=lul-1938-stock-ff3170.wav
 
 can_lead_from_rear=1
 bidirectional=0

diff --git a/london-underground/1983-tube-stock.dat b/london-underground/1983-tube-stock.dat
@@ -23,7 +23,7 @@ axles=4
 cost=1550000
 runningcost=35
 fixed_cost=7292
-sound=lul-1938-stock-ff3170.wav
+sound=the_bloke33-1972-stock.wav
 
 can_lead_from_rear=1
 bidirectional=0
@@ -292,7 +292,6 @@ axles=4
 cost=1550000
 runningcost=35
 fixed_cost=7292
-sound=lul-1938-stock-ff3170.wav
 
 can_lead_from_rear=1
 bidirectional=0

diff --git a/london-underground/lul-c-stock.dat b/london-underground/lul-c-stock.dat
@@ -26,7 +26,7 @@ axles=4
 cost=7000000
 runningcost=53
 fixed_cost=11833
-sound=lul-1938-stock-ff3170.wav
+sound=the_bloke33-1972-stock.wav
 
 can_lead_from_rear=1
 way_constraint_permissive[3]=3
@@ -213,7 +213,6 @@ axles=4
 cost=7000000
 runningcost=53
 fixed_cost=11833
-sound=lul-1938-stock-ff3170.wav
 
 can_lead_from_rear=1
 way_constraint_permissive[3]=3

diff --git a/sound/credits.txt b/sound/credits.txt
@@ -148,6 +148,7 @@ sandeepkurissery-flock-of-sheep.wav
 The Bloke 33
 http://freesound.org/people/the_bloke33/
 the-bloke33-dennis-dart-modern.wav
+the_bloke33-1972-stock.wav
 (CC Attribution)
 
 Multithunder 227
@@ -240,6 +241,10 @@ spompeytransportvideo-class-52.wav
 spompeytransportvideo-class-205.wav
 spompeytransportvideo-class-08.wav
 spompeytransportvideo-class-42.wav
+spompeytransportvideo-class-85.wav
+spompeytransportvideo-class-150.wav
+spompeytransportvideo-class-117.wav
+spompeytransportvideo-tyne-wear-metro.wav
 (Artistic Licence 1.0)
 
 androo4519

diff --git a/sound/spompeytransportvideo-class-117.wav b/sound/spompeytransportvideo-class-117.wav
diff --git a/sound/spompeytransportvideo-class-150.wav b/sound/spompeytransportvideo-class-150.wav
diff --git a/sound/spompeytransportvideo-class-85.wav b/sound/spompeytransportvideo-class-85.wav
diff --git a/sound/spompeytransportvideo-tyne-wear-metro.wav b/sound/spompeytransportvideo-tyne-wear-metro.wav
diff --git a/sound/the_bloke33-1972-stock.wav b/sound/the_bloke33-1972-stock.wav
diff --git a/text/en.tab b/text/en.tab
@@ -4594,6 +4594,10 @@ LNER-1937-Tyneside-EMU-rear-composite
 LNER Tyneside EMU (rear, composite)
 LNER-1937-Tyneside-EMU-MPV
 LNER Tyneside EMU (motor parcels van)
+lner-steam-railmotor-1924
+LNER Sentinel-Cammell steam railmotor (articulated)
+lner-steam-railmotor-1928
+LNER Sentinel-Cammell steam railmotor (rigid)
 LMS-EMU-driving-trailer
 LMS suburban EMU
 LMS-EMU-centre-trailer

diff --git a/trains/br-104.dat b/trains/br-104.dat
@@ -27,7 +27,7 @@ axles=4
 cost=1250000
 runningcost=224
 fixed_cost=7302
-sound=video47-class-121.wav
+sound=spompeytransportvideo-class-117.wav
 
 can_lead_from_rear=1
 bidirectional=0

diff --git a/trains/br-110.dat b/trains/br-110.dat
@@ -28,7 +28,7 @@ cost=1367500
 runningcost=268
 fixed_cost=8459
 # TODO: Attempt to find a suitable sound for this unit.
-sound=video47-class-121.wav
+sound=spompeytransportvideo-class-117.wav
 increase_maintenance_after_years=4
 
 can_lead_from_rear=1

diff --git a/trains/br-114.dat b/trains/br-114.dat
@@ -28,7 +28,7 @@ axles=4
 cost=1273000
 runningcost=224
 fixed_cost=11292
-sound=video47-class-121.wav
+sound=spompeytransportvideo-class-117.wav
 
 can_lead_from_rear=1
 bidirectional=0

diff --git a/trains/br-117.dat b/trains/br-117.dat
@@ -27,7 +27,7 @@ axles=4
 cost=1290000
 runningcost=224
 fixed_cost=11344
-sound=video47-class-121.wav
+sound=spompeytransportvideo-class-117.wav
 
 can_lead_from_rear=1
 bidirectional=0

diff --git a/trains/br-120.dat b/trains/br-120.dat
@@ -27,7 +27,7 @@ axles=4
 cost=1400000
 runningcost=224
 fixed_cost=11458
-sound=video47-class-121.wav
+sound=spompeytransportvideo-class-117.wav
 
 can_lead_from_rear=1
 bidirectional=0

diff --git a/trains/br-121.dat b/trains/br-121.dat
@@ -24,7 +24,7 @@ axles=4
 cost=1300000
 runningcost=112
 fixed_cost=10903
-sound=video47-class-121.wav
+sound=spompeytransportvideo-class-117.wav
 
 can_lead_from_rear=1
 bidirectional=1

diff --git a/trains/br-127.dat b/trains/br-127.dat
@@ -33,7 +33,7 @@ cost=1380000
 runningcost=355
 fixed_cost=13046
 # TODO: Get a better sound for this. There is a preserved example, so recordings should be available.
-sound=video47-class-121.wav
+sound=spompeytransportvideo-class-117.wav
 
 can_lead_from_rear=1
 bidirectional=0

diff --git a/trains/br-128.dat b/trains/br-128.dat
@@ -22,7 +22,7 @@ axles=4
 cost=1340000
 runningcost=343
 fixed_cost=11396
-sound=video47-class-121.wav
+sound=spompeytransportvideo-class-117.wav
 
 can_lead_from_rear=1
 bidirectional=1

diff --git a/trains/br-150.dat b/trains/br-150.dat
@@ -25,7 +25,7 @@ axles=4
 cost=1840000
 runningcost=64
 fixed_cost=6958
-sound=konakaboom-class-159.wav
+sound=spompeytransportvideo-class-150.wav
 
 can_lead_from_rear=1
 bidirectional=0

diff --git a/trains/br-153.dat b/trains/br-153.dat
@@ -26,7 +26,7 @@ cost=1296000
 upgrade_price=0
 runningcost=64
 fixed_cost=6675
-sound=konakaboom-class-159.wav
+sound=spompeytransportvideo-class-150.wav
 
 increase_maintenance_after_years=23
 

diff --git a/trains/br-156.dat b/trains/br-156.dat
@@ -25,7 +25,7 @@ cost=1960000
 upgrade_price=0
 runningcost=64
 fixed_cost=7021
-sound=konakaboom-class-159.wav
+sound=spompeytransportvideo-class-150.wav
 
 can_lead_from_rear=1
 bidirectional=0

diff --git a/trains/br-cl30.dat b/trains/br-cl30.dat
@@ -27,6 +27,7 @@ fixed_cost=19240
 # first introduced.
 increase_maintenance_after_years=6
 rolling_resistance=13
+# It is likely to be difficult to find an authentic sound for this, so use the Class 31 sound instead.
 sound=laurie-class-31.wav
 
 can_lead_from_rear=0

diff --git a/trains/br-cl81.dat b/trains/br-cl81.dat
@@ -23,7 +23,7 @@ axles=4
 cost=8785000
 runningcost=479
 fixed_cost=16101
-sound=treacher-rail-class-86.wav
+sound=spompeytransportvideo-class-85.wav
 increase_maintenance_after_years=20
 
 can_lead_from_rear=0

diff --git a/trains/br-cl85.dat b/trains/br-cl85.dat
@@ -22,7 +22,7 @@ axles=4
 cost=8801000
 runningcost=456
 fixed_cost=16100
-sound=treacher-rail-class-86.wav
+sound=spompeytransportvideo-class-85.wav
 increase_maintenance_after_years=20
 
 can_lead_from_rear=0

diff --git a/trains/lms-10000-b.dat b/trains/lms-10000-b.dat
diff --git a/trains/lms-10000.dat b/trains/lms-10000.dat
@@ -0,0 +1,77 @@
+obj=vehicle
+name=LMS-10000
+engine_type=diesel
+smoke=Diesel-heavy
+speed=150
+gear=50
+power=1200
+tractive_effort=184
+copyright=James
+intro_year=1947
+intro_month=10
+# Extended production time, 
+# as this is when the next type 3s are introduced.
+retire_year=1960
+retire_month=6
+waytype=track
+freight=None
+payload=0
+length=11
+
+# https://en.wikipedia.org/wiki/British_Rail_Class_D16/1
+weight=129.7
+axles=6
+cost=11491200
+runningcost=1203
+fixed_cost=21970
+sound=lwalker-class-40.wav
+increase_maintenance_after_years=15
+
+can_lead_from_rear=0
+bidirectional=1
+
+# Multiple working within type (red diamond)
+Constraint[Prev][0]=LMS-10000
+Constraint[Prev][1]=none
+
+liverytype[0]=LMS-Standard
+liverytype[1]=BR-Early
+liverytype[2]=BR-Revised
+liverytype[3]=BR-Blue
+
+EmptyImage[E][0]=./locomotives/lms-10000_E.0.0
+EmptyImage[SE][0]=./locomotives/lms-10000_SE.0.0
+EmptyImage[S][0]=./locomotives/lms-10000_S.0.0
+EmptyImage[SW][0]=./locomotives/lms-10000_SW.0.0
+EmptyImage[W][0]=./locomotives/lms-10000_W.0.0
+EmptyImage[NW][0]=./locomotives/lms-10000_NW.0.0
+EmptyImage[N][0]=./locomotives/lms-10000_N.0.0
+EmptyImage[NE][0]=./locomotives/lms-10000_NE.0.0
+
+EmptyImage[E][1]=./locomotives/lms-10000-br-black_E.0.0
+EmptyImage[SE][1]=./locomotives/lms-10000-br-black_SE.0.0
+EmptyImage[S][1]=./locomotives/lms-10000-br-black_S.0.0
+EmptyImage[SW][1]=./locomotives/lms-10000-br-black_SW.0.0
+EmptyImage[W][1]=./locomotives/lms-10000-br-black_W.0.0
+EmptyImage[NW][1]=./locomotives/lms-10000-br-black_NW.0.0
+EmptyImage[N][1]=./locomotives/lms-10000-br-black_N.0.0
+EmptyImage[NE][1]=./locomotives/lms-10000-br-black_NE.0.0
+
+EmptyImage[E][2]=./locomotives/lms-10000-br-green_E.0.0
+EmptyImage[SE][2]=./locomotives/lms-10000-br-green_SE.0.0
+EmptyImage[S][2]=./locomotives/lms-10000-br-green_S.0.0
+EmptyImage[SW][2]=./locomotives/lms-10000-br-green_SW.0.0
+EmptyImage[W][2]=./locomotives/lms-10000-br-green_W.0.0
+EmptyImage[NW][2]=./locomotives/lms-10000-br-green_NW.0.0
+EmptyImage[N][2]=./locomotives/lms-10000-br-green_N.0.0
+EmptyImage[NE][2]=./locomotives/lms-10000-br-green_NE.0.0
+
+EmptyImage[E][3]=./locomotives/lms-10000-br-blue_E.0.0
+EmptyImage[SE][3]=./locomotives/lms-10000-br-blue_SE.0.0
+EmptyImage[S][3]=./locomotives/lms-10000-br-blue_S.0.0
+EmptyImage[SW][3]=./locomotives/lms-10000-br-blue_SW.0.0
+EmptyImage[W][3]=./locomotives/lms-10000-br-blue_W.0.0
+EmptyImage[NW][3]=./locomotives/lms-10000-br-blue_NW.0.0
+EmptyImage[N][3]=./locomotives/lms-10000-br-blue_N.0.0
+EmptyImage[NE][3]=./locomotives/lms-10000-br-blue_NE.0.0
+