@civ-clone/library-city 0.1.3 → 0.1.4

package/Specialists/Entertainer.d.ts

@@ -0,0 +1,3 @@
+import Specialist from '@civ-clone/core-city/Specialist';
+export declare class Entertainer extends Specialist {}
+export default Entertainer;

package/Specialists/Entertainer.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Entertainer = void 0;
+const Specialist_1 = require("@civ-clone/core-city/Specialist");
+class Entertainer extends Specialist_1.default {
+}
+exports.Entertainer = Entertainer;
+exports.default = Entertainer;
+//# sourceMappingURL=Entertainer.js.map

package/Specialists/Entertainer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Entertainer.js","sourceRoot":"","sources":["Entertainer.ts"],"names":[],"mappings":";;;AAAA,gEAAyD;AAEzD,MAAa,WAAY,SAAQ,oBAAU;CAAG;AAA9C,kCAA8C;AAE9C,kBAAe,WAAW,CAAC"}

package/Specialists/Entertainer.ts

@@ -0,0 +1,5 @@
+import Specialist from '@civ-clone/core-city/Specialist';
+
+export class Entertainer extends Specialist {}
+
+export default Entertainer;

package/Specialists/Scientist.d.ts

@@ -0,0 +1,3 @@
+import Specialist from '@civ-clone/core-city/Specialist';
+export declare class Scientist extends Specialist {}
+export default Scientist;

package/Specialists/Scientist.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Scientist = void 0;
+const Specialist_1 = require("@civ-clone/core-city/Specialist");
+class Scientist extends Specialist_1.default {
+}
+exports.Scientist = Scientist;
+exports.default = Scientist;
+//# sourceMappingURL=Scientist.js.map

package/Specialists/Scientist.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Scientist.js","sourceRoot":"","sources":["Scientist.ts"],"names":[],"mappings":";;;AAAA,gEAAyD;AAEzD,MAAa,SAAU,SAAQ,oBAAU;CAAG;AAA5C,8BAA4C;AAE5C,kBAAe,SAAS,CAAC"}

package/Specialists/Scientist.ts

@@ -0,0 +1,5 @@
+import Specialist from '@civ-clone/core-city/Specialist';
+
+export class Scientist extends Specialist {}
+
+export default Scientist;

package/Specialists/TaxCollector.d.ts

@@ -0,0 +1,3 @@
+import Specialist from '@civ-clone/core-city/Specialist';
+export declare class TaxCollector extends Specialist {}
+export default TaxCollector;

package/Specialists/TaxCollector.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaxCollector = void 0;
+const Specialist_1 = require("@civ-clone/core-city/Specialist");
+class TaxCollector extends Specialist_1.default {
+}
+exports.TaxCollector = TaxCollector;
+exports.default = TaxCollector;
+//# sourceMappingURL=TaxCollector.js.map

package/Specialists/TaxCollector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TaxCollector.js","sourceRoot":"","sources":["TaxCollector.ts"],"names":[],"mappings":";;;AAAA,gEAAyD;AAEzD,MAAa,YAAa,SAAQ,oBAAU;CAAG;AAA/C,oCAA+C;AAE/C,kBAAe,YAAY,CAAC"}

package/Specialists/TaxCollector.ts

@@ -0,0 +1,5 @@
+import Specialist from '@civ-clone/core-city/Specialist';
+
+export class TaxCollector extends Specialist {}
+
+export default TaxCollector;

package/Specialists.d.ts

@@ -0,0 +1,3 @@
+export { Entertainer } from './Specialists/Entertainer';
+export { TaxCollector } from './Specialists/TaxCollector';
+export { Scientist } from './Specialists/Scientist';

package/Specialists.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Scientist = exports.TaxCollector = exports.Entertainer = void 0;
+var Entertainer_1 = require("./Specialists/Entertainer");
+Object.defineProperty(exports, "Entertainer", { enumerable: true, get: function () { return Entertainer_1.Entertainer; } });
+var TaxCollector_1 = require("./Specialists/TaxCollector");
+Object.defineProperty(exports, "TaxCollector", { enumerable: true, get: function () { return TaxCollector_1.TaxCollector; } });
+var Scientist_1 = require("./Specialists/Scientist");
+Object.defineProperty(exports, "Scientist", { enumerable: true, get: function () { return Scientist_1.Scientist; } });
+//# sourceMappingURL=Specialists.js.map

package/Specialists.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Specialists.js","sourceRoot":"","sources":["Specialists.ts"],"names":[],"mappings":";;;AAAA,yDAAwD;AAA/C,0GAAA,WAAW,OAAA;AACpB,2DAA0D;AAAjD,4GAAA,YAAY,OAAA;AACrB,qDAAoD;AAA3C,sGAAA,SAAS,OAAA"}

package/Specialists.ts

@@ -0,0 +1,3 @@
+export { Entertainer } from './Specialists/Entertainer';
+export { TaxCollector } from './Specialists/TaxCollector';
+export { Scientist } from './Specialists/Scientist';

package/lib/assignWorkers.d.ts

@@ -1,10 +1,40 @@
+import { AvailableSpecialistRegistry } from '@civ-clone/core-city/AvailableSpecialistRegistry';
 import { CityGrowthRegistry } from '@civ-clone/core-city-growth/CityGrowthRegistry';
 import { PlayerWorldRegistry } from '@civ-clone/core-player-world/PlayerWorldRegistry';
+import { SpecialistRegistry } from '@civ-clone/core-city/SpecialistRegistry';
 import { WorkedTileRegistry } from '@civ-clone/core-city/WorkedTileRegistry';
 import City from '@civ-clone/core-city/City';
 import Tile from '@civ-clone/core-world/Tile';
 import Yield from '@civ-clone/core-yield/Yield';
 import CityGrowth from '@civ-clone/core-city-growth/CityGrowth';
