Skip to content

Commit

Permalink
Merge branch 'master' into ex-15
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamespetts
jamespetts committed May 30, 2024
2 parents acfdb71 + c1fcbc4 commit 9c93e1f
Show file tree
Hide file tree
Showing 4,516 changed files with 11,328 additions and 2,467 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file modified Comfort calibration overview.ods
View file
Binary file not shown.
Binary file added SR_Lord_Nelson_Class_No_860_Lord_Hawke.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion boats/ps-industry.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ engine_type=steam
speed=15
power=200
smoke=Steam
sound=ship-horn_b.wav
sound=ship-horn_b.wav
freight=vegetables
payload=45
weight=50
Expand Down
2 changes: 1 addition & 1 deletion bus/aec-607-pneumatic.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ intro_month=7
retire_year=1931
retire_month=8
is_tall=1
sound=androo4519-btu9613t.wav2
sound=androo4519-btu9613t.wav

comfort=38
# Rear platform with conductor: 2.0 seconds per passenger
Expand Down
2 changes: 1 addition & 1 deletion bus/aec-607.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ intro_month=2
retire_year=1927
retire_month=9
is_tall=1
sound=androo4519-btu9613t.wav2
sound=androo4519-btu9613t.wav
upgrade[0]=aec-607-pneumatic

comfort=34
Expand Down
2 changes: 1 addition & 1 deletion bus/bradford-brown-trolleybus.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ intro_month=9
retire_year=1921
retire_month=1
is_tall=0
sound=androo4519-btu9613t.wav2
sound=androo4519-btu9613t.wav

comfort=30
# Rear platform with conductor: 2.0 seconds per passenger
Expand Down
2 changes: 1 addition & 1 deletion bus/dennis-ace.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ waytype=road
freight=Passagiere
payload=20
length=4
sound=gareth-bull-leyland-titan-td1.wav
sound=richard-walker-dennis-e.wav

comfort=38
# One door pay driver: 4.0 seconds per passenger
Expand Down
2 changes: 1 addition & 1 deletion bus/dennis-dart-original.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ waytype=road
freight=Passagiere
payload=20
length=4
sound=gareth-bull-leyland-titan-td1.wav
sound=richard-walker-dennis-e.wav

comfort=37
# One door pay driver: 4.0 seconds per passenger
Expand Down
2 changes: 1 addition & 1 deletion bus/dennis-e-bus.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ intro_year=1925
intro_month=12
retire_year=1930
retire_month=4
sound=gareth-bull-leyland-titan-td1.wav
sound=richard-walker-dennis-e.wav

comfort=37
# Open platform with conductor: 2.0 seconds per passenger
Expand Down
2 changes: 1 addition & 1 deletion bus/dennis-ev-bus.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ intro_year=1929
intro_month=10
retire_year=1931
retire_month=8
sound=gareth-bull-leyland-titan-td1.wav
sound=richard-walker-dennis-e.wav

comfort=37
# Open platform with conductor: 2.0 seconds per passenger
Expand Down
2 changes: 1 addition & 1 deletion bus/dennis-f.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ intro_year=1927
intro_month=3
retire_year=1930
retire_month=10
sound=gareth-bull-leyland-titan-td1.wav
sound=richard-walker-dennis-e.wav

comfort=73
# Coach: 7.5 seconds per passenger
Expand Down
2 changes: 1 addition & 1 deletion bus/dennis-fs.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ intro_year=1930
intro_month=2
retire_year=1932
retire_month=3
sound=gareth-bull-leyland-titan-td1.wav
sound=richard-walker-dennis-e.wav

comfort=73
# Coach: 7.5 seconds per passenger
Expand Down
2 changes: 1 addition & 1 deletion bus/dennis-h.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ intro_month=1
retire_year=1930
retire_month=11
is_tall=1
sound=gareth-bull-leyland-titan-td1.wav
sound=richard-walker-dennis-e.wav

