diff --git a/bus/hackney-carriage.dat b/bus/hackney-carriage.dat index 1e9dcba..4557ebe 100644 --- a/bus/hackney-carriage.dat +++ b/bus/hackney-carriage.dat @@ -15,7 +15,7 @@ intro_year=1750 intro_month=1 retire_year=1913 retire_month=4 -rolling_resistance=40 +rolling_resistance=140 brake_force=0 comfort=30 diff --git a/config/simuconf.tab b/config/simuconf.tab index aa3cbca..443965c 100644 --- a/config/simuconf.tab +++ b/config/simuconf.tab @@ -1043,10 +1043,6 @@ citycar_life = 1375 # Pak128.Britain default = 158 (yellow) cursor_overlay_color = 158 -# how height is a tile in z-direction (default 16, TTD 8) -# THIS WILL BE ONLY USED, WHEN THIS FILE IS IN THE pakxyz/config! -tile_height = 16 - ################################### River settings ################################## # rivers: @@ -1117,7 +1113,7 @@ no_lakes = 0 # Most network settings are found in the base simuconf.tab # Pakset download URL (for display on the list server) -server_pakurl = http://www.bridgewater-brunel.me.uk/downloads/Pak128.Britain-Ex-0.9.2.zip +server_pakurl = http://server.exp.simutrans.com/pak128.Britain-Ex.zip ################################### Livery settings ################################## @@ -2256,4 +2252,4 @@ retire_month[87] = 10 # TODO: Find more liveries for this scheme. livery[87][0] = Grey-Green-standard intro_year[87][0] = 1928 -intro_month[87][0] = 6 \ No newline at end of file +intro_month[87][0] = 6 diff --git a/maglev/RMU9000.dat b/maglev/RMU9000.dat index 7cd3416..c8af5cd 100644 --- a/maglev/RMU9000.dat +++ b/maglev/RMU9000.dat @@ -18,7 +18,7 @@ runningcost=80 can_lead_from_rear=0 bidirectional=1 -air_resistance=1300 +air_resistance=162 Constraint[Prev][0]=none Constraint[Next][0]=RMUflat(cooled) @@ -33,4 +33,4 @@ EmptyImage[W]=images/RMU9000.0.0,-16,-11 EmptyImage[NW]=images/RMU9000.0.1,0,-17 EmptyImage[N]=images/RMU9000.0.2,16,-11 EmptyImage[NE]=images/RMU9000.0.3,20,-3 ----------------------------------- \ No newline at end of file +---------------------------------- diff --git a/maglev/RMU_Aerocab.dat b/maglev/RMU_Aerocab.dat index 75fb62e..517488d 100644 --- a/maglev/RMU_Aerocab.dat +++ b/maglev/RMU_Aerocab.dat @@ -18,7 +18,7 @@ runningcost=420 can_lead_from_rear=1 bidirectional=0 -air_resistance=825 +air_resistance=103 Constraint[Prev][0]=RMU-aerocab(rear) Constraint[Prev][1]=none @@ -53,7 +53,7 @@ runningcost=420 can_lead_from_rear=1 bidirectional=0 -air_resistance=825 +air_resistance=103 Constraint[Prev][0]=RMUbox(cooled) Constraint[Prev][1]=RMUbox(piece) @@ -67,4 +67,4 @@ EmptyImage[SW]=images/RMU_aerocab.0.3,-18,-3 EmptyImage[W]=images/RMU_aerocab.0.4,-12,-9 EmptyImage[NW]=images/RMU_aerocab.0.5,0,-21 EmptyImage[N]=images/RMU_aerocab.0.6,12,-9 -EmptyImage[NE]=images/RMU_aerocab.0.7,18,-3 \ No newline at end of file +EmptyImage[NE]=images/RMU_aerocab.0.7,18,-3 diff --git a/maglev/Ultra450.dat b/maglev/Ultra450.dat index a54fb22..d825e6a 100644 --- a/maglev/Ultra450.dat +++ b/maglev/Ultra450.dat @@ -24,7 +24,7 @@ bidirectional=0 min_loading_time=25 max_loading_time=160 comfort=155 -air_resistance=882 +air_resistance=103 Constraint[Prev][0]=BR-Ultra-450(rear) Constraint[Prev][1]=none @@ -153,7 +153,7 @@ bidirectional=0 min_loading_time=25 max_loading_time=160 comfort=155 -air_resistance=882 +air_resistance=103 Constraint[Prev][0]=BR-Ultra-450(Open) Constraint[Prev][1]=BR-Ultra-450(Buffet) @@ -167,4 +167,4 @@ EmptyImage[SW]=images/Ultra450.0.3,0,-3 EmptyImage[W]=images/Ultra450.0.4,0,-3 EmptyImage[NW]=images/Ultra450.0.5,0,-3 EmptyImage[N]=images/Ultra450.0.6,0,-3 -EmptyImage[NE]=images/Ultra450.0.7,0,-3 \ No newline at end of file +EmptyImage[NE]=images/Ultra450.0.7,0,-3 diff --git a/maglev/Ultra520.dat b/maglev/Ultra520.dat index adc1a05..9d92fff 100644 --- a/maglev/Ultra520.dat +++ b/maglev/Ultra520.dat @@ -24,7 +24,7 @@ bidirectional=0 min_loading_time=20 max_loading_time=180 comfort=149 -air_resistance=825 +air_resistance=103 Constraint[Prev][0]=BR-Ultra-520(rear) Constraint[Prev][1]=none @@ -153,7 +153,7 @@ bidirectional=0 min_loading_time=20 max_loading_time=180 comfort=149 -air_resistance=825 +air_resistance=103 Constraint[Prev][0]=BR-Ultra-520(Open) Constraint[Prev][1]=BR-Ultra-520(Buffet) @@ -167,4 +167,4 @@ EmptyImage[SW]=images/Ultra520.0.3,0,-3 EmptyImage[W]=images/Ultra520.0.4,0,-3 EmptyImage[NW]=images/Ultra520.0.5,0,-3 EmptyImage[N]=images/Ultra520.0.6,0,-3 -EmptyImage[NE]=images/Ultra520.0.7,0,-3 \ No newline at end of file +EmptyImage[NE]=images/Ultra520.0.7,0,-3 diff --git a/maglev/Ultra520DD.dat b/maglev/Ultra520DD.dat index 5ad7b3b..52cbf12 100644 --- a/maglev/Ultra520DD.dat +++ b/maglev/Ultra520DD.dat @@ -25,7 +25,7 @@ bidirectional=0 min_loading_time=35 max_loading_time=240 comfort=128 -air_resistance=882 +air_resistance=110 Constraint[Prev][0]=BR-Ultra-520DD(rear) Constraint[Prev][1]=none @@ -154,7 +154,7 @@ bidirectional=0 min_loading_time=35 max_loading_time=240 comfort=128 -air_resistance=882 +air_resistance=110 Constraint[Prev][0]=BR-Ultra-520DD(Open) Constraint[Prev][1]=BR-Ultra-520DD(Buffet) @@ -168,4 +168,4 @@ EmptyImage[SW]=images/Ultra520DD.0.3,0,-3 EmptyImage[W]=images/Ultra520DD.0.4,0,-3 EmptyImage[NW]=images/Ultra520DD.0.5,0,-3 EmptyImage[N]=images/Ultra520DD.0.6,0,-3 -EmptyImage[NE]=images/Ultra520DD.0.7,0,-3 \ No newline at end of file +EmptyImage[NE]=images/Ultra520DD.0.7,0,-3 diff --git a/maglev/UltraMail.dat b/maglev/UltraMail.dat index f34b978..c7562e0 100644 --- a/maglev/UltraMail.dat +++ b/maglev/UltraMail.dat @@ -23,7 +23,7 @@ bidirectional=0 min_loading_time=45 max_loading_time=240 -air_resistance=882 +air_resistance=103 Constraint[Prev][0]=BR-Ultra-Mail(rear) Constraint[Prev][1]=none @@ -103,7 +103,7 @@ bidirectional=0 min_loading_time=45 max_loading_time=240 -air_resistance=882 +air_resistance=103 Constraint[Prev][0]=BR-Ultra-Mail(Open) Constraint[Next][0]=BR-Ultra-Mail(front) @@ -116,4 +116,4 @@ EmptyImage[SW]=images/UltraMail.0.3,0,-3 EmptyImage[W]=images/UltraMail.0.4,0,-3 EmptyImage[NW]=images/UltraMail.0.5,0,-3 EmptyImage[N]=images/UltraMail.0.6,0,-3 -EmptyImage[NE]=images/UltraMail.0.7,0,-3 \ No newline at end of file +EmptyImage[NE]=images/UltraMail.0.7,0,-3 diff --git a/makeobj-experimental b/makeobj-experimental deleted file mode 120000 index f7d7194..0000000 --- a/makeobj-experimental +++ /dev/null @@ -1 +0,0 @@ -/home/james/Documents/Simutrans/simutrans-experimental/simutrans/makeobj-experimental \ No newline at end of file diff --git a/trains/ner-es1.dat b/trains/ner-es1.dat index 5bb66ae..c89f035 100644 --- a/trains/ner-es1.dat +++ b/trains/ner-es1.dat @@ -24,7 +24,7 @@ runningcost=264 can_lead_from_rear=0 bidirectional=1 way_constraint_permissive[1]=1 -air_resistance=1000 +air_resistance=125 # No multiple working Constraint[Prev][0]=none