Merge branch 'master' into ex-15

attractions/stone-attractions.dat

@@ -988,10 +988,10 @@ Backimage[0][2][1][0][0][0]=images/cur/stone-attractions.2.1
 Backimage[0][2][1][0][0][1]=images/cur/stone-attractions-snow.2.1
 Backimage[0][0][2][0][0][0]=images/cur/stone-attractions.2.1
 Backimage[0][0][2][0][0][1]=images/cur/stone-attractions-snow.2.1
+# The gate tower, orientation 0.  Tricky to align correctly.  Patching can catch the wrong orientation.
 Backimage[0][1][2][0][0][0]=images/cur/stone-attractions.4.1
 Backimage[0][1][2][0][0][1]=images/cur/stone-attractions-snow.4.1
-Backimage[0][1][2][1][0][0]=images/cur/stone-attractions.3.1
-Backimage[0][1][2][1][0][1]=images/cur/stone-attractions-snow.3.1
+# End gate tower orientation 0.
 Backimage[0][2][2][0][0][0]=images/cur/stone-attractions.2.1
 Backimage[0][2][2][0][0][1]=images/cur/stone-attractions-snow.2.1
 
@@ -1001,8 +1001,10 @@ Backimage[1][1][0][0][0][0]=images/cur/stone-attractions.2.0
 Backimage[1][1][0][0][0][1]=images/cur/stone-attractions-snow.2.0
 Backimage[1][2][0][0][0][0]=images/cur/stone-attractions.2.2
 Backimage[1][2][0][0][0][1]=images/cur/stone-attractions-snow.2.2
+# The gate tower, orientation 1.  Tricky to align correctly.  Patching can catch the wrong orientation.
 Backimage[1][0][1][0][0][0]=images/cur/stone-attractions.4.0,44,-22
 Backimage[1][0][1][0][0][1]=images/cur/stone-attractions-snow.4.0,44,-22
+# End gate tower orientation 1.
 Backimage[1][1][1][0][0][0]=images/cur/stone-attractions.4.7
 Backimage[1][1][1][0][0][1]=images/cur/stone-attractions-snow.4.7
 Backimage[1][2][1][0][0][0]=images/cur/stone-attractions.1.1
@@ -1028,8 +1030,10 @@ Backimage[2][0][1][0][0][0]=images/cur/stone-attractions.2.1
 Backimage[2][0][1][0][0][1]=images/cur/stone-attractions-snow.2.1
 Backimage[2][2][0][0][0][0]=images/cur/stone-attractions.2.1
 Backimage[2][2][0][0][0][1]=images/cur/stone-attractions-snow.2.1
-Backimage[2][1][0][0][0][0]=images/cur/stone-attractions.4.1,44,-22
-Backimage[2][1][0][0][0][1]=images/cur/stone-attractions-snow.4.1,44,-22
+# The gate tower, orientation 2.  Tricky to align correctly.  Patching can catch the wrong orientation.
+Backimage[2][1][0][0][0][0]=images/cur/stone-attractions.4.1,-44,-22
+Backimage[2][1][0][0][0][1]=images/cur/stone-attractions-snow.4.1,-44,-22
+# End gate tower orientation 2.
 Backimage[2][0][0][0][0][0]=images/cur/stone-attractions.2.1
 Backimage[2][0][0][0][0][1]=images/cur/stone-attractions-snow.2.1
 
@@ -1039,8 +1043,10 @@ Backimage[3][1][0][0][0][0]=images/cur/stone-attractions.2.0
 Backimage[3][1][0][0][0][1]=images/cur/stone-attractions-snow.2.0
 Backimage[3][0][0][0][0][0]=images/cur/stone-attractions.2.2
 Backimage[3][0][0][0][0][1]=images/cur/stone-attractions-snow.2.2
+# The gate tower, orientation 3.  Tricky to align correctly.  Patching can catch the wrong orientation.
 Backimage[3][2][1][0][0][0]=images/cur/stone-attractions.4.0
 Backimage[3][2][1][0][0][1]=images/cur/stone-attractions-snow.4.0
+# End gate tower orientation 3.
 Backimage[3][1][1][0][0][0]=images/cur/stone-attractions.4.7
 Backimage[3][1][1][0][0][1]=images/cur/stone-attractions-snow.4.7
 Backimage[3][0][1][0][0][0]=images/cur/stone-attractions.1.1

config/simuconf.tab

@@ -162,10 +162,10 @@ commuting_trip_chance_percent = 20
 #min_alternative_destinations_visiting = 1
 
 max_alternative_destinations_per_visitor_demand_millionths = 2750
-max_alternative_destinations_per_job_millionths = 5000
+max_alternative_destinations_per_job_millionths = 12000
 
 min_alternative_destinations_per_visitor_demand_millionths = 750
-min_alternative_destinations_per_job_millionths = 2500
+min_alternative_destinations_per_job_millionths = 6000
 
 # Passengers have a maximum tolerance level for how long that they will spend travelling. 
 # Passengers are generated in two groups: commuting and visiting passengers. Commuting 

industry/fishing-ground.dat

@@ -18,7 +18,10 @@ Location=Water
 distributionweight=19
 Productivity=40
 Range=40
