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

package/Busy/GoTo.d.ts

@@ -0,0 +1,3 @@
+import Busy from '@civ-clone/core-unit/Rules/Busy';
+export declare class GoTo extends Busy {}
+export default GoTo;

package/Busy/GoTo.js

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

package/Busy/GoTo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GoTo.js","sourceRoot":"","sources":["GoTo.ts"],"names":[],"mappings":";;;AAAA,0DAAmD;AAEnD,MAAa,IAAK,SAAQ,cAAI;CAAG;AAAjC,oBAAiC;AAEjC,kBAAe,IAAI,CAAC"}

package/Busy/GoTo.ts

@@ -0,0 +1,5 @@
+import Busy from '@civ-clone/core-unit/Rules/Busy';
+
+export class GoTo extends Busy {}
+
+export default GoTo;

package/Errors/NoPathAvailable.d.ts

@@ -0,0 +1,2 @@
+export declare class NoPathAvailable extends Error {}
+export default NoPathAvailable;

package/Errors/NoPathAvailable.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NoPathAvailable = void 0;
+class NoPathAvailable extends Error {
+}
+exports.NoPathAvailable = NoPathAvailable;
+exports.default = NoPathAvailable;
+//# sourceMappingURL=NoPathAvailable.js.map

package/Errors/NoPathAvailable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NoPathAvailable.js","sourceRoot":"","sources":["NoPathAvailable.ts"],"names":[],"mappings":";;;AAAA,MAAa,eAAgB,SAAQ,KAAK;CAAG;AAA7C,0CAA6C;AAE7C,kBAAe,eAAe,CAAC"}

package/Errors/NoPathAvailable.ts

@@ -0,0 +1,3 @@
+export class NoPathAvailable extends Error {}
+
+export default NoPathAvailable;

package/Errors/NoPathFinderAvailable.d.ts

@@ -0,0 +1,2 @@
+export declare class NoPathFinderAvailable extends Error {}
+export default NoPathFinderAvailable;

package/Errors/NoPathFinderAvailable.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NoPathFinderAvailable = void 0;
+class NoPathFinderAvailable extends Error {
+}
+exports.NoPathFinderAvailable = NoPathFinderAvailable;
+exports.default = NoPathFinderAvailable;
+//# sourceMappingURL=NoPathFinderAvailable.js.map

package/Errors/NoPathFinderAvailable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NoPathFinderAvailable.js","sourceRoot":"","sources":["NoPathFinderAvailable.ts"],"names":[],"mappings":";;;AAAA,MAAa,qBAAsB,SAAQ,KAAK;CAAG;AAAnD,sDAAmD;AAEnD,kBAAe,qBAAqB,CAAC"}

package/Errors/NoPathFinderAvailable.ts

@@ -0,0 +1,3 @@
+export class NoPathFinderAvailable extends Error {}
+
+export default NoPathFinderAvailable;

package/GoTo.js

@@ -18,6 +18,12 @@ const RuleRegistry_1 = require("@civ-clone/core-rule/RuleRegistry");
 const StrategyNote_1 = require("@civ-clone/core-strategy/StrategyNote");
 const StrategyNoteRegistry_1 = require("@civ-clone/core-strategy/StrategyNoteRegistry");
 const Action_1 = require("@civ-clone/core-unit/Action");
+const GoTo_1 = require("./Busy/GoTo");
+const Criterion_1 = require("@civ-clone/core-rule/Criterion");
+const Effect_1 = require("@civ-clone/core-rule/Effect");
+const Moved_1 = require("@civ-clone/core-unit/Rules/Moved");
+const NoPathAvailable_1 = require("./Errors/NoPathAvailable");
+const NoPathFinderAvailable_1 = require("./Errors/NoPathFinderAvailable");
 const moveAlongPath_1 = require("./lib/moveAlongPath");
 const generateKey = (unit) => (0, StrategyNote_1.generateKey)(unit, 'currentPath');
 exports.generateKey = generateKey;
@@ -32,18 +38,22 @@ class GoTo extends Action_1.default {
     perform() {
         const [PathFinder] = __classPrivateFieldGet(this, _GoTo_pathFinderRegistry, "f").entries();
         if (!PathFinder) {
-            // TODO: shout about this?
-            return;
+            throw new NoPathFinderAvailable_1.default();
         }
         const path = new PathFinder(this.unit(), this.unit().tile(), this.to()).generate();
         if (!path) {
-            // TODO: shout about this?
-            return;
+            throw new NoPathAvailable_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));
         (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();
+            this.unit().setBusy();
+        })));
+        this.ruleRegistry().process(Moved_1.default, this.unit(), this);
     }
 }
 exports.GoTo = GoTo;

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;AAGjD,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,0BAA0B;YAC1B,OAAO;SACR;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,0BAA0B;YAC1B,OAAO;SACR;QAED,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;IACnC,CAAC;CACF;AA9CD,oBA8CC;;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;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"}

package/GoTo.ts