+import Specialist from '@civ-clone/core-city/Specialist';
+/**
+ * How many citizens `city` has placed: one per worked tile, the city centre included, and one per `Specialist`. A city
+ * of size `n` has `n + 1`.
+ */
+export declare const citizenCount: (
+  city: City,
+  workedTileRegistry?: WorkedTileRegistry,
+  specialistRegistry?: SpecialistRegistry
+) => number;
+/**
+ * Makes a citizen of `city` a `Specialist` of the first available kind (an Entertainer, in Civ1). Returns `null` when
+ * the ruleset offers no specialists.
+ */
+export declare const addSpecialist: (
+  city: City,
+  specialistRegistry?: SpecialistRegistry,
+  availableSpecialistRegistry?: AvailableSpecialistRegistry
+) => Specialist | null;
+/**
+ * Turns `specialist` into the next available kind, wrapping back to the first. Returns the `Specialist` that replaces
+ * it, or `specialist` itself when there is nothing to change it to.
+ */
+export declare const changeSpecialist: (
+  specialist: Specialist,
+  specialistRegistry?: SpecialistRegistry,
+  availableSpecialistRegistry?: AvailableSpecialistRegistry
+) => Specialist;
 export declare const getHighestValueCityTiles: (city: City) => Tile[];
 export declare const sortTiles: (
   tiles: Tile[],
@@ -16,39 +46,67 @@ export declare const getHighestValueAvailableCityTiles: (
   playerWorldRegistry?: PlayerWorldRegistry,
   workedTileRegistry?: WorkedTileRegistry
 ) => Tile[];
+/**
+ * Rearranges the tiles `city` works from scratch. Its specialists stay as they are.
+ */
 export declare const reassignWorkers: (
   city: City,
   playerWorldRegistry?: PlayerWorldRegistry,
   cityGrowthRegistry?: CityGrowthRegistry,
-  workedTileRegistry?: WorkedTileRegistry
+  workedTileRegistry?: WorkedTileRegistry,
+  specialistRegistry?: SpecialistRegistry,
+  availableSpecialistRegistry?: AvailableSpecialistRegistry
 ) => void;
+/**
+ * Places each of `city`'s citizens that has no job on the best tile available, or makes them a specialist if there is
+ * no tile left to work.
+ */
 export declare const assignWorkers: (
   city: City,
   playerWorldRegistry?: PlayerWorldRegistry,
   cityGrowthRegistry?: CityGrowthRegistry,
-  workedTileRegistry?: WorkedTileRegistry
+  workedTileRegistry?: WorkedTileRegistry,
+  specialistRegistry?: SpecialistRegistry,
+  availableSpecialistRegistry?: AvailableSpecialistRegistry
 ) => void;
+/**
+ * Places one new citizen of `city` on the best tile available, or makes them a specialist if there is no tile left.
+ */
 export declare const assignWorker: (
   city: City,
   playerWorldRegistry?: PlayerWorldRegistry,
   cityGrowthRegistry?: CityGrowthRegistry,
-  workedTileRegistry?: WorkedTileRegistry
+  workedTileRegistry?: WorkedTileRegistry,
+  specialistRegistry?: SpecialistRegistry,
+  availableSpecialistRegistry?: AvailableSpecialistRegistry
 ) => void;
 export type WorkedTileChange = 'removed' | 'added' | 'reassigned' | 'none';
 /**
  * Changes whether `tile` is worked by `city`, as a player clicking it on the city map would.
  *
- * A tile the city works stops being worked. Any other tile is worked by a free worker, if the city has one and is
- * allowed to work it. With every worker already placed, the city's workers are reassigned instead. The city centre is
- * always worked.
+ * A tile the city works stops being worked, and its worker becomes a specialist. Any other tile is worked by a
+ * specialist, or by a citizen with no job, if the city has one and is allowed to work it. With every citizen already
+ * working a tile, the city's workers are reassigned instead. The city centre is always worked.
  */
 export declare const changeWorkedTile: (
   city: City,
   tile: Tile,
   playerWorldRegistry?: PlayerWorldRegistry,
   cityGrowthRegistry?: CityGrowthRegistry,
-  workedTileRegistry?: WorkedTileRegistry
+  workedTileRegistry?: WorkedTileRegistry,
+  specialistRegistry?: SpecialistRegistry,
+  availableSpecialistRegistry?: AvailableSpecialistRegistry
 ) => WorkedTileChange;
+/**
+ * Takes jobs away from `city`'s citizens until it has no more than its size allows: specialists first, then the
+ * workers on the least valuable tiles.
+ */
+export declare const releaseCitizens: (
+  city: City,
+  cityGrowth: CityGrowth,
+  workedTileRegistry?: WorkedTileRegistry,
+  specialistRegistry?: SpecialistRegistry
+) => void;
 export declare const reduceWorkers: (
   city: City,
   cityGrowth: CityGrowth

package/lib/assignWorkers.js

@@ -1,12 +1,64 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reduceWorkers = exports.changeWorkedTile = exports.assignWorker = exports.assignWorkers = exports.reassignWorkers = exports.getHighestValueAvailableCityTiles = exports.sortTiles = exports.getHighestValueCityTiles = void 0;
+exports.reduceWorkers = exports.releaseCitizens = exports.changeWorkedTile = exports.assignWorker = exports.assignWorkers = exports.reassignWorkers = exports.getHighestValueAvailableCityTiles = exports.sortTiles = exports.getHighestValueCityTiles = exports.changeSpecialist = exports.addSpecialist = exports.citizenCount = void 0;
+const AvailableSpecialistRegistry_1 = require("@civ-clone/core-city/AvailableSpecialistRegistry");
 const CityGrowthRegistry_1 = require("@civ-clone/core-city-growth/CityGrowthRegistry");
 const Yields_1 = require("../Yields");
 const PlayerWorldRegistry_1 = require("@civ-clone/core-player-world/PlayerWorldRegistry");
+const SpecialistRegistry_1 = require("@civ-clone/core-city/SpecialistRegistry");
 const WorkedTileRegistry_1 = require("@civ-clone/core-city/WorkedTileRegistry");
 const reduceYields_1 = require("@civ-clone/core-yield/lib/reduceYields");
 const WorkedTile_1 = require("@civ-clone/core-city/WorkedTile");
+/**
+ * How many citizens `city` has placed: one per worked tile, the city centre included, and one per `Specialist`. A city
+ * of size `n` has `n + 1`.
+ */
+const citizenCount = (city, workedTileRegistry = WorkedTileRegistry_1.instance, specialistRegistry = SpecialistRegistry_1.instance) => workedTileRegistry.getByCity(city).length +
+    specialistRegistry.getByCity(city).length;
+exports.citizenCount = citizenCount;
+/**
+ * Makes a citizen of `city` a `Specialist` of the first available kind (an Entertainer, in Civ1). Returns `null` when
+ * the ruleset offers no specialists.
+ */
+const addSpecialist = (city, specialistRegistry = SpecialistRegistry_1.instance, availableSpecialistRegistry = AvailableSpecialistRegistry_1.instance) => {
+    const [SpecialistType] = availableSpecialistRegistry.entries();
+    if (!SpecialistType) {
+        return null;
+    }
+    const specialist = new SpecialistType(city);
+    specialistRegistry.register(specialist);
+    return specialist;
+};
+exports.addSpecialist = addSpecialist;
+/**
+ * Turns `specialist` into the next available kind, wrapping back to the first. Returns the `Specialist` that replaces
+ * it, or `specialist` itself when there is nothing to change it to.
+ */
+const changeSpecialist = (specialist, specialistRegistry = SpecialistRegistry_1.instance, availableSpecialistRegistry = AvailableSpecialistRegistry_1.instance) => {
+    const city = specialist.city(), types = availableSpecialistRegistry.entries(), NextType = types[(types.indexOf(specialist.constructor) + 1) %
+        types.length];
+    if (!NextType || specialist instanceof NextType) {
+        return specialist;
+    }
+    const replacement = new NextType(city);
+    specialistRegistry.unregister(specialist);
+    specialistRegistry.register(replacement);
+    return replacement;
+};
+exports.changeSpecialist = changeSpecialist;
+/**
+ * Puts one of `city`'s specialists back to work, preferring the first available kind (Entertainers), and returns
+ * whether there was one to remove.
+ */
+const removeSpecialist = (city, specialistRegistry, availableSpecialistRegistry) => {
+    var _a;
+    const specialists = specialistRegistry.getByCity(city), [DefaultType] = availableSpecialistRegistry.entries(), specialist = (_a = specialists.find((specialist) => DefaultType && specialist instanceof DefaultType)) !== null && _a !== void 0 ? _a : specialists[specialists.length - 1];
+    if (!specialist) {
+        return false;
+    }
+    specialistRegistry.unregister(specialist);
+    return true;
+};
 const getHighestValueCityTiles = (city) => (0, exports.sortTiles)(city.tiles().entries(), city);
 exports.getHighestValueCityTiles = getHighestValueCityTiles;
 const sortTiles = (tiles, city, weights = [
@@ -30,28 +82,42 @@ exports.sortTiles = sortTiles;
 const getHighestValueAvailableCityTiles = (city, playerWorldRegistry = PlayerWorldRegistry_1.instance, workedTileRegistry = WorkedTileRegistry_1.instance) => (0, exports.getHighestValueCityTiles)(city).filter((tile) => workedTileRegistry.tileCanBeWorkedBy(tile, city) &&
     playerWorldRegistry.getByPlayer(city.player()).includes(tile));
 exports.getHighestValueAvailableCityTiles = getHighestValueAvailableCityTiles;
-const reassignWorkers = (city, playerWorldRegistry = PlayerWorldRegistry_1.instance, cityGrowthRegistry = CityGrowthRegistry_1.instance, workedTileRegistry = WorkedTileRegistry_1.instance) => {
+/**
+ * Rearranges the tiles `city` works from scratch. Its specialists stay as they are.
+ */
+const reassignWorkers = (city, playerWorldRegistry = PlayerWorldRegistry_1.instance, cityGrowthRegistry = CityGrowthRegistry_1.instance, workedTileRegistry = WorkedTileRegistry_1.instance, specialistRegistry = SpecialistRegistry_1.instance, availableSpecialistRegistry = AvailableSpecialistRegistry_1.instance) => {
     workedTileRegistry
         .getBy('city', city)
         .forEach((workedTile) => workedTileRegistry.unregister(workedTile));
     workedTileRegistry.register(new WorkedTile_1.default(city.tile(), city));
-    (0, exports.assignWorkers)(city, playerWorldRegistry, cityGrowthRegistry, workedTileRegistry);
+    (0, exports.assignWorkers)(city, playerWorldRegistry, cityGrowthRegistry, workedTileRegistry, specialistRegistry, availableSpecialistRegistry);
 };
 exports.reassignWorkers = reassignWorkers;
-const assignWorkers = (city, playerWorldRegistry = PlayerWorldRegistry_1.instance, cityGrowthRegistry = CityGrowthRegistry_1.instance, workedTileRegistry = WorkedTileRegistry_1.instance) => {
-    const cityGrowth = cityGrowthRegistry.getByCity(city);
+/**
+ * Places each of `city`'s citizens that has no job on the best tile available, or makes them a specialist if there is
+ * no tile left to work.
+ */
+const assignWorkers = (city, playerWorldRegistry = PlayerWorldRegistry_1.instance, cityGrowthRegistry = CityGrowthRegistry_1.instance, workedTileRegistry = WorkedTileRegistry_1.instance, specialistRegistry = SpecialistRegistry_1.instance, availableSpecialistRegistry = AvailableSpecialistRegistry_1.instance) => {
+    const cityGrowth = cityGrowthRegistry.getByCity(city), placed = () => (0, exports.citizenCount)(city, workedTileRegistry, specialistRegistry) >=
+        cityGrowth.size() + 1;
     (0, exports.getHighestValueAvailableCityTiles)(city, playerWorldRegistry, workedTileRegistry).some((tile) => {
-        if (city.tilesWorked().length >= cityGrowth.size() + 1) {
+        if (placed()) {
             return true;
         }
         workedTileRegistry.register(new WorkedTile_1.default(tile, city));
         return false;
     });
+    while (!placed() &&
+        (0, exports.addSpecialist)(city, specialistRegistry, availableSpecialistRegistry)) { }
 };
 exports.assignWorkers = assignWorkers;
-const assignWorker = (city, playerWorldRegistry = PlayerWorldRegistry_1.instance, cityGrowthRegistry = CityGrowthRegistry_1.instance, workedTileRegistry = WorkedTileRegistry_1.instance) => {
+/**
+ * Places one new citizen of `city` on the best tile available, or makes them a specialist if there is no tile left.
+ */
+const assignWorker = (city, playerWorldRegistry = PlayerWorldRegistry_1.instance, cityGrowthRegistry = CityGrowthRegistry_1.instance, workedTileRegistry = WorkedTileRegistry_1.instance, specialistRegistry = SpecialistRegistry_1.instance, availableSpecialistRegistry = AvailableSpecialistRegistry_1.instance) => {
     const [newTile] = (0, exports.getHighestValueAvailableCityTiles)(city, playerWorldRegistry, workedTileRegistry);
     if (!newTile) {
+        (0, exports.addSpecialist)(city, specialistRegistry, availableSpecialistRegistry);
         return;
     }
     workedTileRegistry.register(new WorkedTile_1.default(newTile, city));
@@ -60,32 +126,50 @@ exports.assignWorker = assignWorker;
 /**
  * Changes whether `tile` is worked by `city`, as a player clicking it on the city map would.
  *
- * A tile the city works stops being worked. Any other tile is worked by a free worker, if the city has one and is
- * allowed to work it. With every worker already placed, the city's workers are reassigned instead. The city centre is
- * always worked.
+ * A tile the city works stops being worked, and its worker becomes a specialist. Any other tile is worked by a
+ * specialist, or by a citizen with no job, if the city has one and is allowed to work it. With every citizen already
+ * working a tile, the city's workers are reassigned instead. The city centre is always worked.
  */
-const changeWorkedTile = (city, tile, playerWorldRegistry = PlayerWorldRegistry_1.instance, cityGrowthRegistry = CityGrowthRegistry_1.instance, workedTileRegistry = WorkedTileRegistry_1.instance) => {
+const changeWorkedTile = (city, tile, playerWorldRegistry = PlayerWorldRegistry_1.instance, cityGrowthRegistry = CityGrowthRegistry_1.instance, workedTileRegistry = WorkedTileRegistry_1.instance, specialistRegistry = SpecialistRegistry_1.instance, availableSpecialistRegistry = AvailableSpecialistRegistry_1.instance) => {
     var _a;
     if (tile === city.tile() || !city.tiles().includes(tile)) {
         return 'none';
     }
     if (((_a = workedTileRegistry.getByTile(tile)) === null || _a === void 0 ? void 0 : _a.city()) === city) {
         workedTileRegistry.unregisterByTile(tile);
+        (0, exports.addSpecialist)(city, specialistRegistry, availableSpecialistRegistry);
         return 'removed';
     }
-    if (workedTileRegistry.getByCity(city).length >=
-        cityGrowthRegistry.getByCity(city).size() + 1) {
-        (0, exports.reassignWorkers)(city, playerWorldRegistry, cityGrowthRegistry, workedTileRegistry);
+    const size = cityGrowthRegistry.getByCity(city).size();
+    if (workedTileRegistry.getByCity(city).length >= size + 1) {
+        (0, exports.reassignWorkers)(city, playerWorldRegistry, cityGrowthRegistry, workedTileRegistry, specialistRegistry, availableSpecialistRegistry);
         return 'reassigned';
     }
     if (!workedTileRegistry.tileCanBeWorkedBy(tile, city) ||
         !playerWorldRegistry.getByPlayer(city.player()).includes(tile)) {
         return 'none';
     }
+    if ((0, exports.citizenCount)(city, workedTileRegistry, specialistRegistry) >= size + 1) {
+        removeSpecialist(city, specialistRegistry, availableSpecialistRegistry);
+    }
     workedTileRegistry.register(new WorkedTile_1.default(tile, city));
     return 'added';
 };
 exports.changeWorkedTile = changeWorkedTile;
+/**
+ * Takes jobs away from `city`'s citizens until it has no more than its size allows: specialists first, then the
+ * workers on the least valuable tiles.
+ */
+const releaseCitizens = (city, cityGrowth, workedTileRegistry = WorkedTileRegistry_1.instance, specialistRegistry = SpecialistRegistry_1.instance) => {
+    const specialists = specialistRegistry.getByCity(city);
+    while (specialists.length > 0 &&
+        (0, exports.citizenCount)(city, workedTileRegistry, specialistRegistry) >
+            cityGrowth.size() + 1) {
+        specialistRegistry.unregister(specialists.pop());
+    }
+    (0, exports.reduceWorkers)(city, cityGrowth).forEach((tile) => workedTileRegistry.unregisterByTile(tile));
+};
+exports.releaseCitizens = releaseCitizens;
 const reduceWorkers = (city, cityGrowth) => (0, exports.sortTiles)(city
     .tilesWorked()
     .entries()

package/lib/assignWorkers.js.map

@@ -1 +1 @@
-{"version":3,"file":"assignWorkers.js","sourceRoot":"","sources":["assignWorkers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"assignWorkers.js","sourceRoot":"","sources":["assignWorkers.ts"],"names":[],"mappings":";;;AAAA,kGAG0D;AAC1D,uFAGwD;AACxD,sCAAoD;AACpD,0FAG0D;AAC1D,gFAGiD;AACjD,gFAGiD;AAIjD,yEAAqE;AACrE,gEAAyD;AAIzD;;;GAGG;AACI,MAAM,YAAY,GAAG,CAC1B,IAAU,EACV,qBAAyC,6BAA0B,EACnE,qBAAyC,6BAA0B,EAC3D,EAAE,CACV,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM;IACzC,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;AAN/B,QAAA,YAAY,gBAMmB;AAE5C;;;GAGG;AACI,MAAM,aAAa,GAAG,CAC3B,IAAU,EACV,qBAAyC,6BAA0B,EACnE,8BAA2D,sCAAmC,EAC3E,EAAE;IACrB,MAAM,CAAC,cAAc,CAAC,GAAG,2BAA2B,CAAC,OAAO,EAAE,CAAC;IAE/D,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,UAAU,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;IAE5C,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAExC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAhBW,QAAA,aAAa,iBAgBxB;AAEF;;;GAGG;AACI,MAAM,gBAAgB,GAAG,CAC9B,UAAsB,EACtB,qBAAyC,6BAA0B,EACnE,8BAA2D,sCAAmC,EAClF,EAAE;IACd,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,EAC5B,KAAK,GAAG,2BAA2B,CAAC,OAAO,EAAE,EAC7C,QAAQ,GACN,KAAK,CACH,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,WAAgC,CAAC,GAAG,CAAC,CAAC;QAC9D,KAAK,CAAC,MAAM,CACf,CAAC;IAEN,IAAI,CAAC,QAAQ,IAAI,UAAU,YAAY,QAAQ,EAAE;QAC/C,OAAO,UAAU,CAAC;KACnB;IAED,MAAM,WAAW,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEvC,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC1C,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAEzC,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAvBW,QAAA,gBAAgB,oBAuB3B;AAEF;;;GAGG;AACH,MAAM,gBAAgB,GAAG,CACvB,IAAU,EACV,kBAAsC,EACtC,2BAAwD,EAC/C,EAAE;;IACX,MAAM,WAAW,GAAG,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,EACpD,CAAC,WAAW,CAAC,GAAG,2BAA2B,CAAC,OAAO,EAAE,EACrD,UAAU,GACR,MAAA,WAAW,CAAC,IAAI,CACd,CAAC,UAAU,EAAE,EAAE,CAAC,WAAW,IAAI,UAAU,YAAY,WAAW,CACjE,mCAAI,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE7C,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,KAAK,CAAC;KACd;IAED,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAE1C,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEK,MAAM,wBAAwB,GAAG,CAAC,IAAU,EAAE,EAAE,CACrD,IAAA,iBAAS,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC;AAD7B,QAAA,wBAAwB,4BACK;AAEnC,MAAM,SAAS,GAAG,CACvB,KAAa,EACb,IAAU,EACV,UAAoC;IAClC,CAAC,aAAI,EAAE,CAAC,CAAC;IACT;QACE,mBAAU;QACV,CAAC;YACC,CAAC,IAAA,0BAAW,EAAC,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,mBAAU,CAAC,KAAK,CAAC;gBACtE,CAAC,CAAC,CAAC;gBACH,CAAC,CAAC,CAAC,CAAC;KACT;IACD;QACE,cAAK;QACL,CAAC;YACC,CAAC,IAAA,0BAAW,EAAC,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,cAAK,CAAC,KAAK,CAAC;gBACjE,CAAC,CAAC,CAAC;gBACH,CAAC,CAAC,CAAC,CAAC;KACT;CACF,EACO,EAAE,CACV,KAAK,CAAC,IAAI,CACR,CAAC,CAAO,EAAE,CAAO,EAAE,EAAE,CACnB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CACpE,CAAC;AAxBS,QAAA,SAAS,aAwBlB;AAEG,MAAM,iCAAiC,GAAG,CAC/C,IAAU,EACV,sBAA2C,8BAA2B,EACtE,qBAAyC,6BAA0B,EACnE,EAAE,CACF,IAAA,gCAAwB,EAAC,IAAI,CAAC,CAAC,MAAM,CACnC,CAAC,IAAI,EAAE,EAAE,CACP,kBAAkB,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC;IAChD,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAChE,CAAC;AATS,QAAA,iCAAiC,qCAS1C;AAEJ;;GAEG;AACI,MAAM,eAAe,GAAG,CAC7B,IAAU,EACV,sBAA2C,8BAA2B,EACtE,qBAAyC,6BAA0B,EACnE,qBAAyC,6BAA0B,EACnE,qBAAyC,6BAA0B,EACnE,8BAA2D,sCAAmC,EAC9F,EAAE;IACF,kBAAkB;SACf,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC;SACnB,OAAO,CAAC,CAAC,UAAsB,EAAE,EAAE,CAClC,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAC1C,CAAC;IAEJ,kBAAkB,CAAC,QAAQ,CAAC,IAAI,oBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;IAE/D,IAAA,qBAAa,EACX,IAAI,EACJ,mBAAmB,EACnB,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,2BAA2B,CAC5B,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,eAAe,mBAwB1B;AAEF;;;GAGG;AACI,MAAM,aAAa,GAOd,CACV,IAAU,EACV,sBAA2C,8BAA2B,EACtE,qBAAyC,6BAA0B,EACnE,qBAAyC,6BAA0B,EACnE,qBAAyC,6BAA0B,EACnE,8BAA2D,sCAAmC,EACxF,EAAE;IACR,MAAM,UAAU,GAAG,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,EACnD,MAAM,GAAG,GAAG,EAAE,CACZ,IAAA,oBAAY,EAAC,IAAI,EAAE,kBAAkB,EAAE,kBAAkB,CAAC;QAC1D,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAE1B,IAAA,yCAAiC,EAC/B,IAAI,EACJ,mBAAmB,EACnB,kBAAkB,CACnB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACd,IAAI,MAAM,EAAE,EAAE;YACZ,OAAO,IAAI,CAAC;SACb;QAED,kBAAkB,CAAC,QAAQ,CAAC,IAAI,oBAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAExD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,OACE,CAAC,MAAM,EAAE;QACT,IAAA,qBAAa,EAAC,IAAI,EAAE,kBAAkB,EAAE,2BAA2B,CAAC,EACpE,GAAE;AACN,CAAC,CAAC;AAtCW,QAAA,aAAa,iBAsCxB;AAEF;;GAEG;AACI,MAAM,YAAY,GAOb,CACV,IAAU,EACV,sBAA2C,8BAA2B,EACtE,qBAAyC,6BAA0B,EACnE,qBAAyC,6BAA0B,EACnE,qBAAyC,6BAA0B,EACnE,8BAA2D,sCAAmC,EACxF,EAAE;IACR,MAAM,CAAC,OAAO,CAAC,GAAG,IAAA,yCAAiC,EACjD,IAAI,EACJ,mBAAmB,EACnB,kBAAkB,CACnB,CAAC;IAEF,IAAI,CAAC,OAAO,EAAE;QACZ,IAAA,qBAAa,EAAC,IAAI,EAAE,kBAAkB,EAAE,2BAA2B,CAAC,CAAC;QAErE,OAAO;KACR;IAED,kBAAkB,CAAC,QAAQ,CAAC,IAAI,oBAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC;AA5BW,QAAA,YAAY,gBA4BvB;AAIF;;;;;;GAMG;AACI,MAAM,gBAAgB,GAQL,CACtB,IAAU,EACV,IAAU,EACV,sBAA2C,8BAA2B,EACtE,qBAAyC,6BAA0B,EACnE,qBAAyC,6BAA0B,EACnE,qBAAyC,6BAA0B,EACnE,8BAA2D,sCAAmC,EAC5E,EAAE;;IACpB,IAAI,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACxD,OAAO,MAAM,CAAC;KACf;IAED,IAAI,CAAA,MAAA,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,0CAAE,IAAI,EAAE,MAAK,IAAI,EAAE;QACvD,kBAAkB,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAE1C,IAAA,qBAAa,EAAC,IAAI,EAAE,kBAAkB,EAAE,2BAA2B,CAAC,CAAC;QAErE,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,IAAI,GAAG,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IAEvD,IAAI,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,IAAI,GAAG,CAAC,EAAE;QACzD,IAAA,uBAAe,EACb,IAAI,EACJ,mBAAmB,EACnB,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,2BAA2B,CAC5B,CAAC;QAEF,OAAO,YAAY,CAAC;KACrB;IAED,IACE,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC;QACjD,CAAC,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC9D;QACA,OAAO,MAAM,CAAC;KACf;IAED,IAAI,IAAA,oBAAY,EAAC,IAAI,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE;QAC1E,gBAAgB,CAAC,IAAI,EAAE,kBAAkB,EAAE,2BAA2B,CAAC,CAAC;KACzE;IAED,kBAAkB,CAAC,QAAQ,CAAC,IAAI,oBAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAExD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AA1DW,QAAA,gBAAgB,oBA0D3B;AAEF;;;GAGG;AACI,MAAM,eAAe,GAAG,CAC7B,IAAU,EACV,UAAsB,EACtB,qBAAyC,6BAA0B,EACnE,qBAAyC,6BAA0B,EAC7D,EAAE;IACR,MAAM,WAAW,GAAG,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAEvD,OACE,WAAW,CAAC,MAAM,GAAG,CAAC;QACtB,IAAA,oBAAY,EAAC,IAAI,EAAE,kBAAkB,EAAE,kBAAkB,CAAC;YACxD,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,EACvB;QACA,kBAAkB,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,EAAG,CAAC,CAAC;KACnD;IAED,IAAA,qBAAa,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,IAAU,EAAQ,EAAE,CAC3D,kBAAkB,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAC1C,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,eAAe,mBAmB1B;AAEK,MAAM,aAAa,GAAG,CAAC,IAAU,EAAE,UAAsB,EAAU,EAAE,CAC1E,IAAA,iBAAS,EACP,IAAI;KACD,WAAW,EAAE;KACb,OAAO,EAAE;KACT,MAAM,CAAC,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC,EAC/C,IAAI,CACL,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;AAPhB,QAAA,aAAa,iBAOG;AAE7B,kBAAe,qBAAa,CAAC"}

package/lib/assignWorkers.ts

@@ -1,3 +1,7 @@
+import {
+  AvailableSpecialistRegistry,
+  instance as availableSpecialistRegistryInstance,
+} from '@civ-clone/core-city/AvailableSpecialistRegistry';
 import {
   CityGrowthRegistry,
   instance as cityGrowthRegistryInstance,
@@ -7,6 +11,10 @@ import {
   PlayerWorldRegistry,
   instance as playerWorldRegistryInstance,
 } from '@civ-clone/core-player-world/PlayerWorldRegistry';
+import {
+  SpecialistRegistry,
+  instance as specialistRegistryInstance,
+} from '@civ-clone/core-city/SpecialistRegistry';
 import {
   WorkedTileRegistry,
   instance as workedTileRegistryInstance,
@@ -17,6 +25,95 @@ import Yield from '@civ-clone/core-yield/Yield';
 import { reduceYield } from '@civ-clone/core-yield/lib/reduceYields';
 import WorkedTile from '@civ-clone/core-city/WorkedTile';
 import CityGrowth from '@civ-clone/core-city-growth/CityGrowth';
+import Specialist from '@civ-clone/core-city/Specialist';
+
+/**
+ * How many citizens `city` has placed: one per worked tile, the city centre included, and one per `Specialist`. A city
+ * of size `n` has `n + 1`.
+ */
+export const citizenCount = (
+  city: City,
+  workedTileRegistry: WorkedTileRegistry = workedTileRegistryInstance,
+  specialistRegistry: SpecialistRegistry = specialistRegistryInstance
+): number =>
+  workedTileRegistry.getByCity(city).length +
+  specialistRegistry.getByCity(city).length;
+
+/**
+ * Makes a citizen of `city` a `Specialist` of the first available kind (an Entertainer, in Civ1). Returns `null` when
+ * the ruleset offers no specialists.
+ */
+export const addSpecialist = (
+  city: City,
+  specialistRegistry: SpecialistRegistry = specialistRegistryInstance,
+  availableSpecialistRegistry: AvailableSpecialistRegistry = availableSpecialistRegistryInstance
+): Specialist | null => {
+  const [SpecialistType] = availableSpecialistRegistry.entries();
+
+  if (!SpecialistType) {
+    return null;
+  }
+
+  const specialist = new SpecialistType(city);
+
+  specialistRegistry.register(specialist);
+
+  return specialist;
+};
+
+/**
+ * Turns `specialist` into the next available kind, wrapping back to the first. Returns the `Specialist` that replaces
+ * it, or `specialist` itself when there is nothing to change it to.
+ */
+export const changeSpecialist = (
+  specialist: Specialist,
+  specialistRegistry: SpecialistRegistry = specialistRegistryInstance,
+  availableSpecialistRegistry: AvailableSpecialistRegistry = availableSpecialistRegistryInstance
+): Specialist => {
+  const city = specialist.city(),
+    types = availableSpecialistRegistry.entries(),
+    NextType =
+      types[
+        (types.indexOf(specialist.constructor as typeof Specialist) + 1) %
+          types.length
+      ];
+
+  if (!NextType || specialist instanceof NextType) {
+    return specialist;
+  }
+
+  const replacement = new NextType(city);
+
+  specialistRegistry.unregister(specialist);
+  specialistRegistry.register(replacement);
+
+  return replacement;
+};
+
+/**
+ * Puts one of `city`'s specialists back to work, preferring the first available kind (Entertainers), and returns
+ * whether there was one to remove.
+ */
+const removeSpecialist = (
+  city: City,
+  specialistRegistry: SpecialistRegistry,
+  availableSpecialistRegistry: AvailableSpecialistRegistry
+): boolean => {
+  const specialists = specialistRegistry.getByCity(city),
+    [DefaultType] = availableSpecialistRegistry.entries(),
+    specialist =
+      specialists.find(
+        (specialist) => DefaultType && specialist instanceof DefaultType
+      ) ?? specialists[specialists.length - 1];
+
+  if (!specialist) {
+    return false;
+  }
+
+  specialistRegistry.unregister(specialist);
+
+  return true;
+};
 
 export const getHighestValueCityTiles = (city: City) =>
   sortTiles(city.tiles().entries(), city);
@@ -58,11 +155,16 @@ export const getHighestValueAvailableCityTiles = (
       playerWorldRegistry.getByPlayer(city.player()).includes(tile)
   );
 
+/**
+ * Rearranges the tiles `city` works from scratch. Its specialists stay as they are.
+ */
 export const reassignWorkers = (
   city: City,
   playerWorldRegistry: PlayerWorldRegistry = playerWorldRegistryInstance,
   cityGrowthRegistry: CityGrowthRegistry = cityGrowthRegistryInstance,
-  workedTileRegistry: WorkedTileRegistry = workedTileRegistryInstance
+  workedTileRegistry: WorkedTileRegistry = workedTileRegistryInstance,
+  specialistRegistry: SpecialistRegistry = specialistRegistryInstance,
+  availableSpecialistRegistry: AvailableSpecialistRegistry = availableSpecialistRegistryInstance
 ) => {
   workedTileRegistry
     .getBy('city', city)
@@ -76,29 +178,42 @@ export const reassignWorkers = (
     city,
     playerWorldRegistry,
     cityGrowthRegistry,
-    workedTileRegistry
+    workedTileRegistry,
+    specialistRegistry,
+    availableSpecialistRegistry
   );
 };
 
+/**
+ * Places each of `city`'s citizens that has no job on the best tile available, or makes them a specialist if there is
+ * no tile left to work.
+ */
 export const assignWorkers: (
   city: City,
   playerWorldRegistry?: PlayerWorldRegistry,
   cityGrowthRegistry?: CityGrowthRegistry,
-  workedTileRegistry?: WorkedTileRegistry
+  workedTileRegistry?: WorkedTileRegistry,
+  specialistRegistry?: SpecialistRegistry,
+  availableSpecialistRegistry?: AvailableSpecialistRegistry
 ) => void = (
   city: City,
   playerWorldRegistry: PlayerWorldRegistry = playerWorldRegistryInstance,
   cityGrowthRegistry: CityGrowthRegistry = cityGrowthRegistryInstance,
-  workedTileRegistry: WorkedTileRegistry = workedTileRegistryInstance
+  workedTileRegistry: WorkedTileRegistry = workedTileRegistryInstance,
+  specialistRegistry: SpecialistRegistry = specialistRegistryInstance,
+  availableSpecialistRegistry: AvailableSpecialistRegistry = availableSpecialistRegistryInstance
 ): void => {
-  const cityGrowth = cityGrowthRegistry.getByCity(city);
+  const cityGrowth = cityGrowthRegistry.getByCity(city),
+    placed = () =>
+      citizenCount(city, workedTileRegistry, specialistRegistry) >=
+      cityGrowth.size() + 1;
 
   getHighestValueAvailableCityTiles(
     city,
     playerWorldRegistry,
     workedTileRegistry
   ).some((tile) => {
-    if (city.tilesWorked().length >= cityGrowth.size() + 1) {
+    if (placed()) {
       return true;
     }
 
@@ -106,18 +221,30 @@ export const assignWorkers: (
 
     return false;
   });
+
+  while (
+    !placed() &&
+    addSpecialist(city, specialistRegistry, availableSpecialistRegistry)
+  ) {}
 };
 
+/**
+ * Places one new citizen of `city` on the best tile available, or makes them a specialist if there is no tile left.
+ */
 export const assignWorker: (
   city: City,
   playerWorldRegistry?: PlayerWorldRegistry,
   cityGrowthRegistry?: CityGrowthRegistry,
-  workedTileRegistry?: WorkedTileRegistry
+  workedTileRegistry?: WorkedTileRegistry,
+  specialistRegistry?: SpecialistRegistry,
+  availableSpecialistRegistry?: AvailableSpecialistRegistry
 ) => void = (
   city: City,
   playerWorldRegistry: PlayerWorldRegistry = playerWorldRegistryInstance,
   cityGrowthRegistry: CityGrowthRegistry = cityGrowthRegistryInstance,
-  workedTileRegistry: WorkedTileRegistry = workedTileRegistryInstance
+  workedTileRegistry: WorkedTileRegistry = workedTileRegistryInstance,
+  specialistRegistry: SpecialistRegistry = specialistRegistryInstance,
+  availableSpecialistRegistry: AvailableSpecialistRegistry = availableSpecialistRegistryInstance
 ): void => {
   const [newTile] = getHighestValueAvailableCityTiles(
     city,
@@ -126,6 +253,8 @@ export const assignWorker: (
   );
 
   if (!newTile) {
+    addSpecialist(city, specialistRegistry, availableSpecialistRegistry);
+
     return;
   }
 
@@ -137,22 +266,26 @@ export type WorkedTileChange = 'removed' | 'added' | 'reassigned' | 'none';
 /**
  * Changes whether `tile` is worked by `city`, as a player clicking it on the city map would.
  *
- * A tile the city works stops being worked. Any other tile is worked by a free worker, if the city has one and is
- * allowed to work it. With every worker already placed, the city's workers are reassigned instead. The city centre is
- * always worked.
+ * A tile the city works stops being worked, and its worker becomes a specialist. Any other tile is worked by a
+ * specialist, or by a citizen with no job, if the city has one and is allowed to work it. With every citizen already
+ * working a tile, the city's workers are reassigned instead. The city centre is always worked.
  */
 export const changeWorkedTile: (
   city: City,
   tile: Tile,
   playerWorldRegistry?: PlayerWorldRegistry,
   cityGrowthRegistry?: CityGrowthRegistry,
-  workedTileRegistry?: WorkedTileRegistry
+  workedTileRegistry?: WorkedTileRegistry,
+  specialistRegistry?: SpecialistRegistry,
+  availableSpecialistRegistry?: AvailableSpecialistRegistry
 ) => WorkedTileChange = (
   city: City,
   tile: Tile,
   playerWorldRegistry: PlayerWorldRegistry = playerWorldRegistryInstance,
   cityGrowthRegistry: CityGrowthRegistry = cityGrowthRegistryInstance,
-  workedTileRegistry: WorkedTileRegistry = workedTileRegistryInstance
+  workedTileRegistry: WorkedTileRegistry = workedTileRegistryInstance,
+  specialistRegistry: SpecialistRegistry = specialistRegistryInstance,
+  availableSpecialistRegistry: AvailableSpecialistRegistry = availableSpecialistRegistryInstance
 ): WorkedTileChange => {
   if (tile === city.tile() || !city.tiles().includes(tile)) {
     return 'none';
@@ -161,18 +294,21 @@ export const changeWorkedTile: (
   if (workedTileRegistry.getByTile(tile)?.city() === city) {
     workedTileRegistry.unregisterByTile(tile);
 
+    addSpecialist(city, specialistRegistry, availableSpecialistRegistry);
+
     return 'removed';
   }
 
-  if (
-    workedTileRegistry.getByCity(city).length >=
-    cityGrowthRegistry.getByCity(city).size() + 1
-  ) {
+  const size = cityGrowthRegistry.getByCity(city).size();
+
+  if (workedTileRegistry.getByCity(city).length >= size + 1) {
     reassignWorkers(
       city,
       playerWorldRegistry,
       cityGrowthRegistry,
-      workedTileRegistry
+      workedTileRegistry,
+      specialistRegistry,
+      availableSpecialistRegistry
     );
 
     return 'reassigned';
@@ -185,11 +321,40 @@ export const changeWorkedTile: (
     return 'none';
   }
 
+  if (citizenCount(city, workedTileRegistry, specialistRegistry) >= size + 1) {
+    removeSpecialist(city, specialistRegistry, availableSpecialistRegistry);
+  }
+
   workedTileRegistry.register(new WorkedTile(tile, city));
 
   return 'added';
 };
 
+/**
+ * Takes jobs away from `city`'s citizens until it has no more than its size allows: specialists first, then the
+ * workers on the least valuable tiles.
+ */
+export const releaseCitizens = (
+  city: City,
+  cityGrowth: CityGrowth,
+  workedTileRegistry: WorkedTileRegistry = workedTileRegistryInstance,
+  specialistRegistry: SpecialistRegistry = specialistRegistryInstance
+): void => {
+  const specialists = specialistRegistry.getByCity(city);
+
+  while (
+    specialists.length > 0 &&
+    citizenCount(city, workedTileRegistry, specialistRegistry) >
+      cityGrowth.size() + 1
+  ) {
+    specialistRegistry.unregister(specialists.pop()!);
+  }
+
+  reduceWorkers(city, cityGrowth).forEach((tile: Tile): void =>
+    workedTileRegistry.unregisterByTile(tile)
+  );
+};
+
 export const reduceWorkers = (city: City, cityGrowth: CityGrowth): Tile[] =>
   sortTiles(
     city

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civ-clone/library-city",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "repository": "git@github.com:civ-clone/library-city.git",
   "keywords": [
     "typescript",
@@ -59,6 +59,7 @@
     "@civ-clone/base-terrain-yield-food": "^0.1.0",
     "@civ-clone/base-terrain-yield-production": "^0.1.0",
     "@civ-clone/base-terrain-yield-trade": "^0.1.0",
+    "@civ-clone/core-city": "^0.1.16",
     "@civ-clone/core-city-growth": "^0.1.0",
     "@civ-clone/core-player-world": "^0.1.9"
   }