diff --git a/app/Engine/Simulation.php b/app/Engine/Simulation.php index 80c941b..e124d77 100644 --- a/app/Engine/Simulation.php +++ b/app/Engine/Simulation.php @@ -126,8 +126,9 @@ final class Simulation } /** - * Food per hour eaten by troops standing here, by units still in training and by the - * wounded: a queued unit takes its villager's place at once, a wounded one keeps it. + * Heads (food per hour at world speed 1) eaten by troops standing here, by units still + * in training and by the wounded: a queued unit takes its villager's place at once, a + * wounded one keeps it. */ public function soldierUpkeep(): float { diff --git a/app/Game/Buildings/BuildingRules.php b/app/Game/Buildings/BuildingRules.php index 1751862..fe420b4 100644 --- a/app/Game/Buildings/BuildingRules.php +++ b/app/Game/Buildings/BuildingRules.php @@ -128,6 +128,27 @@ final class BuildingRules ]; } + /** Whether the type makes food. Farms feed the village and are staffed first. */ + public function isFarm(string $type): bool + { + return ($this->config->building($type)['production']['resource'] ?? null) === 'food'; + } + + /** + * Heads one instance at this level feeds: its food output at full staffing and world + * speed 1, 0 for a building that makes no food. Population counts in heads (food per + * hour at world speed 1), so a village holds the same people on every world speed. + */ + public function feeds(string $type, int $level): float + { + if (! $this->isFarm($type)) { + return 0.0; + } + $production = $this->config->building($type)['production']; + + return $production['base'] * $production['factor'] ** self::above($level); + } + /** Storage capacity this building adds, 0 for non-storage. */ public function capacity(string $type, int $level): float { diff --git a/app/Game/ConfigLint.php b/app/Game/ConfigLint.php index f63f4a9..673fc38 100644 --- a/app/Game/ConfigLint.php +++ b/app/Game/ConfigLint.php @@ -297,8 +297,8 @@ final class ConfigLint continue; } - $output = $rules->output($type, $level); - $food += ($output['resource'] ?? null) === 'food' ? $output['per_hour'] : 0; + // Heads, like the garrison's upkeep below. + $food += $rules->feeds($type, $level); } $upkeep = 0.0; foreach ($season['garrison'] ?? [] as $unit => $count) { @@ -386,12 +386,13 @@ final class ConfigLint $problems = []; $perVillager = $config->get('economy.upkeep.villager', 1); foreach ($config->buildingTypes() as $type) { - if (($rules->output($type, 1)['resource'] ?? null) !== 'food') { + if (! $rules->isFarm($type)) { continue; } for ($level = 1; $level <= $rules->maxLevel($type); $level++) { - $output = $rules->output($type, $level)['per_hour']; - if ($output <= 0 || $rules->workers($type, $level) * $perVillager >= $output) { + // Both in heads, so this holds on every world speed. + $feeds = $rules->feeds($type, $level); + if ($feeds <= 0 || $rules->workers($type, $level) * $perVillager >= $feeds) { $problems[] = "[$type] level $level feeds fewer people than it needs as workers."; } } diff --git a/app/Game/Economy/Population.php b/app/Game/Economy/Population.php index db7a7df..78d953e 100644 --- a/app/Game/Economy/Population.php +++ b/app/Game/Economy/Population.php @@ -12,6 +12,10 @@ use App\Game\WorldConfig; * Capacity uses nominal (fully staffed) farm output, so farms, workers and capacity * can't feed back into each other. Villagers fill `villager_share` of the budget, * minus what soldiers eat; the rest of the farms' output is surplus for storage. + * + * Everything here counts in heads: food per hour at world speed 1. Farms make and + * people eat world speed times that, so a village holds the same heads on every world + * speed (Production::rates scales the food rate). */ final class Population { @@ -23,7 +27,8 @@ final class Population } /** - * Nominal farm output, a copy at its instance share. + * Heads the farms feed: their nominal output at world speed 1, a copy at its + * instance share. * * @param list $buildings */ @@ -32,10 +37,7 @@ final class Population $budget = 0.0; $shares = $this->rules->instanceShares($buildings); foreach ($buildings as $b) { - $output = $this->rules->output($b->type, $b->level); - if ($output && $output['resource'] === 'food') { - $budget += $output['per_hour'] * $shares[$b->id]; - } + $budget += $this->rules->feeds($b->type, $b->level) * $shares[$b->id]; } return $budget; @@ -43,7 +45,7 @@ final class Population /** * @param list $buildings - * @param float $soldierUpkeep food/h eaten by soldiers and stationed support + * @param float $soldierUpkeep heads eaten by soldiers, stationed support, units in training and the wounded * @param int $militia villagers drafted by a levy; they eat as before but don't work */ public function workforce(array $buildings, float $soldierUpkeep = 0.0, int $militia = 0): Workforce @@ -81,8 +83,7 @@ final class Population { $groups = []; foreach ($buildings as $b) { - $isFarm = ($this->rules->output($b->type, $b->level)['resource'] ?? null) === 'food'; - $groups[($isFarm ? 'a' : 'b').str_pad((string) (99 - $b->priority), 3, '0', STR_PAD_LEFT)][] = $b->id; + $groups[($this->rules->isFarm($b->type) ? 'a' : 'b').str_pad((string) (99 - $b->priority), 3, '0', STR_PAD_LEFT)][] = $b->id; } ksort($groups); diff --git a/app/Game/Economy/Production.php b/app/Game/Economy/Production.php index b88ae35..b31fa05 100644 --- a/app/Game/Economy/Production.php +++ b/app/Game/Economy/Production.php @@ -46,7 +46,8 @@ final class Production /** * Net change per hour, with the village role's bonus on its buildings and copies at - * their instance share. Food is farm output minus upkeep, so it can go negative. + * their instance share. Food is farm output minus upkeep, so it can go negative. The + * upkeep is in heads, and each head eats world speed times one food per hour. * * @param list $buildings * @return array{wood: float, clay: float, iron: float, food: float} @@ -64,7 +65,7 @@ final class Production $rates[$output['resource']] += $output['per_hour']; } } - $rates['food'] -= $workforce->upkeep; + $rates['food'] -= $workforce->upkeep * $this->config->speed(); return $rates; } diff --git a/app/Game/Economy/Workforce.php b/app/Game/Economy/Workforce.php index 13cd796..0323947 100644 --- a/app/Game/Economy/Workforce.php +++ b/app/Game/Economy/Workforce.php @@ -2,7 +2,10 @@ namespace App\Game\Economy; -/** Who works where in a village, as computed by Population::workforce(). */ +/** + * Who works where in a village, as computed by Population::workforce(). The budget and + * the upkeep are heads (food per hour at world speed 1), not the food rate. + */ final class Workforce { /** @@ -10,8 +13,10 @@ final class Workforce * @param array $required building id => villagers it needs */ public function __construct( + /** Heads the farms feed, nominally. */ public readonly float $foodBudget, public readonly int $villagers, + /** Heads that eat: villagers, soldiers, stationed support, units in training, the wounded. */ public readonly float $upkeep, public readonly array $assigned, public readonly array $required, diff --git a/app/Presenters/VillagePresenter.php b/app/Presenters/VillagePresenter.php index 0f0e6c7..3a5ccf7 100644 --- a/app/Presenters/VillagePresenter.php +++ b/app/Presenters/VillagePresenter.php @@ -50,6 +50,8 @@ final class VillagePresenter 'resources_at' => self::iso($village->resources_at), 'rates' => array_map(fn (float $n) => round($n, 4), $sim->rates()), 'storage_cap' => round($sim->storageCap()), + // Heads (food per hour at world speed 1), the same on every world speed; the + // food rate at world speed is rates.food. 'population' => [ 'food_budget' => round($workforce->foodBudget, 2), 'upkeep' => round($workforce->upkeep, 2),