@myclaw163/clawclaw-cli 0.6.58 → 0.6.60

package/src/strategies/goals/find-player-top.ts

@@ -1,93 +1,93 @@
-import type { GameState } from '../../sdk/types.js';
-import { Action } from '../../sdk/action.js';
-import {
-  dist,
-  isTargetAlive,
-  nearestVisibleTarget,
-  PatrolState,
-  PATROL_REACHED_DISTANCE,
-  PROGRESS_INTERVAL_MS,
-  pursueVisibleTarget,
-} from '../game-utils.js';
-import type { BehaviorDecision, StrategyContext } from '../types.js';
-import { Goal } from './goal.js';
-
-const DEFAULT_TRACK_DISTANCE = 40;
-const LAST_SEEN_ARRIVE = 20;
-
-export class FindPlayerTop extends Goal {
-  private readonly patrol = new PatrolState();
-  private lastSeenX: number | null = null;
-  private lastSeenY: number | null = null;
-  private foundNotified = false;
-
-  constructor(
-    private readonly target: string,
-    private readonly trackDistance: number = DEFAULT_TRACK_DISTANCE,
-  ) {
-    super();
-  }
-
-  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    if (!isTargetAlive(state, this.target, ctx)) {
-      ctx.notifications.push('目标已死亡');
-      this.emitProgress(state, ctx);
-      return [];
-    }
-
-    const target = nearestVisibleTarget(state, ctx, [this.target]);
-    if (target) {
-      this.lastSeenX = target.x;
-      this.lastSeenY = target.y;
-      if (!this.foundNotified) {
-        this.foundNotified = true;
-        ctx.notifications.push('我已经牢牢跟住他了！');
-      }
-      const decision = pursueVisibleTarget(state, target, { kill: false, followDistance: this.trackDistance });
-      this.emitProgress(state, ctx);
-      return decision ? [decision] : [];
-    }
-
-    this.foundNotified = false;
-
-    if (this.lastSeenX != null && this.lastSeenY != null) {
-      if (dist(state.you.x, state.you.y, this.lastSeenX, this.lastSeenY) > LAST_SEEN_ARRIVE) {
-        this.emitProgress(state, ctx);
-        return [{ action: Action.move({ x: this.lastSeenX, y: this.lastSeenY }) }];
-      }
-      this.lastSeenX = null;
-      this.lastSeenY = null;
-    }
-
-    this.emitProgress(state, ctx);
-    return this.patrolDecision(state, ctx);
-  }
-
-  private patrolDecision(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    let room = this.patrol.nextRoom(ctx);
-    if (!room) return [];
-    if (dist(state.you.x, state.you.y, room.x, room.y) <= PATROL_REACHED_DISTANCE) {
-      this.patrol.advance(ctx);
-      const next = this.patrol.nextRoom(ctx);
-      if (next) room = next;
-    }
-    return [{ action: Action.move({ x: room.x, y: room.y }) }];
-  }
-
-  private emitProgress(state: GameState, ctx: StrategyContext): void {
-    const now = Date.now();
-    if (now - ctx.lastProgressNotifyAt < PROGRESS_INTERVAL_MS) return;
-    ctx.lastProgressNotifyAt = now;
-
-    const room = state.you.room ?? '未知';
-    if (this.foundNotified) {
-      const t = nearestVisibleTarget(state, ctx, [this.target]);
-      const d = t ? (t.distance ?? dist(state.you.x, state.you.y, t.x, t.y)) : 0;
-      ctx.notifications.push(`[进度] 当前在${room}，正在跟踪目标${this.target}，距离${Math.round(d)}px。`);
-    } else if (this.lastSeenX != null) {
-      ctx.notifications.push(`[进度] 当前在${room}，跟丢了，正赶往${this.target}最后出现的位置。`);
-    } else {
-      ctx.notifications.push(`[进度] 当前在${room}，正在巡逻寻找${this.target}。`);
-    }
-  }
-}
+import type { GameState } from '../../sdk/types.js';
+import { Action } from '../../sdk/action.js';
+import {
+  dist,
+  isTargetAlive,
+  nearestVisibleTarget,
+  PatrolState,
+  PATROL_REACHED_DISTANCE,
+  PROGRESS_INTERVAL_MS,
+  pursueVisibleTarget,
+} from '../game-utils.js';
+import type { BehaviorDecision, StrategyContext } from '../types.js';
+import { Goal } from './goal.js';
+
+const DEFAULT_TRACK_DISTANCE = 40;
+const LAST_SEEN_ARRIVE = 20;
+
+export class FindPlayerTop extends Goal {
+  private readonly patrol = new PatrolState();
+  private lastSeenX: number | null = null;
+  private lastSeenY: number | null = null;
+  private foundNotified = false;
+
+  constructor(
+    private readonly target: string,
+    private readonly trackDistance: number = DEFAULT_TRACK_DISTANCE,
+  ) {
+    super();
+  }
+
+  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    if (!isTargetAlive(state, this.target, ctx)) {
+      ctx.notifications.push('目标已死亡');
+      this.emitProgress(state, ctx);
+      return [];
+    }
+
+    const target = nearestVisibleTarget(state, ctx, [this.target]);
+    if (target) {
+      this.lastSeenX = target.x;
+      this.lastSeenY = target.y;
+      if (!this.foundNotified) {
+        this.foundNotified = true;
+        ctx.notifications.push('我已经牢牢跟住他了！');
+      }
+      const decision = pursueVisibleTarget(state, target, { kill: false, followDistance: this.trackDistance });
+      this.emitProgress(state, ctx);
+      return decision ? [decision] : [];
+    }
+
+    this.foundNotified = false;
+
+    if (this.lastSeenX != null && this.lastSeenY != null) {
+      if (dist(state.you.x, state.you.y, this.lastSeenX, this.lastSeenY) > LAST_SEEN_ARRIVE) {
+        this.emitProgress(state, ctx);
+        return [{ action: Action.move({ x: this.lastSeenX, y: this.lastSeenY }) }];
+      }
+      this.lastSeenX = null;
+      this.lastSeenY = null;
+    }
+
+    this.emitProgress(state, ctx);
+    return this.patrolDecision(state, ctx);
+  }
+
+  private patrolDecision(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    let room = this.patrol.nextRoom(ctx);
+    if (!room) return [];
+    if (dist(state.you.x, state.you.y, room.x, room.y) <= PATROL_REACHED_DISTANCE) {
+      this.patrol.advance(ctx);
+      const next = this.patrol.nextRoom(ctx);
+      if (next) room = next;
+    }
+    return [{ action: Action.move({ x: room.x, y: room.y }) }];
+  }
+
+  private emitProgress(state: GameState, ctx: StrategyContext): void {
+    const now = Date.now();
+    if (now - ctx.lastProgressNotifyAt < PROGRESS_INTERVAL_MS) return;
+    ctx.lastProgressNotifyAt = now;
+
+    const room = state.you.room ?? '未知';
+    if (this.foundNotified) {
+      const t = nearestVisibleTarget(state, ctx, [this.target]);
+      const d = t ? (t.distance ?? dist(state.you.x, state.you.y, t.x, t.y)) : 0;
+      ctx.notifications.push(`[进度] 当前在${room}，正在跟踪目标${this.target}，距离${Math.round(d)}px。`);
+    } else if (this.lastSeenX != null) {
+      ctx.notifications.push(`[进度] 当前在${room}，跟丢了，正赶往${this.target}最后出现的位置。`);
+    } else {
+      ctx.notifications.push(`[进度] 当前在${room}，正在巡逻寻找${this.target}。`);
+    }
+  }
+}

