Rebalanced pax and mail ships

simutrans · Apr 7, 2024 · c3db7c8 · c3db7c8
1 parent 099449a
commit c3db7c8
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 16 deletions.
diff --git a/tools/dat2csv.txt b/tools/dat2csv.txt
@@ -0,0 +1,16 @@
+BEGIN { INGNORECASE=1; FS="="; print "name,intro_year,retire_year,freight,payload,speed,engine_type,gear,power,weight,cost,runningcost,fixed_cost"; name=""; intro_year=""; retire_year=""; freight=""; payload=0; speed=0; engine_type=""; gear=0; power=0; weight=0; cost=0; runningcost=0; fixed_cost=0; }
+/^name/ {name=$2}
+/^intro_year/ {intro_year=$2}
+/^retire_year/ {retire_year=$2}
+/^freight[ ]*=/ {freight=$2}
+/^payload/ {payload=$2}
+/^speed/ {speed=$2}
+/^engine_type/ {engine_type=$2}
+/^gear/ {gear=$2}
+/^power/ {power=$2}
+/^weight/ {weight=$2}
+/^cost/ {cost=$2}
+/^runningcost/ {runningcost=$2}
+/^fixed_cost/ {fixed_cost=$2}
+/^-/    {print name","intro_year","retire_year","freight","payload","speed","engine_type","gear","power","weight","cost","runningcost","fixed_cost; name=""; intro_year=""; retire_year=""; freight=""; payload=0; speed=0; engine_type=""; gear=0; power=0; weight=0; cost=0; runningcost=0; fixed_cost=0; }
+ENDFILE {print name","intro_year","retire_year","freight","payload","speed","engine_type","gear","power","weight","cost","runningcost","fixed_cost; name=""; intro_year=""; retire_year=""; freight=""; payload=0; speed=0; engine_type=""; gear=0; power=0; weight=0; cost=0; runningcost=0; fixed_cost=0; }
diff --git a/vehicles/ships-ferries/brick_goelette.dat b/vehicles/ships-ferries/brick_goelette.dat
@@ -10,7 +10,8 @@ power=300
 gear=250
 weight=302
 cost=806857
-runningcost=744
+runningcost=109
+fixed_cost=30
 intro_year=1810
 intro_month=1
 retire_year=1950

diff --git a/vehicles/ships-ferries/ferries.xlsx b/vehicles/ships-ferries/ferries.xlsx
diff --git a/vehicles/ships-ferries/ferry_mail_extension_(small).dat b/vehicles/ships-ferries/ferry_mail_extension_(small).dat
@@ -10,7 +10,7 @@ power=0
 gear=100
 weight=5
 cost=82432
-runningcost=88
+runningcost=113
 intro_year=1901
 intro_month=5
 constraint[next][0]=none

diff --git a/vehicles/ships-ferries/ferry_yeu_128set.dat b/vehicles/ships-ferries/ferry_yeu_128set.dat
@@ -9,7 +9,8 @@ speed=37
 power=2400
 weight=70
 cost=800000
-runningcost=350
+runningcost=915
+fixed_cost=1000
 intro_year=2000
 intro_month=5
 constraint[next][0]=none

diff --git a/vehicles/ships-ferries/freya.dat b/vehicles/ships-ferries/freya.dat
@@ -10,7 +10,8 @@ gear=100
 power=600
 weight=220
 cost=246400
-runningcost=515
+runningcost=649
+fixed_cost=250
 intro_year=1904
 intro_month=1
 retire_year=1949

diff --git a/vehicles/ships-ferries/gripsholm.dat b/vehicles/ships-ferries/gripsholm.dat
@@ -10,7 +10,8 @@ gear=100
 power=6800
 weight=1075
 cost=33826100
-runningcost=4133
+runningcost=6288
+fixed_cost=4000
 intro_year=1925
 intro_month=1
 retire_year=1966

