diff options
| author | rubidium <rubidium@openttd.org> | 2009-09-09 08:22:21 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-09-09 08:22:21 +0000 |
| commit | f1cc044a4021362f1826378b129ecef1210a6a0d (patch) | |
| tree | c98ac2757eb87f4accb3507e31bdf2f446d8e873 | |
| parent | 008ffc58dd581839d62331d0281849fc3fcef71d (diff) | |
| download | openttd-f1cc044a4021362f1826378b129ecef1210a6a0d.tar.xz | |
(svn r17485) -Change [FS2459]: make the performance ratings harder to exploit; only count profitable vehicles and recently serviced stations.
| -rw-r--r-- | src/economy.cpp | 5 | ||||
| -rw-r--r-- | src/lang/english.txt | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/economy.cpp b/src/economy.cpp index 205797984..a31595a7e 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -166,7 +166,7 @@ int UpdateCompanyRatingAndValue(Company *c, bool update) FOR_ALL_VEHICLES(v) { if (v->owner != owner) continue; if (IsCompanyBuildableVehicleType(v->type) && v->IsPrimaryVehicle()) { - num++; + if (v->profit_last_year > 0) num++; // For the vehicle score only count profitable vehicles if (v->age > 730) { /* Find the vehicle with the lowest amount of profit */ if (min_profit_first || min_profit > v->profit_last_year) { @@ -191,7 +191,8 @@ int UpdateCompanyRatingAndValue(Company *c, bool update) const Station *st; FOR_ALL_STATIONS(st) { - if (st->owner == owner) num += CountBits((byte)st->facilities); + /* Only count stations that are actually serviced */ + if (st->owner == owner && (st->time_since_load <= 20 || st->time_since_unload <= 20)) num += CountBits((byte)st->facilities); } _score_part[owner][SCORE_STATIONS] = num; } diff --git a/src/lang/english.txt b/src/lang/english.txt index f22fdbb77..b698c2eba 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -555,9 +555,9 @@ STR_PERFORMANCE_DETAIL_MONEY :{BLACK}Money: STR_PERFORMANCE_DETAIL_LOAN :{BLACK}Loan: STR_PERFORMANCE_DETAIL_TOTAL :{BLACK}Total: ############ End of order list -STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP :{BLACK}Number of vehicles; this includes road vehicles, trains, ships and aircraft -STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP :{BLACK}Number of station parts. Every part of a station (e.g. train station, bus stop, airport) is counted, even if they are connected as one station -STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP :{BLACK}The profit of the vehicle with the lowest income (of all vehicles older than 2 years) +STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP :{BLACK}Number of vehicles that turned a profit last year; this includes road vehicles, trains, ships and aircraft +STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP :{BLACK}Number of recently-serviced station parts. Every part of a station (e.g. train station, bus stop, airport) is counted, even if they are connected as one station +STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP :{BLACK}The profit of the vehicle with the lowest income (only vehicles older than two years are considered) STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP :{BLACK}Amount of cash made in the month with the lowest profit of the last 12 quarters STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP :{BLACK}Amount of cash made in the month with the highest profit of the last 12 quarters STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP :{BLACK}Units of cargo delivered in the last four quarters |