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

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.2",
   "main": "index.js",
   "repository": "git@github.com:civ-clone/base-unit-action-goto.git",
   "keywords": [