diff --git a/vehicles/ships-ferries/liner_mail_extension_(large).dat b/vehicles/ships-ferries/liner_mail_extension_(large).dat
@@ -10,7 +10,8 @@ power=0
 gear=100
 weight=15
 cost=132432
-runningcost=279
+runningcost=824
+fixed_cost=500
 intro_year=1915
 intro_month=5
 constraint[next][0]=none

diff --git a/vehicles/ships-ferries/mhz-c3p_post_barge.dat b/vehicles/ships-ferries/mhz-c3p_post_barge.dat
@@ -10,7 +10,7 @@ power=420
 gear=110
 weight=85
 cost=384040
-runningcost=372
+runningcost=534
 intro_year=1972
 intro_month=4
 constraint[next][0]=none

diff --git a/vehicles/ships-ferries/mv_balmoral.dat b/vehicles/ships-ferries/mv_balmoral.dat
@@ -10,7 +10,8 @@ gear=100
 power=1200
 weight=310
 cost=656600
-runningcost=777
+runningcost=1615
+fixed_cost=2000
 intro_year=1949
 intro_month=1
 sound=1

diff --git a/vehicles/ships-ferries/post_barge.dat b/vehicles/ships-ferries/post_barge.dat
@@ -10,7 +10,7 @@ power=440
 gear=140
 weight=87
 cost=375280
-runningcost=377
+runningcost=534
 intro_year=1928
 intro_month=12
 retire_year=1972

diff --git a/vehicles/ships-ferries/queen_elisabeth_2.dat b/vehicles/ships-ferries/queen_elisabeth_2.dat
@@ -10,7 +10,8 @@ gear=100
 power=13300
 weight=1375
 cost=81681573
-runningcost=3889
+runningcost=11392
+fixed_cost=20000
 intro_year=1965
 intro_month=7
 sound=1

diff --git a/vehicles/ships-ferries/rms_baltic.dat b/vehicles/ships-ferries/rms_baltic.dat
@@ -10,7 +10,8 @@ gear=100
 power=2400
 weight=990
 cost=12070600
-runningcost=2034
+runningcost=3993
+fixed_cost=3000
 intro_year=1904
 intro_month=1
 retire_year=1933

diff --git a/vehicles/ships-ferries/rvg-sail_passanger_ship_0.dat b/vehicles/ships-ferries/rvg-sail_passanger_ship_0.dat
@@ -10,7 +10,8 @@ power=280
 gear=250
 weight=287
 cost=573753
-runningcost=973
+runningcost=531
+fixed_cost=100
 intro_year=1833
 intro_month=12
 retire_year=1901

diff --git a/vehicles/ships-ferries/rvg-steam_passanger_ship_0.dat b/vehicles/ships-ferries/rvg-steam_passanger_ship_0.dat
@@ -10,7 +10,8 @@ power=510
 gear=200
 weight=345
 cost=1507848
-runningcost=963
+runningcost=892
+fixed_cost=200
 intro_year=1867
 intro_month=5
 retire_year=1935

diff --git a/vehicles/ships-ferries/sail_post_ship_0.dat b/vehicles/ships-ferries/sail_post_ship_0.dat
@@ -10,7 +10,7 @@ power=320
 gear=250
 weight=288
 cost=236518
-runningcost=620
+runningcost=294
 intro_year=1748
 intro_month=5
 retire_year=1935

diff --git a/vehicles/ships-ferries/veveri_ship_128set.dat b/vehicles/ships-ferries/veveri_ship_128set.dat
@@ -14,7 +14,8 @@ gear=100
 weight=35
 
 cost=150000
-runningcost=95
+runningcost=297
+fixed_cost=1000
 
 intro_year=1961
 intro_month=8

diff --git a/vehicles/ships-ferries/willamette_chief.dat b/vehicles/ships-ferries/willamette_chief.dat
@@ -10,7 +10,8 @@ gear=100
 power=180
 weight=95
 cost=120600
-runningcost=148
+runningcost=82
+fixed_cost=50
 intro_year=1870
 intro_month=1
 retire_year=1904