comfort=37
# Open platform with conductor: 2.0 seconds per passenger
Expand Down
2 changes: 1 addition & 1 deletion bus/dennis-lancet-2-coach.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ intro_year=1935
intro_month=5
retire_year=1939
retire_month=10
sound=video47-leyland-titan-pd1.wav
sound=richard-walker-dennis-e.wav

comfort=69
# Coach: 7.5 seconds per passenger
Expand Down
2 changes: 1 addition & 1 deletion bus/dennis-lancet-2.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ intro_year=1935
intro_month=5
retire_year=1939
retire_month=10
sound=video47-leyland-titan-pd1.wav
sound=richard-walker-dennis-e.wav

comfort=41
# Single door with conductor: 2.5 seconds per passenger
Expand Down
2 changes: 1 addition & 1 deletion bus/straker-squire-a-type-double.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ intro_month=11
retire_year=1927
retire_month=7
is_tall=1
sound=androo4519-btu9613t.wav2
sound=androo4519-btu9613t.wav

comfort=32
# Rear platform with conductor: 2.0 seconds per passenger
Expand Down
4 changes: 2 additions & 2 deletions citybuildings/res-1840.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ class_proportion[2]=25
class_proportion[3]=0
class_proportion[4]=0
intro_year=1975
retire_year=1970
retire_year=1995
needs_ground=1
regions=3,5
dims=1,1,4
Expand Down Expand Up @@ -643,7 +643,7 @@ class_proportion[2]=25
class_proportion[3]=00
class_proportion[4]=0
intro_year=1975
retire_year=1970
retire_year=1995
needs_ground=1
dims=1,1,4
regions=3,5
Expand Down
176 changes: 172 additions & 4 deletions citybuildings/res-1870.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,43 @@ BackImage[0][0][0][0][0][1]=images/res/1870-townhouse-3f.1.2
BackImage[3][0][0][0][0][1]=images/res/1870-townhouse-3f.1.3
--
Obj=building
Name=RES_A_1870_00_12
Name=RES_A_1870_00_12_CAL
copyright=Archon
type=RES
chance=320
population_and_visitor_demand_capacity=100
Level=12
# Squalid tenements
class_proportion[0]=60
class_proportion[1]=40
class_proportion[2]=0
class_proportion[3]=0
class_proportion[4]=0
intro_year=1870
retire_year=1920
needs_ground=1
dims=1,1,4
# Tenements are the characteristic housing stock of central Scotland
regions=2
clusters=12

BackImage[0][0][0][0][0][0]=images/res/1870-tenement-3f.0.0
BackImage[1][0][0][0][0][0]=images/res/1870-tenement-3f.0.1
BackImage[2][0][0][0][0][0]=images/res/1870-tenement-3f.0.2
BackImage[3][0][0][0][0][0]=images/res/1870-tenement-3f.0.3
BackImage[0][0][0][0][0][1]=images/res/1870-tenement-3f.1.0
BackImage[1][0][0][0][0][1]=images/res/1870-tenement-3f.1.1
BackImage[2][0][0][0][0][1]=images/res/1870-tenement-3f.1.2
BackImage[3][0][0][0][0][1]=images/res/1870-tenement-3f.1.3
--
Obj=building
Name=RES_A_1870_00_12_ERIN
copyright=Archon
type=RES
chance=80
population_and_visitor_demand_capacity=100
Level=12
# Squalid tenaments
# Squalid tenements
class_proportion[0]=60
class_proportion[1]=40
class_proportion[2]=0
Expand All @@ -42,6 +72,8 @@ intro_year=1870
retire_year=1920
needs_ground=1
dims=1,1,4
# Tenements occurred in Dublin, though the Hiberian English term is much wider than this building
regions=5
clusters=12

BackImage[0][0][0][0][0][0]=images/res/1870-tenement-3f.0.0
Expand All @@ -54,13 +86,148 @@ BackImage[2][0][0][0][0][1]=images/res/1870-tenement-3f.1.2
BackImage[3][0][0][0][0][1]=images/res/1870-tenement-3f.1.3
--
Obj=building
Name=RES_A_1870_01_15
Name=RES_A_1870_00_12
copyright=Archon
type=RES
chance=20
population_and_visitor_demand_capacity=100
Level=12
# Squalid tenements
class_proportion[0]=60
class_proportion[1]=40
class_proportion[2]=0
class_proportion[3]=0
class_proportion[4]=0
intro_year=1870
retire_year=1920
needs_ground=1
dims=1,1,4
regions=0,1,3,4
clusters=12