package/src/strategies/goals/flee-players-goal.ts

@@ -1,53 +1,53 @@
-import type { GameState, PlayerInfo } from '../../sdk/types.js';
-import { dist, hasReachedRoomTarget, resolveRoom, roomAwayFromPlayers } from '../game-utils.js';
-import type { BehaviorDecision, StrategyContext } from '../types.js';
-import { Goal } from './goal.js';
-import { MoveRoomGoal } from './move-room-goal.js';
-
-export type FleePlayerResolver = (state: GameState, ctx: StrategyContext) => PlayerInfo[];
-
-export interface FleePlayersGoalOptions {
-  emitProgress?: boolean;
-  finishWhenEmpty?: boolean;
-  stopOnPlayer?: boolean;
-}
-
-export class FleePlayersGoal extends Goal {
-  constructor(
-    public readonly key: string,
-    private readonly resolvePlayers: FleePlayerResolver,
-    private readonly options: FleePlayersGoalOptions = {},
-  ) {
-    super();
-  }
-
-  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    const players = this.resolvePlayers(state, ctx);
-    const worker = this.subGoal;
-    if (worker instanceof MoveRoomGoal && this.canKeepTarget(worker, state, ctx, players)) return [];
-
-    const room = roomAwayFromPlayers(state, ctx, players);
-    if (!room) return [];
-
-    if (!(worker instanceof MoveRoomGoal) || worker.room !== room.name) {
-      if (this.subGoal) this.removeSubGoal();
-      this.setSubGoal(new MoveRoomGoal(room.name, hasReachedRoomTarget, {
-        emitProgress: this.options.emitProgress ?? false,
-        stopOnPlayer: this.options.stopOnPlayer ?? false,
-      }), 0.2);
-    }
-    return [];
-  }
-
-  isFinish(state: GameState, ctx: StrategyContext): boolean {
-    return (this.options.finishWhenEmpty ?? true) && this.resolvePlayers(state, ctx).length === 0;
-  }
-
-  private canKeepTarget(worker: MoveRoomGoal, state: GameState, ctx: StrategyContext, players: PlayerInfo[]): boolean {
-    const target = resolveRoom(worker.room, ctx);
-    if (!target) return false;
-    if (hasReachedRoomTarget(state, target)) return true;
-    if (ctx.blockedMoveTarget && dist(target.x, target.y, ctx.blockedMoveTarget.x, ctx.blockedMoveTarget.y) <= 10) return false;
-    return !players.some(player => player.room?.toLowerCase() === target.name.toLowerCase());
-  }
-}
+import type { GameState, PlayerInfo } from '../../sdk/types.js';
+import { dist, hasReachedRoomTarget, resolveRoom, roomAwayFromPlayers } from '../game-utils.js';
+import type { BehaviorDecision, StrategyContext } from '../types.js';
+import { Goal } from './goal.js';
+import { MoveRoomGoal } from './move-room-goal.js';
+
+export type FleePlayerResolver = (state: GameState, ctx: StrategyContext) => PlayerInfo[];
+
+export interface FleePlayersGoalOptions {
+  emitProgress?: boolean;
+  finishWhenEmpty?: boolean;
+  stopOnPlayer?: boolean;
+}
+
+export class FleePlayersGoal extends Goal {
+  constructor(
+    public readonly key: string,
+    private readonly resolvePlayers: FleePlayerResolver,
+    private readonly options: FleePlayersGoalOptions = {},
+  ) {
+    super();
+  }
+
+  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    const players = this.resolvePlayers(state, ctx);
+    const worker = this.subGoal;
+    if (worker instanceof MoveRoomGoal && this.canKeepTarget(worker, state, ctx, players)) return [];
+
+    const room = roomAwayFromPlayers(state, ctx, players);
+    if (!room) return [];
+
+    if (!(worker instanceof MoveRoomGoal) || worker.room !== room.name) {
+      if (this.subGoal) this.removeSubGoal();
+      this.setSubGoal(new MoveRoomGoal(room.name, hasReachedRoomTarget, {
+        emitProgress: this.options.emitProgress ?? false,
+        stopOnPlayer: this.options.stopOnPlayer ?? false,
+      }), 0.2);
+    }
+    return [];
+  }
+
+  isFinish(state: GameState, ctx: StrategyContext): boolean {
+    return (this.options.finishWhenEmpty ?? true) && this.resolvePlayers(state, ctx).length === 0;
+  }
+
+  private canKeepTarget(worker: MoveRoomGoal, state: GameState, ctx: StrategyContext, players: PlayerInfo[]): boolean {
+    const target = resolveRoom(worker.room, ctx);
+    if (!target) return false;
+    if (hasReachedRoomTarget(state, target)) return true;
+    if (ctx.blockedMoveTarget && dist(target.x, target.y, ctx.blockedMoveTarget.x, ctx.blockedMoveTarget.y) <= 10) return false;
+    return !players.some(player => player.room?.toLowerCase() === target.name.toLowerCase());
+  }
+}

