Merge branch 'master' into jgrpp

This commit is contained in:
Jonathan G Rennison
2019-11-20 21:21:55 +00:00
4 changed files with 144 additions and 29 deletions

View File

@@ -3671,6 +3671,11 @@ static int CountActiveStations(Town *t)
*/
static uint GetNormalGrowthRate(Town *t)
{
/**
* Note:
* Unserviced+unfunded towns get an additional malus in UpdateTownGrowth(),
* so the "320" is actually not better than the "420".
*/
static const uint16 _grow_count_values[2][6] = {
{ 120, 120, 120, 100, 80, 60 }, // Fund new buildings has been activated
{ 320, 420, 300, 220, 160, 100 } // Normal values