-max_distance_to_consumer=40
+# Britain was sending fishing fleets from the east coast of the UK
+# to fish off the coast of Iceland in the 14th century.
+# See the article on the "Cod Wars" in Wikipedia.
+max_distance_to_consumer=1500
 passenger_boost=0
 mail_boost=0
 electricity_amount=0
@@ -51,7 +54,7 @@ Location=Water
 distributionweight=13
 Productivity=60
 Range=40
-max_distance_to_consumer=60
+max_distance_to_consumer=1500
 passenger_boost=0
 mail_boost=0
 electricity_amount=0
@@ -84,7 +87,7 @@ Location=Water
 distributionweight=10
 Productivity=140
 Range=40
-max_distance_to_consumer=100
+max_distance_to_consumer=1500
 passenger_boost=0
 mail_boost=0
 electricity_amount=0
@@ -118,7 +121,7 @@ Location=Water
 distributionweight=9
 Productivity=100
 Range=40
-max_distance_to_consumer=100
+max_distance_to_consumer=1500
 passenger_boost=0
 mail_boost=0
 electricity_amount=0
@@ -148,7 +151,7 @@ Location=Water
 distributionweight=8
 Productivity=70
 Range=20
-max_distance_to_consumer=100
+max_distance_to_consumer=1500
 passenger_boost=0
 mail_boost=0
 electricity_amount=0

industry/market.dat

@@ -9,7 +9,8 @@ copyright=jamespetts
 # Divide by 2 for meters/tile adjustment
 # x4 to compensate for the size
 population_and_visitor_demand_capacity=400
-employment_capacity=120
+# Take into account that a market only normally runs a few days a week.
+employment_capacity=35
 mail_demand=0
 class_proportion[0]=35
 class_proportion[1]=55
@@ -79,7 +80,7 @@ retire_year=1910
 retire_month=12
 copyright=jamespetts
 population_and_visitor_demand_capacity=800
-employment_capacity=240
+employment_capacity=60
 mail_demand=0
 class_proportion[0]=35
 class_proportion[1]=55
@@ -146,7 +147,7 @@ retire_year=1945
 retire_month=3
 copyright=jamespetts
 population_and_visitor_demand_capacity=1200
-employment_capacity=250
+employment_capacity=75
 mail_demand=0
 class_proportion[0]=25
 class_proportion[1]=45
@@ -212,7 +213,7 @@ retire_year=1974
 retire_month=2
 copyright=jamespetts
 population_and_visitor_demand_capacity=1600
-employment_capacity=240
+employment_capacity=60
 mail_demand=0
 class_proportion[0]=20
 class_proportion[1]=40

industry/slaughterhouse.dat

@@ -36,7 +36,8 @@ electricity_amount=0
 electricity_boost=0
 MapColor=35 
 InputGood[0]=livestock
-InputCapacity[0]=28 
+# 35 livestock drover capacity x 4 for size x2 for unknown reasons
+InputCapacity[0]=280
 #InputSupplier[0]=1  
 OutputGood[0]=meat
 OutputCapacity[0]=10 
@@ -107,7 +108,8 @@ smoketile=0,0
 smokeoffset=-5,6
 smokeheight=64
 InputGood[0]=livestock
-InputCapacity[0]=84 
+# 35 livestock drover capacity x 4 for size x 2 for unknown reasons
+InputCapacity[0]=280
 #InputSupplier[0]=1  
 OutputGood[0]=meat
 OutputCapacity[0]=21 
@@ -217,7 +219,8 @@ smoketile=0,0
 smokeoffset=-5,6
 smokeheight=64
 InputGood[0]=livestock
-InputCapacity[0]=168 
+# 35 livestock drover capacity x 4 for size x 2 for unknown reasons
+InputCapacity[0]=280
 #InputSupplier[0]=1  
 OutputGood[0]=meat
 OutputCapacity[0]=42 

stations/timing-point.dat

@@ -0,0 +1,28 @@
+Obj=building
+Name=TimingPoint
+# must be 1*1
+type=stop
+waytype=track
+noconstruction=1
+#NoInfo=1
+Dims=1,1,2
+enables_ware=0
+population_and_visitor_demand_capacity=0
+employment_capacity=0
+mail_demand=0
+intro_year=1750
+level=1
+allow_underground=0
+intro_month=1
+maintenance=0
+cost=0
+capacity=0
+pier_sub_1_mask=0x1F
+pier_sub_2_mask=0xFFFFFFFF
+BackImage[0][0][0][0][0][0]=timing-point.0.0
+BackImage[1][0][0][0][0][0]=timing-point.0.1
+BackImage[0][0][0][0][0][1]=timing-point.0.4
+BackImage[1][0][0][0][0][1]=timing-point.0.5
+icon=> timing-point.0.3
+cursor=timing-point.0.2
+

text/en.tab

@@ -9689,6 +9689,8 @@ Yerkes-station-building
 Tube station building
 art-deco-underground-station-building
 Tube station building
+TimingPoint
+Timing point
 #_________________City cars_______________________
 #_________________City cars_______________________
 AustinMetro(Blue)