@civ-clone/core-treasury 0.1.2 → 0.1.4

package/AdditionalData/spend-cost.d.ts

@@ -0,0 +1,6 @@
+import { RuleRegistry } from '@civ-clone/core-rule/RuleRegistry';
+import AdditionalData from '@civ-clone/core-data-object/AdditionalData';
+export declare const getAdditionalData: (
+  ruleRegistry?: RuleRegistry
+) => AdditionalData[];
+export default getAdditionalData;

package/AdditionalData/spend-cost.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAdditionalData = void 0;
+const RuleRegistry_1 = require("@civ-clone/core-rule/RuleRegistry");
+const AdditionalData_1 = require("@civ-clone/core-data-object/AdditionalData");
+const CityBuild_1 = require("@civ-clone/core-city-build/CityBuild");
+const Spend_1 = require("../Rules/Spend");
+const getAdditionalData = (ruleRegistry = RuleRegistry_1.instance) => [
+    new AdditionalData_1.default(CityBuild_1.default, 'spendCost', (cityBuild) => ruleRegistry.process(Spend_1.default, cityBuild)),
+];
+exports.getAdditionalData = getAdditionalData;
+exports.default = exports.getAdditionalData;
+//# sourceMappingURL=spend-cost.js.map

package/AdditionalData/spend-cost.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spend-cost.js","sourceRoot":"","sources":["spend-cost.ts"],"names":[],"mappings":";;;AAAA,oEAG2C;AAC3C,+EAAwE;AACxE,oEAA6D;AAC7D,0CAAmC;AAE5B,MAAM,iBAAiB,GAAG,CAC/B,eAA6B,uBAAoB,EACjD,EAAE,CAAC;IACH,IAAI,wBAAc,CAAC,mBAAS,EAAE,WAAW,EAAE,CAAC,SAAoB,EAAE,EAAE,CAClE,YAAY,CAAC,OAAO,CAAC,eAAK,EAAE,SAAS,CAAC,CACvC;CACF,CAAC;AANW,QAAA,iBAAiB,qBAM5B;AAEF,kBAAe,yBAAiB,CAAC"}

package/AdditionalData/spend-cost.ts

@@ -0,0 +1,17 @@
+import {
+  RuleRegistry,
+  instance as ruleRegistryInstance,
+} from '@civ-clone/core-rule/RuleRegistry';
+import AdditionalData from '@civ-clone/core-data-object/AdditionalData';
+import CityBuild from '@civ-clone/core-city-build/CityBuild';
+import Spend from '../Rules/Spend';
+
+export const getAdditionalData = (
+  ruleRegistry: RuleRegistry = ruleRegistryInstance
+) => [
+  new AdditionalData(CityBuild, 'spendCost', (cityBuild: CityBuild) =>
+    ruleRegistry.process(Spend, cityBuild)
+  ),
+];
+
+export default getAdditionalData;

package/AdditionalData/{treasury.js → treasuries.js}

@@ -5,8 +5,8 @@ const PlayerTreasuryRegistry_1 = require("../PlayerTreasuryRegistry");
 const AdditionalData_1 = require("@civ-clone/core-data-object/AdditionalData");
 const Player_1 = require("@civ-clone/core-player/Player");
 const getAdditionalData = (playerTreasuryRegistry = PlayerTreasuryRegistry_1.instance) => [
-    new AdditionalData_1.default(Player_1.default, 'treasury', (player) => playerTreasuryRegistry.getByPlayer(player)),
+    new AdditionalData_1.default(Player_1.default, 'treasuries', (player) => playerTreasuryRegistry.getByPlayer(player)),
 ];
 exports.getAdditionalData = getAdditionalData;
 exports.default = exports.getAdditionalData;
-//# sourceMappingURL=treasury.js.map
+//# sourceMappingURL=treasuries.js.map

package/AdditionalData/treasuries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"treasuries.js","sourceRoot":"","sources":["treasuries.ts"],"names":[],"mappings":";;;AAAA,sEAGmC;AACnC,+EAAwE;AACxE,0DAAmD;AAE5C,MAAM,iBAAiB,GAAG,CAC/B,yBAAiD,iCAA8B,EAC/E,EAAE,CAAC;IACH,IAAI,wBAAc,CAAC,gBAAM,EAAE,YAAY,EAAE,CAAC,MAAc,EAAE,EAAE,CAC1D,sBAAsB,CAAC,WAAW,CAAC,MAAM,CAAC,CAC3C;CACF,CAAC;AANW,QAAA,iBAAiB,qBAM5B;AAEF,kBAAe,yBAAiB,CAAC"}

package/AdditionalData/{treasury.ts → treasuries.ts}

