feedback7: merge fb7-owner-sim — community reports via the owner: 白铁's 铁钳号 opens only the skills that act on it (圣约送葬人 spends and stacks), 伊内丝 S3 after a 突袭 jump, 引星棘刺 alchemy units as HP regen (不屈者 / 禁疗), 不可对空 effects spare flying allies (炎佑), 望's 跟子 at battle start, 香槟炸弹 unhealable / no HP loss (owner decision) and not set off by unrevealed 隐匿 or sleeping enemies

- Grok review: MERGE AFTER FIXES — the HIGH finding (skills opened on the device but spending nothing) fixed on the branch
  (69d791f9: skills.js allyTargetsOk, per-kit allyTargets flags).
- Golden union OK; broad node --test 5500 (5499 pass, 0 fail, 1 skipped); lint 0 errors.

server/sim/battle/deploy.js

@@ -56,7 +56,11 @@ export class BattleDeploy {
     const sk = u.skill;
     // "自动操作具有3s冷却，在完成一次操作或作战开始时部署的单位将进入冷却" (PRTS 卫戍协议/帮助; skills.js)
     if (initial) sk.opReadyAt = this.time + this.flags.startOpCooldown;
-    if (keepSp && !sk.noSkill && sk.kind !== 'passive' && !sk.active) {
+    // keepSp (突袭 "保留技力"): the SP / charges before the jump — not for a skill that costs no SP (spCost 0, the
+    // deploy-timed skills), which reset() just re-armed as at every deployment: the retreat ended it, so its snapshot
+    // holds 0 charges, and writing that back took the charge 伊内丝 S3's deploy hook casts with (community report:
+    // 伊内丝激活突袭瞬移以后3技能被吞; those with activateOnDeploy run already, skipped by `!sk.active`)
+    if (keepSp && !sk.noSkill && sk.kind !== 'passive' && !sk.active && sk.spCost > 0) {
       sk.charges = Math.max(0, Math.min(sk.maxCharges, Math.floor(fin(keepSp.charges, 0))));
       sk.sp = Math.max(0, Math.min(sk.spCost, fin(keepSp.sp, 0)));
       if (sk.charges >= sk.maxCharges) sk.sp = sk.spCost;

server/sim/battle/queries.js

@@ -45,19 +45,34 @@ export class BattleQueries {
   /**
    * Ally units an ally's attack selects like an enemy — the "ally targets" content registers (setAllyTarget): 白铁's
    * 铁钳号·原型机, a summon of the enemy camp that "可被我方干员攻击但不受伤害" (PRTS 铁钳号·原型机 备注 "该召唤物阵营为敌方";
-   * kits/ops/op-ironmn.js). Those standing on one of `keys`, alive and deployed — never `attacker` itself, and an ally target
-   * selects none. ai.js acquireTargets appends them after the enemies (their 嘲讽等级 −2 puts them last). [] at once
-   * while none is registered, so every other battle runs exactly as before.
+   * kits/ops/op-ironmn.js). Those standing on one of `keys` (tile keys, or a Set of them), alive and deployed — never
+   * `attacker` itself, and an ally target selects none. ai.js acquireTargets appends them after the enemies (their 嘲讽等级
+   * −2 puts them last); a skill that acts on them counts them like an enemy for its automatic start (skills.js
+   * `_allyTargetIn` / `allyTargetsOk`). [] at
+   * once while none is registered, so every other battle runs exactly as before.
    */
   allyTargetsInKeys(keys, attacker) {
     const set = this._allyTargets;
     if (!set || !set.size || !keys || !attacker || set.has(attacker)) return [];
-    const ks = keys === attacker.rangeKeys && attacker.rangeKeySet ? attacker.rangeKeySet : new Set(keys);
+    const ks = keys instanceof Set ? keys : (keys === attacker.rangeKeys && attacker.rangeKeySet ? attacker.rangeKeySet : new Set(keys));
     const out = [];
     for (const a of set) if (a.alive && a.deployed && !a.hidden && ks.has(a.tileR * COLS + a.tileC)) out.push(a);
     return out;
   }
 
+  /**
+   * The registered ally targets within `r` of (x, y) (centre distance) — the radius form of allyTargetsInKeys, for a kit
+   * whose area selection takes them too (a skill flagged `allyTargets`, skills.js allyTargetsOk). [] while none is registered.
+   */
+  allyTargetsInRadius(x, y, r, attacker) {
+    const set = this._allyTargets;
+    if (!set || !set.size || !attacker || set.has(attacker)) return [];
+    const r2 = r * r + 1e-9;
+    const out = [];
+    for (const a of set) if (a.alive && a.deployed && !a.hidden && (a.x - x) * (a.x - x) + (a.y - y) * (a.y - y) <= r2) out.push(a);
+    return out;
+  }
+
   /** Register (`on`) or drop an ally target (allyTargetsInKeys); one off the field is skipped while registered. */
   setAllyTarget(unit, on = true) {
     if (!unit || unit.side !== 'ally') return false;