BackImage[0][0][0][0][0][0]=images/res/1870-tenement-3f.0.0
BackImage[1][0][0][0][0][0]=images/res/1870-tenement-3f.0.1
BackImage[2][0][0][0][0][0]=images/res/1870-tenement-3f.0.2
BackImage[3][0][0][0][0][0]=images/res/1870-tenement-3f.0.3
BackImage[0][0][0][0][0][1]=images/res/1870-tenement-3f.1.0
BackImage[1][0][0][0][0][1]=images/res/1870-tenement-3f.1.1
BackImage[2][0][0][0][0][1]=images/res/1870-tenement-3f.1.2
BackImage[3][0][0][0][0][1]=images/res/1870-tenement-3f.1.3
--
Obj=building
Name=RES_A_1870_01_15_CAL
copyright=Archon
type=RES
chance=380
population_and_visitor_demand_capacity=100
Level=15
# Large squalid tenements
class_proportion[0]=55
class_proportion[1]=45
class_proportion[2]=0
class_proportion[3]=0
class_proportion[4]=0
intro_year=1870
retire_year=1920
needs_ground=1
# Tenements are the characteristic housing stock of central Scotland
regions=2
dims=1,1,8
clusters=12

BackImage[0][0][0][0][0][0]=images/res/1875-tenement-4f.1.0
BackImage[0][0][0][1][0][0]=images/res/1875-tenement-4f.0.0
BackImage[1][0][0][0][0][0]=images/res/1875-tenement-4f.1.1
BackImage[1][0][0][1][0][0]=images/res/1875-tenement-4f.0.1
BackImage[2][0][0][0][0][0]=images/res/1875-tenement-4f.1.2
BackImage[2][0][0][1][0][0]=images/res/1875-tenement-4f.0.2
BackImage[3][0][0][0][0][0]=images/res/1875-tenement-4f.1.3
BackImage[3][0][0][1][0][0]=images/res/1875-tenement-4f.0.3
BackImage[4][0][0][0][0][0]=images/res/1875-tenement-4f.5.0
BackImage[4][0][0][1][0][0]=images/res/1875-tenement-4f.4.0
BackImage[5][0][0][0][0][0]=images/res/1875-tenement-4f.5.1
BackImage[5][0][0][1][0][0]=images/res/1875-tenement-4f.4.1
BackImage[6][0][0][0][0][0]=images/res/1875-tenement-4f.5.2
BackImage[7][0][0][0][0][0]=images/res/1875-tenement-4f.5.3
BackImage[7][0][0][1][0][0]=images/res/1875-tenement-4f.4.3

BackImage[0][0][0][0][0][1]=images/res/1875-tenement-4f.3.0
BackImage[0][0][0][1][0][1]=images/res/1875-tenement-4f.2.0
BackImage[1][0][0][0][0][1]=images/res/1875-tenement-4f.3.1
BackImage[1][0][0][1][0][1]=images/res/1875-tenement-4f.2.1
BackImage[2][0][0][0][0][1]=images/res/1875-tenement-4f.3.2
BackImage[2][0][0][1][0][1]=images/res/1875-tenement-4f.2.2
BackImage[3][0][0][0][0][1]=images/res/1875-tenement-4f.3.3
BackImage[3][0][0][1][0][1]=images/res/1875-tenement-4f.2.3
BackImage[4][0][0][0][0][1]=images/res/1875-tenement-4f.7.0
BackImage[4][0][0][1][0][1]=images/res/1875-tenement-4f.6.0
BackImage[5][0][0][0][0][1]=images/res/1875-tenement-4f.7.1
BackImage[5][0][0][1][0][1]=images/res/1875-tenement-4f.6.1
BackImage[6][0][0][0][0][1]=images/res/1875-tenement-4f.7.2
BackImage[7][0][0][0][0][1]=images/res/1875-tenement-4f.7.3
BackImage[7][0][0][1][0][1]=images/res/1875-tenement-4f.6.3
--
Obj=building
Name=RES_A_1870_01_15_ERIN
copyright=Archon
type=RES
chance=95
population_and_visitor_demand_capacity=100
Level=15
# Large squalid tenaments
# Large squalid tenements
class_proportion[0]=55
class_proportion[1]=45
class_proportion[2]=0
class_proportion[3]=0
class_proportion[4]=0
intro_year=1870
retire_year=1920
needs_ground=1
# Tenements occurred in Dublin, though the Hiberian English term is much wider than this building
regions=5
dims=1,1,8
clusters=12

