feedback1 integrate: WG 奥术 shown 本局禁用 where the mode disables it; returned equipment auto-merges

# Conflicts:
#	public/js/ui/shopBar.js

server/match/PlayerState.js

@@ -512,7 +512,8 @@ export class PlayerState {
    * grows. Otherwise the elite goes to the hand, overflow temp — outside PREP too (a SETTLE merge's elite waits in temp
    * through the next prep, tempDue). The copies' equipment returns to the hand ("干员晋级后已配发装备会回收至整备区";
    * overflow temp; with both full it stays on the elite, up to its equipPerChess (2) slots — any further item is
-   * destroyed with a log warning, as before the official rule); their summons are removed, and an elite on the board
+   * destroyed with a log warning, as before the official rule) and an identical normal pair among it merges like any gain
+   * (checkItemMerges); their summons are removed, and an elite on the board
    * gets its own summon stack (grantTokensFor: its loadout, like any deployment). Returns the elite piece (or null if
    * the elite could not be stored).
    * @param {string} baseId
@@ -556,6 +557,8 @@ export class PlayerState {
       if (where && elite.items.length < this.gd.equipPerChess) { elite.items.push(it); continue; }
       this.m.log.warn?.(`[match ${this.m.roomCode}] ${this.playerId}: returned item ${it.id} destroyed (no space)`);
     }
+    // the returned equipment follows the auto-merge rule like any other gain ("已拥有2件同一初始装备时…自动合并")
+    this.checkItemMerges();
     // deployed like any operator placed by hand: its manually deployable summons join the hand (after the returned
     // equipment, which would be lost in temp — a summon stack removed there comes back at the next round start)
     if (where === 'board') this.grantTokensFor(elite);

server/match/effectsMeta.js

@@ -527,6 +527,7 @@ export function makeCtx(m, ps, source, hook, ev = null) {
         for (const it of l.piece.items || []) ps.stow(it, { allowTemp: true });
         l.piece.items = [];
         ps.returnCopies(l.piece);
+        ps.checkItemMerges(); // the returned equipment auto-merges like any gain
       }
       ps.recompute();
       return true;

server/sim/content/bonds/addon/battle.js

@@ -16,7 +16,14 @@
 //                      two players of a pair field compete for it, the strongest wins (battle.applyStrongest, 同名效果取最高:
 //                      PRTS 作战机制 "同名buff的默认叠加策略buff只能表现出一个"; 巴哈姆特 12316 first-hand: "共享型buff會跟對面搶
 //                      如果對面層數比你高就不需要再特別激活直接吃他的奧術buff"). v2.5 kept one per player, so two players'
-//                      instances multiplied (×5.4 × ×5.6 on a leader at ~250 layers, DESIGN §20.10)
+//                      instances multiplied (×5.4 × ×5.6 on a leader at ~250 layers, DESIGN §20.10). PRTS 盟约记录's own
+//                      note "※同一单位仅可对同一目标同时施加1个该盟约法术伤害提升效果" (one instance per unit and target)
+//                      fits it under the engine default (a newer same-named buff waits until the earlier ends, PRTS
+//                      常见同名状态); strongest vs earliest is [ASSUMED]. Known deviation [ASSUMED]: an earlier revision
+//                      (oldid 386936) forbade a unit re-applying while its own instance lasts; an equal hit here
+//                      refreshes it to a fresh 3 s (slightly stronger). Re-measured after the 0.1.0 report
+//                      "奥术盟约不生效": it works on the real and the browser path (test/sim/feedback1b-arcane.test.js);
+//                      标准 never activates it (modeDataDict inactiveBondIdList)
 //   坚守 steadShip     all operators max HP +(base + per·L); tier 2: 40 % of a non-member operator's damage is borne by
 //                      the members on the field (split evenly, sourceless true damage — already mitigated), members’ thorns
 //                      (base + per·L arts, sourceless but credited to the member hit, ≤ 1 per cd_duration per member;