@civ-clone/core-treasury 0.1.2 → 0.1.3

package/PlayerTreasury.js

@@ -37,9 +37,9 @@ class PlayerTreasury extends Yield_1.default {
         this.subtract(cost.value());
     }
     cost(city) {
-        const cityBuild = __classPrivateFieldGet(this, _PlayerTreasury_cityBuildRegistry, "f").getByCity(city);
+        const cityBuild = __classPrivateFieldGet(this, _PlayerTreasury_cityBuildRegistry, "f").getByCity(city), cost = new Yield_1.default();
         return __classPrivateFieldGet(this, _PlayerTreasury_ruleRegistry, "f")
-            .process(Spend_1.default, cityBuild)
+            .process(Spend_1.default, cityBuild, cost)
             .reduce((totalYield, currentYield) => {
             totalYield.add(currentYield);
             return totalYield;

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;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,EACvD,IAAI,GAAG,IAAI,eAAK,EAAE,CAAC;QAErB,OAAO,uBAAA,IAAI,oCAAc;aACtB,OAAO,CAAC,eAAK,EAAE,SAAS,EAAE,IAAI,CAAC;aAC/B,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;AA/CD,wCA+CC;;AAED,kBAAe,cAAc,CAAC"}

package/PlayerTreasury.ts

@@ -49,10 +49,11 @@ export class PlayerTreasury extends Yield implements IPlayerTreasury {
   }
 
   cost(city: City): Yield {
-    const cityBuild = this.#cityBuildRegistry.getByCity(city);
+    const cityBuild = this.#cityBuildRegistry.getByCity(city),
+      cost = new Yield();
 
     return this.#ruleRegistry
-      .process(Spend, cityBuild)
+      .process(Spend, cityBuild, cost)
       .reduce((totalYield, currentYield) => {
         totalYield.add(currentYield);
 

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> {}
+export declare class Spend extends Rule<[CityBuild, Yield], Yield> {}
 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,cAA+B;CAAG;AAA7D,sBAA6D;AAE7D,kBAAe,KAAK,CAAC"}

package/Rules/Spend.ts

@@ -2,6 +2,6 @@ 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 class Spend extends Rule<[CityBuild], Yield> {}
+export class Spend extends Rule<[CityBuild, Yield], Yield> {}
 
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civ-clone/core-treasury",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "main": "index.js",
   "repository": "git@github.com:civ-clone/core-treasury.git",
   "keywords": [