package/src/strategies/goals/goal-manager.ts

@@ -1,41 +1,41 @@
-import type { GameState } from '../../sdk/types.js';
-import type { BehaviorDecision, StrategyContext } from '../types.js';
-import { Goal } from './goal.js';
-
-export class GoalManager {
-  private top: Goal | null = null;
-
-  setTop(goal: Goal): void {
-    this.top = goal;
-  }
-
-  getTop(): Goal | null {
-    return this.top;
-  }
-
-  clear(): void {
-    this.top = null;
-  }
-
-  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    const decisions: BehaviorDecision[] = [];
-    let parent: Goal | null = null;
-    let node: Goal | null = this.top;
-
-    while (node !== null) {
-      if (node.isFinish(state, ctx)) {
-        if (parent === null) {
-          this.top = null;
-        } else {
-          parent.removeSubGoal();
-        }
-        break;
-      }
-      decisions.push(...node.tick(state, ctx));
-      parent = node;
-      node = node.subGoal;
-    }
-
-    return decisions;
-  }
-}
+import type { GameState } from '../../sdk/types.js';
+import type { BehaviorDecision, StrategyContext } from '../types.js';
+import { Goal } from './goal.js';
+
+export class GoalManager {
+  private top: Goal | null = null;
+
+  setTop(goal: Goal): void {
+    this.top = goal;
+  }
+
+  getTop(): Goal | null {
+    return this.top;
+  }
+
+  clear(): void {
+    this.top = null;
+  }
+
+  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    const decisions: BehaviorDecision[] = [];
+    let parent: Goal | null = null;
+    let node: Goal | null = this.top;
+
+    while (node !== null) {
+      if (node.isFinish(state, ctx)) {
+        if (parent === null) {
+          this.top = null;
+        } else {
+          parent.removeSubGoal();
+        }
+        break;
+      }
+      decisions.push(...node.tick(state, ctx));
+      parent = node;
+      node = node.subGoal;
+    }
+
+    return decisions;
+  }
+}