@@ -8,7 +8,7 @@ import Player from '@civ-clone/core-player/Player';
 export const getAdditionalData = (
   playerTreasuryRegistry: PlayerTreasuryRegistry = playerTreasuryRegistryInstance
 ) => [
-  new AdditionalData(Player, 'treasury', (player: Player) =>
+  new AdditionalData(Player, 'treasuries', (player: Player) =>
     playerTreasuryRegistry.getByPlayer(player)
   ),
 ];

package/PlayerTreasury.d.ts

@@ -1,22 +1,37 @@
 import { CityBuildRegistry } from '@civ-clone/core-city-build/CityBuildRegistry';
 import { RuleRegistry } from '@civ-clone/core-rule/RuleRegistry';
 import City from '@civ-clone/core-city/City';
+import DataObject from '@civ-clone/core-data-object/DataObject';
 import Player from '@civ-clone/core-player/Player';
+import SpendCost from './SpendCost';
 import Yield from '@civ-clone/core-yield/Yield';
 export interface IPlayerTreasury {
+  add(value: Yield | number, provider: string): void;
   buy(city: City): void;
-  cost(city: City): Yield;
+  cost(city: City): SpendCost[];
   player(): Player;
+  set(value: Yield | number, provider: string): void;
+  subtract(value: Yield | number, provider: string): void;
+  yield(): typeof Yield;
 }
-export declare class PlayerTreasury extends Yield implements IPlayerTreasury {
+export declare class PlayerTreasury
+  extends DataObject
+  implements IPlayerTreasury
+{
   #private;
   constructor(
     player: Player,
+    YieldType: typeof Yield,
     cityBuildRegistry?: CityBuildRegistry,
     ruleRegistry?: RuleRegistry
   );
+  add(value: Yield | number): void;
   buy(city: City): void;
-  cost(city: City): Yield;
+  cost(city: City): SpendCost[];
   player(): Player;
+  set(value: Yield | number): void;
+  subtract(value: Yield | number): void;
+  value(): number;
+  yield(): typeof Yield;
 }
 export default PlayerTreasury;

package/PlayerTreasury.js

@@ -10,46 +10,72 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _PlayerTreasury_player, _PlayerTreasury_ruleRegistry, _PlayerTreasury_cityBuildRegistry;
+var _PlayerTreasury_cityBuildRegistry, _PlayerTreasury_player, _PlayerTreasury_ruleRegistry, _PlayerTreasury_value, _PlayerTreasury_yield;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlayerTreasury = void 0;
 const CityBuildRegistry_1 = require("@civ-clone/core-city-build/CityBuildRegistry");
 const RuleRegistry_1 = require("@civ-clone/core-rule/RuleRegistry");
+const DataObject_1 = require("@civ-clone/core-data-object/DataObject");
 const Spend_1 = require("./Rules/Spend");
 const Yield_1 = require("@civ-clone/core-yield/Yield");
-class PlayerTreasury extends Yield_1.default {
-    constructor(player, cityBuildRegistry = CityBuildRegistry_1.instance, ruleRegistry = RuleRegistry_1.instance) {
+const Rush_1 = require("./Rules/Rush");
+class PlayerTreasury extends DataObject_1.default {
+    constructor(player, YieldType, cityBuildRegistry = CityBuildRegistry_1.instance, ruleRegistry = RuleRegistry_1.instance) {
         super();
+        _PlayerTreasury_cityBuildRegistry.set(this, void 0);
         _PlayerTreasury_player.set(this, void 0);
         _PlayerTreasury_ruleRegistry.set(this, void 0);
-        _PlayerTreasury_cityBuildRegistry.set(this, void 0);
+        _PlayerTreasury_value.set(this, 0);
+        _PlayerTreasury_yield.set(this, void 0);
+        this.addKey('value', 'yield');
+        __classPrivateFieldSet(this, _PlayerTreasury_cityBuildRegistry, cityBuildRegistry, "f");
         __classPrivateFieldSet(this, _PlayerTreasury_player, player, "f");
         __classPrivateFieldSet(this, _PlayerTreasury_ruleRegistry, ruleRegistry, "f");
-        __classPrivateFieldSet(this, _PlayerTreasury_cityBuildRegistry, cityBuildRegistry, "f");
+        __classPrivateFieldSet(this, _PlayerTreasury_yield, YieldType, "f");
+    }
+    add(value) {
+        if (value instanceof Yield_1.default) {
+            this.add(value.value());
+            return;
+        }
+        __classPrivateFieldSet(this, _PlayerTreasury_value, __classPrivateFieldGet(this, _PlayerTreasury_value, "f") + value, "f");
     }
     buy(city) {
-        const cityBuild = __classPrivateFieldGet(this, _PlayerTreasury_cityBuildRegistry, "f").getByCity(city), cost = this.cost(city);
-        if (city.player() !== __classPrivateFieldGet(this, _PlayerTreasury_player, "f") || this.value() < cost.value()) {
+        const cityBuild = __classPrivateFieldGet(this, _PlayerTreasury_cityBuildRegistry, "f").getByCity(city), [spendCost] = this.cost(city).filter((spendCost) => spendCost.resource() === __classPrivateFieldGet(this, _PlayerTreasury_yield, "f")), cost = spendCost.value();
+        if (city.player() !== __classPrivateFieldGet(this, _PlayerTreasury_player, "f") || this.value() < cost) {
             return;
         }
+        __classPrivateFieldGet(this, _PlayerTreasury_ruleRegistry, "f").process(Rush_1.default, cityBuild, spendCost);
         // TODO: do this via Rules and then use Production
         cityBuild.add(new Yield_1.default(cityBuild.remaining()));
-        this.subtract(cost.value());
+        this.subtract(cost);
     }
     cost(city) {
         const cityBuild = __classPrivateFieldGet(this, _PlayerTreasury_cityBuildRegistry, "f").getByCity(city);
-        return __classPrivateFieldGet(this, _PlayerTreasury_ruleRegistry, "f")
-            .process(Spend_1.default, cityBuild)
-            .reduce((totalYield, currentYield) => {
-            totalYield.add(currentYield);
-            return totalYield;
-        });
+        return __classPrivateFieldGet(this, _PlayerTreasury_ruleRegistry, "f").process(Spend_1.default, cityBuild);
     }
     player() {
         return __classPrivateFieldGet(this, _PlayerTreasury_player, "f");
     }
+    set(value) {
+        __classPrivateFieldSet(this, _PlayerTreasury_value, 0, "f");
+        this.add(value);
+    }
+    subtract(value) {
+        if (value instanceof Yield_1.default) {
+            this.add(value.value());
+            return;
+        }
+        __classPrivateFieldSet(this, _PlayerTreasury_value, __classPrivateFieldGet(this, _PlayerTreasury_value, "f") - value, "f");
+    }
+    value() {
+        return __classPrivateFieldGet(this, _PlayerTreasury_value, "f");
+    }
+    yield() {
+        return __classPrivateFieldGet(this, _PlayerTreasury_yield, "f");
+    }
 }
 exports.PlayerTreasury = PlayerTreasury;
-_PlayerTreasury_player = new WeakMap(), _PlayerTreasury_ruleRegistry = new WeakMap(), _PlayerTreasury_cityBuildRegistry = new WeakMap();
+_PlayerTreasury_cityBuildRegistry = new WeakMap(), _PlayerTreasury_player = new WeakMap(), _PlayerTreasury_ruleRegistry = new WeakMap(), _PlayerTreasury_value = new WeakMap(), _PlayerTreasury_yield = new WeakMap();
 exports.default = PlayerTreasury;
 //# sourceMappingURL=PlayerTreasury.js.map

package/PlayerTreasury.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlayerTreasury.js","sourceRoot":"","sources":["PlayerTreasury.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oFAGsD;AACtD,oEAG2C;AAG3C,yCAAkC;AAClC,uDAAgD;AAQhD,MAAa,cAAe,SAAQ,eAAK;IAKvC,YACE,MAAc,EACd,oBAAuC,4BAAyB,EAChE,eAA6B,uBAAoB;QAEjD,KAAK,EAAE,CAAC;QATV,yCAAgB;QAChB,+CAA4B;QAC5B,oDAAsC;QASpC,uBAAA,IAAI,0BAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,gCAAiB,YAAY,MAAA,CAAC;QAClC,uBAAA,IAAI,qCAAsB,iBAAiB,MAAA,CAAC;IAC9C,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,MAAM,SAAS,GAAG,uBAAA,IAAI,yCAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,EACvD,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEzB,IAAI,IAAI,CAAC,MAAM,EAAE,KAAK,uBAAA,IAAI,8BAAQ,IAAI,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,EAAE;YACjE,OAAO;SACR;QAED,kDAAkD;QAClD,SAAS,CAAC,GAAG,CAAC,IAAI,eAAK,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAEhD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,CAAC,IAAU;QACb,MAAM,SAAS,GAAG,uBAAA,IAAI,yCAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE1D,OAAO,uBAAA,IAAI,oCAAc;aACtB,OAAO,CAAC,eAAK,EAAE,SAAS,CAAC;aACzB,MAAM,CAAC,CAAC,UAAU,EAAE,YAAY,EAAE,EAAE;YACnC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAE7B,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM;QACJ,OAAO,uBAAA,IAAI,8BAAQ,CAAC;IACtB,CAAC;CACF;AA9CD,wCA8CC;;AAED,kBAAe,cAAc,CAAC"}
+{"version":3,"file":"PlayerTreasury.js","sourceRoot":"","sources":["PlayerTreasury.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oFAGsD;AACtD,oEAG2C;AAE3C,uEAAgE;AAEhE,yCAAkC;AAElC,uDAAgD;AAChD,uCAAgC;AAYhC,MAAa,cAAe,SAAQ,oBAAU;IAO5C,YACE,MAAc,EACd,SAAuB,EACvB,oBAAuC,4BAAyB,EAChE,eAA6B,uBAAoB;QAEjD,KAAK,EAAE,CAAC;QAZV,oDAAsC;QACtC,yCAAgB;QAChB,+CAA4B;QAC5B,gCAAiB,CAAC,EAAC;QACnB,wCAAqB;QAUnB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE9B,uBAAA,IAAI,qCAAsB,iBAAiB,MAAA,CAAC;QAC5C,uBAAA,IAAI,0BAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,gCAAiB,YAAY,MAAA,CAAC;QAClC,uBAAA,IAAI,yBAAU,SAAS,MAAA,CAAC;IAC1B,CAAC;IAED,GAAG,CAAC,KAAqB;QACvB,IAAI,KAAK,YAAY,eAAK,EAAE;YAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAExB,OAAO;SACR;QAED,+GAAe,KAAK,MAAA,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,MAAM,SAAS,GAAG,uBAAA,IAAI,yCAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,EACvD,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAClC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,uBAAA,IAAI,6BAAO,CACpD,EACD,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;QAE3B,IAAI,IAAI,CAAC,MAAM,EAAE,KAAK,uBAAA,IAAI,8BAAQ,IAAI,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE;YACzD,OAAO;SACR;QAED,uBAAA,IAAI,oCAAc,CAAC,OAAO,CAAC,cAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACvD,kDAAkD;QAClD,SAAS,CAAC,GAAG,CAAC,IAAI,eAAK,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAEhD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,IAAU;QACb,MAAM,SAAS,GAAG,uBAAA,IAAI,yCAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE1D,OAAO,uBAAA,IAAI,oCAAc,CAAC,OAAO,CAAC,eAAK,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAED,MAAM;QACJ,OAAO,uBAAA,IAAI,8BAAQ,CAAC;IACtB,CAAC;IAED,GAAG,CAAC,KAAqB;QACvB,uBAAA,IAAI,yBAAU,CAAC,MAAA,CAAC;QAEhB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC;IAED,QAAQ,CAAC,KAAqB;QAC5B,IAAI,KAAK,YAAY,eAAK,EAAE;YAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAExB,OAAO;SACR;QAED,+GAAe,KAAK,MAAA,CAAC;IACvB,CAAC;IAED,KAAK;QACH,OAAO,uBAAA,IAAI,6BAAO,CAAC;IACrB,CAAC;IAED,KAAK;QACH,OAAO,uBAAA,IAAI,6BAAO,CAAC;IACrB,CAAC;CACF;AApFD,wCAoFC;;AAED,kBAAe,cAAc,CAAC"}

package/PlayerTreasury.ts

@@ -7,62 +7,107 @@ import {
   instance as ruleRegistryInstance,
 } from '@civ-clone/core-rule/RuleRegistry';
 import City from '@civ-clone/core-city/City';
+import DataObject from '@civ-clone/core-data-object/DataObject';
 import Player from '@civ-clone/core-player/Player';
 import Spend from './Rules/Spend';
+import SpendCost from './SpendCost';
 import Yield from '@civ-clone/core-yield/Yield';
+import Rush from './Rules/Rush';
 
 export interface IPlayerTreasury {
+  add(value: Yield | number, provider: string): void;
   buy(city: City): void;
-  cost(city: City): Yield;
+  cost(city: City): SpendCost[];
   player(): Player;
+  set(value: Yield | number, provider: string): void;
+  subtract(value: Yield | number, provider: string): void;
+  yield(): typeof Yield;
 }
 
-export class PlayerTreasury extends Yield implements IPlayerTreasury {
+export class PlayerTreasury extends DataObject implements IPlayerTreasury {
+  #cityBuildRegistry: CityBuildRegistry;
   #player: Player;
   #ruleRegistry: RuleRegistry;
-  #cityBuildRegistry: CityBuildRegistry;
+  #value: number = 0;
+  #yield: typeof Yield;
 
   constructor(
     player: Player,
+    YieldType: typeof Yield,
     cityBuildRegistry: CityBuildRegistry = cityBuildRegistryInstance,
     ruleRegistry: RuleRegistry = ruleRegistryInstance
   ) {
     super();
 
+    this.addKey('value', 'yield');
+
+    this.#cityBuildRegistry = cityBuildRegistry;
     this.#player = player;
     this.#ruleRegistry = ruleRegistry;
-    this.#cityBuildRegistry = cityBuildRegistry;
+    this.#yield = YieldType;
+  }
+
+  add(value: Yield | number): void {
+    if (value instanceof Yield) {
+      this.add(value.value());
+
+      return;
+    }
+
+    this.#value += value;
   }
 
   buy(city: City): void {
     const cityBuild = this.#cityBuildRegistry.getByCity(city),
-      cost = this.cost(city);
+      [spendCost] = this.cost(city).filter(
+        (spendCost) => spendCost.resource() === this.#yield
+      ),
+      cost = spendCost.value();
 
-    if (city.player() !== this.#player || this.value() < cost.value()) {
+    if (city.player() !== this.#player || this.value() < cost) {
       return;
     }
 
+    this.#ruleRegistry.process(Rush, cityBuild, spendCost);
     // TODO: do this via Rules and then use Production
     cityBuild.add(new Yield(cityBuild.remaining()));
 
-    this.subtract(cost.value());
+    this.subtract(cost);
   }
 
-  cost(city: City): Yield {
+  cost(city: City): SpendCost[] {
     const cityBuild = this.#cityBuildRegistry.getByCity(city);
 
-    return this.#ruleRegistry
-      .process(Spend, cityBuild)
-      .reduce((totalYield, currentYield) => {
-        totalYield.add(currentYield);
-
-        return totalYield;
-      });
+    return this.#ruleRegistry.process(Spend, cityBuild);
   }
 
   player(): Player {
     return this.#player;
   }
+
+  set(value: Yield | number): void {
+    this.#value = 0;
+
+    this.add(value);
+  }
+
+  subtract(value: Yield | number): void {
+    if (value instanceof Yield) {
+      this.add(value.value());
+
+      return;
+    }
+
+    this.#value -= value;
+  }
+
+  value(): number {
+    return this.#value;
+  }
+
+  yield(): typeof Yield {
+    return this.#yield;
+  }
 }
 
 export default PlayerTreasury;

package/PlayerTreasuryRegistry.d.ts

@@ -4,15 +4,18 @@ import {
 } from '@civ-clone/core-registry/EntityRegistry';
 import Player from '@civ-clone/core-player/Player';
 import PlayerTreasury from './PlayerTreasury';
+import Yield from '@civ-clone/core-yield/Yield';
 interface IPlayerTreasuryRegistry extends IEntityRegistry<PlayerTreasury> {
-  getByPlayer(player: Player): PlayerTreasury;
+  getByPlayer(player: Player): PlayerTreasury[];
+  getByPlayerAndType(player: Player, YieldType: typeof Yield): PlayerTreasury;
 }
 export declare class PlayerTreasuryRegistry
   extends EntityRegistry<PlayerTreasury>
   implements IPlayerTreasuryRegistry
 {
   constructor();
-  getByPlayer(player: Player): PlayerTreasury;
+  getByPlayer(player: Player): PlayerTreasury[];
+  getByPlayerAndType(player: Player, YieldType: typeof Yield): PlayerTreasury;
 }
 export declare const instance: PlayerTreasuryRegistry;
 export default PlayerTreasuryRegistry;

package/PlayerTreasuryRegistry.js

@@ -8,9 +8,13 @@ class PlayerTreasuryRegistry extends EntityRegistry_1.EntityRegistry {
         super(PlayerTreasury_1.default);
     }
     getByPlayer(player) {
-        const playerTreasuries = this.getBy('player', player);
+        return this.getBy('player', player);
+    }
+    getByPlayerAndType(player, YieldType) {
+        const playerTreasuries = this.filter((playerTreasury) => playerTreasury.player() === player &&
+            playerTreasury.yield() === YieldType);
         if (playerTreasuries.length !== 1) {
-            throw new TypeError('Wrong number of PlayerTreasuries for player.');
+            throw new TypeError(`Wrong number of playerTreasuries: ${playerTreasuries.length}`);
         }
         return playerTreasuries[0];
     }

package/PlayerTreasuryRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlayerTreasuryRegistry.js","sourceRoot":"","sources":["PlayerTreasuryRegistry.ts"],"names":[],"mappings":";;;AAAA,4EAGiD;AAEjD,qDAA8C;AAM9C,MAAa,sBACX,SAAQ,+BAA8B;IAGtC;QACE,KAAK,CAAC,wBAAc,CAAC,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,MAAc;QACxB,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEtD,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,MAAM,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;SACrE;QAED,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;CACF;AAjBD,wDAiBC;AAEY,QAAA,QAAQ,GAA2B,IAAI,sBAAsB,EAAE,CAAC;AAE7E,kBAAe,sBAAsB,CAAC"}
+{"version":3,"file":"PlayerTreasuryRegistry.js","sourceRoot":"","sources":["PlayerTreasuryRegistry.ts"],"names":[],"mappings":";;;AAAA,4EAGiD;AAEjD,qDAA8C;AAQ9C,MAAa,sBACX,SAAQ,+BAA8B;IAGtC;QACE,KAAK,CAAC,wBAAc,CAAC,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,MAAc;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAED,kBAAkB,CAAC,MAAc,EAAE,SAAuB;QACxD,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAClC,CAAC,cAA8B,EAAW,EAAE,CAC1C,cAAc,CAAC,MAAM,EAAE,KAAK,MAAM;YAClC,cAAc,CAAC,KAAK,EAAE,KAAK,SAAS,CACvC,CAAC;QAEF,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,MAAM,IAAI,SAAS,CACjB,qCAAqC,gBAAgB,CAAC,MAAM,EAAE,CAC/D,CAAC;SACH;QAED,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;CACF;AA3BD,wDA2BC;AAEY,QAAA,QAAQ,GAA2B,IAAI,sBAAsB,EAAE,CAAC;AAE7E,kBAAe,sBAAsB,CAAC"}

package/PlayerTreasuryRegistry.ts

@@ -4,9 +4,11 @@ import {
 } from '@civ-clone/core-registry/EntityRegistry';
 import Player from '@civ-clone/core-player/Player';
 import PlayerTreasury from './PlayerTreasury';
+import Yield from '@civ-clone/core-yield/Yield';
 
 interface IPlayerTreasuryRegistry extends IEntityRegistry<PlayerTreasury> {
-  getByPlayer(player: Player): PlayerTreasury;
+  getByPlayer(player: Player): PlayerTreasury[];
+  getByPlayerAndType(player: Player, YieldType: typeof Yield): PlayerTreasury;
 }
 
 export class PlayerTreasuryRegistry
@@ -17,11 +19,21 @@ export class PlayerTreasuryRegistry
     super(PlayerTreasury);
   }
 
-  getByPlayer(player: Player): PlayerTreasury {
-    const playerTreasuries = this.getBy('player', player);
+  getByPlayer(player: Player): PlayerTreasury[] {
+    return this.getBy('player', player);
+  }
+
+  getByPlayerAndType(player: Player, YieldType: typeof Yield): PlayerTreasury {
+    const playerTreasuries = this.filter(
+      (playerTreasury: PlayerTreasury): boolean =>
+        playerTreasury.player() === player &&
+        playerTreasury.yield() === YieldType
+    );
 
     if (playerTreasuries.length !== 1) {
-      throw new TypeError('Wrong number of PlayerTreasuries for player.');
+      throw new TypeError(
+        `Wrong number of playerTreasuries: ${playerTreasuries.length}`
+      );
     }
 
     return playerTreasuries[0];

package/Rules/Rush.d.ts

@@ -0,0 +1,5 @@
+import CityBuild from '@civ-clone/core-city-build/CityBuild';
+import Rule from '@civ-clone/core-rule/Rule';
+import SpendCost from '../SpendCost';
+export declare class Rush extends Rule<[CityBuild, SpendCost], void> {}
+export default Rush;

package/Rules/Rush.js

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

package/Rules/Rush.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Rush.js","sourceRoot":"","sources":["Rush.ts"],"names":[],"mappings":";;;AACA,oDAA6C;AAG7C,MAAa,IAAK,SAAQ,cAAkC;CAAG;AAA/D,oBAA+D;AAE/D,kBAAe,IAAI,CAAC"}

package/Rules/Rush.ts

@@ -0,0 +1,7 @@
+import CityBuild from '@civ-clone/core-city-build/CityBuild';
+import Rule from '@civ-clone/core-rule/Rule';
+import SpendCost from '../SpendCost';
+
+export class Rush extends Rule<[CityBuild, SpendCost], void> {}
+
+export default Rush;

package/Rules/Spend.d.ts

@@ -1,5 +1,5 @@
 import CityBuild from '@civ-clone/core-city-build/CityBuild';
 import Rule from '@civ-clone/core-rule/Rule';
-import Yield from '@civ-clone/core-yield/Yield';
-export declare class Spend extends Rule<[CityBuild], Yield> {}
+import SpendCost from '../SpendCost';
+export declare class Spend extends Rule<[CityBuild], SpendCost> {}
 export default Spend;

package/Rules/Spend.js.map

@@ -1 +1 @@
-{"version":3,"file":"Spend.js","sourceRoot":"","sources":["Spend.ts"],"names":[],"mappings":";;;AACA,oDAA6C;AAG7C,MAAa,KAAM,SAAQ,cAAwB;CAAG;AAAtD,sBAAsD;AAEtD,kBAAe,KAAK,CAAC"}
+{"version":3,"file":"Spend.js","sourceRoot":"","sources":["Spend.ts"],"names":[],"mappings":";;;AACA,oDAA6C;AAG7C,MAAa,KAAM,SAAQ,cAA4B;CAAG;AAA1D,sBAA0D;AAE1D,kBAAe,KAAK,CAAC"}

package/Rules/Spend.ts

@@ -1,7 +1,7 @@
 import CityBuild from '@civ-clone/core-city-build/CityBuild';
 import Rule from '@civ-clone/core-rule/Rule';
-import Yield from '@civ-clone/core-yield/Yield';
+import SpendCost from '../SpendCost';
 
-export class Spend extends Rule<[CityBuild], Yield> {}
+export class Spend extends Rule<[CityBuild], SpendCost> {}
 
 export default Spend;

package/Rules/Updated.d.ts

@@ -1,9 +1,5 @@
 import City from '@civ-clone/core-city/City';
-import { IRuleRegistry } from '@civ-clone/core-rule/RuleRegistry';
 import PlayerTreasury from '../PlayerTreasury';
 import Rule from '@civ-clone/core-rule/Rule';
-declare type UpdatedArgs = [PlayerTreasury, City];
-export declare class Updated extends Rule<UpdatedArgs, void> {}
+export declare class Updated extends Rule<[PlayerTreasury, City], void> {}
 export default Updated;
-export interface IUpdatedRegistry
-  extends IRuleRegistry<Updated, UpdatedArgs, void> {}

package/Rules/Updated.js.map

@@ -1 +1 @@
-{"version":3,"file":"Updated.js","sourceRoot":"","sources":["Updated.ts"],"names":[],"mappings":";;;AAGA,oDAA6C;AAI7C,MAAa,OAAQ,SAAQ,cAAuB;CAAG;AAAvD,0BAAuD;AAEvD,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"Updated.js","sourceRoot":"","sources":["Updated.ts"],"names":[],"mappings":";;;AAEA,oDAA6C;AAE7C,MAAa,OAAQ,SAAQ,cAAkC;CAAG;AAAlE,0BAAkE;AAElE,kBAAe,OAAO,CAAC"}

package/Rules/Updated.ts

@@ -1,13 +1,7 @@
 import City from '@civ-clone/core-city/City';
-import { IRuleRegistry } from '@civ-clone/core-rule/RuleRegistry';
 import PlayerTreasury from '../PlayerTreasury';
 import Rule from '@civ-clone/core-rule/Rule';
 
-type UpdatedArgs = [PlayerTreasury, City];
-
-export class Updated extends Rule<UpdatedArgs, void> {}
+export class Updated extends Rule<[PlayerTreasury, City], void> {}
 
 export default Updated;
-
-export interface IUpdatedRegistry
-  extends IRuleRegistry<Updated, UpdatedArgs, void> {}

package/SpendCost.d.ts

@@ -0,0 +1,13 @@
+import DataObject from '@civ-clone/core-data-object/DataObject';
+import Yield from '@civ-clone/core-yield/Yield';
+interface ISpend {
+  resource(): typeof Yield;
+  value(): number;
+}
+export declare class SpendCost extends DataObject implements ISpend {
+  #private;
+  constructor(resource: typeof Yield, value: number);
+  resource(): typeof Yield;
+  value(): number;
+}
+export default SpendCost;

package/SpendCost.js

@@ -0,0 +1,36 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpendCost_resource, _SpendCost_value;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SpendCost = void 0;
+const DataObject_1 = require("@civ-clone/core-data-object/DataObject");
+class SpendCost extends DataObject_1.default {
+    constructor(resource, value) {
+        super();
+        _SpendCost_resource.set(this, void 0);
+        _SpendCost_value.set(this, void 0);
+        this.addKey('resource', 'value');
+        __classPrivateFieldSet(this, _SpendCost_resource, resource, "f");
+        __classPrivateFieldSet(this, _SpendCost_value, value, "f");
+    }
+    resource() {
+        return __classPrivateFieldGet(this, _SpendCost_resource, "f");
+    }
+    value() {
+        return __classPrivateFieldGet(this, _SpendCost_value, "f");
+    }
+}
+exports.SpendCost = SpendCost;
+_SpendCost_resource = new WeakMap(), _SpendCost_value = new WeakMap();
+exports.default = SpendCost;
+//# sourceMappingURL=SpendCost.js.map

package/SpendCost.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SpendCost.js","sourceRoot":"","sources":["SpendCost.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAAgE;AAQhE,MAAa,SAAU,SAAQ,oBAAU;IAIvC,YAAY,QAAsB,EAAE,KAAa;QAC/C,KAAK,EAAE,CAAC;QAJV,sCAAwB;QACxB,mCAAe;QAKb,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAEjC,uBAAA,IAAI,uBAAa,QAAQ,MAAA,CAAC;QAC1B,uBAAA,IAAI,oBAAU,KAAK,MAAA,CAAC;IACtB,CAAC;IAED,QAAQ;QACN,OAAO,uBAAA,IAAI,2BAAU,CAAC;IACxB,CAAC;IAED,KAAK;QACH,OAAO,uBAAA,IAAI,wBAAO,CAAC;IACrB,CAAC;CACF;AApBD,8BAoBC;;AAED,kBAAe,SAAS,CAAC"}

package/SpendCost.ts

@@ -0,0 +1,31 @@
+import DataObject from '@civ-clone/core-data-object/DataObject';
+import Yield from '@civ-clone/core-yield/Yield';
+
+interface ISpend {
+  resource(): typeof Yield;
+  value(): number;
+}
+
+export class SpendCost extends DataObject implements ISpend {
+  #resource: typeof Yield;
+  #value: number;
+
+  constructor(resource: typeof Yield, value: number) {
+    super();
+
+    this.addKey('resource', 'value');
+
+    this.#resource = resource;
+    this.#value = value;
+  }
+
+  resource(): typeof Yield {
+    return this.#resource;
+  }
+
+  value(): number {
+    return this.#value;
+  }
+}
+
+export default SpendCost;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civ-clone/core-treasury",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "main": "index.js",
   "repository": "git@github.com:civ-clone/core-treasury.git",
   "keywords": [
@@ -23,6 +23,7 @@
   "dependencies": {
     "@civ-clone/core-city": "^0.1.0",
     "@civ-clone/core-city-build": "^0.1.0",
+    "@civ-clone/core-data-object": "^0.1.0",
     "@civ-clone/core-player": "^0.1.0",
     "@civ-clone/core-registry": "^0.1.0",
     "@civ-clone/core-rule": "^0.1.0",

package/registerAdditionalData.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const AdditionalDataRegistry_1 = require("@civ-clone/core-data-object/AdditionalDataRegistry");
-const treasury_1 = require("./AdditionalData/treasury");
-AdditionalDataRegistry_1.instance.register(...(0, treasury_1.default)());
+const spend_cost_1 = require("./AdditionalData/spend-cost");
+const treasuries_1 = require("./AdditionalData/treasuries");
+AdditionalDataRegistry_1.instance.register(...(0, spend_cost_1.default)(), ...(0, treasuries_1.default)());
 //# sourceMappingURL=registerAdditionalData.js.map

package/registerAdditionalData.js.map

@@ -1 +1 @@
-{"version":3,"file":"registerAdditionalData.js","sourceRoot":"","sources":["registerAdditionalData.ts"],"names":[],"mappings":";;AAAA,+FAAgH;AAChH,wDAAiD;AAEjD,iCAA8B,CAAC,QAAQ,CAAC,GAAG,IAAA,kBAAQ,GAAE,CAAC,CAAC"}
+{"version":3,"file":"registerAdditionalData.js","sourceRoot":"","sources":["registerAdditionalData.ts"],"names":[],"mappings":";;AAAA,+FAAgH;AAChH,4DAAoD;AACpD,4DAAmD;AAEnD,iCAA8B,CAAC,QAAQ,CAAC,GAAG,IAAA,oBAAS,GAAE,EAAE,GAAG,IAAA,oBAAQ,GAAE,CAAC,CAAC"}

package/registerAdditionalData.ts

@@ -1,4 +1,5 @@
 import { instance as additionalDataRegistryInstance } from '@civ-clone/core-data-object/AdditionalDataRegistry';
-import treasury from './AdditionalData/treasury';
+import spendCost from './AdditionalData/spend-cost';
+import treasury from './AdditionalData/treasuries';
 
-additionalDataRegistryInstance.register(...treasury());
+additionalDataRegistryInstance.register(...spendCost(), ...treasury());

package/AdditionalData/treasury.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"treasury.js","sourceRoot":"","sources":["treasury.ts"],"names":[],"mappings":";;;AAAA,sEAGmC;AACnC,+EAAwE;AACxE,0DAAmD;AAE5C,MAAM,iBAAiB,GAAG,CAC/B,yBAAiD,iCAA8B,EAC/E,EAAE,CAAC;IACH,IAAI,wBAAc,CAAC,gBAAM,EAAE,UAAU,EAAE,CAAC,MAAc,EAAE,EAAE,CACxD,sBAAsB,CAAC,WAAW,CAAC,MAAM,CAAC,CAC3C;CACF,CAAC;AANW,QAAA,iBAAiB,qBAM5B;AAEF,kBAAe,yBAAiB,CAAC"}