feedback6: merge fb6-small-fixes (see its commits)

server/sim/content/garrisons/meta.js

@@ -202,7 +202,9 @@ H.SERVER_ADD_REFRESH_CNT_MULTIPLIER_BOND_LAYER = {
 // (ev.trigger) is no manual refresh: it neither fires nor counts. A new copy (bought, granted) starts at 0, and so does
 // an elite merged this round: a new 拉普兰德, its own first manual refresh this round adds +8 even when its copies
 // already fired (GitHub #169; the owner's decision of 2026-10-06 — PlayerState._mergeChess carries no counter over).
-// [ASSUMED]: a copy bought after selling one this round is a new copy — "获得该干员后" — and fires on its own first
+// A copy gained by a refresh's own effects (贾维's gift on every 6th refresh, or the elite that gift completes) did not
+// witness that refresh: the dispatcher runs the chess that stood there when it happened (effectsMeta.js onRefresh), so
+// her first is the next manual refresh (PR #196). [ASSUMED]: a copy bought after selling one this round is a new copy — "获得该干员后" — and fires on its own first
 // refresh (the server cannot tell it from any other copy; each such +4 costs her price + a refresh − the 1-fund refund,
 // and needs her in the shop again).
 const REFRESH_CNT_KEY = 'garrison:SERVER_GAIN_BOND_LAYER_BY_REFRESH_CNT:refreshes'; // per-piece counter (module-prefixed)

server/sim/content/tokens.js

@@ -1515,11 +1515,18 @@ export function touchGospel(bb, skill) {
   };
 }
 
-/** Touch (外勤医疗 map character): 恳切福音 (touchGospel) + 攫升 / 超脱 (mapCharTalents). */
+/**
+ * Touch (外勤医疗 map character): 恳切福音 (touchGospel) + 攫升 / 超脱 (mapCharTalents). The trigger is ACTIVE_RANGE on
+ * the skill's 5-2 range (her running range, which strictly contains her own 3-3): an injured ally inside it casts — the
+ * owner's larger-range rule of 2026-10-05, read for a heal skill as for the Touch 补位 stand-in, whose data rule it is
+ * (data/backups.json). The map character's record keeps DEFAULT (tools/build-data.mjs resolveTrigger widens operators'
+ * skills only), so she waited for an injured ally in her 3-3 (GitHub #260, PR #278).
+ */
 function touchKit(bb, raw, def) {
   const sk = def?.skill;
   if (!sk) return { skill: null, talents: mapCharTalents(def) };
   const g = touchGospel(bb, sk);
+  if (sk.rangeGrid && sk.rangeGrid.length) g.skill.trigger = { rule: 'ACTIVE_RANGE', grid: sk.rangeGrid };
   return { talents: mapCharTalents(def), skill: g.skill, install: g.install };
 }
 

server/sim/damage.js

@@ -478,12 +478,16 @@ function resolveBurst(battle, source, target, el) {
         },
       });
     } else {
-      // 15 s of 阻回 ("停止并阻止任意形式的技力回复": noSp) + 静默 (no skill activation), −1 SP and 100 arts damage per second
+      // 15 s of 阻回 ("停止并阻止任意形式的技力回复": noSp) + 静默 (no skill activation), −1 SP and 100 arts damage per second.
+      // The loss is of the official 技力 (Skill.spTotal: the stored charges × cost + the SP towards the next) — PRTS 技能
+      // 可充能 "当持有者的技力流失时，充能次数也会实时降低": taking it from the partial bar alone left a full skill every
+      // charge it had (a one-charge skill stayed ready through the burst; PR #262). setSpTotal rebuilds the charges
+      // silently (no spGain) and leaves a running timed skill alone, whose SP was spent at its cast.
       lock(c.duration, {
         flags: { silence: true, noSp: true }, interval: 1,
         onTick: () => {
           const sk = target.skill;
-          if (sk && !sk.noSkill && sk.kind !== 'passive' && !(sk.active && sk.isTimed) && sk.sp > 0) sk.sp = Math.max(0, sk.sp - c.spLossPerSec);
+          if (sk && !sk.noSkill && sk.kind !== 'passive' && !(sk.active && sk.isTimed) && sk.spTotal > 0) sk.setSpTotal(Math.max(0, sk.spTotal - c.spLossPerSec));
           hit(c.dps, c.dpsType);
         },
       });