@@ -15,6 +15,12 @@ import {
   instance as strategyNoteRegistryInstance,
 } from '@civ-clone/core-strategy/StrategyNoteRegistry';
 import Action from '@civ-clone/core-unit/Action';
+import BusyGoTo from './Busy/GoTo';
+import Criterion from '@civ-clone/core-rule/Criterion';
+import Effect from '@civ-clone/core-rule/Effect';
+import Moved from '@civ-clone/core-unit/Rules/Moved';
+import NoPathAvailable from './Errors/NoPathAvailable';
+import NoPathFinderAvailable from './Errors/NoPathFinderAvailable';
 import Tile from '@civ-clone/core-world/Tile';
 import Unit from '@civ-clone/core-unit/Unit';
 import moveAlongPath from './lib/moveAlongPath';
@@ -43,8 +49,7 @@ export class GoTo extends Action {
     const [PathFinder] = this.#pathFinderRegistry.entries();
 
     if (!PathFinder) {
-      // TODO: shout about this?
-      return;
+      throw new NoPathFinderAvailable();
     }
 
     const path = new PathFinder(
@@ -54,10 +59,11 @@ export class GoTo extends Action {
     ).generate();
 
     if (!path) {
-      // TODO: shout about this?
-      return;
+      throw new NoPathAvailable();
     }
 
+    this.unit().setBusy();
+
     // remove the current `Tile` so that the next shift will be the target.
     path.shift();
 
@@ -66,6 +72,18 @@ export class GoTo extends Action {
     );
 
     moveAlongPath(this.unit(), path);
+
+    this.unit().setBusy(
+      new BusyGoTo(
+        new Criterion((): boolean => this.unit().tile() === path.end()),
+        new Effect((): void => {
+          this.unit().setActive();
+          this.unit().setBusy();
+        })
+      )
+    );
+
+    this.ruleRegistry().process(Moved, this.unit(), this);
   }
 }
 

package/README.md

@@ -1,3 +1,3 @@
 # base-unit-action-goto
 
-This is a template repo.
+A repo for handling the `GoTo` command, sending a `Unit` to a distant `Tile`.

package/Rules/Player/turn-start.d.ts

@@ -0,0 +1,8 @@
+import { StrategyNoteRegistry } from '@civ-clone/core-strategy/StrategyNoteRegistry';
+import { UnitRegistry } from '@civ-clone/core-unit/UnitRegistry';
+import TurnStart from '@civ-clone/core-player/Rules/TurnStart';
+export declare const getRules: (
+  strategyNoteRegistry?: StrategyNoteRegistry,
+  unitRegistry?: UnitRegistry
+) => TurnStart[];
+export default getRules;

package/Rules/Player/turn-start.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRules = void 0;
+const StrategyNoteRegistry_1 = require("@civ-clone/core-strategy/StrategyNoteRegistry");
+const UnitRegistry_1 = require("@civ-clone/core-unit/UnitRegistry");
+const Effect_1 = require("@civ-clone/core-rule/Effect");
+const GoTo_1 = require("../../Busy/GoTo");
+const Low_1 = require("@civ-clone/core-rule/Priorities/Low");
+const TurnStart_1 = require("@civ-clone/core-player/Rules/TurnStart");
+const GoTo_2 = require("../../GoTo");
+const moveAlongPath_1 = require("../../lib/moveAlongPath");
+const getRules = (strategyNoteRegistry = StrategyNoteRegistry_1.instance, unitRegistry = UnitRegistry_1.instance) => [
+    new TurnStart_1.default(
+    // This needs to have happened after the `Unit`s `Yield`s have been reset.
+    new Low_1.default(), new Effect_1.default((player) => unitRegistry.getByPlayer(player).forEach((unit) => {
+        if (!(unit.busy() instanceof GoTo_1.default)) {
+            return;
+        }
+        const note = strategyNoteRegistry.getByKey((0, GoTo_2.generateKey)(unit));
+        if (!note) {
+            unit.setBusy();
+            unit.setActive();
+            return;
+        }
+        const path = note.value();
+        (0, moveAlongPath_1.default)(unit, path);
+    }))),
+];
+exports.getRules = getRules;
+exports.default = exports.getRules;
+//# sourceMappingURL=turn-start.js.map

package/Rules/Player/turn-start.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-start.js","sourceRoot":"","sources":["turn-start.ts"],"names":[],"mappings":";;;AAAA,wFAGuD;AACvD,oEAG2C;AAC3C,wDAAiD;AACjD,0CAAmC;AACnC,6DAAsD;AAGtD,sEAA+D;AAC/D,qCAAyC;AACzC,2DAAoD;AAE7C,MAAM,QAAQ,GAAG,CACtB,uBAA6C,+BAA4B,EACzE,eAA6B,uBAAoB,EACpC,EAAE,CAAC;IAChB,IAAI,mBAAS;IACX,0EAA0E;IAC1E,IAAI,aAAG,EAAE,EACT,IAAI,gBAAM,CAAC,CAAC,MAAc,EAAE,EAAE,CAC5B,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChD,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,cAAI,CAAC,EAAE;YAClC,OAAO;SACR;QAED,MAAM,IAAI,GAAG,oBAAoB,CAAC,QAAQ,CAAO,IAAA,kBAAW,EAAC,IAAI,CAAC,CAAC,CAAC;QAEpE,IAAI,CAAC,IAAI,EAAE;YACT,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC,SAAS,EAAE,CAAC;YAEjB,OAAO;SACR;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAE1B,IAAA,uBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CACH,CACF;CACF,CAAC;AA5BW,QAAA,QAAQ,YA4BnB;AAEF,kBAAe,gBAAQ,CAAC"}

