From c80d01306548fee66ce0c9ec9f0e5e41c03b8b60 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 25 Oct 2026 18:48:40 +0000
Subject: [PATCH] Blockilization: a Great Engineer hurries only what's being
 built, Civ V style

The hurry added 300 + 30 a citizen straight to the city's production with
no cap, and what was over the current build's cost carried on to the next
item, one finished a turn. A big city's engineer on a cheap build left
hundreds of production over, so everything after it took a turn each for
many builds. Now, as in Civ V, it puts in no more than the current build
still needs (and fails, keeping the engineer, with nothing to hurry).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HaXWkqcsX9gsXphN4egMc1
---
 src/games/blockilization/client/more.ts |  2 +-
 src/games/blockilization/rules/game.ts  |  8 +++++++-
 src/games/blockilization/tests/cases.ts | 26 ++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/games/blockilization/client/more.ts b/src/games/blockilization/client/more.ts
index 8b30713..36c040c 100644
--- a/src/games/blockilization/client/more.ts
+++ b/src/games/blockilization/client/more.ts
@@ -52,7 +52,7 @@ export function unitExtras(u: UnitWire, act: (label: string, o: Parameters<typeo
       act('Build Academy', { t: 'greatPerson', unit: u.id, action: 'improvement' }, '+3 science on this tile, for good.');
       break;
     case 'great_engineer':
-      act('Hurry production', { t: 'greatPerson', unit: u.id, action: 'hurry' }, 'In one of your cities: a great deal of production toward what it builds (wonders too).');
+      act('Hurry production', { t: 'greatPerson', unit: u.id, action: 'hurry' }, 'In one of your cities: a great deal of production toward what it builds now (wonders too), as much as it needs and no more.');
       act('Build Manufactory', { t: 'greatPerson', unit: u.id, action: 'improvement' }, '+3 production on this tile, for good.');
       break;
     case 'great_merchant':
diff --git a/src/games/blockilization/rules/game.ts b/src/games/blockilization/rules/game.ts
index a996aec..2ec87aa 100644
--- a/src/games/blockilization/rules/game.ts
+++ b/src/games/blockilization/rules/game.ts
@@ -2365,7 +2365,13 @@ function greatAction(game: Game, p: Player, u: Unit, action: Extract<Order, { t:
       if (!abilities.includes('hurry')) return fail('Only a Great Engineer');
       const city = cityAt(game, u.tile);
       if (!city || city.owner !== p.index) return fail('Stand it in one of your cities');
-      city.prod += 300 + 30 * city.pop;
+      // Toward what's being built now and no more than it still needs (Civ V's): none of it is left
+      // over to finish what comes after it in a turn each.
+      const item = city.queue[0];
+      if (!item) return fail(`${city.name} isn't building anything`);
+      const left = itemCost(game, item) - city.prod;
+      if (left <= 0) return fail(`${city.name} has already finished what it's building`);
+      city.prod += Math.min(left, 300 + 30 * city.pop);
       return used(`Your Great Engineer has hurried the work in ${city.name}.`);
     }
     case 'trade': {
diff --git a/src/games/blockilization/tests/cases.ts b/src/games/blockilization/tests/cases.ts
index 593d01f..9f6e024 100644
--- a/src/games/blockilization/tests/cases.ts
+++ b/src/games/blockilization/tests/cases.ts
@@ -12,7 +12,7 @@ import { CIV_SYMBOL, glyphPaths } from '../client/icons';
 import { atWar, canStand, cityAt, createGame, maxMoves, seesUnit, techCost, unitSight, updateAllVisibility } from '../rules/core';
 import { assignCitizens, cityEffects, cityYields, workedYields, connected, dissent, foodKept, freshWater, goldUpkeep, growthThreshold, greatCost, greatPeopleBonus, happiness, policyCost, purchaseCost, strategic, tileCultureCost, tileYields, UNHAPPINESS_PER_CITY, weighing, workable } from '../rules/economy';
 import { faithCost, faithTurn, faithUnit, foundReligion, maxReligions, prophetCost, religionsLeft, spreadsOf } from '../rules/faith';
-import { ANARCHY_TURNS, apply, applyOnce, blockers, canBuild, workTurns, constructible, canChooseIdeology, ideologySwitch, SWITCH_DISSENT, canDig, canFound, checkVictory, endTurn, faithPurchases, healing, learn, plunder, productionToward, score, shareResearch, trainable, trainOptions, upgradeCost, upgradeTo, wellFormed, type Order } from '../rules/game';
+import { ANARCHY_TURNS, apply, applyOnce, blockers, canBuild, workTurns, constructible, canChooseIdeology, ideologySwitch, SWITCH_DISSENT, canDig, canFound, checkVictory, endTurn, faithPurchases, healing, itemCost, learn, plunder, productionToward, score, shareResearch, trainable, trainOptions, upgradeCost, upgradeTo, wellFormed, type Order } from '../rules/game';
 import { colOf, distance, line, neighbour, neighbours, rowOf, tileAt, within } from '../rules/hex';
 import { generate, Rng, START_ISLAND } from '../rules/mapgen';
 import { NATURAL_WONDERS } from '../rules/nature';
@@ -1817,6 +1817,30 @@ test('great people used: the Mausoleum’s gold, Reliquary’s faith, Rationalis
   eq(game.tiles[at(6, 5)].improvement, 'landmark', 'a landmark');
 });
 
+test('a Great Engineer hurries what’s being built now and no more: nothing left over for what comes after', () => {
+  const { game, at } = blank();
+  const c = city(game, 0, at(10, 8), { pop: 10 });
+  const monument = { kind: 'building', id: 'monument' } as const;
+  c.queue = [monument, { kind: 'unit', id: 'warrior' }, { kind: 'unit', id: 'warrior' }, { kind: 'unit', id: 'warrior' }];
+  const g = unit(game, 'great_engineer', 0, c.tile);
+  ok(apply(game, 0, { t: 'greatPerson', unit: g.id, action: 'hurry' }).ok, 'hurried');
+  eq(c.prod, itemCost(game, monument), 'as much as the monument needs');
+  endTurn(game);
+  ok(c.buildings.includes('monument'), 'the monument built');
+  ok(c.prod < itemCost(game, { kind: 'unit', id: 'warrior' }), `only a turn's production carried to the warrior (${c.prod})`);
+  endTurn(game);
+  eq(game.units.filter((u) => u.type === 'warrior' && u.owner === 0).length, 0, 'which takes more than a turn');
+  // Nothing to hurry: the engineer kept.
+  c.queue = [];
+  c.prod = 0;
+  const g2 = unit(game, 'great_engineer', 0, c.tile);
+  ok(!apply(game, 0, { t: 'greatPerson', unit: g2.id, action: 'hurry' }).ok && game.units.includes(g2), 'not with nothing being built');
+  // A wonder far from done gets the whole of it.
+  c.queue = [{ kind: 'building', id: 'cn_tower' }];
+  ok(apply(game, 0, { t: 'greatPerson', unit: g2.id, action: 'hurry' }).ok, 'a wonder hurried');
+  eq(c.prod, 300 + 30 * c.pop, 'with all 300 and 30 a citizen');
+});
+
 // -------------------------------------------------------------------------------------------------
 // City-states, trade, spies, research agreements
 // -------------------------------------------------------------------------------------------------