package/src/strategies/goals/goal-root-strategy.ts

@@ -1,49 +1,49 @@
-import type { GameState } from '../../sdk/types.js';
-import type { BehaviorDecision, CustomModule, Strategy, StrategyContext } from '../types.js';
-import type { Goal } from './goal.js';
-import { GoalManager } from './goal-manager.js';
-
-export interface GoalRootStrategyOptions {
-  resetOnMeetingResume?: boolean;
-  customModules?: CustomModule[];
-  onUpdateRole?: (role: string) => void;
-}
-
-export class GoalRootStrategy implements Strategy {
-  readonly name: string;
-  private readonly mgr = new GoalManager();
-  private readonly makeTop: () => Goal;
-  private readonly resetOnMeetingResume: boolean;
-  private readonly modules: CustomModule[];
-  private readonly onUpdateRole?: (role: string) => void;
-
-  constructor(name: string, makeTop: () => Goal, options?: GoalRootStrategyOptions) {
-    this.name = name;
-    this.makeTop = makeTop;
-    this.resetOnMeetingResume = options?.resetOnMeetingResume ?? true;
-    this.modules = options?.customModules ?? [];
-    this.onUpdateRole = options?.onUpdateRole;
-    this.mgr.setTop(makeTop());
-  }
-
-  decide(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    if (this.mgr.getTop() === null) this.mgr.setTop(this.makeTop());
-    return this.mgr.tick(state, ctx);
-  }
-
-  onMeetingResume(): void {
-    if (this.resetOnMeetingResume) {
-      this.mgr.setTop(this.makeTop());
-      return;
-    }
-    this.mgr.getTop()?.onMeetingResume();
-  }
-
-  customModules(): CustomModule[] {
-    return this.modules;
-  }
-
-  updateRole(role: string): void {
-    this.onUpdateRole?.(role);
-  }
-}
+import type { GameState } from '../../sdk/types.js';
+import type { BehaviorDecision, CustomModule, Strategy, StrategyContext } from '../types.js';
+import type { Goal } from './goal.js';
+import { GoalManager } from './goal-manager.js';
+
+export interface GoalRootStrategyOptions {
+  resetOnMeetingResume?: boolean;
+  customModules?: CustomModule[];
+  onUpdateRole?: (role: string) => void;
+}
+
+export class GoalRootStrategy implements Strategy {
+  readonly name: string;
+  private readonly mgr = new GoalManager();
+  private readonly makeTop: () => Goal;
+  private readonly resetOnMeetingResume: boolean;
+  private readonly modules: CustomModule[];
+  private readonly onUpdateRole?: (role: string) => void;
+
+  constructor(name: string, makeTop: () => Goal, options?: GoalRootStrategyOptions) {
+    this.name = name;
+    this.makeTop = makeTop;
+    this.resetOnMeetingResume = options?.resetOnMeetingResume ?? true;
+    this.modules = options?.customModules ?? [];
+    this.onUpdateRole = options?.onUpdateRole;
+    this.mgr.setTop(makeTop());
+  }
+
+  decide(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    if (this.mgr.getTop() === null) this.mgr.setTop(this.makeTop());
+    return this.mgr.tick(state, ctx);
+  }
+
+  onMeetingResume(): void {
+    if (this.resetOnMeetingResume) {
+      this.mgr.setTop(this.makeTop());
+      return;
+    }
+    this.mgr.getTop()?.onMeetingResume();
+  }
+
+  customModules(): CustomModule[] {
+    return this.modules;
+  }
+
+  updateRole(role: string): void {
+    this.onUpdateRole?.(role);
+  }
+}

