mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Make subsidies scan tiles for town acceptance and production instead of using desync-prone town caches

pull/8254/head
dP 2020-05-18 16:12:20 +03:00 committed by Niels Martin Hansen
parent ca2604c4e2
commit 380fd8cab4
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/subsidy.cpp
View File

@ -328,21 +328,28 @@ bool FindSubsidyTownCargoRoute()
const Town *src_town = Town::GetRandom(); const Town *src_town = Town::GetRandom();
if (src_town->cache.population < SUBSIDY_CARGO_MIN_POPULATION) return false; if (src_town->cache.population < SUBSIDY_CARGO_MIN_POPULATION) return false;
CargoTypes town_cargo_produced = src_town->cargo_produced; CargoArray town_cargo_produced = GetProductionAroundTiles(src_town->xy, 1, 1, SUBSIDY_TOWN_CARGO_RADIUS);
/* Passenger subsidies are not handled here. */ /* Passenger subsidies are not handled here. */
ClrBit(town_cargo_produced, CT_PASSENGERS); town_cargo_produced[CT_PASSENGERS] = 0;
uint8 cargo_count = 0;
for (CargoID i = 0; i < NUM_CARGO; i++) {
if (town_cargo_produced[i] > 0) cargo_count++;
}
/* No cargo produced at all? */ /* No cargo produced at all? */
if (town_cargo_produced == 0) return false; if (cargo_count == 0) return false;
/* Choose a random cargo that is produced in the town. */ /* Choose a random cargo that is produced in the town. */
uint8 cargo_number = RandomRange(CountBits(town_cargo_produced)); uint8 cargo_number = RandomRange(cargo_count);
CargoID cid; CargoID cid;
FOR_EACH_SET_CARGO_ID(cid, town_cargo_produced) { for (cid = 0; cid < NUM_CARGO; cid++) {
if (town_cargo_produced[cid] > 0) {
if (cargo_number == 0) break; if (cargo_number == 0) break;
cargo_number--; cargo_number--;
} }
}
/* Avoid using invalid NewGRF cargoes. */ /* Avoid using invalid NewGRF cargoes. */
if (!CargoSpec::Get(cid)->IsValid() || if (!CargoSpec::Get(cid)->IsValid() ||
@ -416,17 +423,18 @@ bool FindSubsidyIndustryCargoRoute()
*/ */
bool FindSubsidyCargoDestination(CargoID cid, SourceType src_type, SourceID src) bool FindSubsidyCargoDestination(CargoID cid, SourceType src_type, SourceID src)
{ {
/* Choose a random destination. Only consider towns if they can accept the cargo. */ /* Choose a random destination. */
SourceType dst_type = (HasBit(_town_cargoes_accepted, cid) && Chance16(1, 2)) ? ST_TOWN : ST_INDUSTRY; SourceType dst_type = Chance16(1, 2) ? ST_TOWN : ST_INDUSTRY;
SourceID dst; SourceID dst;
switch (dst_type) { switch (dst_type) {
case ST_TOWN: { case ST_TOWN: {
/* Select a random town. */ /* Select a random town. */
const Town *dst_town = Town::GetRandom(); const Town *dst_town = Town::GetRandom();
CargoArray town_cargo_accepted = GetAcceptanceAroundTiles(dst_town->xy, 1, 1, SUBSIDY_TOWN_CARGO_RADIUS);
/* Check if the town can accept this cargo. */ /* Check if the town can accept this cargo. */
if (!HasBit(dst_town->cargo_accepted_total, cid)) return false; if (town_cargo_accepted[cid] >= 8) return false;
dst = dst_town->index; dst = dst_town->index;
break; break;

1
src/subsidy_base.h
View File

@ -57,5 +57,6 @@ static const uint SUBSIDY_PAX_MIN_POPULATION = 400; ///< Min. population of to
static const uint SUBSIDY_CARGO_MIN_POPULATION = 900; ///< Min. population of destination town for cargo route static const uint SUBSIDY_CARGO_MIN_POPULATION = 900; ///< Min. population of destination town for cargo route
static const uint SUBSIDY_MAX_PCT_TRANSPORTED = 42; ///< Subsidy will be created only for towns/industries with less % transported static const uint SUBSIDY_MAX_PCT_TRANSPORTED = 42; ///< Subsidy will be created only for towns/industries with less % transported
static const uint SUBSIDY_MAX_DISTANCE = 70; ///< Max. length of subsidised route (DistanceManhattan) static const uint SUBSIDY_MAX_DISTANCE = 70; ///< Max. length of subsidised route (DistanceManhattan)
static const uint SUBSIDY_TOWN_CARGO_RADIUS = 6; ///< Extent of a tile area around town center when scanning for town cargo acceptance and production (6 ~= min catchmement + min station / 2)
#endif /* SUBSIDY_BASE_H */ #endif /* SUBSIDY_BASE_H */