Fix source-owned Lemuen detection and wanted skill triggers (#428)

docs/design/engine.md

@@ -182,3 +182,7 @@ Each domain file `server/sim/content/{tokens,bonds,garrisons,items,bands,enemies
 - choices: 机变 families (悬赏决策 bounties, 道具补给, 机密商店, 战术决策 team/personal buffs). 悬赏决策 = the official structure of its round (choices.json `bountyDrafts`, 86 drafted cards: R3 a fixed set of six 两场 cards, R9 6 of a boss group's list, R11 6 of a seen 7-card list; §21.2); 机密商店 (R11 the official composition) and 战术决策 can offer the same card twice (`shopDraft` / `tacticDraft`); bounty cards carry `descRaw`; no draft offers a multi-round card, and 教鞭's lasts two battles (`choices.js MULTI_ROUND_BOUNTY_BATTLES`, §20.6). Pointing Stick (教鞭) offers up to three private Tactical Training cards during PREP; the owner confirms one through `g.choice` with its `choiceId`, with Ready blocked until confirmation or the existing prep deadline's auto-pick. “神秘顾客” remains random (META §2.5).
 
 ---
+
+蕾缪安's wanted tiles extend both attacks and the existing content skill-trigger range (§28.4). New detection
+requires selectability; an attached timer needs continuous detection range, and each on-field source owns its timers
+and marks. Leaving clears that source's state without clearing another still-deployed source's marks.

docs/history/0.2.3.md

@@ -78,6 +78,21 @@ The secure Clipboard API remains first choice; a failed fallback returns false f
 Shared invite/loadout copying uses the same helper. Device tests passed 16/16; independent interaction probes
 passed 12/12. The real nested-dialog regression is included in `test/ui/modal.e2e.test.js` for integration testing.
 
+### 28.4 蕾缪安's wanted range also triggers skills — #428
+
+Reported by @CurlyZhu. Marked enemies' tiles extended normal targeting, but were absent from the skill's
+initial trigger range: full SP could sit idle while she attacked a remote wanted enemy. Her kit now registers
+those tiles through the existing `addTriggerRange` contract, retaining target selectability and operation cooldown.
+[PRTS 蕾缪安](https://prts.wiki/w/蕾缪安) also clarifies that a new detection timer needs a selectable target,
+a timer already attached continues while sleeping within detection range, and the source leaving clears its
+timers and marks. Each source now tracks its own progress; one Lemuen leaving does not erase another's marks.
+The focused 12 tests cover all three skills, cross-player detection in a joint field, sleep/wake, multiple sources,
+redeployment (including immediate range cleanup before the next attack) and the existing S3 waiting/late-bombardment behavior. Independent review passed after fixing that cleanup.
+
+Golden: all 285 scenarios recomputed. `roster-016/018/035/036/045`, `boss-boss_1/3/5/7-pair`,
+`hidden-boss_9-pair` and `solo-HARD-9-boosted` move because wanted marks now drive skill casts and
+source-owned detection/cleanup; allies and kill timing consequently change. Bonds, stand-ins and DIY are unchanged.
+
 ### 28.5 远牙's granted trait on substitute switches — #415 / PR #429
 
 Ported from [PR #429](https://github.com/sganggs/Stronghold-Protocol/pull/429) by @CXUtk; reported and
@@ -127,3 +142,4 @@ independently replayed for this port. **[ASSUMED]** other push sources and pulls
 share the examples' display behavior; the drag template alone cannot establish that engine rule.
 Tests cover real push/pull skill paths, default/override metadata, snapshot reversal, and an earlier attack
 arriving after slide prestart in either field direction. Golden metadata deliberately omits the display flag.
+

server/sim/content/kits/ops/chess_char_6_01-lemuen.js

@@ -21,24 +21,43 @@ const LEMUEN_SHELL_FLIGHT = 0.3;
 function ensureWanted(battle) {
   const S = bstate(battle);
   if (S.wanted) return S.wanted;
-  const W = S.wanted = { lemuens: new Set(), time: new WeakMap() };
+  const W = S.wanted = { lemuens: new Set(), sources: new Map(), refreshRanges: new Set() };
   const activeLem = () => [...W.lemuens].filter(live);
-  battle.every(0.25, () => {
+  const reconcile = () => {
-    const lems = activeLem();
-    if (!lems.length) return;
-    const need = Math.min(...lems.map((u) => u.mem.wantedInterval));
-    const lat = battle.allyUnits.filter((a) => live(a) && a.kind === 'op' && hasBond(a, 'lateranoShip'));
     for (const e of battle.enemies) {
-      if (!e.alive || e.hidden || !isElite(e) || e.findBuff('lemuen:wanted')) continue;
+      const marked = [...W.sources.values()].some((s) => s.marks.has(e));
-      // "停留超过8秒": a continuous stay — leaving every 拉特兰 range restarts the count
+      if (marked && e.alive && !e.findBuff('lemuen:wanted')) {
-      if (!lat.some((a) => a.rangeKeySet && bodyInKeys(e, a.rangeKeySet))) { W.time.delete(e); continue; }
-      const t = (W.time.get(e) ?? 0) + 0.25;
-      W.time.set(e, t);
-      if (t >= need - 1e-9) {
         battle.addBuff(e, { key: 'lemuen:wanted', visible: true });
         battle.fx('wanted', { x: e.x, y: e.y, id: e.id });
+      } else if (!marked && e.findBuff('lemuen:wanted')) battle.removeBuff(e, 'lemuen:wanted');
+    }
+    for (const refresh of W.refreshRanges) refresh();
+  };
+  // PRTS: the source leaving clears its timers and marks; another on-field Lemuen keeps her own progress.
+  battle.on('death', ({ unit }) => {
+    if (!W.lemuens.has(unit)) return;
+    W.sources.delete(unit);
+    reconcile();
+  });
+  battle.every(0.25, () => {
+    const lems = activeLem();
+    for (const u of W.sources.keys()) if (!lems.includes(u)) W.sources.delete(u);
+    const lat = battle.allyUnits.filter((a) => live(a) && a.kind === 'op' && hasBond(a, 'lateranoShip'));
+    for (const u of lems) {
+      let state = W.sources.get(u);
+      if (!state) W.sources.set(u, state = { time: new WeakMap(), marks: new Set() });
+      for (const e of state.marks) if (!e.alive) state.marks.delete(e);
+      for (const e of battle.enemies) {
+        if (!e.alive || state.marks.has(e) || !isElite(e)) continue;
+        // PRTS: starting the timer needs selectability; once attached, only its continuous stay is tested.
+        if (e.hidden || !lat.some((a) => a.rangeKeySet && bodyInKeys(e, a.rangeKeySet))) { state.time.delete(e); continue; }
+        if (!state.time.has(e) && !canTargetEnemy(u, e, ANY)) continue;
+        const t = (state.time.get(e) ?? 0) + 0.25;
+        state.time.set(e, t);
+        if (t >= u.mem.wantedInterval - 1e-9) state.marks.add(e);
       }
     }
+    reconcile();
   });
   battle.on('hit', (ctx) => {
     const s = ctx.source, t = ctx.target;
@@ -205,17 +224,26 @@ function lemuen(bb, chess, def) {
       { install(battle, unit) { // 跨境追缉许可
         unit.mem.wantedInterval = num(t0.interval, 8);
         unit.mem.wantedScale = num(t0.damage_scale, 1);
-        ensureWanted(battle).lemuens.add(unit);
+        const wanted = ensureWanted(battle);
-        let sig = null;
+        wanted.lemuens.add(unit);
-        battle.on('tick', () => { // wanted targets' tiles join her range (engine extra range keys, kept across rebuilds)
+        const wantedKeys = () => {
-          if (!live(unit)) return;
           const keys = [];
           for (const e of battle.enemies) if (e.alive && !e.hidden && e.findBuff('lemuen:wanted')) keys.push(...bodyKeys(e));
+          return keys;
+        };
+        // #428: extra attack range also opens her skill under the existing content-trigger contract.
+        unit.skill?.addTriggerRange(() => [{ keys: wantedKeys(), profile: unit.profile }]);
+        let sig = null;
+        const refresh = () => { // update immediately when the last source leaves, before another attack can run
+          const keys = live(unit) ? wantedKeys() : [];
           const s = keys.join(',');
           if (s === sig) return;
           sig = s;
           battle.setExtraRange(unit, keys);
-        }, { owner: unit });
+        };
+        wanted.refreshRanges.add(refresh);
+        battle.on('tick', refresh, { owner: unit });
+        battle.on('deploy', ({ unit: u }) => { if (u === unit) { sig = null; refresh(); } }, { owner: unit });
       } },
       { install(battle, unit) { // 逃犯引渡手续
         const iv = num(t1.interval, 20), atk = num(t1.atk), add = Math.floor(num(t1.add_count)), exAdd = Math.floor(num(t1.ex_add_count));

test/content/kits_alt_t6.test.js

@@ -121,15 +121,15 @@ test('6_01 蕾缪安 S2 归乡邀约: ASPD/ATK +; a wanted enemy is aimed at for
     const h = run({
       defs: { enemies: { el: dummy('el', { rank: 'ELITE' }) } },
       units: [U(id, sid, 10, 4, { carryState: READY })], enemies: [{ key: 'el', pos: [10, 6] }],
-      setup(b) { b.on('enemySpawn', ({ enemy }) => b.addBuff(enemy, { key: 'lemuen:wanted' })); },
     });
     const u = h.unit(id);
     usesSkill(u, sid);
     assert.ok(h.runUntil(() => u.skill.active, 10));
     approx(skillBuff(u).mods.aspd, bb.attack_speed, 'ASPD +');
     approx(skillBuff(u).mods.atkPct, bb.atk, 'ATK +');
+    assert.ok(h.runUntil(() => !!h.enemies()[0]?.findBuff('lemuen:wanted'), 10), 'real detection marks the enemy');
     assert.ok(h.runUntil(() => !!u.mem.lemAim, 5), 'aims at the wanted enemy');
-    const ammo = u.skill.ammoLeft, t0 = h.b.time;
+    const ammo = u.skill.ammoLeft, t0 = h.b.time, aimingAtk = u.s.atk;
     const atks0 = h.hooksOf('attack').filter((c) => c.attacker === u).length;
     assert.ok(h.runUntil(() => !u.mem.lemAim, 10));
     approx(h.b.time - t0, bb['attack@aim_duration'], 'aims the full time (1e7 HP)', 0.03);
@@ -139,7 +139,7 @@ test('6_01 蕾缪安 S2 归乡邀约: ASPD/ATK +; a wanted enemy is aimed at for
     assert.equal(snipe.length, 1);
     assert.equal(snipe[0].dmg.canDodge, false);
     const wanted = u.def.bonds.includes('lateranoShip') ? tal(id).damage_scale : 1;
-    approx(snipe[0].amount, u.s.atk * bb['attack@fin_atk_scale'] * wanted, `${id} fin × wanted`);
+    approx(snipe[0].amount, aimingAtk * bb['attack@fin_atk_scale'] * wanted, `${id} fin × wanted`);
     done(h);
   }
 });

test/content/lemuen-wanted-023.test.js

@@ -0,0 +1,61 @@
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { makeBattle, enemyRec, checkInvariants } from '../helpers/battleHarness.js';
+const LEM = 'chess_char_6_01_a';
+function field({ skillIndex = 2, second = false, unite = false } = {}) {
+  const units = [{ uid: 1, chessId: LEM, row: 12, col: 2, skillIndex, potential: 1 },
+    { uid: 2, chessId: 'chess_char_2_01_a', row: 9, col: 7 }];
+  if (second) units.push({ uid: 3, chessId: LEM, row: 12, col: 4, skillIndex, potential: 1 });
+  const config = { defs: { enemies: { target: enemyRec({ key: 'target', rank: 'ELITE', hp: 1e9, speed: 0 }) } },
+    units, enemies: [{ key: 'target', pos: [9, 8] }], autoFinish: false, hooks: ['skillStart'] };
+  if (unite) {
+    config.kind = 'unite';
+    config.players = [{ playerId: 'p1', seat: 0, side: 'L', colOffset: 0, bonds: {}, units: [{ kind: 'chess', ...units[0] }] },
+      { playerId: 'p2', seat: 1, side: 'L', colOffset: 0, bonds: {}, units: [{ kind: 'chess', ...units[1] }] }];
+    delete config.units;
+  }
+  const h = makeBattle(config);h.step();return { h, u: h.unit(1), e: h.enemies()[0] };
+}
+function done(h) { checkInvariants(h.b); assert.deepEqual(h.b.errors, []); }
+for (const skillIndex of [0, 1, 2]) for (const unite of [false, true]) {
+  test(`通缉 opens S${skillIndex + 1} outside original range (unite=${unite})`, () => {
+    const { h, u, e } = field({ skillIndex, unite });
+    u.skill.gainSp(999);h.run(8.5);
+    assert.ok(e.findBuff('lemuen:wanted'));
+    assert.ok(h.hooksOf('skillStart').some(c => c.unit === u));
+    done(h);
+  });
+}
+test('a new 通缉 timer waits for selectability; an existing timer continues through sleep', () => {
+  for (const startBeforeSleep of [false, true]) {
+    const { h, u, e } = field();
+    if (startBeforeSleep) h.run(0.5);
+    h.b.applyStatus(e, 'sleep', { duration: 10 });
+    u.skill.gainSp(999);h.run(8.5);
+    assert.equal(!!e.findBuff('lemuen:wanted'), startBeforeSleep);
+    assert.equal(u.skill.active, false, 'sleep cannot trigger the skill');
+    h.run(2);
+    assert.equal(u.skill.active, startBeforeSleep, 'waking a marked enemy opens S3');
+    if (!startBeforeSleep) { h.run(8);assert.ok(e.findBuff('lemuen:wanted')); }
+    done(h);
+  }
+});
+test('each 蕾缪安 clears only her own timer/mark on exit and starts fresh on redeployment', () => {
+  const { h, u, e } = field({ second: true });const other = h.unit(3);
+  h.run(8.5);assert.ok(e.findBuff('lemuen:wanted'));
+  h.b.retreat(u, { reason: 'test' });assert.ok(e.findBuff('lemuen:wanted'), 'other source remains');
+  h.b.retreat(other, { reason: 'test' });assert.equal(e.findBuff('lemuen:wanted'), null);
+  h.b.redeploy(u, { free: true });h.run(0.5);assert.equal(e.findBuff('lemuen:wanted'), null);
+  h.run(8);assert.ok(e.findBuff('lemuen:wanted'));
+  done(h);
+});
+
+test('immediate redeployment cannot attack through a cleared wanted range', () => {
+  const { h, u, e } = field();h.run(8.5);assert.ok(e.findBuff('lemuen:wanted'));
+  h.b.retreat(u, { reason: 'test' });
+  assert.equal(e.findBuff('lemuen:wanted'), null);
+  assert.equal(h.b.enemiesInKeys(u.extraRangeKeys || [], u, u.profile).length, 0);
+  h.b.redeploy(u, { free: true });const before = u.stats.attacks;u.atkCd = 0;
+  h.step();assert.equal(u.stats.attacks, before, 'the allies phase sees the cleared range immediately');
+  done(h);
+});

test/golden/fields.json

@@ -17,42 +17,42 @@
       "round": 14,
       "seed": 1379500996,
       "waveId": "act1autochess_h07_01",
-      "time": 200,
+      "time": 198.03,
-      "ticks": 6000,
+      "ticks": 5941,
-      "reason": "forced",
+      "reason": "cleared",
       "killed": 20,
       "total": 16,
       "unspawned": 0,
-      "bossHpLeft": 618934,
+      "bossHpLeft": 0,
-      "rngDraws": 453,
+      "rngDraws": 624,
       "errors": {"count":0,"kinds":[]},
       "players": {
-        "p1": {"killed":20,"total":16,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":1839184,"bossDmg":1436068,"heal":20574,"deaths":2,"layerGains":{}},
+        "p1": {"killed":20,"total":16,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":2580943,"bossDmg":2141675,"heal":19370,"deaths":1,"layerGains":{}},
-        "p2": {"killed":0,"total":0,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":1847871,"bossDmg":1544998,"heal":63434,"deaths":0,"layerGains":{}}
+        "p2": {"killed":0,"total":0,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":1723678,"bossDmg":1458325,"heal":61060,"deaths":0,"layerGains":{}}
       },
       "units": [
-        ["p1",1,"op","chess_char_6_03_b",2,"uniequip_002_yu",837.83,1,13,0,0,17176,14038,0,1],
+        ["p1",1,"op","chess_char_6_03_b",2,"uniequip_002_yu",2060.79,1,13,0,0,12547,10824,0,0],
-        ["p1",2,"op","chess_char_6_06_b",2,"uniequip_002_pepe",3232.9,1,15,0,0,0,0,0,0],
+        ["p1",2,"op","chess_char_6_06_b",2,"uniequip_002_pepe",1839.57,1,15,0,0,4688,524,0,0],
-        ["p1",3,"op","chess_char_6_07_b",2,"uniequip_002_siege2",3411.1,1,17,3,15315,3469,1192,4,1],
+        ["p1",3,"op","chess_char_6_07_b",2,"uniequip_002_siege2",2662.34,1,17,0,0,5403,1853,0,0],
-        ["p1",4,"op","chess_char_6_01_b",2,"uniequip_002_lemuen",0,0,7,5,542548,4356,0,62,1],
+        ["p1",4,"op","chess_char_6_01_b",2,"uniequip_002_lemuen",709.43,1,7,8,1345935,1252,0,63,8],
-        ["p1",5,"op","chess_char_6_02_b",2,"uniequip_002_sbell2",1614.1,1,9,0,0,512,0,0,0],
+        ["p1",5,"op","chess_char_6_02_b",2,"uniequip_002_sbell2",2126.3,1,9,0,0,1417,0,0,0],
-        ["p1",6,"op","chess_char_6_04_b",2,"uniequip_002_skadi2",177.08,1,19,0,97622,14936,3171,0,5],
+        ["p1",6,"op","chess_char_6_04_b",2,"uniequip_002_skadi2",0,0,19,0,71666,12281,3597,0,4],
-        ["p1",7,"op","chess_char_6_05_b",2,"uniequip_002_pasngr",1586.2,1,24,5,647768,1411,0,98,10],
+        ["p1",7,"op","chess_char_6_05_b",2,"uniequip_002_pasngr",1586.2,1,24,3,640231,1558,444,98,10],
-        ["p1",8,"op","chess_char_6_08_b",2,"uniequip_002_reed2",1834.8,1,11,0,0,630,0,0,0],
+        ["p1",8,"op","chess_char_6_08_b",2,"uniequip_002_reed2",1834.8,1,11,0,0,593,0,0,0],
-        ["p1",9,"op","chess_char_6_09_b",0,"uniequip_002_cello",1454.2,1,26,3,369401,1184,110,51,51],
+        ["p1",9,"op","chess_char_6_09_b",0,"uniequip_002_cello",1454.2,1,26,3,308334,2483,51,51,51],
-        ["p1",10,"op","chess_char_6_11_b",2,"uniequip_002_mlyss",2082.3,1,63,1,99596,3284,268,144,4],
+        ["p1",10,"op","chess_char_6_11_b",2,"uniequip_002_mlyss",1015.63,1,21,0,133231,1763,39,214,5],
         ["p1",11,"token","token_10017_skadi2_dedant",null,null,138,0,28,0,0,0,0,0,null],
-        ["p1",12,"token","token_10030_mlyss_wtrman",null,null,0,0,22,0,26675,4228,1794,28,1],
+        ["p1",12,"token","token_10030_mlyss_wtrman",null,null,0,0,22,0,22803,4807,1334,27,1],
-        ["p2",13,"op","chess_char_6_15_b",2,"uniequip_002_qiubai",4435.2,1,33,8,928232,21716,0,192,3],
+        ["p2",13,"op","chess_char_6_15_b",2,"uniequip_002_qiubai",4435.2,1,33,10,787333,16947,0,190,3],
-        ["p2",14,"op","chess_char_6_19_b",2,"uniequip_002_blkkgt",3043.7,1,16,1,75440,3988,0,0,1],
+        ["p2",14,"op","chess_char_6_19_b",2,"uniequip_002_blkkgt",3043.7,1,16,1,75440,6403,0,0,1],
-        ["p2",15,"op","chess_char_5_01_b",1,"uniequip_002_excu2",238.17,1,18,0,0,2550,0,0,0],
+        ["p2",15,"op","chess_char_5_01_b",1,"uniequip_002_excu2",2545.4,1,18,0,0,0,0,0,0],
-        ["p2",16,"op","chess_char_6_17_b",2,"uniequip_002_nearl2",3952.3,1,23,0,255627,2505,0,134,4],
+        ["p2",16,"op","chess_char_6_17_b",2,"uniequip_002_nearl2",3952.3,1,23,1,218717,3293,0,133,4],
-        ["p2",17,"op","chess_char_6_12_b",1,"uniequip_002_rosmon",3175.48,1,8,0,0,1065,0,0,0],
+        ["p2",17,"op","chess_char_6_12_b",1,"uniequip_002_rosmon",2545.15,1,8,0,0,4493,0,0,0],
-        ["p2",18,"op","chess_char_6_13_b",1,"uniequip_002_angel2",1508.4,1,10,0,8845,7529,219,0,0],
+        ["p2",18,"op","chess_char_6_13_b",1,"uniequip_002_angel2",2119.76,1,10,0,48487,5750,2454,0,0],
-        ["p2",19,"op","chess_char_6_14_b",2,"uniequip_002_lumen",3028.91,1,20,0,0,0,8020,9,1],
+        ["p2",19,"op","chess_char_6_14_b",2,"uniequip_002_lumen",3028.91,1,20,0,0,1127,12010,16,1],
-        ["p2",20,"op","chess_char_6_16_b",2,"uniequip_002_halo2",1741.19,1,25,0,271084,1915,0,204,4],
+        ["p2",20,"op","chess_char_6_16_b",2,"uniequip_002_halo2",1741.19,1,25,0,235654,1496,0,202,4],
-        ["p2",21,"op","chess_char_6_18_b",2,"uniequip_002_whitw2",953.23,1,12,1,294014,2967,0,0,3],
+        ["p2",21,"op","chess_char_6_18_b",2,"uniequip_002_whitw2",1695.1,1,12,1,343425,890,0,0,3],
-        ["p2",22,"op","chess_char_6_20_b",2,"uniequip_002_agoat2",1828.31,1,27,0,0,1545,55194,47,2],
+        ["p2",22,"op","chess_char_6_20_b",2,"uniequip_002_agoat2",1828.31,1,27,0,0,0,46597,45,2],
         ["-","~1","device","trap_1105_accrate",null,null,100,1,1,0,0,0,0,0,null],
         ["-","~2","device","trap_1105_accrate",null,null,100,1,2,0,0,0,0,0,null],
         ["-","~3","device","trap_1105_accrate",null,null,100,1,3,0,0,0,0,0,null],
@@ -60,29 +60,30 @@
         ["-","~5","device","trap_1105_accrate",null,null,100,1,5,0,0,0,0,0,null],
         ["-","~6","device","trap_1105_accrate",null,null,100,1,6,0,0,0,0,0,null],
         ["p2","~1","token","token_10019_nearl2_sword",null,null,8280,0,38,0,3661,0,0,25,null],
-        ["p1","~1","token","token_10030_mlyss_wtrman",null,null,1989.96,0,39,0,6710,0,0,12,null],
+        ["p1","~1","token","token_10030_mlyss_wtrman",null,null,875.29,0,39,1,6710,1115,0,12,null],
-        ["p1","~2","token","token_10030_mlyss_wtrman",null,null,0,0,43,0,7148,1875,0,10,null],
+        ["p1","~2","token","token_10030_mlyss_wtrman",null,null,303.83,0,43,0,8824,1571,0,12,null],
-        ["p1","~1","token","token_10017_skadi2_dedant",null,null,100,0,52,0,0,0,0,0,null],
+        ["p1","~1","token","token_10017_skadi2_dedant",null,null,100,0,53,0,0,0,0,0,null],
         ["p2","~2","token","token_10019_nearl2_sword",null,null,6600,0,55,0,3661,0,0,25,null],
-        ["p1","~2","token","token_10017_skadi2_dedant",null,null,138,0,61,0,0,0,0,0,null],
+        ["p1","~3","token","token_10030_mlyss_wtrman",null,null,1442,1,58,0,28966,705,705,52,1],
-        ["p1","~3","token","token_10030_mlyss_wtrman",null,null,1442,1,64,0,20360,0,0,30,1],
+        ["p1","~4","token","token_10030_mlyss_wtrman",null,null,1989.96,0,61,0,6040,0,0,12,null],
-        ["p2","~3","token","token_10019_nearl2_sword",null,null,6600,0,65,0,3661,0,0,25,null],
+        ["p1","~2","token","token_10017_skadi2_dedant",null,null,138,0,64,0,0,0,0,0,null],
-        ["p1","~4","token","token_10030_mlyss_wtrman",null,null,1442,0,68,0,6040,0,0,12,null],
+        ["p2","~3","token","token_10019_nearl2_sword",null,null,6600,0,65,0,3654,0,0,25,null],
-        ["p1","~3","token","token_10017_skadi2_dedant",null,null,100,1,70,0,0,0,0,0,null],
+        ["p1","~5","token","token_10030_mlyss_wtrman",null,null,1442,0,67,0,2686,0,0,12,null],
-        ["p2","~4","token","token_10019_nearl2_sword",null,null,6600,1,71,0,3648,0,0,6,null],
+        ["p1","~6","token","token_10030_mlyss_wtrman",null,null,1442,0,70,0,4846,0,0,12,null],
-        ["p1","~5","token","token_10030_mlyss_wtrman",null,null,1442,1,73,0,1,0,0,1,null]
+        ["p1","~7","token","token_10030_mlyss_wtrman",null,null,1442,1,71,0,672,0,0,3,null],
+        ["p2","~4","token","token_10019_nearl2_sword",null,null,6600,1,72,0,3647,0,0,4,null]
       ],
       "enemies": {
         "enemy_1005_yokai": [4,4,0,0,13759],
-        "enemy_1006_shield_2": [14,14,0,24515,601974],
+        "enemy_1006_shield_2": [14,14,0,19099,601974],
-        "enemy_1061_zomshd": [2,2,0,1578,89996],
+        "enemy_1061_zomshd": [2,2,0,1052,88636],
-        "enemy_9013_acstmk": [1,0,0,45932,2981066],
+        "enemy_9013_acstmk": [1,1,0,46552,3600000],
-        "enemy_9016_acstmr": [8,7,0,0,259]
+        "enemy_9016_acstmr": [8,7,0,0,251]
       },
-      "hooks": [1,71,6000,1216,1216,3077,3464,3590,31,40,93,87,9,39108,2936,13,29,0,1,31,0,24,0],
+      "hooks": [1,71,5941,1319,1319,3122,3493,3694,30,42,98,94,69,41511,2716,10,29,0,1,29,0,21,0],
-      "events": {"atk":1544,"deploy":36,"die":40,"dmg":3174,"engage":18,"fx":664,"heal":370,"skill":180,"spawn":69,"status":736},
+      "events": {"atk":1625,"deploy":36,"die":42,"dmg":3192,"engage":19,"fx":854,"heal":336,"skill":192,"spawn":70,"status":607},
-      "fx": {"airstrike":4,"beam":54,"blink":1,"bombard":9,"bombardShell":9,"burst":24,"copy":2,"dp":4,"drone":335,"droneLock":17,"drones":3,"finale":1,"firewall":1,"garrisonGrant":1,"lightning":132,"link":1,"lock":9,"phase":1,"radiantSword":4,"shell":8,"slash":1,"snow":5,"split":4,"storm":10,"summon":8,"talent":4,"tide":5,"wanted":7},
+      "fx": {"airstrike":26,"beam":54,"blink":1,"bombard":69,"bombardShell":69,"burst":21,"copy":2,"dp":5,"drone":328,"droneLock":18,"drones":3,"finale":1,"garrisonGrant":1,"lightning":129,"link":2,"lock":69,"phase":1,"radiantSword":4,"shell":8,"slash":1,"snow":5,"split":6,"storm":10,"summon":8,"talent":4,"tide":4,"wanted":5},
-      "snaps": "362955fd 046a3f3c 47a9e7a9 a025586d 8e8427c7 d0623150 b6b43f8d e840d833 c2507216 590ccdaa c23f5af5 4d6fbf14 42b722ef 0c65a252 c567e3ba bf36987c a4b9bfdf 4a97b26f 1100cdcb 8df09899"
+      "snaps": "d0c7ebf7 c2a47f5c 6df72cfc f267f95e d216374a ed68fbff db7fd85b 64c3b233 8d07119c 37a755de af8e384d 37e6901f f432740d 5617ea7a bd1267d1 796410c7 47858302 d2d260f8 5c90313f 65608f5f"
     },
     "boss-boss_1-solo": {
       "about": "假想敌：胄 solo pool 1800000: chess_char_5_08_b chess_char_5_11_b chess_char_5_05_b chess_char_5_06_b chess_char_5_13_b chess_char_5_07_b chess_char_5_02_b chess_char_5_03_b chess_char_5_10_b chess_char_5_12_b",
@@ -225,111 +226,110 @@
       "round": 14,
       "seed": 1428555614,
       "waveId": "act1autochess_h07_03",
-      "time": 188.07,
+      "time": 165.03,
-      "ticks": 5642,
+      "ticks": 4951,
       "reason": "cleared",
       "killed": 19,
       "total": 6,
       "unspawned": 0,
       "bossHpLeft": 0,
-      "rngDraws": 1348,
+      "rngDraws": 1278,
       "errors": {"count":0,"kinds":[]},
       "players": {
-        "p1": {"killed":19,"total":6,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":1368471,"bossDmg":1285012,"heal":9160,"deaths":3,"layerGains":{}},
+        "p1": {"killed":19,"total":6,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":1570654,"bossDmg":1472280,"heal":5235,"deaths":2,"layerGains":{}},
-        "p2": {"killed":0,"total":0,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":2815995,"bossDmg":2714988,"heal":34375,"deaths":3,"layerGains":{}}
+        "p2": {"killed":0,"total":0,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":2613753,"bossDmg":2527720,"heal":37017,"deaths":3,"layerGains":{}}
       },
       "units": [
-        ["p1",1,"op","chess_char_6_03_b",2,"uniequip_002_yu",4070,1,7,0,0,0,4276,0,1],
+        ["p1",1,"op","chess_char_6_03_b",2,"uniequip_002_yu",4070,1,7,0,0,0,3196,0,1],
         ["p1",2,"op","chess_char_6_06_b",2,"uniequip_002_pepe",3232.9,1,11,0,0,0,0,0,0],
-        ["p1",3,"op","chess_char_6_07_b",2,"uniequip_002_siege2",3411.1,1,9,2,63,2514,0,29,1],
+        ["p1",3,"op","chess_char_6_07_b",2,"uniequip_002_siege2",3411.1,1,9,1,44,1804,324,32,1],
-        ["p1",4,"op","chess_char_6_01_b",2,"uniequip_002_lemuen",2344.65,1,67,3,622775,3440,0,38,6],
+        ["p1",4,"op","chess_char_6_01_b",2,"uniequip_002_lemuen",2344.65,1,13,4,902572,2208,317,53,7],
-        ["p1",5,"op","chess_char_6_02_b",2,"uniequip_002_sbell2",2126.3,1,17,2,371146,6403,1072,60,3],
+        ["p1",5,"op","chess_char_6_02_b",2,"uniequip_002_sbell2",2126.3,1,17,3,323222,5411,272,52,3],
-        ["p1",6,"op","chess_char_6_04_b",2,"uniequip_002_skadi2",414.87,1,60,1,26009,13143,2524,0,3],
+        ["p1",6,"op","chess_char_6_04_b",2,"uniequip_002_skadi2",532.64,1,63,1,27583,12835,687,0,3],
-        ["p1",7,"op","chess_char_6_05_b",2,"uniequip_002_pasngr",2061.61,1,68,1,189996,6900,1268,56,3],
+        ["p1",7,"op","chess_char_6_05_b",2,"uniequip_002_pasngr",823.13,1,67,1,178714,7514,404,45,3],
-        ["p1",8,"op","chess_char_6_08_b",2,"uniequip_002_reed2",1834.8,1,5,0,33,0,21,15,2],
+        ["p1",8,"op","chess_char_6_08_b",2,"uniequip_002_reed2",1834.8,1,5,0,59,0,36,25,2],
-        ["p1",9,"op","chess_char_6_09_b",0,"uniequip_002_cello",1454.2,1,15,0,38,0,0,10,10],
+        ["p1",9,"op","chess_char_6_09_b",0,"uniequip_002_cello",1454.2,1,15,1,59,0,0,15,15],
-        ["p1",10,"op","chess_char_6_11_b",2,"uniequip_002_mlyss",2082.3,1,23,1,115275,0,0,194,5],
+        ["p1",10,"op","chess_char_6_11_b",2,"uniequip_002_mlyss",2082.3,1,23,0,101077,0,0,170,4],
         ["p1",11,"token","token_10017_skadi2_dedant",null,null,138,0,26,0,0,0,0,0,null],
-        ["p2",12,"op","chess_char_6_15_b",2,"uniequip_002_qiubai",4181.76,1,31,1,510967,1350,0,193,3],
+        ["p2",12,"op","chess_char_6_15_b",2,"uniequip_002_qiubai",4181.76,1,31,0,465270,0,0,170,3],
-        ["p2",13,"op","chess_char_6_19_b",2,"uniequip_002_blkkgt",3043.7,1,61,1,28,3044,0,9,1],
+        ["p2",13,"op","chess_char_6_19_b",2,"uniequip_002_blkkgt",3043.7,1,60,1,29,3044,0,9,1],
-        ["p2",14,"op","chess_char_5_01_b",1,"uniequip_002_excu2",2545.4,1,56,0,14,3710,780,14,1],
+        ["p2",14,"op","chess_char_5_01_b",1,"uniequip_002_excu2",2545.4,1,58,0,16,3865,960,16,1],
-        ["p2",15,"op","chess_char_6_17_b",2,"uniequip_002_nearl2",6916.53,1,32,0,357712,2679,0,90,3],
+        ["p2",15,"op","chess_char_6_17_b",2,"uniequip_002_nearl2",6916.53,1,32,0,293853,2679,0,72,3],
-        ["p2",16,"op","chess_char_6_12_b",1,"uniequip_002_rosmon",3493.03,1,16,6,245365,3571,618,70,4],
+        ["p2",16,"op","chess_char_6_12_b",1,"uniequip_002_rosmon",3493.03,1,16,6,216145,3498,625,60,3],
-        ["p2",17,"op","chess_char_6_13_b",1,"uniequip_002_angel2",2680.15,1,20,1,1463571,6531,1719,331,6],
+        ["p2",17,"op","chess_char_6_13_b",1,"uniequip_002_angel2",2680.15,1,20,2,1433169,5683,1699,302,5],
-        ["p2",18,"op","chess_char_6_14_b",2,"uniequip_002_lumen",2297.79,1,22,0,0,3550,6963,54,1],
+        ["p2",18,"op","chess_char_6_14_b",2,"uniequip_002_lumen",2297.79,1,22,0,0,3550,4812,50,1],
-        ["p2",19,"op","chess_char_6_16_b",2,"uniequip_002_halo2",1741.19,1,25,0,83295,1414,0,132,4],
+        ["p2",19,"op","chess_char_6_16_b",2,"uniequip_002_halo2",1741.19,1,25,0,67561,1414,0,113,3],
-        ["p2",20,"op","chess_char_6_18_b",2,"uniequip_002_whitw2",1695.1,1,59,0,123102,1695,0,22,2],
+        ["p2",20,"op","chess_char_6_18_b",2,"uniequip_002_whitw2",1695.1,1,59,0,105769,1695,0,21,2],
-        ["p2",21,"op","chess_char_6_20_b",2,"uniequip_002_agoat2",1828.31,1,18,0,0,1775,24295,56,2],
+        ["p2",21,"op","chess_char_6_20_b",2,"uniequip_002_agoat2",1828.31,1,18,0,0,1833,28921,49,2],
         ["-","~1","device","trap_1105_accrate",null,null,100,1,1,0,0,0,0,0,null],
         ["-","~2","device","trap_1105_accrate",null,null,100,1,2,0,0,0,0,0,null],
         ["-","~3","device","trap_1105_accrate",null,null,100,1,3,0,0,0,0,0,null],
         ["-","~4","device","trap_1105_accrate",null,null,100,1,4,0,0,0,0,0,null],
-        ["p1","~1","token","token_10030_mlyss_wtrman",null,null,1586.2,1,24,0,43122,1020,0,85,1],
+        ["p1","~1","token","token_10030_mlyss_wtrman",null,null,1586.2,1,24,0,37309,0,0,74,1],
         ["p2","~1","token","token_10019_nearl2_sword",null,null,8280,0,41,0,10647,0,0,0,null],
-        ["p1","~2","token","token_10030_mlyss_wtrman",null,null,1989.96,0,42,0,1,0,0,1,null],
+        ["p1","~2","token","token_10030_mlyss_wtrman",null,null,1989.96,0,42,0,0,0,0,0,null],
         ["p1","~1","token","token_10017_skadi2_dedant",null,null,100,0,49,0,0,0,0,0,null],
         ["p1","~3","token","token_10030_mlyss_wtrman",null,null,1586.2,0,50,0,3,0,0,3,null],
         ["p2","~2","token","token_10019_nearl2_sword",null,null,6600,0,52,0,10647,0,0,0,null],
         ["p1","~4","token","token_10030_mlyss_wtrman",null,null,1989.96,0,54,0,0,0,0,0,null],
-        ["p1","~1","token","token_10040_siege2_vlion",null,null,1827.23,0,57,0,10,3644,0,10,null],
+        ["p1","~1","token","token_10040_siege2_vlion",null,null,2804.82,0,55,0,10,2715,0,10,null],
-        ["p1","~2","token","token_10040_siege2_vlion",null,null,5520,0,58,1,1,0,0,1,null],
+        ["p1","~2","token","token_10040_siege2_vlion",null,null,5520,0,56,0,2,0,0,2,null],
-        ["p2","~3","token","token_10019_nearl2_sword",null,null,6600,0,63,0,10647,0,0,0,null],
+        ["p2","~3","token","token_10019_nearl2_sword",null,null,6600,0,62,0,10647,0,0,0,null],
-        ["p1","~2","token","token_10017_skadi2_dedant",null,null,100,0,64,0,0,0,0,0,null],
+        ["p1","~2","token","token_10017_skadi2_dedant",null,null,100,1,64,0,0,0,0,0,null],
-        ["p1","~5","token","token_10030_mlyss_wtrman",null,null,1586.2,0,66,0,0,0,0,0,null]
+        ["p1","~5","token","token_10030_mlyss_wtrman",null,null,1586.2,1,65,0,0,0,0,0,null]
       ],
       "enemies": {
         "enemy_1197_sfshu_2": [2,2,0,0,28809],
         "enemy_1198_msfshu_2": [6,6,0,0,102],
-        "enemy_1209_sfden_2": [2,2,0,2371,154793],
+        "enemy_1209_sfden_2": [2,2,0,0,154793],
         "enemy_1210_msfden_2": [2,2,0,0,386],
         "enemy_9021_acduml": [1,1,0,0,4000000],
-        "enemy_9023_acdums": [9,7,0,52595,376]
+        "enemy_9023_acdums": [8,7,0,49006,317]
       },
-      "hooks": [1,67,5642,1481,1481,4032,4819,3190,26,40,62,55,317,39781,2084,4,22,0,1,26,0,12,1],
+      "hooks": [1,65,4951,1349,1349,3657,4441,2191,25,37,64,57,319,35751,1888,4,21,0,1,24,0,12,1],
-      "events": {"atk":1817,"deploy":41,"die":40,"dmg":4536,"engage":20,"fx":1175,"heal":366,"skill":117,"spawn":59,"status":888},
+      "events": {"atk":1613,"deploy":40,"die":37,"dmg":4177,"engage":19,"fx":1131,"heal":431,"skill":121,"spawn":58,"status":789},
       "fx": {
-        "airstrike": 121,
+        "airstrike": 115,
         "appear": 1,
-        "beam": 11,
+        "beam": 10,
-        "blessing": 1,
         "blink": 2,
-        "bombard": 39,
+        "bombard": 60,
-        "bombardShell": 39,
+        "bombardShell": 60,
         "buff": 3,
         "burst": 12,
         "copy": 1,
         "disappear": 1,
         "displace": 1,
         "dodge": 1,
-        "dp": 5,
+        "dp": 4,
-        "drone": 210,
+        "drone": 199,
-        "droneLock": 18,
+        "droneLock": 21,
         "drones": 2,
-        "explode": 458,
+        "explode": 392,
-        "extraAttack": 3,
+        "extraAttack": 5,
         "finale": 1,
         "firewall": 1,
         "garrisonGrant": 1,
-        "lightning": 44,
+        "lightning": 37,
-        "link": 8,
+        "link": 7,
-        "lock": 41,
+        "lock": 60,
         "lure": 3,
-        "phase": 44,
+        "phase": 38,
         "radiantSword": 3,
-        "scorchBurst": 1,
+        "scorchBurst": 2,
         "slash": 11,
-        "snow": 42,
+        "snow": 37,
         "split": 4,
-        "steal": 6,
+        "steal": 5,
         "storm": 3,
-        "summon": 16,
+        "summon": 15,
         "sunBurst": 1,
-        "talent": 8,
+        "talent": 6,
         "telegraph": 2,
         "tide": 3,
-        "wanted": 3
+        "wanted": 1
       },
-      "snaps": "68fffef1 494368df 4e38f532 91f07ed2 9fcea09c 633c36ab 9b6c2366 d9028a91 7c314a07 8bf87563 ee1c48e6 d1a1465b 525c20b9 1a9879f4 523362ee ac980627 62f240a4 78d219ff 942c0868"
+      "snaps": "68fffef1 494368df d4448d17 4e91833a 23e11a5a 8752e6c6 6f9be873 fa966775 dfb5037e cefeae7b 8ab8ba7b e65d3634 fa7102a8 076e446e 4f16e0ab 97fb5ca2 77c75b43"
     },
     "boss-boss_3-solo": {
       "about": "假想敌：管 solo pool 2000000: chess_char_5_08_b chess_char_5_11_b chess_char_5_05_b chess_char_5_06_b chess_char_5_13_b chess_char_5_07_b chess_char_5_02_b chess_char_5_03_b chess_char_5_10_b chess_char_5_12_b",
@@ -518,101 +518,99 @@
       "round": 14,
       "seed": 2302764647,
       "waveId": "act2autochess_h07_05",
-      "time": 137.77,
+      "time": 103.97,
-      "ticks": 4133,
+      "ticks": 3119,
       "reason": "cleared",
-      "killed": 20,
+      "killed": 18,
       "total": 8,
       "unspawned": 0,
       "bossHpLeft": 0,
-      "rngDraws": 1188,
+      "rngDraws": 867,
       "errors": {"count":0,"kinds":[]},
       "players": {
-        "p1": {"killed":20,"total":8,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":1088003,"bossDmg":768628,"heal":14456,"deaths":4,"layerGains":{}},
+        "p1": {"killed":18,"total":8,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":1249795,"bossDmg":929511,"heal":26462,"deaths":1,"layerGains":{}},
-        "p2": {"killed":0,"total":0,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":1371948,"bossDmg":791372,"heal":64230,"deaths":1,"layerGains":{}}
+        "p2": {"killed":0,"total":0,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":1109971,"bossDmg":630489,"heal":42330,"deaths":1,"layerGains":{}}
       },
       "units": [
-        ["p1",1,"op","chess_char_6_03_b",2,"uniequip_002_yu",8872.6,1,7,0,29127,1495,7423,9,2],
+        ["p1",1,"op","chess_char_6_03_b",2,"uniequip_002_yu",4070,1,7,0,42174,5551,11075,18,1],
-        ["p1",2,"op","chess_char_6_06_b",2,"uniequip_002_pepe",0,0,12,0,38976,5169,0,8,1],
+        ["p1",2,"op","chess_char_6_06_b",2,"uniequip_002_pepe",3232.9,1,12,1,64021,2256,958,12,1],
-        ["p1",3,"op","chess_char_6_07_b",2,"uniequip_002_siege2",4198.97,1,14,0,107350,5802,0,39,2],
+        ["p1",3,"op","chess_char_6_07_b",2,"uniequip_002_siege2",3411.1,1,14,0,76000,4697,2195,34,1],
-        ["p1",4,"op","chess_char_6_01_b",2,"uniequip_002_lemuen",0,0,1,2,322202,1940,0,23,2],
+        ["p1",4,"op","chess_char_6_01_b",2,"uniequip_002_lemuen",1617,1,1,2,587890,2311,1987,32,4],
-        ["p1",5,"op","chess_char_6_02_b",2,"uniequip_002_sbell2",2794.43,1,16,0,93702,1501,0,23,2],
+        ["p1",5,"op","chess_char_6_02_b",2,"uniequip_002_sbell2",2126.3,1,16,0,54457,230,21,11,2],
-        ["p1",6,"op","chess_char_6_04_b",2,"uniequip_002_skadi2",0,0,3,0,4001,5040,48,0,2],
+        ["p1",6,"op","chess_char_6_04_b",2,"uniequip_002_skadi2",1694.16,1,3,0,6859,6498,1793,0,3],
-        ["p1",7,"op","chess_char_6_05_b",2,"uniequip_002_pasngr",1898.56,1,18,2,176764,3538,447,10,7],
+        ["p1",7,"op","chess_char_6_05_b",2,"uniequip_002_pasngr",1586.2,1,18,0,143648,2793,596,18,4],
-        ["p1",8,"op","chess_char_6_08_b",2,"uniequip_002_reed2",2532.02,1,5,0,98463,4801,5934,63,2],
+        ["p1",8,"op","chess_char_6_08_b",2,"uniequip_002_reed2",1834.8,1,5,1,49062,868,4571,26,2],
-        ["p1",9,"op","chess_char_6_09_b",0,"uniequip_002_cello",2006.8,1,20,2,145114,5300,603,24,25],
+        ["p1",9,"op","chess_char_6_09_b",0,"uniequip_002_cello",0,0,20,2,143676,6495,603,20,20],
-        ["p1",10,"op","chess_char_6_11_b",2,"uniequip_002_mlyss",0,0,9,0,46746,3396,0,45,2],
+        ["p1",10,"op","chess_char_6_11_b",2,"uniequip_002_mlyss",2082.3,1,9,1,53802,2964,1391,64,3],
         ["p1",11,"token","token_10017_skadi2_dedant",null,null,138,0,22,0,0,0,0,0,null],
-        ["p1",12,"token","token_10030_mlyss_wtrman",null,null,0,0,10,0,16689,1668,0,30,1],
+        ["p1",12,"token","token_10030_mlyss_wtrman",null,null,0,0,10,0,18615,2939,1271,35,1],
-        ["p2",13,"op","chess_char_6_15_b",2,"uniequip_002_qiubai",5114.17,1,61,7,461782,10876,0,127,5],
+        ["p2",13,"op","chess_char_6_15_b",2,"uniequip_002_qiubai",3508.08,1,56,5,369668,10048,0,93,4],
-        ["p2",14,"op","chess_char_6_19_b",2,"uniequip_002_blkkgt",4200.31,1,13,1,188904,8403,0,36,4],
+        ["p2",14,"op","chess_char_6_19_b",2,"uniequip_002_blkkgt",2043.7,1,13,1,152329,5717,0,19,3],
-        ["p2",15,"op","chess_char_5_01_b",1,"uniequip_002_excu2",33.88,1,15,0,14992,4143,840,14,1],
+        ["p2",15,"op","chess_char_5_01_b",1,"uniequip_002_excu2",2081.5,1,15,0,12767,1079,540,9,1],
-        ["p2",16,"op","chess_char_6_17_b",2,"uniequip_002_nearl2",7032.81,1,66,3,215780,8720,0,57,3],
+        ["p2",16,"op","chess_char_6_17_b",2,"uniequip_002_nearl2",6504.15,1,58,2,186781,6913,0,46,2],
-        ["p2",17,"op","chess_char_6_12_b",1,"uniequip_002_rosmon",6763.77,1,2,2,271686,2646,2629,26,2],
+        ["p2",17,"op","chess_char_6_12_b",1,"uniequip_002_rosmon",5344.3,1,2,2,194696,4516,2646,20,2],
-        ["p2",18,"op","chess_char_6_13_b",1,"uniequip_002_angel2",5017.24,1,17,0,56784,9547,2614,8,1],
+        ["p2",18,"op","chess_char_6_13_b",1,"uniequip_002_angel2",3562.16,1,17,2,73558,4871,2224,8,1],
-        ["p2",19,"op","chess_char_6_14_b",2,"uniequip_002_lumen",2882.68,1,4,0,0,3711,13620,22,1],
+        ["p2",19,"op","chess_char_6_14_b",2,"uniequip_002_lumen",1336.23,1,4,0,0,2258,9039,16,1],
-        ["p2",20,"op","chess_char_6_16_b",2,"uniequip_002_halo2",2184.4,1,19,1,32191,1031,0,40,3],
+        ["p2",20,"op","chess_char_6_16_b",2,"uniequip_002_halo2",1741.19,1,19,0,22189,174,0,27,2],
-        ["p2",21,"op","chess_char_6_18_b",2,"uniequip_002_whitw2",2339.24,1,65,1,105283,1695,0,13,2],
+        ["p2",21,"op","chess_char_6_18_b",2,"uniequip_002_whitw2",0,0,6,0,88775,1695,0,12,1],
-        ["p2",22,"op","chess_char_6_20_b",2,"uniequip_002_agoat2",2293.7,1,21,0,0,6115,44528,39,2],
+        ["p2",22,"op","chess_char_6_20_b",2,"uniequip_002_agoat2",1828.31,1,21,0,0,2787,27882,28,1],
-        ["p2","~1","token","token_10019_nearl2_sword",null,null,1907.57,0,32,0,9195,6372,0,11,null],
+        ["p2","~1","token","token_10019_nearl2_sword",null,null,1907.57,0,32,0,9195,6372,0,12,null],
-        ["p1","~1","token","token_10030_mlyss_wtrman",null,null,2301.84,0,36,0,3732,0,0,9,null],
+        ["p1","~1","token","token_10030_mlyss_wtrman",null,null,2301.84,0,36,0,4738,0,0,12,null],
-        ["p1","~1","token","token_10040_siege2_vlion",null,null,1324.07,0,39,0,3325,3428,0,8,null],
+        ["p1","~1","token","token_10040_siege2_vlion",null,null,1631.32,0,39,0,2850,3136,0,7,null],
-        ["p2","~2","token","token_10019_nearl2_sword",null,null,1355.55,0,46,0,7933,4644,0,21,null],
+        ["p2","~2","token","token_10019_nearl2_sword",null,null,2413.5,0,45,0,13,3587,0,23,null],
         ["p1","~1","token","token_10017_skadi2_dedant",null,null,100,0,48,0,0,0,0,0,null],
-        ["p1","~2","token","token_10030_mlyss_wtrman",null,null,0,0,54,0,1812,1668,0,5,null],
+        ["p1","~2","token","token_10030_mlyss_wtrman",null,null,0,0,52,0,2003,1668,0,8,null]
-        ["p2","~3","token","token_10019_nearl2_sword",null,null,7543.59,0,60,0,7418,736,0,0,null],
-        ["p1","~2","token","token_10040_siege2_vlion",null,null,4125.49,1,63,0,0,1395,0,1,null]
       ],
       "enemies": {
-        "enemy_1010_demon_2": [2,2,0,1134,128995],
+        "enemy_1010_demon_2": [2,2,0,1457,128995],
-        "enemy_2009_csaudc": [4,4,0,1711,137594],
+        "enemy_2009_csaudc": [4,4,0,1050,137594],
-        "enemy_2010_csdcr": [2,2,0,5156,103196],
+        "enemy_2010_csdcr": [2,2,0,6581,103196],
-        "enemy_2016_csphtm": [2,2,0,93974,1560000],
+        "enemy_2016_csphtm": [2,2,0,70829,1560000],
-        "enemy_2017_csphts": [13,12,0,2291,530167]
+        "enemy_2017_csphts": [10,10,0,3407,429982]
       },
-      "hooks": [1,65,4133,791,791,2222,2555,1506,29,47,72,60,32,27243,1391,42,23,0,1,29,0,17,107],
+      "hooks": [1,56,3119,685,685,1889,2222,4724,24,38,60,51,43,26422,1127,30,20,0,1,23,0,17,64],
-      "events": {"atk":1016,"deploy":42,"die":47,"dmg":2366,"engage":24,"fx":634,"heal":355,"skill":132,"spawn":53,"status":629},
+      "events": {"atk":852,"deploy":36,"die":38,"dmg":2064,"engage":23,"fx":534,"heal":240,"skill":111,"spawn":48,"status":580},
       "fx": {
-        "airstrike": 11,
+        "airstrike": 14,
-        "blink": 24,
+        "blink": 18,
-        "bombard": 15,
+        "bombard": 33,
-        "bombardShell": 15,
+        "bombardShell": 33,
         "burst": 17,
         "cleanse": 2,
         "copy": 1,
-        "displace": 4,
+        "dodge": 64,
-        "dodge": 107,
+        "dp": 3,
-        "dp": 2,
+        "drone": 102,
-        "drone": 137,
+        "droneLock": 3,
-        "droneLock": 7,
+        "drones": 1,
-        "drones": 2,
         "emergency": 2,
-        "explode": 35,
+        "explode": 29,
         "extraAttack": 3,
-        "finale": 4,
+        "finale": 3,
-        "firewall": 2,
+        "firewall": 1,
         "garrisonGrant": 1,
-        "lightning": 76,
+        "lightning": 47,
-        "link": 5,
+        "link": 4,
-        "lock": 18,
+        "lock": 33,
         "lure": 2,
-        "radiantSword": 3,
+        "palsy": 1,
-        "scorchBurst": 2,
+        "radiantSword": 2,
-        "shield": 11,
+        "scorchBurst": 1,
-        "slash": 44,
+        "shield": 13,
-        "snow": 28,
+        "slash": 33,
+        "snow": 21,
         "split": 2,
         "steal": 1,
-        "storm": 7,
+        "storm": 4,
         "strike": 3,
-        "summon": 18,
+        "summon": 13,
-        "sunBurst": 6,
+        "sunBurst": 4,
         "talent": 4,
-        "telegraph": 5,
+        "telegraph": 6,
-        "tide": 2,
+        "tide": 3,
-        "wanted": 6
+        "wanted": 7
       },
-      "snaps": "706fed87 d2a17620 79acca3b 82d3e441 2593d936 bcc646f0 c1a12d76 9ceb2652 41f70032 312d9621 10453580 6d798be6 70eff3ef e2e98ab7"
+      "snaps": "d3cd88f1 0b40f2d2 1bc3ac15 f797dbfa 67a1d811 c33ee6e2 949c4a4b a8645ba6 e4cccf0c f1968adc 303367ba"
     },
     "boss-boss_5-solo": {
       "about": "卢西恩，“猩红血钻” solo pool 780000: chess_char_5_08_b chess_char_5_11_b chess_char_5_05_b chess_char_5_06_b chess_char_5_13_b chess_char_5_07_b chess_char_5_02_b chess_char_5_03_b chess_char_5_10_b chess_char_5_12_b",
@@ -813,57 +811,56 @@
       "round": 14,
       "seed": 120974514,
       "waveId": "act1autochess_h07_07",
-      "time": 200,
+      "time": 171.13,
-      "ticks": 6000,
+      "ticks": 5134,
-      "reason": "forced",
+      "reason": "cleared",
       "killed": 16,
       "total": 16,
       "unspawned": 0,
-      "bossHpLeft": 326218,
+      "bossHpLeft": 0,
-      "rngDraws": 809,
+      "rngDraws": 910,
       "errors": {"count":0,"kinds":[]},
       "players": {
-        "p1": {"killed":16,"total":16,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":1066969,"bossDmg":1033852,"heal":29411,"deaths":0,"layerGains":{}},
+        "p1": {"killed":16,"total":16,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":1769900,"bossDmg":1675565,"heal":25043,"deaths":0,"layerGains":{}},
-        "p2": {"killed":0,"total":0,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":3079793,"bossDmg":2639931,"heal":44248,"deaths":0,"layerGains":{}}
+        "p2": {"killed":0,"total":0,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":2703080,"bossDmg":2324435,"heal":40114,"deaths":0,"layerGains":{}}
       },
       "units": [
         ["p1",1,"op","chess_char_6_03_b",2,"uniequip_002_yu",4070,1,5,0,0,0,0,0,0],
         ["p1",2,"op","chess_char_6_06_b",2,"uniequip_002_pepe",3232.9,1,7,0,0,0,0,0,0],
         ["p1",3,"op","chess_char_6_07_b",2,"uniequip_002_siege2",3411.1,1,11,0,0,0,0,0,0],
-        ["p1",4,"op","chess_char_6_01_b",2,"uniequip_002_lemuen",1617,1,1,2,322898,0,0,110,0],
+        ["p1",4,"op","chess_char_6_01_b",2,"uniequip_002_lemuen",1617,1,1,2,1131550,0,0,82,8],
         ["p1",5,"op","chess_char_6_02_b",2,"uniequip_002_sbell2",2126.3,1,9,0,0,0,0,0,0],
-        ["p1",6,"op","chess_char_6_04_b",2,"uniequip_002_skadi2",1716.64,1,17,0,49553,21491,1501,0,5],
+        ["p1",6,"op","chess_char_6_04_b",2,"uniequip_002_skadi2",1669.91,1,17,0,41867,19445,1580,0,5],
         ["p1",7,"op","chess_char_6_05_b",2,"uniequip_002_pasngr",1586.2,1,3,0,0,0,0,0,0],
-        ["p1",8,"op","chess_char_6_08_b",2,"uniequip_002_reed2",1834.8,1,13,0,187545,0,24085,140,4],
+        ["p1",8,"op","chess_char_6_08_b",2,"uniequip_002_reed2",1834.8,1,13,0,161084,0,19850,120,3],
-        ["p1",9,"op","chess_char_6_09_b",0,"uniequip_002_cello",1454.2,1,15,2,302984,1172,0,51,51],
+        ["p1",9,"op","chess_char_6_09_b",0,"uniequip_002_cello",1454.2,1,15,1,254912,0,0,44,44],
-        ["p1",10,"op","chess_char_6_11_b",2,"uniequip_002_mlyss",2082.3,1,19,0,167503,13971,1815,200,5],
+        ["p1",10,"op","chess_char_6_11_b",2,"uniequip_002_mlyss",2082.3,1,19,0,140358,12849,1604,170,4],
         ["p1",11,"token","token_10017_skadi2_dedant",null,null,138,0,22,0,0,0,0,0,null],
-        ["p1",12,"token","token_10030_mlyss_wtrman",null,null,0,0,20,0,6335,2977,0,17,1],
+        ["p1",12,"token","token_10030_mlyss_wtrman",null,null,0,0,20,0,7684,2977,0,17,1],
-        ["p2",13,"op","chess_char_6_15_b",2,"uniequip_002_qiubai",4435.2,1,26,4,448777,0,0,142,3],
+        ["p2",13,"op","chess_char_6_15_b",2,"uniequip_002_qiubai",4435.2,1,26,2,403485,0,0,134,3],
         ["p2",14,"op","chess_char_6_19_b",2,"uniequip_002_blkkgt",3043.7,1,2,0,0,0,0,0,0],
         ["p2",15,"op","chess_char_5_01_b",1,"uniequip_002_excu2",2545.4,1,6,0,0,0,0,0,0],
-        ["p2",16,"op","chess_char_6_17_b",2,"uniequip_002_nearl2",6916.53,1,31,0,150170,15936,0,38,3],
+        ["p2",16,"op","chess_char_6_17_b",2,"uniequip_002_nearl2",6844.55,1,31,2,137844,15939,0,41,3],
-        ["p2",17,"op","chess_char_6_12_b",1,"uniequip_002_rosmon",2480.38,1,16,5,467308,12000,0,74,4],
+        ["p2",17,"op","chess_char_6_12_b",1,"uniequip_002_rosmon",2480.38,1,16,2,379931,10260,0,64,3],
-        ["p2",18,"op","chess_char_6_13_b",1,"uniequip_002_angel2",2680.15,1,21,3,1460868,6016,2779,331,7],
+        ["p2",18,"op","chess_char_6_13_b",1,"uniequip_002_angel2",2653.35,1,21,6,1358147,5265,2873,294,6],
         ["p2",19,"op","chess_char_6_14_b",2,"uniequip_002_lumen",2088.9,1,8,0,0,0,0,0,0],
-        ["p2",20,"op","chess_char_6_16_b",2,"uniequip_002_halo2",1582.9,1,12,0,174352,0,0,125,4],
+        ["p2",20,"op","chess_char_6_16_b",2,"uniequip_002_halo2",1582.9,1,12,1,140177,0,0,100,4],
-        ["p2",21,"op","chess_char_6_18_b",2,"uniequip_002_whitw2",1695.1,1,14,0,378318,0,0,77,3],
+        ["p2",21,"op","chess_char_6_18_b",2,"uniequip_002_whitw2",1695.1,1,14,1,283496,0,0,77,3],
-        ["p2",22,"op","chess_char_6_20_b",2,"uniequip_002_agoat2",1828.31,1,18,0,0,1103,41469,68,2],
+        ["p2",22,"op","chess_char_6_20_b",2,"uniequip_002_agoat2",1828.31,1,18,0,0,0,37241,59,2],
-        ["p1","~1","token","token_10030_mlyss_wtrman",null,null,0,0,34,0,8266,2454,630,12,null],
+        ["p1","~1","token","token_10030_mlyss_wtrman",null,null,0,0,34,0,10512,2454,630,12,null],
-        ["p1","~2","token","token_10030_mlyss_wtrman",null,null,0,0,41,0,4999,1677,0,9,1],
+        ["p1","~2","token","token_10030_mlyss_wtrman",null,null,0,0,41,0,5418,1593,0,9,1],
         ["p1","~1","token","token_10017_skadi2_dedant",null,null,100,0,42,0,0,0,0,0,null],
-        ["p1","~3","token","token_10030_mlyss_wtrman",null,null,0,0,46,0,2225,2504,0,5,1],
+        ["p1","~3","token","token_10030_mlyss_wtrman",null,null,0,0,46,0,2005,1322,0,6,1],
         ["p1","~2","token","token_10017_skadi2_dedant",null,null,138,0,48,0,0,0,0,0,null],
-        ["p1","~4","token","token_10030_mlyss_wtrman",null,null,0,0,49,0,10505,2126,0,29,1],
+        ["p1","~4","token","token_10030_mlyss_wtrman",null,null,122.63,1,49,0,10116,2003,0,28,1],
-        ["p1","~5","token","token_10030_mlyss_wtrman",null,null,0,0,50,0,4155,2968,1379,11,null],
+        ["p1","~5","token","token_10030_mlyss_wtrman",null,null,0,0,50,0,4393,3044,1379,12,null],
-        ["p1","~3","token","token_10017_skadi2_dedant",null,null,100,0,51,0,0,0,0,0,null],
+        ["p1","~3","token","token_10017_skadi2_dedant",null,null,100,1,51,0,0,0,0,0,null]
-        ["p1","~6","token","token_10030_mlyss_wtrman",null,null,1322,1,52,0,0,0,0,0,1]
       ],
-      "enemies": {"enemy_1067_snslime":[8,8,0,13025,111795],"enemy_1081_sotisd":[4,4,0,0,257989],"enemy_1249_lysdb_2":[4,4,0,0,103196],"enemy_9033_acdeer":[1,0,0,44861,3673782]},
+      "enemies": {"enemy_1067_snslime":[8,8,0,8997,111795],"enemy_1081_sotisd":[4,4,0,0,257989],"enemy_1249_lysdb_2":[4,4,0,0,103196],"enemy_9033_acdeer":[1,1,0,43366,4000000]},
-      "hooks": [1,50,6000,1441,1441,3438,3792,3123,22,28,96,91,258,39041,1625,2,17,0,1,22,0,13,0],
+      "hooks": [1,49,5134,1270,1270,3029,3331,3007,22,27,92,86,300,37421,1393,1,17,0,1,21,0,11,0],
-      "events": {"atk":1620,"deploy":33,"die":28,"dmg":3484,"engage":16,"fx":564,"heal":517,"skill":187,"spawn":48,"status":575},
+      "events": {"atk":1436,"deploy":32,"die":27,"dmg":3070,"engage":16,"fx":669,"heal":444,"skill":178,"spawn":47,"status":497},
-      "fx": {"airstrike":90,"beam":5,"blink":2,"burst":13,"column":51,"copy":5,"dp":5,"drone":333,"droneLock":14,"drones":3,"explode":7,"garrisonGrant":1,"link":1,"phase":1,"shieldBreak":4,"snow":5,"split":2,"steal":7,"sunBurst":4,"talent":4,"tide":5,"wanted":2},
+      "fx": {"airstrike":100,"beam":5,"blink":2,"bombard":69,"bombardShell":69,"burst":11,"column":45,"copy":4,"dp":4,"drone":234,"droneLock":11,"drones":3,"explode":6,"garrisonGrant":1,"link":1,"lock":69,"phase":1,"scorchBurst":2,"shieldBreak":4,"snow":5,"split":2,"steal":6,"sunBurst":4,"talent":4,"tide":5,"wanted":2},
-      "snaps": "fb8307e1 9e07f2cd c4f4c363 66764623 1ffe1d8f bb69de14 13510aff 5e67011a 343d267f ea800429 35dcb095 6c8b3934 0f452f6a d8ce55f6 34d9aadc 9d401cff 083e5b91 7b27cce1 d16ea085 275893dd"
+      "snaps": "e8f77b71 c1cf2cef 36ab0e73 ccc2551f 2b2e3882 dd02a2c0 0af53ff0 4dd61228 eb6652cc d394b2db 63e0edd0 aa384869 69ec5174 2cf805c7 d39727e2 8d04b1b9 23c424be cf78b290"
     },
     "boss-boss_7-solo": {
       "about": "“萨米的意志” solo pool 2000000: chess_char_5_08_b chess_char_5_11_b chess_char_5_05_b chess_char_5_06_b chess_char_5_13_b chess_char_5_07_b chess_char_5_02_b chess_char_5_03_b chess_char_5_10_b chess_char_5_12_b",
@@ -1077,108 +1074,106 @@
       "killed": 8,
       "total": 8,
       "unspawned": 0,
-      "bossHpLeft": 3259464,
+      "bossHpLeft": 2705390,
-      "rngDraws": 1758,
+      "rngDraws": 2092,
       "errors": {"count":0,"kinds":[]},
       "players": {
-        "p1": {"killed":8,"total":8,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":2129537,"bossDmg":903375,"heal":16098,"deaths":5,"layerGains":{}},
+        "p1": {"killed":8,"total":8,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":2847989,"bossDmg":1144813,"heal":26393,"deaths":3,"layerGains":{}},
-        "p2": {"killed":0,"total":0,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":3855181,"bossDmg":1385750,"heal":134321,"deaths":11,"layerGains":{}}
+        "p2": {"killed":0,"total":0,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":0,"dmg":4559292,"bossDmg":1700319,"heal":131365,"deaths":10,"layerGains":{}}
       },
       "units": [
-        ["p1",1,"op","chess_char_6_03_b",2,"uniequip_002_yu",3314.01,1,67,0,93,12362,9197,9,2],
+        ["p1",1,"op","chess_char_6_03_b",2,"uniequip_002_yu",7326,1,15,0,3237,9562,15614,31,3],
-        ["p1",2,"op","chess_char_6_06_b",2,"uniequip_002_pepe",3232.9,1,11,0,31721,194,0,40,2],
+        ["p1",2,"op","chess_char_6_06_b",2,"uniequip_002_pepe",3232.9,1,11,0,22947,281,0,23,1],
-        ["p1",3,"op","chess_char_6_07_b",2,"uniequip_002_siege2",3400.3,1,17,0,54370,3026,0,60,2],
+        ["p1",3,"op","chess_char_6_07_b",2,"uniequip_002_siege2",2302.22,1,17,0,49362,1605,0,26,2],
-        ["p1",4,"op","chess_char_6_01_b",2,"uniequip_002_lemuen",724.48,1,7,2,1683832,3951,0,58,8],
+        ["p1",4,"op","chess_char_6_01_b",2,"uniequip_002_lemuen",528.27,1,7,1,2380803,4432,0,60,9],
-        ["p1",5,"op","chess_char_6_02_b",2,"uniequip_002_sbell2",2126.3,1,9,0,36128,11957,0,46,2],
+        ["p1",5,"op","chess_char_6_02_b",2,"uniequip_002_sbell2",871.14,1,9,0,37700,13770,0,46,2],
-        ["p1",6,"op","chess_char_6_04_b",2,"uniequip_002_skadi2",909.84,1,54,0,30008,11964,711,0,4],
+        ["p1",6,"op","chess_char_6_04_b",2,"uniequip_002_skadi2",719.06,1,54,0,30456,11524,527,0,4],
-        ["p1",7,"op","chess_char_6_05_b",2,"uniequip_002_pasngr",2696.54,1,13,1,82007,0,0,0,11],
+        ["p1",7,"op","chess_char_6_05_b",2,"uniequip_002_pasngr",2696.54,1,13,1,70578,0,0,0,11],
-        ["p1",8,"op","chess_char_6_08_b",2,"uniequip_002_reed2",1834.8,1,19,0,55745,0,5536,58,2],
+        ["p1",8,"op","chess_char_6_08_b",2,"uniequip_002_reed2",1834.8,1,19,0,54992,0,9335,73,2],
-        ["p1",9,"op","chess_char_6_09_b",0,"uniequip_002_cello",0,0,61,0,126763,9972,0,18,18],
+        ["p1",9,"op","chess_char_6_09_b",0,"uniequip_002_cello",0,0,21,1,160062,13974,0,27,27],
-        ["p1",10,"op","chess_char_6_11_b",2,"uniequip_002_mlyss",2082.3,1,59,0,23487,9115,306,76,2],
+        ["p1",10,"op","chess_char_6_11_b",2,"uniequip_002_mlyss",2082.3,1,59,0,29453,10289,306,74,2],
         ["p1",11,"token","token_10017_skadi2_dedant",null,null,138,0,28,0,0,0,0,0,null],
         ["p1",12,"token","token_10030_mlyss_wtrman",null,null,0,0,24,0,0,1670,348,4,1],
-        ["p2",13,"op","chess_char_6_15_b",2,"uniequip_002_qiubai",0,0,68,5,787713,37574,0,240,4],
+        ["p2",13,"op","chess_char_6_15_b",2,"uniequip_002_qiubai",0,0,51,4,1181207,26626,0,330,3],
-        ["p2",14,"op","chess_char_6_19_b",2,"uniequip_002_blkkgt",0,0,66,0,387018,19438,0,56,4],
+        ["p2",14,"op","chess_char_6_19_b",2,"uniequip_002_blkkgt",0,0,56,0,619703,17069,0,79,5],
-        ["p2",15,"op","chess_char_5_01_b",1,"uniequip_002_excu2",0,0,65,0,87788,9854,4620,33,2],
+        ["p2",15,"op","chess_char_5_01_b",1,"uniequip_002_excu2",0,0,12,0,19399,8026,5640,64,2],
-        ["p2",16,"op","chess_char_6_17_b",2,"uniequip_002_nearl2",6788.07,1,50,0,146420,23469,0,55,3],
+        ["p2",16,"op","chess_char_6_17_b",2,"uniequip_002_nearl2",0,0,64,1,633128,29140,0,72,3],
-        ["p2",17,"op","chess_char_6_12_b",1,"uniequip_002_rosmon",1,1,8,0,1111938,20367,0,79,3],
+        ["p2",17,"op","chess_char_6_12_b",1,"uniequip_002_rosmon",0,0,8,0,905789,18226,0,72,3],
-        ["p2",18,"op","chess_char_6_13_b",1,"uniequip_002_angel2",0,0,14,0,954332,9175,4378,255,5],
+        ["p2",18,"op","chess_char_6_13_b",1,"uniequip_002_angel2",2314.38,1,14,0,663280,10817,6140,266,5],
-        ["p2",19,"op","chess_char_6_14_b",2,"uniequip_002_lumen",3342.24,1,20,0,0,0,20321,78,1],
+        ["p2",19,"op","chess_char_6_14_b",2,"uniequip_002_lumen",0,0,20,0,0,3342,19329,77,1],
-        ["p2",20,"op","chess_char_6_16_b",2,"uniequip_002_halo2",0,0,10,0,149682,3301,904,123,3],
+        ["p2",20,"op","chess_char_6_16_b",2,"uniequip_002_halo2",0,0,10,0,102836,1583,0,121,3],
-        ["p2",21,"op","chess_char_6_18_b",2,"uniequip_002_whitw2",1854.61,1,27,0,168244,5160,0,25,3],
+        ["p2",21,"op","chess_char_6_18_b",2,"uniequip_002_whitw2",1844.61,1,27,0,352326,5115,0,25,3],
-        ["p2",22,"op","chess_char_6_20_b",2,"uniequip_002_agoat2",1548.31,1,25,0,0,14000,104098,82,2],
+        ["p2",22,"op","chess_char_6_20_b",2,"uniequip_002_agoat2",1828.31,1,25,0,0,15360,100256,80,2],
         ["-","~1","device","trap_1105_accrate",null,null,100,1,1,0,0,0,0,0,null],
         ["-","~2","device","trap_1105_accrate",null,null,100,1,2,0,0,0,0,0,null],
         ["-","~3","device","trap_1105_accrate",null,null,100,1,3,0,0,0,0,0,null],
         ["-","~4","device","trap_1105_accrate",null,null,100,1,4,0,0,0,0,0,null],
         ["-","~5","device","trap_1105_accrate",null,null,100,1,5,0,0,0,0,0,null],
         ["-","~6","device","trap_1105_accrate",null,null,100,1,6,0,0,0,0,0,null],
-        ["p2","~1","token","token_10019_nearl2_sword",null,null,1079.08,0,46,0,7456,7201,0,23,null],
+        ["p1","~1","token","token_10030_mlyss_wtrman",null,null,0,0,45,0,2647,1882,0,21,1],
-        ["p1","~1","token","token_10030_mlyss_wtrman",null,null,0,0,47,0,1126,1482,0,21,1],
+        ["p2","~1","token","token_10019_nearl2_sword",null,null,1739.66,0,47,0,7453,6540,0,21,null],
-        ["p1","~2","token","token_10030_mlyss_wtrman",null,null,0,0,48,0,336,3127,0,9,null],
+        ["p1","~2","token","token_10030_mlyss_wtrman",null,null,0,0,48,0,390,3127,0,9,null],
-        ["p1","~3","token","token_10030_mlyss_wtrman",null,null,0,0,49,0,595,1322,0,9,null],
+        ["p1","~3","token","token_10030_mlyss_wtrman",null,null,0,0,49,0,613,1322,0,10,null],
-        ["p1","~1","token","token_10040_siege2_vlion",null,null,3725.8,0,52,0,3325,274,0,7,null],
+        ["p1","~1","token","token_10040_siege2_vlion",null,null,3730,0,52,0,4750,270,0,10,null],
-        ["p1","~1","token","token_10017_skadi2_dedant",null,null,138,0,56,0,0,0,0,0,null],
+        ["p1","~1","token","token_10017_skadi2_dedant",null,null,138,0,55,0,0,0,0,0,null],
-        ["p2","~2","token","token_10019_nearl2_sword",null,null,7754.73,0,57,0,25274,440,0,13,null],
+        ["p2","~2","token","token_10019_nearl2_sword",null,null,0,0,57,0,50543,6744,0,0,null],
-        ["p1","~4","token","token_10030_mlyss_wtrman",null,null,1598,1,60,0,0,0,0,0,1],
+        ["p1","~4","token","token_10030_mlyss_wtrman",null,null,1322,1,60,0,0,310,263,0,1],
-        ["p1","~2","token","token_10017_skadi2_dedant",null,null,100,0,62,0,0,0,0,0,null],
+        ["p1","~2","token","token_10017_skadi2_dedant",null,null,100,0,61,0,0,0,0,0,null],
-        ["p1","~2","token","token_10040_siege2_vlion",null,null,4000,0,63,0,0,0,0,0,null],
+        ["p1","~2","token","token_10040_siege2_vlion",null,null,3913.91,0,62,0,0,119,0,0,null],
-        ["p2","~3","token","token_10019_nearl2_sword",null,null,1828.14,0,64,0,29315,4972,0,0,null],
+        ["p2","~3","token","token_10019_nearl2_sword",null,null,205.57,0,63,0,23627,7004,0,0,null],
-        ["p1","~3","token","token_10017_skadi2_dedant",null,null,100,1,69,0,0,0,0,0,null]
+        ["p1","~3","token","token_10017_skadi2_dedant",null,null,100,1,65,0,0,0,0,0,null]
       ],
       "enemies": {
-        "enemy_1267_nhpbr_2": [6,6,0,1850,141894],
+        "enemy_1267_nhpbr_2": [6,6,0,1900,141894],
-        "enemy_9007_acelem": [2,2,0,14922,309587],
+        "enemy_9007_acelem": [2,2,0,13271,309587],
-        "enemy_9017_achunt_2": [2,0,0,60627,2340536],
+        "enemy_9017_achunt_2": [2,0,0,58763,2894610],
-        "enemy_9018_actrpa": [1,0,0,54457,906009],
+        "enemy_9018_actrpa": [1,0,0,61321,1190947],
-        "enemy_9019_actrpb": [1,0,0,25685,878899],
+        "enemy_9019_actrpb": [1,0,0,28448,1109516],
-        "enemy_9020_actrpc": [1,0,0,25174,1516290]
+        "enemy_9020_actrpc": [1,0,0,21621,1863552]
       },
-      "hooks": [1,67,6000,1638,1638,8422,16416,2601,28,40,86,80,295,45767,3159,20,13,0,1,35,0,16,0],
+      "hooks": [1,63,6000,1773,1773,9719,19351,3054,26,38,96,92,314,48736,3494,21,13,0,1,33,0,18,0],
-      "events": {"atk":2196,"deploy":48,"die":40,"dmg":15795,"engage":23,"fx":2189,"heal":884,"skill":166,"spawn":53,"status":745},
+      "events": {"atk":2403,"deploy":44,"die":38,"dmg":18745,"engage":22,"fx":2239,"heal":960,"skill":188,"spawn":53,"status":946},
       "fx": {
-        "airstrike": 98,
+        "airstrike": 113,
         "beam": 26,
-        "blessing": 1,
+        "blink": 5,
-        "blink": 4,
+        "bombard": 78,
-        "bombard": 72,
+        "bombardShell": 78,
-        "bombardShell": 72,
+        "burst": 18,
-        "burst": 16,
         "camouflage": 1,
         "copy": 3,
         "dash": 24,
-        "displace": 16,
+        "displace": 17,
         "dp": 2,
-        "drone": 333,
+        "drone": 334,
         "droneLock": 11,
         "drones": 3,
-        "extraAttack": 8,
+        "extraAttack": 23,
-        "finale": 4,
+        "finale": 5,
-        "firewall": 2,
+        "firewall": 3,
         "garrisonGrant": 1,
-        "lightning": 129,
+        "lightning": 118,
         "link": 1141,
-        "lock": 72,
+        "lock": 78,
         "lure": 2,
         "phase": 11,
         "radiantSword": 3,
         "revive": 3,
-        "scorchBurst": 1,
+        "shieldBreak": 9,
-        "shieldBreak": 10,
+        "slash": 55,
-        "slash": 44,
+        "snow": 26,
-        "snow": 30,
         "split": 2,
         "steal": 5,
         "storm": 11,
         "summon": 5,
-        "sunBurst": 2,
+        "sunBurst": 4,
         "talent": 4,
         "tide": 4,
         "undying": 1,
         "wanted": 6,
         "zone": 6
       },
-      "snaps": "8b102142 ac8eb78f 45c19500 1402c536 d62cd71f 4e626330 10eaddfb 347014af 3d073b2e 390cd025 a65f5bb7 476a7aff 1e98e749 c2e576f2 c1e6ac20 65078f40 91b7683e c9b32000 7ff88469 f34eb3d3"
+      "snaps": "8b102142 7109c20e 6cb62905 cd421024 07699f86 52b1f74f 9eb6286f 13679ac3 4a76f2fe f3f7a2a9 bfaa974c 4043041c 78cb5e5f e4afd571 ee6c6d9a fd48d22e 44c582cd 445a604a 58683b3b b2f7ef86"
     },
     "hidden-boss_9-solo": {
       "about": "假想敌：铳 solo pool 2800000: chess_char_5_08_b chess_char_5_11_b chess_char_5_05_b chess_char_5_06_b chess_char_5_13_b chess_char_5_07_b chess_char_5_02_b chess_char_5_03_b chess_char_5_10_b chess_char_5_12_b",

test/golden/matches.json

@@ -1322,7 +1322,7 @@
       "combat": "client",
       "boost": {"lp":400,"layers":300},
       "setup": {"stageId":"act1autochess_m02","bossId":"boss_5","hiddenBossId":"boss_10","factions":["TIMES","ELEMENT","DOT"]},
-      "end": {"victory":true,"roundsPassed":15,"hiddenReached":true,"hiddenCleared":true,"reason":"victory","teamLp":399,"bossPoolLeft":0,"virtualMs":113700},
+      "end": {"victory":true,"roundsPassed":15,"hiddenReached":true,"hiddenCleared":true,"reason":"victory","teamLp":397,"bossPoolLeft":0,"virtualMs":113700},
       "rng": {"setup":25,"shop":346,"waves":0,"draft":42,"bots":10350,"meta":3},
       "errors": {"engine":0,"logged":0,"sim":0,"dispatcher":0},
       "rounds": [
@@ -1385,12 +1385,12 @@
           "victory": true,
           "roundsPassed": 15,
           "eliminatedRound": null,
-          "lp": 399,
+          "lp": 397,
           "bandId": "band_paganini",
           "title": {"id":"comment_1","name":"卫戍之星","picId":"comment_icon_1","text":"对敌方领袖造成伤害最高（仅胜利时）"},
           "trophies": 0,
           "reward": 425,
-          "stats": {"activatedLayers":2279,"bossDamage":4580000,"dmgDealt":6596430,"gold":175,"itemsEquipped":25,"kills":375,"leaks":1,"lpLost":1,"merges":5,"perfectRounds":12,"refreshes":34},
+          "stats": {"activatedLayers":2279,"bossDamage":4580000,"dmgDealt":6596436,"gold":175,"itemsEquipped":25,"kills":376,"leaks":1,"lpLost":1,"merges":5,"perfectRounds":12,"refreshes":34},
           "lineup": ["4_02_b@12,7[3_08_e_a+1_02_e_b]","6_01_a@12,8[3_03_e_a+3_02_e_a]","6_16_a@11,5","3_18_a@11,8[4_11_e_a+4_05_e_b]","4_10_a@10,4[1_05_e_b]","6_05_a@10,5","4_01_b@10,6[4_06_e_a+4_05_e_a]","1_08_b@9,9[4_10_e_a]"],
           "bonds": ["arcaneShip 2/389","deputShip 0/300","egirShip 0/300","emptyShip 0/300","indomShip 0/308","investShip 0/300","kazimierzShip 0/308","kjeragShip 0/300","lateranoShip 1/320","maniShip 0/300","miraShip 0/300","preciShip 1/302","raidShip 0/300","sargonShip 0/300","siracusaShip 1/345","skillfulShip 0/335","soloShip 1/307","steadShip 0/300","suntShip 1/300","swiftShip 1/316","victoriaShip 0/300","visiShip 0/300","yanShip 0/300"]
         }

test/golden/roster.json

@@ -1010,71 +1010,71 @@
       "round": 12,
       "seed": 3545615126,
       "waveId": "act1autochess_h05",
-      "time": 230,
+      "time": 226.4,
-      "ticks": 6900,
+      "ticks": 6792,
-      "reason": "timeout",
+      "reason": "cleared",
-      "killed": 105,
+      "killed": 104,
       "total": 126,
       "unspawned": 0,
       "bossHpLeft": null,
-      "rngDraws": 633,
+      "rngDraws": 605,
       "errors": {"count":0,"kinds":[]},
       "players": {
         "p1": {
-          "killed": 105,
+          "killed": 104,
           "total": 126,
           "perfect": false,
-          "leaks": 22,
+          "leaks": 23,
           "leaksUncounted": 0,
           "coins": 10,
-          "dmg": 5000855,
+          "dmg": 4885870,
           "bossDmg": 0,
-          "heal": 92236,
+          "heal": 80735,
-          "deaths": 4,
+          "deaths": 7,
           "layerGains": {"preciShip":4}
         }
       },
       "units": [
-        ["p1",1,"op","chess_char_5_19_b",2,"uniequip_002_mlynar",4297.7,1,2,18,602485,3572,935,94,5],
+        ["p1",1,"op","chess_char_5_19_b",2,"uniequip_002_mlynar",4297.7,1,130,8,555859,4578,280,79,4],
-        ["p1",2,"op","chess_char_6_03_a",2,null,4459.95,1,4,1,125610,20086,15136,82,3],
+        ["p1",2,"op","chess_char_6_03_a",2,null,2973.3,1,122,1,90690,18321,9211,67,2],
-        ["p1",3,"op","chess_char_6_06_a",2,null,2445.3,1,139,7,554612,19329,583,71,2],
+        ["p1",3,"op","chess_char_6_06_a",2,null,2445.3,1,135,8,553051,18507,837,91,2],
-        ["p1",4,"op","chess_char_5_17_b",1,"uniequip_002_f12yin",3011.8,1,8,9,204346,33430,14620,337,1],
+        ["p1",4,"op","chess_char_5_17_b",1,"uniequip_002_f12yin",3011.8,1,8,8,248468,28911,11557,331,1],
-        ["p1",5,"op","chess_char_5_20_b",2,"uniequip_002_aglina",1520.2,1,10,2,144300,0,0,44,5],
+        ["p1",5,"op","chess_char_5_20_b",2,"uniequip_002_aglina",1520.2,1,10,2,160362,0,0,48,5],
-        ["p1",6,"op","chess_char_5_21_b",1,"uniequip_002_sntlla",1791.9,1,85,1,319504,3362,889,122,3],
+        ["p1",6,"op","chess_char_5_21_b",1,"uniequip_002_sntlla",1791.9,1,85,1,369795,3362,889,125,3],
-        ["p1",7,"op","chess_char_5_22_b",1,"uniequip_002_nymph",1772.1,1,1,1,13078,1242,569,7,3],
+        ["p1",7,"op","chess_char_5_22_b",1,"uniequip_002_nymph",1772.1,1,128,1,4914,2027,255,5,3],
-        ["p1",8,"op","chess_char_5_23_b",1,"uniequip_002_reckpr",1771,1,3,0,0,1352,54601,78,4],
+        ["p1",8,"op","chess_char_5_23_b",1,"uniequip_002_reckpr",1771,1,127,0,0,4860,52445,66,4],
-        ["p1",9,"op","chess_char_6_01_a",2,null,1273.8,1,5,38,1233629,1462,645,97,5],
+        ["p1",9,"op","chess_char_6_01_a",2,null,1273.8,1,5,43,1148844,1462,452,98,5],
-        ["p1",10,"op","chess_char_6_02_a",2,null,1855.7,1,7,23,1379878,2121,288,76,3],
+        ["p1",10,"op","chess_char_6_02_a",2,null,1855.7,1,7,27,1342901,1863,429,73,3],
-        ["p1",11,"op","chess_char_6_04_a",2,null,1322.2,1,9,3,102446,10462,1863,0,4],
+        ["p1",11,"op","chess_char_6_04_a",2,null,1322.2,1,9,0,96272,9110,2272,0,4],
-        ["p1",12,"op","chess_char_6_05_a",2,null,1336.5,1,59,2,320966,3845,2107,69,5],
+        ["p1",12,"op","chess_char_6_05_a",2,null,1336.5,1,59,3,314713,3845,2107,69,5],
         ["p1",13,"token","token_10017_skadi2_dedant",null,null,100,0,13,0,0,0,0,0,null],
         ["p1","~1","token","token_10017_skadi2_dedant",null,null,100,0,60,0,0,0,0,0,null],
         ["p1","~2","token","token_10017_skadi2_dedant",null,null,100,0,101,0,0,0,0,0,null],
-        ["p1","~3","token","token_10017_skadi2_dedant",null,null,100,0,141,0,0,0,0,0,null],
+        ["p1","~3","token","token_10017_skadi2_dedant",null,null,100,0,144,0,0,0,0,0,null],
-        ["p1","~4","token","token_10017_skadi2_dedant",null,null,100,1,149,0,0,0,0,0,null]
+        ["p1","~4","token","token_10017_skadi2_dedant",null,null,100,1,152,0,0,0,0,0,null]
       ],
       "enemies": {
-        "enemy_10045_parrot": [1,0,1,0,53667],
+        "enemy_10045_parrot": [1,0,1,0,59936],
-        "enemy_10098_crhro": [1,0,1,6535,161143],
+        "enemy_10098_crhro": [1,1,0,8773,185752],
-        "enemy_10124_uashld_2": [12,8,3,46823,1543522],
+        "enemy_10124_uashld_2": [12,9,3,44779,1527741],
         "enemy_1019_jshoot_2": [1,1,0,1629,16718],
-        "enemy_1043_zomsbr": [72,62,10,101,1105813],
+        "enemy_1043_zomsbr": [72,61,11,66,1082509],
-        "enemy_1061_zomshd": [30,26,4,12386,1814925],
+        "enemy_1061_zomshd": [30,25,5,9861,1798745],
         "enemy_1072_dlancer": [1,1,0,271,37150],
-        "enemy_1165_duhond": [1,1,0,86,17337],
+        "enemy_1165_duhond": [1,1,0,0,17337],
         "enemy_1196_msfyin_2": [1,1,0,0,9],
-        "enemy_1209_sfden_2": [1,1,0,781,111451],
+        "enemy_1209_sfden_2": [1,1,0,2344,111451],
-        "enemy_1210_msfden_2": [1,0,1,0,36],
+        "enemy_1210_msfden_2": [1,0,1,0,13],
-        "enemy_1273_stmgun_2": [1,1,0,26361,111451],
+        "enemy_1273_stmgun_2": [1,0,1,23833,36689],
         "enemy_1355_mrfly": [1,1,0,0,37150],
         "enemy_1433_dsbasi_2": [1,1,0,0,35293],
         "enemy_2001_duckmi_2": [1,1,0,0,37150],
-        "enemy_9006_actoxi": [1,0,1,0,25174]
+        "enemy_9006_actoxi": [1,0,1,0,5530]
       },
-      "hooks": [1,148,6900,1084,1158,7800,8054,66853,109,134,43,38,29,40854,1160,49,127,21,1,125,2,12,7],
+      "hooks": [1,151,6792,1051,1131,7506,7729,62877,111,138,41,38,29,39389,1162,40,127,23,1,120,2,9,8],
-      "events": {"atk":2485,"bounty":5,"deploy":21,"die":113,"dmg":7974,"engage":10,"fx":604,"heal":118,"layer":2,"leak":21,"skill":81,"spawn":144,"status":2762},
+      "events": {"atk":2382,"bounty":5,"deploy":24,"die":115,"dmg":7649,"engage":10,"fx":578,"heal":102,"layer":2,"leak":23,"skill":79,"spawn":144,"status":2786},
-      "fx": {"aoe":8,"bombard":29,"bombardShell":29,"burst":12,"crit":66,"dodge":7,"explode":30,"firewall":3,"garrison":2,"iceSpike":99,"lightning":139,"lock":29,"lure":3,"revive":1,"snow":74,"soul":1,"sp":1,"storm":5,"summon":1,"talent":1,"telegraph":7,"tide":4,"wanted":48,"weightless":5},
+      "fx": {"aoe":7,"bombard":29,"bombardShell":29,"burst":9,"crit":56,"dodge":8,"explode":29,"firewall":2,"garrison":2,"iceSpike":99,"lightning":127,"lock":29,"lure":3,"revive":1,"snow":75,"sp":2,"storm":5,"summon":1,"talent":1,"telegraph":8,"tide":4,"wanted":47,"weightless":5},
-      "snaps": "fe3def4e 60ce0e98 68e4eff1 0ab18079 e3445176 db32929f bf23ff70 1142d3b6 bc663bbd dde23a5f 8df8a873 85d69b81 c70cdc4f 94132718 683de6ff 1eccc1af f1c61b7b 2bf8e444 50898a85 e25629e3 913e8ab6 2f3a3189 fa6f8200"
+      "snaps": "fe3def4e d483c136 ee2f3c0d 07a1e547 9d76e528 885dce23 cc4899ef 0f9faea8 eff043fe 32300c6f 2224c6d6 e3df2d18 9d122a08 27bee743 0d07fc4f f4421c12 c5ec3c4a fe540660 e802505f c9d74e16 6b47afbe e6a0a4fc 8246b490"
     },
     "roster-017": {
       "about": "pass 0 band 6: chess_char_6_15_a chess_char_6_19_a chess_char_6_07_a chess_char_6_17_a chess_char_6_08_a chess_char_6_09_a chess_char_6_11_a chess_char_6_12_a chess_char_6_13_a chess_char_6_14_a chess_char_6_16_a chess_char_6_18_a",
@@ -1186,14 +1186,14 @@
         ["p1",2,"op","chess_char_6_06_b",2,"uniequip_002_pepe",3982.93,1,6,0,0,0,0,0,0],
         ["p1",3,"op","chess_char_6_07_b",2,"uniequip_002_siege2",4202.48,1,9,0,0,0,0,0,0],
         ["p1",4,"op","chess_char_6_20_a",2,null,1676.38,1,4,0,0,0,20803,39,2],
-        ["p1",5,"op","chess_char_6_01_b",2,"uniequip_002_lemuen",1992.14,1,7,13,153989,0,0,16,4],
+        ["p1",5,"op","chess_char_6_01_b",2,"uniequip_002_lemuen",1992.14,1,7,13,153506,0,0,16,4],
         ["p1",6,"op","chess_char_6_02_b",2,"uniequip_002_sbell2",4745.9,1,10,6,54184,1175,228,9,2],
         ["p1",7,"op","chess_char_6_04_b",2,"uniequip_002_skadi2",2165.61,1,13,3,29280,9361,158,0,4],
         ["p1",8,"op","chess_char_6_05_b",2,"uniequip_002_pasngr",0,0,15,14,202987,9152,2841,37,7],
-        ["p1",9,"op","chess_char_6_08_b",2,"uniequip_002_reed2",2260.47,1,5,5,59266,0,1426,10,1],
+        ["p1",9,"op","chess_char_6_08_b",2,"uniequip_002_reed2",2260.47,1,5,4,59611,0,1426,10,1],
         ["p1",10,"op","chess_char_6_09_b",0,"uniequip_002_cello",1791.57,1,8,0,6356,0,0,7,7],
         ["p1",11,"op","chess_char_6_11_b",2,"uniequip_002_mlyss",2565.39,1,11,20,142679,1500,198,131,4],
-        ["p1",12,"op","chess_char_6_12_b",1,"uniequip_002_rosmon",5309.4,1,14,55,826198,6437,628,72,4],
+        ["p1",12,"op","chess_char_6_12_b",1,"uniequip_002_rosmon",5309.4,1,14,56,826336,6437,628,72,4],
         ["p1",13,"token","token_10017_skadi2_dedant",null,null,100,0,16,0,0,0,0,0,null],
         ["p1",14,"token","token_10030_mlyss_wtrman",null,null,2540.38,1,12,3,41803,1886,0,88,1],
         ["-","~1","device","trap_1105_accrate",null,null,100,1,1,0,0,0,0,0,null],
@@ -1226,10 +1226,10 @@
         "enemy_2002_bearmi_2": [1,1,0,0,18248],
         "enemy_9008_acbunn": [1,1,0,2467,19907]
       },
-      "hooks": [1,146,5846,504,504,1218,1369,3207,125,131,36,33,31,25088,308,7,122,0,1,125,11,7,0],
+      "hooks": [1,146,5846,504,504,1219,1370,3207,125,131,36,33,31,25088,308,7,122,0,1,125,11,7,0],
-      "events": {"atk":591,"bounty":6,"deploy":22,"die":131,"dmg":1289,"engage":13,"fx":228,"heal":168,"layer":11,"skill":69,"spawn":146,"status":364},
+      "events": {"atk":591,"bounty":6,"deploy":22,"die":131,"dmg":1290,"engage":13,"fx":227,"heal":168,"layer":11,"skill":69,"spawn":146,"status":363},
-      "fx": {"beam":2,"bombard":31,"bombardShell":31,"burst":7,"camouflage":2,"copy":1,"dp":4,"explode":1,"garrison":8,"lightning":66,"link":1,"lock":31,"lure":2,"scorchBurst":13,"snow":7,"split":5,"storm":7,"summon":2,"talent":1,"tide":4,"wanted":2},
+      "fx": {"beam":2,"bombard":31,"bombardShell":31,"burst":7,"camouflage":2,"copy":1,"dp":4,"explode":1,"garrison":8,"lightning":66,"link":1,"lock":31,"lure":2,"scorchBurst":13,"snow":7,"split":5,"storm":7,"summon":2,"talent":1,"tide":4,"wanted":1},
-      "snaps": "85a627d3 96b74913 f90578ee a9fd1fc6 5eaea080 d5ef9005 d2e35af4 da0ca331 5e774d9b 26fb09a6 1d5f2ae1 bd96d3b0 f279a102 a2c30780 23dc3a8d 56797f32 ac6bc567 0e96ba48 ccf97cae d84f723b"
+      "snaps": "85a627d3 96b74913 f90578ee a9fd1fc6 5eaea080 563d470a 946ba347 17f1a6ce 3be5d3d0 26a8e7d1 dbd5870e 610edc77 1c25b4f9 a09dc00f 00aca81a 93037509 3c01cab8 f7120d47 9c67edb5 51295128"
     },
     "roster-019": {
       "about": "pass 0 band 7: chess_char_6_15_b chess_char_6_19_b chess_char_5_01_b chess_char_5_05_b chess_char_6_17_b chess_char_6_13_b chess_char_6_14_b chess_char_6_16_b chess_char_6_18_b chess_char_6_20_b chess_char_5_02_b chess_char_5_03_b",
@@ -2166,12 +2166,12 @@
         ["p1",3,"op","chess_char_6_07_a",0,null,2420,1,5,0,0,0,0,0,0],
         ["p1",4,"op","chess_char_5_22_b",0,"uniequip_003_nymph",1794.1,1,6,1,6276,0,0,2,1],
         ["p1",5,"op","chess_char_5_23_b",0,"none",1694,1,9,0,0,0,5122,9,9],
-        ["p1",6,"op","chess_char_6_01_a",0,null,1273.8,1,7,4,47209,0,0,19,1],
+        ["p1",6,"op","chess_char_6_01_a",0,null,1273.8,1,7,5,46801,0,0,19,1],
         ["p1",7,"op","chess_char_6_02_a",0,null,1855.7,1,10,1,13525,0,0,0,1],
         ["p1",8,"op","chess_char_6_04_a",0,null,1322.2,1,8,0,0,1242,983,0,3],
-        ["p1",9,"op","chess_char_6_05_a",0,null,1336.5,1,11,67,716733,0,0,52,34],
+        ["p1",9,"op","chess_char_6_05_a",0,null,1336.5,1,11,67,715812,0,0,52,34],
-        ["p1",10,"op","chess_char_6_08_a",0,null,1497.1,1,12,38,369898,1242,1010,140,3],
+        ["p1",10,"op","chess_char_6_08_a",0,null,1497.1,1,12,38,370818,1242,1010,140,3],
-        ["p1",11,"op","chess_char_6_09_a",1,null,1029.6,1,13,14,190879,4631,0,112,4],
+        ["p1",11,"op","chess_char_6_09_a",1,null,1029.6,1,13,13,191287,4631,0,112,4],
         ["p1",12,"op","chess_char_6_11_a",0,null,1634.6,1,2,0,0,0,0,0,0],
         ["p1",13,"token","token_10017_skadi2_dedant",null,null,100,0,14,0,0,0,0,0,null],
         ["p1",14,"token","token_10030_mlyss_wtrman",null,null,1042.2,1,3,0,0,0,0,0,1],
@@ -2192,10 +2192,10 @@
         "enemy_1511_mdrock": [1,1,0,0,43265],
         "enemy_9007_acelem": [1,1,0,0,34560]
       },
-      "hooks": [1,142,5560,344,344,549,907,981,125,128,57,54,6,14496,441,7,125,0,1,126,2,25,0],
+      "hooks": [1,142,5560,344,344,550,908,981,125,128,57,54,6,14497,442,7,125,0,1,126,2,25,0],
-      "events": {"atk":520,"bounty":4,"deploy":17,"die":128,"dmg":907,"engage":6,"fx":230,"heal":14,"layer":2,"skill":111,"spawn":142,"status":725},
+      "events": {"atk":520,"bounty":4,"deploy":17,"die":128,"dmg":908,"engage":6,"fx":229,"heal":14,"layer":2,"skill":111,"spawn":142,"status":726},
-      "fx": {"bombard":2,"bombardShell":2,"burst":25,"copy":1,"expose":118,"frostNova":1,"garrison":2,"heal":3,"phase":1,"pulse":2,"shieldBreak":1,"snow":14,"soul":2,"sp":39,"talent":1,"wanted":16},
+      "fx": {"bombard":2,"bombardShell":2,"burst":25,"copy":1,"expose":118,"frostNova":1,"garrison":2,"heal":3,"phase":1,"pulse":2,"shieldBreak":1,"snow":14,"soul":2,"sp":39,"talent":1,"wanted":15},
-      "snaps": "1fd81580 b17d7b6d d8b5abf7 7e233288 1620158d 5d003c43 27405266 e0eab1f3 962d2acd 975c3275 87710941 2597eaa3 37e9c308 8fd8d55e 1074b7b5 f56c9bd6 ba81d281 fa7b270a 71422f59"
+      "snaps": "1fd81580 e8b29c39 8fe3be2e 22869cd5 83901ef4 36107212 007246d4 0fbda2dd d9aefee2 c69d102c cac8d601 30f7a8ad 606c1bdc d241a31d d8ce3067 1c139be5 14565097 4a7b95ab ecf99e3e"
     },
     "roster-036": {
       "about": "pass 1 band 7: chess_char_6_03_b chess_char_6_15_a chess_char_6_19_a chess_char_6_17_a chess_char_6_12_a chess_char_6_13_a chess_char_6_14_a chess_char_6_16_a chess_char_6_18_a chess_char_6_20_a chess_char_6_01_b chess_char_6_02_b",
@@ -2206,14 +2206,14 @@
       "round": 13,
       "seed": 4141759642,
       "waveId": "act1autochess_h06",
-      "time": 215.43,
+      "time": 207.37,
-      "ticks": 6463,
+      "ticks": 6221,
       "reason": "cleared",
       "killed": 75,
       "total": 130,
       "unspawned": 0,
       "bossHpLeft": null,
-      "rngDraws": 184,
+      "rngDraws": 172,
       "errors": {"count":0,"kinds":[]},
       "players": {
         "p1": {
@@ -2225,7 +2225,7 @@
           "coins": 4,
           "dmg": 1156117,
           "bossDmg": 0,
-          "heal": 22619,
+          "heal": 20941,
           "deaths": 17,
           "layerGains": {"preciShip":8}
         }
@@ -2233,15 +2233,15 @@
       "units": [
         ["p1",1,"op","chess_char_6_03_b",0,"none",0,0,5,2,49206,5477,997,10,0],
         ["p1",2,"op","chess_char_6_15_a",0,null,0,0,139,0,26545,6965,0,31,3],
-        ["p1",3,"op","chess_char_6_19_a",0,null,2455.84,1,157,1,13768,13124,0,31,3],
+        ["p1",3,"op","chess_char_6_19_a",0,null,2132.82,1,157,0,11050,11412,0,24,2],
-        ["p1",4,"op","chess_char_6_17_a",0,null,3205.22,1,158,2,12768,12844,0,46,0],
+        ["p1",4,"op","chess_char_6_17_a",0,null,0,0,134,2,10900,12844,0,41,0],
         ["p1",5,"op","chess_char_6_12_a",0,null,0,0,8,1,12206,2150,0,20,4],
-        ["p1",6,"op","chess_char_6_13_a",0,null,2022.93,1,12,1,39099,6058,864,66,4],
+        ["p1",6,"op","chess_char_6_13_a",0,null,2043.36,1,12,1,39577,5895,925,66,4],
-        ["p1",7,"op","chess_char_6_14_a",0,null,1863.97,1,14,0,0,3566,10568,61,15],
+        ["p1",7,"op","chess_char_6_14_a",0,null,1863.97,1,14,0,0,3566,10425,58,15],
-        ["p1",8,"op","chess_char_6_16_a",0,null,404.84,1,4,2,174080,895,0,112,4],
+        ["p1",8,"op","chess_char_6_16_a",0,null,404.84,1,4,1,166510,895,0,109,4],
         ["p1",9,"op","chess_char_6_18_a",0,null,0,0,107,2,56257,8712,0,83,2],
-        ["p1",10,"op","chess_char_6_20_a",0,null,653.14,1,146,0,0,3814,10190,39,0],
+        ["p1",10,"op","chess_char_6_20_a",0,null,653.14,1,146,0,0,3814,8594,36,0],
-        ["p1",11,"op","chess_char_6_01_b",0,"none",1603.8,1,13,31,244016,3538,0,80,4],
+        ["p1",11,"op","chess_char_6_01_b",0,"none",1603.8,1,13,33,255694,3538,0,77,5],
         ["p1",12,"op","chess_char_6_02_b",0,"none",2296.4,1,15,33,528172,2220,0,0,17],
         ["-","~1","device","trap_1105_accrate",null,null,100,1,1,0,0,0,0,0,null],
         ["-","~2","device","trap_1105_accrate",null,null,100,1,2,0,0,0,0,0,null],
@@ -2255,14 +2255,14 @@
         "enemy_1161_tidmag": [1,1,0,3139,9953],
         "enemy_1202_msfzhi": [1,1,0,0,5],
         "enemy_1273_stmgun_2": [1,0,1,9600,10936],
-        "enemy_1402_tgshd_2": [36,8,28,16091,454822],
+        "enemy_1402_tgshd_2": [36,8,28,14955,454822],
         "enemy_1415_mmkabi_2": [1,0,1,0,40107],
         "enemy_2003_rockman": [1,0,1,904,8976]
       },
-      "hooks": [1,158,6463,665,664,1413,1671,8365,92,147,56,56,56,25016,3717,26,130,55,1,92,2,4,0],
+      "hooks": [1,157,6221,639,638,1374,1624,8342,92,147,56,54,59,23902,3684,26,130,55,1,92,2,4,0],
-      "events": {"atk":704,"bounty":2,"deploy":25,"die":92,"dmg":1456,"engage":9,"fx":675,"heal":550,"layer":2,"leak":55,"skill":112,"spawn":145,"status":890},
+      "events": {"atk":680,"bounty":2,"deploy":24,"die":92,"dmg":1417,"engage":9,"fx":644,"heal":524,"layer":2,"leak":55,"skill":110,"spawn":145,"status":871},
-      "fx": {"airstrike":14,"aoe":3,"burst":4,"displace":2,"explode":16,"expose":489,"frostNova":17,"garrison":2,"healField":15,"link":1,"phase":1,"snow":39,"sunBurst":3,"talent":7,"telegraph":2,"wanted":60},
+      "fx": {"airstrike":15,"aoe":3,"burst":4,"displace":2,"explode":16,"expose":460,"frostNova":17,"garrison":2,"healField":15,"link":1,"phase":1,"snow":37,"sunBurst":2,"talent":7,"telegraph":2,"wanted":60},
-      "snaps": "352a6117 5197ba48 22ff25c2 16105f43 67bd4112 04c5a2b1 e4e63a95 9087d64d 41e697b3 8e3b24fc fa002205 4a75e62c 71798688 e3c0247f 3b14b2c2 04aa6c52 2d90b642 4764ab7a 541b8b1e 598e0a94 d3c55a55 6007931b"
+      "snaps": "352a6117 5197ba48 10f9a2ae 33f679df 3665a8ee 49550c0d 3f360174 ce1f9cce 89c5196c 39a34bf7 31facd72 20cbae52 17caf576 03e5ee75 5a29cf38 cd4bf8d3 6a8928c3 7ccff12b 527fbb07 bf017b13 a9045a61"
     },
     "roster-037": {
       "about": "pass 1 band 7: chess_char_6_06_b chess_char_6_15_b chess_char_6_07_b chess_char_6_04_b chess_char_6_05_b chess_char_6_08_b chess_char_6_09_b chess_char_6_11_b chess_char_6_12_b chess_char_6_13_b chess_char_6_14_b chess_char_6_16_b token_10017_skadi2_dedant token_10030_mlyss_wtrman",
@@ -2773,58 +2773,70 @@
       "round": 12,
       "seed": 3997526607,
       "waveId": "act1autochess_h05",
-      "time": 183.7,
+      "time": 183.3,
-      "ticks": 5511,
+      "ticks": 5499,
       "reason": "cleared",
       "killed": 68,
       "total": 67,
       "unspawned": 0,
       "bossHpLeft": null,
-      "rngDraws": 2,
+      "rngDraws": 43,
       "errors": {"count":0,"kinds":[]},
       "players": {
-        "p1": {"killed":68,"total":67,"perfect":true,"leaks":0,"leaksUncounted":0,"coins":8,"dmg":1242089,"bossDmg":0,"heal":9493,"deaths":0,"layerGains":{"sargonShip":4}}
+        "p1": {
+          "killed": 68,
+          "total": 67,
+          "perfect": true,
+          "leaks": 0,
+          "leaksUncounted": 0,
+          "coins": 8,
+          "dmg": 1238376,
+          "bossDmg": 0,
+          "heal": 9730,
+          "deaths": 0,
+          "layerGains": {"lateranoShip":12,"preciShip":8}
+        }
       },
       "units": [
         ["p1",1,"op","chess_char_6_03_a",1,null,5054.61,1,7,0,0,0,0,0,0],
         ["p1",2,"op","chess_char_6_06_a",1,null,2445.3,1,9,1,1,0,0,1,1],
         ["p1",3,"op","chess_char_6_07_a",1,null,2420,1,10,0,0,0,0,0,0],
-        ["p1",4,"op","chess_char_6_01_a",1,null,1273.8,1,4,9,149948,0,0,54,0],
+        ["p1",4,"op","chess_char_6_01_a",1,null,1273.8,1,4,26,302286,0,0,36,3],
         ["p1",5,"op","chess_char_6_02_a",1,null,1855.7,1,5,0,0,0,0,0,0],
         ["p1",6,"op","chess_char_6_04_a",1,null,1322.2,1,11,0,0,0,0,0,1],
-        ["p1",7,"op","chess_char_6_05_a",1,null,1336.5,1,13,7,164312,0,0,27,2],
+        ["p1",7,"op","chess_char_6_05_a",1,null,1336.5,1,13,5,85739,0,0,19,2],
         ["p1",8,"op","chess_char_6_08_a",1,null,1497.1,1,6,0,0,0,0,0,0],
-        ["p1",9,"op","chess_char_6_09_a",2,null,1029.6,1,14,20,427175,842,842,116,2],
+        ["p1",9,"op","chess_char_6_09_a",2,null,1029.6,1,14,11,378876,864,864,111,2],
-        ["p1",10,"op","chess_char_6_11_a",1,null,1634.6,1,12,12,175286,0,0,100,3],
+        ["p1",10,"op","chess_char_6_11_a",1,null,1634.6,1,12,6,173885,0,0,95,3],
-        ["p1",11,"op","chess_char_6_12_a",2,null,4308.7,1,15,19,325367,5188,5188,58,2],
+        ["p1",11,"op","chess_char_6_12_a",2,null,4367.19,1,15,18,228756,5384,5403,45,2],
-        ["p1",12,"op","chess_char_6_13_a",2,null,1892,1,8,0,0,3462,3462,0,0],
+        ["p1",12,"op","chess_char_6_13_a",2,null,1892,1,8,1,68833,3462,3462,0,0],
         ["p1",13,"token","token_10017_skadi2_dedant",null,null,100,0,16,0,0,0,0,0,null],
         ["-","~1","device","trap_1105_accrate",null,null,100,1,1,0,0,0,0,0,null],
         ["-","~2","device","trap_1105_accrate",null,null,100,1,2,0,0,0,0,0,null],
         ["-","~3","device","trap_1105_accrate",null,null,100,1,3,0,0,0,0,0,null],
-        ["p1","~1","token","token_10012_rosmon_shield",null,null,4087.7,0,42,0,0,912,0,0,null],
+        ["p1","~1","token","token_10012_rosmon_shield",null,null,4770.31,0,42,0,0,230,0,0,null],
         ["p1","~2","token","token_10012_rosmon_shield",null,null,5000,0,43,0,0,0,0,0,null],
-        ["p1","~1","token","token_10017_skadi2_dedant",null,null,100,0,54,0,0,0,0,0,null],
+        ["p1","~1","token","token_10017_skadi2_dedant",null,null,100,0,51,0,0,0,0,0,null],
         ["p1","~2","token","token_10017_skadi2_dedant",null,null,100,0,72,0,0,0,0,0,null],
-        ["p1","~3","token","token_10012_rosmon_shield",null,null,2411.64,0,84,0,0,2588,0,0,null],
+        ["p1","~3","token","token_10012_rosmon_shield",null,null,2409.7,0,82,0,0,2590,0,0,null],
         ["p1","~3","token","token_10017_skadi2_dedant",null,null,100,1,91,0,0,0,0,0,null]
       ],
       "enemies": {
         "enemy_10073_mpcar": [1,1,0,0,3110],
         "enemy_1023_jmage": [1,1,0,1159,3421],
-        "enemy_1045_hammer_2": [12,12,0,7330,373248],
+        "enemy_1045_hammer_2": [12,12,0,6631,373248],
-        "enemy_1061_zomshd": [48,48,0,780,792589],
+        "enemy_1061_zomshd": [48,48,0,940,788876],
-        "enemy_1158_divman": [1,1,0,263,5132],
+        "enemy_1158_divman": [1,1,0,285,5132],
         "enemy_1199_sfjin": [1,1,0,0,10109],
         "enemy_1200_msfjin": [1,1,0,0,47],
         "enemy_1270_nhstlk_2": [1,1,0,0,24883],
-        "enemy_1402_tgshd_2": [1,1,0,0,20218],
+        "enemy_1402_tgshd_2": [1,1,0,54,20218],
         "enemy_2001_duckmi_2": [1,1,0,0,9331]
       },
-      "hooks": [1,90,5511,411,389,808,1242,9085,68,74,11,10,0,23783,611,24,68,0,1,68,2,55,0],
+      "hooks": [1,90,5499,356,338,701,1128,8573,68,74,14,12,41,25781,515,20,68,0,1,68,10,51,0],
-      "events": {"atk":434,"bounty":4,"deploy":19,"die":74,"dmg":1059,"engage":6,"fx":125,"layer":2,"skill":21,"spawn":90,"status":1257},
+      "events": {"atk":361,"bounty":4,"deploy":19,"die":74,"dmg":945,"engage":6,"fx":193,"layer":10,"skill":26,"spawn":90,"status":1102},
-      "fx": {"burst":55,"dp":3,"expose":6,"garrison":2,"link":1,"snow":5,"summon":3,"summonStun":3,"talent":1,"wanted":46},
+      "fx": {"airstrike":12,"burst":51,"crit":28,"dp":3,"expose":6,"garrison":6,"link":1,"lock":28,"snow":5,"summon":3,"summonStun":3,"talent":1,"wanted":46},
-      "snaps": "a85a8369 358bc61b 19dbb987 deedda93 c40264b9 1038c4cc d3aedff4 2e617008 2f7fb69f 789bcc77 c4b5eb58 c1328772 509e6ac3 4d9f9b59 4a6df827 d39c6dfd 10011e19 dbb943d3 26dcaf70"
+      "snaps": "a85a8369 0a33b2f2 724f8cee 96cdeaea 2a60b953 251ce27e ef31d396 4fd327c7 e1fcf4f3 2413fe96 23f1c1b9 e60d68c2 414b5196 26676467 18daab40 3c5e3c0d 5fcd0834 02715784 017438eb"
     },
     "roster-046": {
       "about": "pass 2 band 7: chess_char_6_03_b chess_char_6_15_a chess_char_6_19_a chess_char_6_17_a chess_char_6_14_a chess_char_6_16_a chess_char_6_18_a chess_char_6_20_a chess_char_6_01_b chess_char_6_02_b chess_char_6_04_b chess_char_6_05_b token_10017_skadi2_dedant",