package/src/strategies/goals/goal.ts

@@ -1,28 +1,28 @@
-import type { GameState } from '../../sdk/types.js';
-import type { BehaviorDecision, StrategyContext } from '../types.js';
-
-export abstract class Goal {
-  subGoal: Goal | null = null;
-  priority = 0;
-
-  abstract tick(state: GameState, ctx: StrategyContext): BehaviorDecision[];
-
-  isFinish(_state: GameState, _ctx: StrategyContext): boolean {
-    return false;
-  }
-
-  onMeetingResume(): void {}
-
-  setSubGoal(child: Goal, priority: number): boolean {
-    if (this.subGoal !== null && this.subGoal.priority >= priority) {
-      return false;
-    }
-    child.priority = priority;
-    this.subGoal = child;
-    return true;
-  }
-
-  removeSubGoal(): void {
-    this.subGoal = null;
-  }
-}
+import type { GameState } from '../../sdk/types.js';
+import type { BehaviorDecision, StrategyContext } from '../types.js';
+
+export abstract class Goal {
+  subGoal: Goal | null = null;
+  priority = 0;
+
+  abstract tick(state: GameState, ctx: StrategyContext): BehaviorDecision[];
+
+  isFinish(_state: GameState, _ctx: StrategyContext): boolean {
+    return false;
+  }
+
+  onMeetingResume(): void {}
+
+  setSubGoal(child: Goal, priority: number): boolean {
+    if (this.subGoal !== null && this.subGoal.priority >= priority) {
+      return false;
+    }
+    child.priority = priority;
+    this.subGoal = child;
+    return true;
+  }
+
+  removeSubGoal(): void {
+    this.subGoal = null;
+  }
+}