BackImage[0][0][0][0][0][0]=images/res/1875-tenement-4f.1.0
BackImage[0][0][0][1][0][0]=images/res/1875-tenement-4f.0.0
BackImage[1][0][0][0][0][0]=images/res/1875-tenement-4f.1.1
BackImage[1][0][0][1][0][0]=images/res/1875-tenement-4f.0.1
BackImage[2][0][0][0][0][0]=images/res/1875-tenement-4f.1.2
BackImage[2][0][0][1][0][0]=images/res/1875-tenement-4f.0.2
BackImage[3][0][0][0][0][0]=images/res/1875-tenement-4f.1.3
BackImage[3][0][0][1][0][0]=images/res/1875-tenement-4f.0.3
BackImage[4][0][0][0][0][0]=images/res/1875-tenement-4f.5.0
BackImage[4][0][0][1][0][0]=images/res/1875-tenement-4f.4.0
BackImage[5][0][0][0][0][0]=images/res/1875-tenement-4f.5.1
BackImage[5][0][0][1][0][0]=images/res/1875-tenement-4f.4.1
BackImage[6][0][0][0][0][0]=images/res/1875-tenement-4f.5.2
BackImage[7][0][0][0][0][0]=images/res/1875-tenement-4f.5.3
BackImage[7][0][0][1][0][0]=images/res/1875-tenement-4f.4.3

BackImage[0][0][0][0][0][1]=images/res/1875-tenement-4f.3.0
BackImage[0][0][0][1][0][1]=images/res/1875-tenement-4f.2.0
BackImage[1][0][0][0][0][1]=images/res/1875-tenement-4f.3.1
BackImage[1][0][0][1][0][1]=images/res/1875-tenement-4f.2.1
BackImage[2][0][0][0][0][1]=images/res/1875-tenement-4f.3.2
BackImage[2][0][0][1][0][1]=images/res/1875-tenement-4f.2.2
BackImage[3][0][0][0][0][1]=images/res/1875-tenement-4f.3.3
BackImage[3][0][0][1][0][1]=images/res/1875-tenement-4f.2.3
BackImage[4][0][0][0][0][1]=images/res/1875-tenement-4f.7.0
BackImage[4][0][0][1][0][1]=images/res/1875-tenement-4f.6.0
BackImage[5][0][0][0][0][1]=images/res/1875-tenement-4f.7.1
BackImage[5][0][0][1][0][1]=images/res/1875-tenement-4f.6.1
BackImage[6][0][0][0][0][1]=images/res/1875-tenement-4f.7.2
BackImage[7][0][0][0][0][1]=images/res/1875-tenement-4f.7.3
BackImage[7][0][0][1][0][1]=images/res/1875-tenement-4f.6.3
--
Obj=building
Name=RES_A_1870_01_15
copyright=Archon
type=RES
chance=24
population_and_visitor_demand_capacity=100
Level=15
# Large squalid tenements
class_proportion[0]=55
class_proportion[1]=45
class_proportion[2]=0
Expand All @@ -69,6 +236,7 @@ class_proportion[4]=0
intro_year=1870
retire_year=1920
needs_ground=1
regions=0,1,3,4
dims=1,1,8
clusters=12

Expand Down
Loading

0 comments on commit 9c93e1f

Please sign in to comment.