|
@@ -217,15 +217,15 @@ static bool AiNew_Check_City_or_Industry
|
|
|
|
|
|
// We don't like roadconstructions, don't even true such a city
|
|
|
if (t->road_build_months != 0) return false;
|
|
|
|
|
|
// Check if the rating in a city is high enough
|
|
|
// If not, take a chance if we want to continue
|
|
|
if (t->ratings[_current_player] < 0 && AI_CHANCE16(1,4)) return false;
|
|
|
if (t->ratings[_current_player] < 0 && AI_CHANCE16(1, 4)) return false;
|
|
|
|
|
|
if (t->max_pass - t->act_pass < AI_CHECKCITY_NEEDED_CARGO && !AI_CHANCE16(1,AI_CHECKCITY_CITY_CHANCE)) return false;
|
|
|
if (t->max_pass - t->act_pass < AI_CHECKCITY_NEEDED_CARGO && !AI_CHANCE16(1, AI_CHECKCITY_CITY_CHANCE)) return false;
|
|
|
|
|
|
// Check if we have build a station in this town the last 6 months
|
|
|
// else we don't do it. This is done, because stat updates can be slow
|
|
|
// and sometimes it takes up to 4 months before the stats are corectly.
|
|
|
// This way we don't get 12 busstations in one city of 100 population ;)
|
|
|
FOR_ALL_STATIONS(st) {
|
|
@@ -272,13 +272,13 @@ static bool AiNew_Check_City_or_Industry
|
|
|
if (type == AI_INDUSTRY) {
|
|
|
const Industry* i = GetIndustry(ic);
|
|
|
const Station* st;
|
|
|
int count = 0;
|
|
|
int j = 0;
|
|
|
|
|
|
if (i->town != NULL && i->town->ratings[_current_player] < 0 && AI_CHANCE16(1,4)) return false;
|
|
|
if (i->town != NULL && i->town->ratings[_current_player] < 0 && AI_CHANCE16(1, 4)) return false;
|
|
|
|
|
|
// No limits on delevering stations!
|
|
|
// Or for industry that does not give anything yet
|
|
|
if (i->produced_cargo[0] == CT_INVALID || i->total_production[0] == 0) return true;
|
|
|
|
|
|
if (i->total_production[0] - i->total_transported[0] < AI_CHECKCITY_NEEDED_CARGO) return false;
|
|
@@ -639,14 +639,14 @@ static void AiNew_State_FindStation(Play
|
|
|
|
|
|
if (new_tile == 0 && p->ainew.tbt == AI_BUS) {
|
|
|
uint x, y, i = 0;
|
|
|
int r;
|
|
|
uint best;
|
|
|
uint accepts[NUM_CARGO];
|
|
|
TileIndex found_spot[AI_FINDSTATION_TILE_RANGE*AI_FINDSTATION_TILE_RANGE*4];
|
|
|
uint found_best[AI_FINDSTATION_TILE_RANGE*AI_FINDSTATION_TILE_RANGE*4];
|
|
|
TileIndex found_spot[AI_FINDSTATION_TILE_RANGE*AI_FINDSTATION_TILE_RANGE * 4];
|
|
|
uint found_best[AI_FINDSTATION_TILE_RANGE*AI_FINDSTATION_TILE_RANGE * 4];
|
|
|
// To find a good spot we scan a range from the center, a get the point
|
|
|
// where we get the most cargo and where it is buildable.
|
|
|
// TODO: also check for station of myself and make sure we are not
|
|
|
// taking eachothers passangers away (bad result when it does not)
|
|
|
for (x = TileX(tile) - AI_FINDSTATION_TILE_RANGE; x <= TileX(tile) + AI_FINDSTATION_TILE_RANGE; x++) {
|
|
|
for (y = TileY(tile) - AI_FINDSTATION_TILE_RANGE; y <= TileY(tile) + AI_FINDSTATION_TILE_RANGE; y++) {
|
|
@@ -958,19 +958,19 @@ static void AiNew_State_VerifyRoute(Play
|
|
|
p->ainew.state = AI_STATE_NOTHING;
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
// Now we can build the route, check the direction of the stations!
|
|
|
if (p->ainew.from_direction == AI_PATHFINDER_NO_DIRECTION) {
|
|
|
p->ainew.from_direction = AiNew_GetDirection(p->ainew.path_info.route[p->ainew.path_info.route_length-1], p->ainew.path_info.route[p->ainew.path_info.route_length-2]);
|
|
|
p->ainew.from_direction = AiNew_GetDirection(p->ainew.path_info.route[p->ainew.path_info.route_length - 1], p->ainew.path_info.route[p->ainew.path_info.route_length - 2]);
|
|
|
}
|
|
|
if (p->ainew.to_direction == AI_PATHFINDER_NO_DIRECTION) {
|
|
|
p->ainew.to_direction = AiNew_GetDirection(p->ainew.path_info.route[0], p->ainew.path_info.route[1]);
|
|
|
}
|
|
|
if (p->ainew.from_tile == AI_STATION_RANGE)
|
|
|
p->ainew.from_tile = p->ainew.path_info.route[p->ainew.path_info.route_length-1];
|
|
|
p->ainew.from_tile = p->ainew.path_info.route[p->ainew.path_info.route_length - 1];
|
|
|
if (p->ainew.to_tile == AI_STATION_RANGE)
|
|
|
p->ainew.to_tile = p->ainew.path_info.route[0];
|
|
|
|
|
|
p->ainew.state = AI_STATE_BUILD_STATION;
|
|
|
p->ainew.temp = 0;
|
|
|
|