package/Rules/Player/turn-start.ts

@@ -0,0 +1,48 @@
+import {
+  StrategyNoteRegistry,
+  instance as strategyNoteRegistryInstance,
+} from '@civ-clone/core-strategy/StrategyNoteRegistry';
+import {
+  UnitRegistry,
+  instance as unitRegistryInstance,
+} from '@civ-clone/core-unit/UnitRegistry';
+import Effect from '@civ-clone/core-rule/Effect';
+import GoTo from '../../Busy/GoTo';
+import Low from '@civ-clone/core-rule/Priorities/Low';
+import Path from '@civ-clone/core-world-path/Path';
+import Player from '@civ-clone/core-player/Player';
+import TurnStart from '@civ-clone/core-player/Rules/TurnStart';
+import { generateKey } from '../../GoTo';
+import moveAlongPath from '../../lib/moveAlongPath';
+
+export const getRules = (
+  strategyNoteRegistry: StrategyNoteRegistry = strategyNoteRegistryInstance,
+  unitRegistry: UnitRegistry = unitRegistryInstance
+): TurnStart[] => [
+  new TurnStart(
+    // This needs to have happened after the `Unit`s `Yield`s have been reset.
+    new Low(),
+    new Effect((player: Player) =>
+      unitRegistry.getByPlayer(player).forEach((unit) => {
+        if (!(unit.busy() instanceof GoTo)) {
+          return;
+        }
+
+        const note = strategyNoteRegistry.getByKey<Path>(generateKey(unit));
+
+        if (!note) {
+          unit.setBusy();
+          unit.setActive();
+
+          return;
+        }
+
+        const path = note.value();
+
+        moveAlongPath(unit, path);
+      })
+    )
+  ),
+];
+
+export default getRules;

package/index.d.ts

@@ -0,0 +1 @@
+import './registerRules';

package/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./registerRules");
+//# sourceMappingURL=index.js.map

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAAA,2BAAyB"}

package/index.ts

@@ -0,0 +1 @@
+import './registerRules';

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())
@@ -13,7 +15,15 @@ const moveAlongPath = (unit, path) => {
         }
         move.perform();
     }
-    if (unit.moves().value() === 0) {
+    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.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,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;QAC9B,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;AA/BW,QAAA,aAAa,iBA+BxB;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())
@@ -19,7 +28,18 @@ export const moveAlongPath = (unit: Unit, path: Path): void => {
     move.perform();
   }
 
-  if (unit.moves().value() === 0) {
+  if (path.length === 0) {
+    unit.setBusy();
+    unit.setActive();
+
+    const note = strategyNoteRegistry.getByKey(generateKey(unit));
+
+    if (note) {
+      strategyNoteRegistry.unregister(note);
+    }
+  }
+
+  if (unit.moves().value() > 0.25) {
     return;
   }
 

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@civ-clone/base-unit-action-goto",
-  "version": "0.1.0",
+  "version": "0.1.2",
+  "main": "index.js",
   "repository": "git@github.com:civ-clone/base-unit-action-goto.git",
   "keywords": [
     "typescript",
@@ -23,6 +24,7 @@
   "dependencies": {
     "@civ-clone/base-unit-action-move": "^0.1.1",
     "@civ-clone/base-unit-action-no-orders": "^0.1.0",
+    "@civ-clone/core-player": "^0.1.0",
     "@civ-clone/core-rule": "^0.1.2",
     "@civ-clone/core-strategy": "^0.1.0",
     "@civ-clone/core-unit": "^0.1.13",

package/registerRules.d.ts

@@ -0,0 +1 @@
+export {};

package/registerRules.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const RuleRegistry_1 = require("@civ-clone/core-rule/RuleRegistry");
+const turn_start_1 = require("./Rules/Player/turn-start");
+RuleRegistry_1.instance.register(...(0, turn_start_1.default)());
+//# sourceMappingURL=registerRules.js.map

package/registerRules.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"registerRules.js","sourceRoot":"","sources":["registerRules.ts"],"names":[],"mappings":";;AAAA,oEAAqF;AACrF,0DAAkD;AAElD,uBAAoB,CAAC,QAAQ,CAAC,GAAG,IAAA,oBAAS,GAAE,CAAC,CAAC"}

package/registerRules.ts

@@ -0,0 +1,4 @@
+import { instance as ruleRegistryInstance } from '@civ-clone/core-rule/RuleRegistry';
+import turnStart from './Rules/Player/turn-start';
+
+ruleRegistryInstance.register(...turnStart());