|
@@ -1733,14 +1733,14 @@ static void DoCreateNewIndustry(Industry
|
|
|
MemSetT(i->this_month_transported, 0, lengthof(i->this_month_transported));
|
|
|
MemSetT(i->last_month_pct_transported, 0, lengthof(i->last_month_pct_transported));
|
|
|
MemSetT(i->last_month_transported, 0, lengthof(i->last_month_transported));
|
|
|
MemSetT(i->incoming_cargo_waiting, 0, lengthof(i->incoming_cargo_waiting));
|
|
|
MemSetT(i->last_cargo_accepted_at, 0, lengthof(i->last_cargo_accepted_at));
|
|
|
|
|
|
/* don't use smooth economy for industries using production related callbacks */
|
|
|
if (indspec->UsesSmoothEconomy()) {
|
|
|
/* Randomize inital production if non-original economy is used and there are no production related callbacks. */
|
|
|
if (!indspec->UsesOriginalEconomy()) {
|
|
|
for (size_t ci = 0; ci < lengthof(i->production_rate); ci++) {
|
|
|
i->production_rate[ci] = min((RandomRange(256) + 128) * i->production_rate[ci] >> 8, 255);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
i->town = t;
|
|
@@ -2301,13 +2301,13 @@ static void UpdateIndustryStatistics(Ind
|
|
|
* Recompute #production_rate for current #prod_level.
|
|
|
* This function is only valid when not using smooth economy.
|
|
|
*/
|
|
|
void Industry::RecomputeProductionMultipliers()
|
|
|
{
|
|
|
const IndustrySpec *indspec = GetIndustrySpec(this->type);
|
|
|
assert(!indspec->UsesSmoothEconomy());
|
|
|
assert(indspec->UsesOriginalEconomy());
|
|
|
|
|
|
/* Rates are rounded up, so e.g. oilrig always produces some passengers */
|
|
|
for (size_t i = 0; i < lengthof(this->production_rate); i++) {
|
|
|
this->production_rate[i] = min(CeilDiv(indspec->production_rate[i] * this->prod_level, PRODLEVEL_DEFAULT), 0xFF);
|
|
|
}
|
|
|
}
|
|
@@ -2601,14 +2601,14 @@ static void ChangeIndustryProduction(Ind
|
|
|
StringID str = STR_NULL;
|
|
|
bool closeit = false;
|
|
|
const IndustrySpec *indspec = GetIndustrySpec(i->type);
|
|
|
bool standard = false;
|
|
|
bool suppress_message = false;
|
|
|
bool recalculate_multipliers = false; ///< reinitialize production_rate to match prod_level
|
|
|
/* don't use smooth economy for industries using production related callbacks */
|
|
|
bool smooth_economy = indspec->UsesSmoothEconomy();
|
|
|
/* use original economy for industries using production related callbacks */
|
|
|
bool original_economy = indspec->UsesOriginalEconomy();
|
|
|
byte div = 0;
|
|
|
byte mul = 0;
|
|
|
int8 increment = 0;
|
|
|
|
|
|
bool callback_enabled = HasBit(indspec->callback_mask, monthly ? CBM_IND_MONTHLYPROD_CHANGE : CBM_IND_PRODUCTION_CHANGE);
|
|
|
if (callback_enabled) {
|
|
@@ -2637,21 +2637,31 @@ static void ChangeIndustryProduction(Ind
|
|
|
i->prod_level = Clamp(GB(GetRegister(0x100), 16, 8), PRODLEVEL_MINIMUM, PRODLEVEL_MAXIMUM);
|
|
|
recalculate_multipliers = true;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
if (monthly != smooth_economy) return;
|
|
|
if (monthly == original_economy) return;
|
|
|
if (!original_economy && _settings_game.economy.type == ET_FROZEN) return;
|
|
|
if (indspec->life_type == INDUSTRYLIFE_BLACK_HOLE) return;
|
|
|
}
|
|
|
|
|
|
if (standard || (!callback_enabled && (indspec->life_type & (INDUSTRYLIFE_ORGANIC | INDUSTRYLIFE_EXTRACTIVE)) != 0)) {
|
|
|
/* decrease or increase */
|
|
|
bool only_decrease = (indspec->behaviour & INDUSTRYBEH_DONT_INCR_PROD) && _settings_game.game_creation.landscape == LT_TEMPERATE;
|
|
|
|
|
|
if (smooth_economy) {
|
|
|
if (original_economy) {
|
|
|
if (only_decrease || Chance16(1, 3)) {
|
|
|
/* If more than 60% transported, 66% chance of increase, else 33% chance of increase */
|
|
|
if (!only_decrease && (i->last_month_pct_transported[0] > PERCENT_TRANSPORTED_60) != Chance16(1, 3)) {
|
|
|
mul = 1; // Increase production
|
|
|
} else {
|
|
|
div = 1; // Decrease production
|
|
|
}
|
|
|
}
|
|
|
} else if (_settings_game.economy.type == ET_SMOOTH) {
|
|
|
closeit = true;
|
|
|
for (byte j = 0; j < lengthof(i->produced_cargo); j++) {
|
|
|
if (i->produced_cargo[j] == CT_INVALID) continue;
|
|
|
uint32 r = Random();
|
|
|
int old_prod, new_prod, percent;
|
|
|
/* If over 60% is transported, mult is 1, else mult is -1. */
|
|
@@ -2695,26 +2705,17 @@ static void ChangeIndustryProduction(Ind
|
|
|
if (new_prod > 1) closeit = false;
|
|
|
|
|
|
if (abs(percent) >= 10) {
|
|
|
ReportNewsProductionChangeIndustry(i, i->produced_cargo[j], percent);
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
if (only_decrease || Chance16(1, 3)) {
|
|
|
/* If more than 60% transported, 66% chance of increase, else 33% chance of increase */
|
|
|
if (!only_decrease && (i->last_month_pct_transported[0] > PERCENT_TRANSPORTED_60) != Chance16(1, 3)) {
|
|
|
mul = 1; // Increase production
|
|
|
} else {
|
|
|
div = 1; // Decrease production
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if (!callback_enabled && (indspec->life_type & INDUSTRYLIFE_PROCESSING)) {
|
|
|
if ( (byte)(_cur_year - i->last_prod_year) >= 5 && Chance16(1, smooth_economy ? 180 : 2)) {
|
|
|
if ( (byte)(_cur_year - i->last_prod_year) >= 5 && Chance16(1, original_economy ? 2 : 180)) {
|
|
|
closeit = true;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
/* Increase if needed */
|
|
|
while (mul-- != 0 && i->prod_level < PRODLEVEL_MAXIMUM) {
|
|
@@ -2931,20 +2932,20 @@ Money IndustrySpec::GetConstructionCost(
|
|
|
Money IndustrySpec::GetRemovalCost() const
|
|
|
{
|
|
|
return (_price[PR_CLEAR_INDUSTRY] * this->removal_cost_multiplier) >> 8;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* Determines whether this industrytype uses smooth economy or whether it uses standard/newgrf production changes.
|
|
|
* @return true if smooth economy is used.
|
|
|
* Determines whether this industrytype uses standard/newgrf production changes.
|
|
|
* @return true if original economy is used.
|
|
|
*/
|
|
|
bool IndustrySpec::UsesSmoothEconomy() const
|
|
|
bool IndustrySpec::UsesOriginalEconomy() const
|
|
|
{
|
|
|
return _settings_game.economy.smooth_economy &&
|
|
|
!(HasBit(this->callback_mask, CBM_IND_PRODUCTION_256_TICKS) || HasBit(this->callback_mask, CBM_IND_PRODUCTION_CARGO_ARRIVAL)) && // production callbacks
|
|
|
!(HasBit(this->callback_mask, CBM_IND_MONTHLYPROD_CHANGE) || HasBit(this->callback_mask, CBM_IND_PRODUCTION_CHANGE) || HasBit(this->callback_mask, CBM_IND_PROD_CHANGE_BUILD)); // production change callbacks
|
|
|
return _settings_game.economy.type == ET_ORIGINAL ||
|
|
|
HasBit(this->callback_mask, CBM_IND_PRODUCTION_256_TICKS) || HasBit(this->callback_mask, CBM_IND_PRODUCTION_CARGO_ARRIVAL) || // production callbacks
|
|
|
HasBit(this->callback_mask, CBM_IND_MONTHLYPROD_CHANGE) || HasBit(this->callback_mask, CBM_IND_PRODUCTION_CHANGE) || HasBit(this->callback_mask, CBM_IND_PROD_CHANGE_BUILD); // production change callbacks
|
|
|
}
|
|
|
|
|
|
IndustrySpec::~IndustrySpec()
|
|
|
{
|
|
|
if (HasBit(this->cleanup_flag, CLEAN_RANDOMSOUNDS)) {
|
|
|
free(this->random_sounds);
|