@civ-clone/base-unit-action-goto 0.1.1 → 0.1.3

package/GoTo.d.ts

@@ -6,7 +6,8 @@ import Tile from '@civ-clone/core-world/Tile';
 import Unit from '@civ-clone/core-unit/Unit';
 export declare const generateKey: (unit: Unit) => string;
 export declare class GoTo extends Action {
-  #private;
+  private _pathFinderRegistry;
+  private _strategyNoteRegistry;
   constructor(
     from: Tile,
     to: Tile,

package/GoTo.js

@@ -1,16 +1,4 @@
 "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 _GoTo_pathFinderRegistry, _GoTo_strategyNoteRegistry;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoTo = exports.generateKey = void 0;
 const PathFinderRegistry_1 = require("@civ-clone/core-world-path/PathFinderRegistry");
@@ -30,13 +18,11 @@ exports.generateKey = generateKey;
 class GoTo extends Action_1.default {
     constructor(from, to, unit, ruleRegistry = RuleRegistry_1.instance, pathFinderRegistry = PathFinderRegistry_1.instance, strategyNoteRegistry = StrategyNoteRegistry_1.instance) {
         super(from, to, unit, ruleRegistry);
-        _GoTo_pathFinderRegistry.set(this, void 0);
-        _GoTo_strategyNoteRegistry.set(this, void 0);
-        __classPrivateFieldSet(this, _GoTo_pathFinderRegistry, pathFinderRegistry, "f");
-        __classPrivateFieldSet(this, _GoTo_strategyNoteRegistry, strategyNoteRegistry, "f");
+        this._pathFinderRegistry = pathFinderRegistry;
+        this._strategyNoteRegistry = strategyNoteRegistry;
     }
     perform() {
-        const [PathFinder] = __classPrivateFieldGet(this, _GoTo_pathFinderRegistry, "f").entries();
+        const [PathFinder] = this._pathFinderRegistry.entries();
         if (!PathFinder) {
             throw new NoPathFinderAvailable_1.default();
         }
@@ -47,7 +33,7 @@ class GoTo extends Action_1.default {
         this.unit().setBusy();
         // remove the current `Tile` so that the next shift will be the target.
         path.shift();
-        __classPrivateFieldGet(this, _GoTo_strategyNoteRegistry, "f").replace(new StrategyNote_1.StrategyNote((0, exports.generateKey)(this.unit()), path));
+        this._strategyNoteRegistry.replace(new StrategyNote_1.StrategyNote((0, exports.generateKey)(this.unit()), path));
         (0, moveAlongPath_1.default)(this.unit(), path);
         this.unit().setBusy(new GoTo_1.default(new Criterion_1.default(() => this.unit().tile() === path.end()), new Effect_1.default(() => {
             this.unit().setActive();
@@ -57,6 +43,5 @@ class GoTo extends Action_1.default {
     }
 }
 exports.GoTo = GoTo;
-_GoTo_pathFinderRegistry = new WeakMap(), _GoTo_strategyNoteRegistry = new WeakMap();
 exports.default = GoTo;
 //# sourceMappingURL=GoTo.js.map

package/GoTo.js.map

@@ -1 +1 @@
-{"version":3,"file":"GoTo.js","sourceRoot":"","sources":["GoTo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sFAGuD;AACvD,oEAG2C;AAC3C,wEAG+C;AAC/C,wFAGuD;AACvD,wDAAiD;AACjD,sCAAmC;AACnC,8DAAuD;AACvD,wDAAiD;AACjD,4DAAqD;AACrD,8DAAuD;AACvD,0EAAmE;AAGnE,uDAAgD;AAEzC,MAAM,WAAW,GAAG,CAAC,IAAU,EAAE,EAAE,CAAC,IAAA,0BAAc,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAAlE,QAAA,WAAW,eAAuD;AAE/E,MAAa,IAAK,SAAQ,gBAAM;IAI9B,YACE,IAAU,EACV,EAAQ,EACR,IAAU,EACV,eAA6B,uBAAoB,EACjD,qBAAyC,6BAA0B,EACnE,uBAA6C,+BAA4B;QAEzE,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;QAXtC,2CAAwC;QACxC,6CAA4C;QAY1C,uBAAA,IAAI,4BAAuB,kBAAkB,MAAA,CAAC;QAC9C,uBAAA,IAAI,8BAAyB,oBAAoB,MAAA,CAAC;IACpD,CAAC;IAED,OAAO;QACL,MAAM,CAAC,UAAU,CAAC,GAAG,uBAAA,IAAI,gCAAoB,CAAC,OAAO,EAAE,CAAC;QAExD,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,+BAAqB,EAAE,CAAC;SACnC;QAED,MAAM,IAAI,GAAG,IAAI,UAAU,CACzB,IAAI,CAAC,IAAI,EAAE,EACX,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAClB,IAAI,CAAC,EAAE,EAAE,CACV,CAAC,QAAQ,EAAE,CAAC;QAEb,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,yBAAe,EAAE,CAAC;SAC7B;QAED,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEtB,uEAAuE;QACvE,IAAI,CAAC,KAAK,EAAE,CAAC;QAEb,uBAAA,IAAI,kCAAsB,CAAC,OAAO,CAChC,IAAI,2BAAY,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CACjD,CAAC;QAEF,IAAA,uBAAa,EAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;QAEjC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CACjB,IAAI,cAAQ,CACV,IAAI,mBAAS,CAAC,GAAY,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC,EAC/D,IAAI,gBAAM,CAAC,GAAS,EAAE;YACpB,IAAI,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,CAAC;YACxB,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC,CAAC,CACH,CACF,CAAC;QAEF,IAAI,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,eAAK,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;CACF;AA1DD,oBA0DC;;AAED,kBAAe,IAAI,CAAC"}
+{"version":3,"file":"GoTo.js","sourceRoot":"","sources":["GoTo.ts"],"names":[],"mappings":";;;AAAA,sFAGuD;AACvD,oEAG2C;AAC3C,wEAG+C;AAC/C,wFAGuD;AACvD,wDAAiD;AACjD,sCAAmC;AACnC,8DAAuD;AACvD,wDAAiD;AACjD,4DAAqD;AACrD,8DAAuD;AACvD,0EAAmE;AAGnE,uDAAgD;AAEzC,MAAM,WAAW,GAAG,CAAC,IAAU,EAAE,EAAE,CAAC,IAAA,0BAAc,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAAlE,QAAA,WAAW,eAAuD;AAE/E,MAAa,IAAK,SAAQ,gBAAM;IAI9B,YACE,IAAU,EACV,EAAQ,EACR,IAAU,EACV,eAA6B,uBAAoB,EACjD,qBAAyC,6BAA0B,EACnE,uBAA6C,+BAA4B;QAEzE,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;QAEpC,IAAI,CAAC,mBAAmB,GAAG,kBAAkB,CAAC;QAC9C,IAAI,CAAC,qBAAqB,GAAG,oBAAoB,CAAC;IACpD,CAAC;IAED,OAAO;QACL,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;QAExD,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,+BAAqB,EAAE,CAAC;SACnC;QAED,MAAM,IAAI,GAAG,IAAI,UAAU,CACzB,IAAI,CAAC,IAAI,EAAE,EACX,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAClB,IAAI,CAAC,EAAE,EAAE,CACV,CAAC,QAAQ,EAAE,CAAC;QAEb,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,yBAAe,EAAE,CAAC;SAC7B;QAED,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEtB,uEAAuE;QACvE,IAAI,CAAC,KAAK,EAAE,CAAC;QAEb,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAChC,IAAI,2BAAY,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CACjD,CAAC;QAEF,IAAA,uBAAa,EAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;QAEjC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CACjB,IAAI,cAAQ,CACV,IAAI,mBAAS,CAAC,GAAY,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC,EAC/D,IAAI,gBAAM,CAAC,GAAS,EAAE;YACpB,IAAI,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,CAAC;YACxB,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC,CAAC,CACH,CACF,CAAC;QAEF,IAAI,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,eAAK,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;CACF;AA1DD,oBA0DC;AAED,kBAAe,IAAI,CAAC"}

package/GoTo.ts

@@ -28,8 +28,8 @@ import moveAlongPath from './lib/moveAlongPath';
 export const generateKey = (unit: Unit) => generateRawKey(unit, 'currentPath');
 
 export class GoTo extends Action {
-  #pathFinderRegistry: PathFinderRegistry;
-  #strategyNoteRegistry: StrategyNoteRegistry;
+  private _pathFinderRegistry: PathFinderRegistry;
+  private _strategyNoteRegistry: StrategyNoteRegistry;
 
   constructor(
     from: Tile,
@@ -41,12 +41,12 @@ export class GoTo extends Action {
   ) {
     super(from, to, unit, ruleRegistry);
 
-    this.#pathFinderRegistry = pathFinderRegistry;
-    this.#strategyNoteRegistry = strategyNoteRegistry;
+    this._pathFinderRegistry = pathFinderRegistry;
+    this._strategyNoteRegistry = strategyNoteRegistry;
   }
 
   perform(): void {
-    const [PathFinder] = this.#pathFinderRegistry.entries();
+    const [PathFinder] = this._pathFinderRegistry.entries();
 
     if (!PathFinder) {
       throw new NoPathFinderAvailable();
@@ -67,7 +67,7 @@ export class GoTo extends Action {
     // remove the current `Tile` so that the next shift will be the target.
     path.shift();
 
-    this.#strategyNoteRegistry.replace(
+    this._strategyNoteRegistry.replace(
       new StrategyNote(generateKey(this.unit()), path)
     );
 

package/lib/moveAlongPath.d.ts

@@ -1,4 +1,9 @@
+import { StrategyNoteRegistry } from '@civ-clone/core-strategy/StrategyNoteRegistry';
 import Path from '@civ-clone/core-world-path/Path';
 import Unit from '@civ-clone/core-unit/Unit';
-export declare const moveAlongPath: (unit: Unit, path: Path) => void;
+export declare const moveAlongPath: (
+  unit: Unit,
+  path: Path,
+  strategyNoteRegistry?: StrategyNoteRegistry
+) => void;
 export default moveAlongPath;

package/lib/moveAlongPath.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.moveAlongPath = void 0;
+const StrategyNoteRegistry_1 = require("@civ-clone/core-strategy/StrategyNoteRegistry");
 const Move_1 = require("@civ-clone/base-unit-action-move/Move");
 const NoOrders_1 = require("@civ-clone/base-unit-action-no-orders/NoOrders");
-const moveAlongPath = (unit, path) => {
+const GoTo_1 = require("../GoTo");
+const moveAlongPath = (unit, path, strategyNoteRegistry = StrategyNoteRegistry_1.instance) => {
     while (unit.moves().value() > 0.25) {
         const [move] = unit
             .actions(path.shift())
@@ -16,9 +18,12 @@ const moveAlongPath = (unit, path) => {
     if (path.length === 0) {
         unit.setBusy();
         unit.setActive();
+        const note = strategyNoteRegistry.getByKey((0, GoTo_1.generateKey)(unit));
+        if (note) {
+            strategyNoteRegistry.unregister(note);
+        }
     }
-    if (unit.moves().value() === 0) {
-        unit.setActive(false);
+    if (unit.moves().value() > 0.25) {
         return;
     }
     const [noOrders] = unit

package/lib/moveAlongPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"moveAlongPath.js","sourceRoot":"","sources":["moveAlongPath.ts"],"names":[],"mappings":";;;AACA,gEAAyD;AACzD,6EAAsE;AAI/D,MAAM,aAAa,GAAG,CAAC,IAAU,EAAE,IAAU,EAAQ,EAAE;IAC5D,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE;QAClC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI;aAChB,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;aACrB,MAAM,CACL,CAAC,MAAqB,EAAkB,EAAE,CAAC,MAAM,YAAY,cAAI,CAClE,CAAC;QAEJ,IAAI,CAAC,IAAI,EAAE;YACT,MAAM;SACP;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;KAChB;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,EAAE,CAAC;KAClB;IAED,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;QAC9B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAEtB,OAAO;KACR;IAED,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI;SACpB,OAAO,EAAE;SACT,MAAM,CAAC,CAAC,MAAM,EAAsB,EAAE,CAAC,MAAM,YAAY,kBAAQ,CAAC,CAAC;IAEtE,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,OAAO,EAAE,CAAC;QAEnB,OAAO;KACR;IAED,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACpB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AACxB,CAAC,CAAC;AAtCW,QAAA,aAAa,iBAsCxB;AAEF,kBAAe,qBAAa,CAAC"}
+{"version":3,"file":"moveAlongPath.js","sourceRoot":"","sources":["moveAlongPath.ts"],"names":[],"mappings":";;;AAAA,wFAGuD;AAEvD,gEAAyD;AACzD,6EAAsE;AAGtE,kCAAsC;AAE/B,MAAM,aAAa,GAAG,CAC3B,IAAU,EACV,IAAU,EACV,uBAA6C,+BAA4B,EACnE,EAAE;IACR,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE;QAClC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI;aAChB,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;aACrB,MAAM,CACL,CAAC,MAAqB,EAAkB,EAAE,CAAC,MAAM,YAAY,cAAI,CAClE,CAAC;QAEJ,IAAI,CAAC,IAAI,EAAE;YACT,MAAM;SACP;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;KAChB;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,EAAE,CAAC;QAEjB,MAAM,IAAI,GAAG,oBAAoB,CAAC,QAAQ,CAAC,IAAA,kBAAW,EAAC,IAAI,CAAC,CAAC,CAAC;QAE9D,IAAI,IAAI,EAAE;YACR,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SACvC;KACF;IAED,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI;SACpB,OAAO,EAAE;SACT,MAAM,CAAC,CAAC,MAAM,EAAsB,EAAE,CAAC,MAAM,YAAY,kBAAQ,CAAC,CAAC;IAEtE,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,OAAO,EAAE,CAAC;QAEnB,OAAO;KACR;IAED,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACpB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AACxB,CAAC,CAAC;AA9CW,QAAA,aAAa,iBA8CxB;AAEF,kBAAe,qBAAa,CAAC"}

package/lib/moveAlongPath.ts

@@ -1,10 +1,19 @@
+import {
+  StrategyNoteRegistry,
+  instance as strategyNoteRegistryInstance,
+} from '@civ-clone/core-strategy/StrategyNoteRegistry';
 import Action from '@civ-clone/core-unit/Action';
 import Move from '@civ-clone/base-unit-action-move/Move';
 import NoOrders from '@civ-clone/base-unit-action-no-orders/NoOrders';
 import Path from '@civ-clone/core-world-path/Path';
 import Unit from '@civ-clone/core-unit/Unit';
+import { generateKey } from '../GoTo';
 
-export const moveAlongPath = (unit: Unit, path: Path): void => {
+export const moveAlongPath = (
+  unit: Unit,
+  path: Path,
+  strategyNoteRegistry: StrategyNoteRegistry = strategyNoteRegistryInstance
+): void => {
   while (unit.moves().value() > 0.25) {
     const [move] = unit
       .actions(path.shift())
@@ -22,11 +31,15 @@ export const moveAlongPath = (unit: Unit, path: Path): void => {
   if (path.length === 0) {
     unit.setBusy();
     unit.setActive();
-  }
 
-  if (unit.moves().value() === 0) {
-    unit.setActive(false);
+    const note = strategyNoteRegistry.getByKey(generateKey(unit));
+
+    if (note) {
+      strategyNoteRegistry.unregister(note);
+    }
+  }
 
+  if (unit.moves().value() > 0.25) {
     return;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civ-clone/base-unit-action-goto",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "main": "index.js",
   "repository": "git@github.com:civ-clone/base-unit-action-goto.git",
   "keywords": [