Merge origin/main into feature/gen-modularization (생성기 모듈화)

main의 5개 PR(#62 exhaust+tooltip, #66 dex/thorns, #67 캐릭터 덱버튼 제거, #68 스크롤바, #69 표창카드)을 모듈화 브랜치에 병합. 충돌은 tools/deck/gen-slaydeck.mjs 한 파일 — main이 그 단일체를 콘텐츠 변경 (구조/emit/top-level 상수는 불변)한 반면 본 브랜치는 모듈로 재구조화. 해결: main 버전(theirs)을 취해 **콘텐츠 마커 기반으로 재모듈화**(라인인덱스 X, 이름 자동 파생) → lib/data·lib/ui-helpers + hud/*.mjs 16종 재생성. 검증(손실 0): 재모듈화 생성기 출력이 origin/main 산출물과 **바이트 동일** (diffcheck: ui/DefaultGroup.ui·SlayDeckController.codeblock IDENTICAL). common.gamelogic은 origin/main 그대로 채택(유일 차이는 main의 stale `.0` 정수표기 — origin/main 원본 생성기도 정수를 만듦을 확인). 미러 테스트 sim-balance·rogue-map 통과. RULES.md는 §1(모듈구조)+§4/§7(main) 자동 병합. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-16 07:38:54 +09:00
parent d265c8f918 255781d969
commit 420cce561c
26 changed files with 1009 additions and 882 deletions
--- a/Global/common.gamelogic
+++ b/Global/common.gamelogic
@@ -32,10 +32,10 @@
            {
              "@type": "script.SlayDeckController",
              "Enable": true,
-              "Energy": 0,
-              "MaxEnergy": 3,
-              "Turn": 0,
-              "TweenEventId": 0
+              "Energy": 0.0,
+              "MaxEnergy": 3.0,
+              "Turn": 0.0,
+              "TweenEventId": 0.0
            }
          ],
          "@version": 1
--- a/RULES.md
+++ b/RULES.md
@@ -61,6 +61,7 @@ grep -c "CalcPlayerAttack" RootDesk/MyDesk/SlayDeckController.codeblock

 - 브랜치 → 커밋(기능 단위) → push → **PR은 반드시 `node tools/git/gitea-pr.mjs`로** (인라인 `curl -d` 한글 본문은 Windows에서 CP949로 깨짐 — PR #34~41 사고).
  - 제목/본문은 UTF-8 spec JSON 파일로 작성 후 `create <spec.json>` / `merge <번호>`.
+  - PR 제목과 본문은 한국어로 작성한다.
 - 산출물 재생성 커밋은 소스 변경 커밋과 분리하거나, 메시지에 "산출물 재생성"을 명시.

 ## 5. 메이커(MSW) 연동 주의
@@ -77,3 +78,9 @@ grep -c "CalcPlayerAttack" RootDesk/MyDesk/SlayDeckController.codeblock
 |---|---|---|---|
 | 전투 규칙 | PlayCard·CalcPlayerAttack 등 | `tools/balance/sim-balance.mjs` | `node --test tools/balance/sim-balance.test.mjs` |
 | 맵 생성 | GenerateMap | `tools/map/rogue-map.mjs` | `node --test tools/map/rogue-map.test.mjs` |
+
+## 7. UI 숫자 표기
+
+- UI 텍스트에서는 정수값인 숫자에 `.0`을 붙이지 않는다. `1.0/1.0`이 아니라 `1/1`처럼 표시한다.
+- 생성기 내 Lua UI 코드에서 number 또는 숫자 문자열을 텍스트에 붙일 때는 `FormatNumber` 같은 포맷 헬퍼를 우선 사용한다.
+- 소수부가 플레이어에게 의미 있을 때만 소수점 표기를 유지한다.
--- a/RootDesk/MyDesk/SlayDeckController.codeblock
+++ b/RootDesk/MyDesk/SlayDeckController.codeblock
--- a/data/cards.json
+++ b/data/cards.json
@@ -417,6 +417,17 @@
      "desc": "피해를 6 줍니다.",
      "damage": 6
    },
+    "Shiv": {
+      "name": "표창",
+      "cost": 0,
+      "kind": "Attack",
+      "class": "shiv",
+      "rarity": "normal",
+      "desc": "피해를 4 줍니다. 소멸.",
+      "damage": 4,
+      "exhaust": true,
+      "token": true
+    },
    "DaggerSpray": {
      "name": "단검 분사",
      "cost": 1,
@@ -465,8 +476,9 @@
      "kind": "Attack",
      "class": "bandit",
      "rarity": "normal",
-      "desc": "피해를 3 줍니다. 단도를 2장 손으로 가져옵니다.",
-      "damage": 3
+      "desc": "피해를 3 줍니다. 표창을 2장 손으로 가져옵니다.",
+      "damage": 3,
+      "addShiv": 2
    },
    "FollowThrough": {
      "name": "완수",
@@ -516,7 +528,7 @@
      "class": "bandit",
      "rarity": "normal",
      "desc": "이번 턴 동안 민첩을 2 얻습니다.",
-      "draw": 1
+      "dex": 2
    },
    "Deflect": {
      "name": "튕겨내기",
@@ -530,12 +542,12 @@
    "BladeDance": {
      "name": "검무",
      "cost": 1,
-      "kind": "Attack",
+      "kind": "Skill",
      "class": "bandit",
      "rarity": "normal",
-      "desc": "단도를 3장 손으로 가져옵니다. 소멸.",
-      "damage": 4,
-      "hits": 3
+      "desc": "표창을 3장 손으로 가져옵니다. 소멸.",
+      "addShiv": 3,
+      "exhaust": true
    },
    "Backflip": {
      "name": "공중제비",
@@ -568,13 +580,12 @@
    "CloakAndDagger": {
      "name": "망토와 단검",
      "cost": 1,
-      "kind": "Attack",
+      "kind": "Skill",
      "class": "bandit",
      "rarity": "normal",
-      "desc": "방어도를 6 얻습니다. 단도를 1장 손으로 가져옵니다.",
+      "desc": "방어도를 6 얻습니다. 표창을 1장 손으로 가져옵니다.",
      "block": 6,
-      "damage": 4,
-      "hits": 1
+      "addShiv": 1
    },
    "DeadlyPoison": {
      "name": "맹독",
@@ -727,13 +738,12 @@
    "HiddenDaggers": {
      "name": "숨겨진 단검",
      "cost": 0,
-      "kind": "Attack",
+      "kind": "Skill",
      "class": "bandit",
      "rarity": "unique",
-      "desc": "카드를 2장 버립니다. 단도를 2장 손으로 가져옵니다.",
-      "damage": 4,
-      "hits": 2,
-      "discard": 2
+      "desc": "카드를 2장 버립니다. 표창을 2장 손으로 가져옵니다.",
+      "discard": 2,
+      "addShiv": 2
    },
    "EscapePlan": {
      "name": "탈출구",
@@ -813,12 +823,11 @@
    "UpMySleeve": {
      "name": "비책",
      "cost": 2,
-      "kind": "Attack",
+      "kind": "Skill",
      "class": "bandit",
      "rarity": "unique",
-      "desc": "단도를 3장 손으로 가져옵니다. 이 카드의 비용이 1 감소합니다.",
-      "damage": 4,
-      "hits": 3
+      "desc": "표창을 3장 손으로 가져옵니다. 이 카드의 비용이 1 감소합니다.",
+      "addShiv": 3
    },
    "BouncingFlask": {
      "name": "탄성 플라스크",
@@ -873,12 +882,11 @@
    "InfiniteBlades": {
      "name": "무한의 검날",
      "cost": 1,
-      "kind": "Attack",
+      "kind": "Power",
      "class": "bandit",
      "rarity": "unique",
-      "desc": "내 턴 시작 시, 단도를 1장 손으로 가져옵니다.",
-      "damage": 4,
-      "hits": 1
+      "desc": "내 턴 시작 시, 표창을 1장 손으로 가져옵니다.",
+      "turnStartShiv": 1
    },
    "Footwork": {
      "name": "발놀림",
@@ -887,8 +895,7 @@
      "class": "bandit",
      "rarity": "unique",
      "desc": "민첩을 2 얻습니다.",
-      "powerEffect": "blockPerTurn",
-      "value": 2
+      "dex": 2
    },
    "Outbreak": {
      "name": "발병",
@@ -919,7 +926,7 @@
      "kind": "Power",
      "class": "bandit",
      "rarity": "unique",
-      "desc": "단도의 피해량이 4 증가합니다.",
+      "desc": "표창의 피해량이 4 증가합니다.",
      "powerEffect": "strengthPerTurn",
      "value": 1
    },
@@ -929,7 +936,7 @@
      "kind": "Power",
      "class": "bandit",
      "rarity": "unique",
-      "desc": "단도가 보존을 얻습니다. 매 턴마다 처음으로 사용하는 단도의 피해량이 9 증가합니다.",
+      "desc": "표창이 보존을 얻습니다. 매 턴마다 처음으로 사용하는 표창의 피해량이 9 증가합니다.",
      "powerEffect": "strengthPerTurn",
      "value": 1
    },
@@ -1019,9 +1026,9 @@
      "kind": "Skill",
      "class": "bandit",
      "rarity": "legend",
-      "desc": "손에 있는 모든 카드를 버립니다. 버린 카드의 수만큼 단도를 손으로 가져옵니다.",
-      "draw": 1,
-      "discardAll": true
+      "desc": "손에 있는 모든 카드를 버립니다. 버린 카드의 수만큼 표창을 손으로 가져옵니다.",
+      "discardAll": true,
+      "addShivPerDiscard": true
    },
    "ShadowStep": {
      "name": "그림자 걸음",
@@ -1054,12 +1061,11 @@
    "BladeOfInk": {
      "name": "잉크 칼날",
      "cost": 1,
-      "kind": "Attack",
+      "kind": "Skill",
      "class": "bandit",
      "rarity": "legend",
-      "desc": "잉크투성이 단도를 2장 손으로 가져옵니다.",
-      "damage": 4,
-      "hits": 2
+      "desc": "잉크투성이 표창을 2장 손으로 가져옵니다.",
+      "addShiv": 2
    },
    "Burst": {
      "name": "폭주",
@@ -1076,7 +1082,7 @@
      "kind": "Skill",
      "class": "bandit",
      "rarity": "legend",
-      "desc": "대상 적에게 소멸된 카드 더미에 있는 모든 단도를 사용합니다.",
+      "desc": "대상 적에게 소멸된 카드 더미에 있는 모든 표창을 사용합니다.",
      "draw": 1
    },
    "BulletTime": {
@@ -1165,14 +1171,13 @@
    "FanOfKnives": {
      "name": "칼날 부채",
      "cost": 2,
-      "kind": "Attack",
+      "kind": "Skill",
      "class": "bandit",
      "rarity": "legend",
-      "desc": "단도가 이제 모든 적을 대상으로 합니다. 단도를 4장 손으로 가져옵니다.",
+      "desc": "표창이 이제 모든 적을 대상으로 합니다. 표창을 4장 손으로 가져옵니다.",
      "powerEffect": "strengthPerTurn",
      "value": 1,
-      "damage": 4,
-      "hits": 4
+      "addShiv": 4
    },
    "SerpentForm": {
      "name": "구렁이의 형상",
@@ -1192,8 +1197,8 @@
      "class": "bandit",
      "rarity": "legend",
      "desc": "교활. 민첩을 1 얻습니다. 가시를 4 얻습니다.",
-      "powerEffect": "blockPerTurn",
-      "value": 2,
+      "dex": 1,
+      "thorns": 4,
      "sly": true
    },
    "Suppress": {
--- a/tools/balance/sim-balance.mjs
+++ b/tools/balance/sim-balance.mjs
@@ -108,9 +108,10 @@ export function simulateCombat(data, rng, stats) {
  if (monsters.length === 0) return { win: true, turns: 0, playerHpRemaining: PLAYER_HP };
  let drawPile = shuffle(starterDeck, rng);
  let discard = [];
+  const exhaust = [];
  let hand = [];
  let pHp = PLAYER_HP, pBlock = 0;
-  let pStr = 0, pWeak = 0, pVuln = 0;
+  let pStr = 0, pDex = 0, pThorns = 0, pWeak = 0, pVuln = 0;
  const powers = [];
  const mob = monsters.map((m) => ({
    name: m.name, hp: m.maxHp, maxHp: m.maxHp, block: 0, str: 0, weak: 0, vuln: 0, poison: 0,
@@ -130,10 +131,17 @@ export function simulateCombat(data, rng, stats) {
      } else hand.push(card);
    }
  }
+  function addCardsToHand(id, n) {
+    for (let k = 0; k < n; k++) {
+      if (hand.length >= 10) discard.push(id);
+      else hand.push(id);
+    }
+  }
  const aliveList = () => mob.filter((m) => m.alive);
  function resolveCardEffects(id, c, costSpent, recordStats = true) {
    const alive = aliveList();
    let dmg = 0;
+    let blockGained = 0;
    if (c.kind === 'Attack') {
      if (alive.length && c.damage) {
        const target = chooseTarget(alive, calcAttack(c.damage || 0, pStr, pWeak, 0));
@@ -162,11 +170,11 @@ export function simulateCombat(data, rng, stats) {
          if (target.hp <= 0) target.alive = false;
        }
      }
-      if (c.block) pBlock += c.block;
+      if (c.block) { blockGained = Math.max(0, c.block + pDex); pBlock += blockGained; }
    } else if (c.kind === 'Power') {
-      if (c.powerEffect && recordStats) powers.push(id);
+      if (recordStats) powers.push(id);
    } else {
-      pBlock += c.block || 0;
+      if (c.block) { blockGained = Math.max(0, c.block + pDex); pBlock += blockGained; }
      if ((c.weak || c.vuln || c.poison) && alive.length) {
        const target = chooseTarget(alive, 0);
        if (c.weak) target.weak += c.weak;
@@ -175,10 +183,13 @@ export function simulateCombat(data, rng, stats) {
      }
    }
    if (c.strength) pStr += c.strength;
+    if (c.dex) pDex += c.dex;
+    if (c.thorns) pThorns += c.thorns;
    if (c.selfVuln) pVuln += c.selfVuln;
    if (c.heal) pHp = Math.min(pHp + c.heal, PLAYER_HP);
    if (c.draw) draw(c.draw);
-    if (recordStats && stats) stats[id] = bump(stats[id], costSpent, dmg, c.block || 0);
+    if (c.addShiv && !c.discard && c.discardAll !== true) addCardsToHand('Shiv', c.addShiv);
+    if (recordStats && stats) stats[id] = bump(stats[id], costSpent, dmg, blockGained);
  }
  function triggerSly(id) {
    const c = cards[id];
@@ -192,12 +203,15 @@ export function simulateCombat(data, rng, stats) {
    if (trigger) triggerSly(id);
  }
  function applyDiscardEffects(c) {
+    let discarded = 0;
    if (c.discardAll) {
-      while (hand.length) discardHandCard(hand.length - 1, true);
+      while (hand.length) { discardHandCard(hand.length - 1, true); discarded++; }
    } else if (c.discard) {
      const n = Math.min(c.discard, hand.length);
-      for (let i = 0; i < n; i++) discardHandCard(hand.length - 1, true);
+      for (let i = 0; i < n; i++) { discardHandCard(hand.length - 1, true); discarded++; }
    }
+    if (c.addShiv && (c.discard || c.discardAll === true)) addCardsToHand('Shiv', c.addShiv);
+    if (c.addShivPerDiscard === true) addCardsToHand('Shiv', discarded);
  }

  while (turns < MAX_TURNS) {
@@ -211,6 +225,7 @@ export function simulateCombat(data, rng, stats) {
      if (pc.powerEffect === 'strengthPerTurn') pStr += pc.value;
      else if (pc.powerEffect === 'energyPerTurn') energyBonus += pc.value;
      else if (pc.powerEffect === 'blockPerTurn') pBlock += pc.value;
+      if (pc.turnStartShiv) addCardsToHand('Shiv', pc.turnStartShiv);
    }
    let energy = ENERGY + energyBonus; draw(HAND_SIZE);
    while (true) {
@@ -222,7 +237,8 @@ export function simulateCombat(data, rng, stats) {
      energy -= c.cost;
      resolveCardEffects(id, c, c.cost);
      hand.splice(idx, 1);
-      if (c.kind !== 'Power') discard.push(id);
+      if (c.exhaust === true || String(c.desc || '').includes('소멸.')) exhaust.push(id);
+      else if (c.kind !== 'Power') discard.push(id);
      applyDiscardEffects(c);
      if (aliveList().length === 0) return { win: true, turns, playerHpRemaining: pHp };
    }
@@ -255,7 +271,12 @@ export function simulateCombat(data, rng, stats) {
      if (it) {
        if (it.kind === 'Attack') {
          const atk = calcAttack(it.value, m.str, m.weak, pVuln);
+          const beforeHp = pHp;
          const r = applyDamage(pHp, pBlock, atk); pHp = r.hp; pBlock = r.block;
+          if (beforeHp > pHp && pThorns > 0) {
+            m.hp -= pThorns;
+            if (m.hp <= 0) m.alive = false;
+          }
        } else if (it.kind === 'Defend') { m.block += it.value; }
        else if (it.kind === 'Debuff') {
          if (it.effect === 'weak') pWeak += it.value;
--- a/tools/balance/sim-balance.test.mjs
+++ b/tools/balance/sim-balance.test.mjs
@@ -405,3 +405,59 @@ test("simulateCombat: retain keeps card in hand across turns", () => {
  assert.equal(r.win, true);
  assert.equal(r.turns, 2);
 });
+
+test("simulateCombat: exhaust cards do not return through discard reshuffle", () => {
+  const data = {
+    cards: {
+      BurnOut: { name: "BurnOut", cost: 1, kind: "Attack", damage: 10, exhaust: true },
+    },
+    starterDeck: ["BurnOut"],
+    monsters: [{ name: "Dummy", maxHp: 12, intents: [{ kind: "Defend", value: 0 }] }],
+  };
+  const r = simulateCombat(data, mulberry32(1));
+  assert.equal(r.win, false);
+  assert.equal(r.draw, true);
+});
+
+test("simulateCombat: dex increases block gained from cards", () => {
+  const data = {
+    cards: {
+      Footwork: { name: "Footwork", cost: 1, kind: "Power", dex: 2 },
+      Defend: { name: "Defend", cost: 1, kind: "Skill", block: 5 },
+    },
+    starterDeck: ["Footwork", "Defend"],
+    monsters: [{ name: "Dummy", maxHp: 99, intents: [{ kind: "Attack", value: 6 }] }],
+  };
+  const r = simulateCombat(data, () => 0.999999);
+  assert.equal(r.win, false);
+  assert.equal(r.draw, true);
+  assert.equal(r.playerHpRemaining, 80);
+});
+
+test("simulateCombat: thorns reflects unblocked attack damage", () => {
+  const data = {
+    cards: {
+      Spikes: { name: "Spikes", cost: 1, kind: "Power", thorns: 4 },
+    },
+    starterDeck: ["Spikes"],
+    monsters: [{ name: "Dummy", maxHp: 4, intents: [{ kind: "Attack", value: 1 }] }],
+  };
+  const r = simulateCombat(data, () => 0.999999);
+  assert.equal(r.win, true);
+  assert.equal(r.turns, 1);
+  assert.equal(r.playerHpRemaining, 79);
+});
+
+test("simulateCombat: addShiv creates shuriken cards in hand", () => {
+  const data = {
+    cards: {
+      MakeShiv: { name: "MakeShiv", cost: 0, kind: "Skill", addShiv: 2 },
+      Shiv: { name: "표창", cost: 0, kind: "Attack", damage: 4, exhaust: true },
+    },
+    starterDeck: ["MakeShiv"],
+    monsters: [{ name: "Dummy", maxHp: 8, intents: [{ kind: "Attack", value: 0 }] }],
+  };
+  const r = simulateCombat(data, () => 0.999999);
+  assert.equal(r.win, true);
+  assert.equal(r.turns, 1);
+});
--- a/tools/deck/gen-slaydeck.mjs
+++ b/tools/deck/gen-slaydeck.mjs
@@ -1,6 +1,7 @@
 import { readFileSync, writeFileSync } from 'node:fs';

-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from './lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from './lib/data.mjs';
+import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from './lib/ui-helpers.mjs';
 import { buildDeckHud } from './hud/deckhud.mjs';
 import { buildDeckInspect } from './hud/deckinspect.mjs';
 import { buildDeckAll } from './hud/deckall.mjs';
@@ -18,7 +19,6 @@ import { buildSoulShop } from './hud/soulshop.mjs';
 import { buildMainMenu } from './hud/mainmenu.mjs';
 import { buildCharSelect } from './hud/charselect.mjs';

-import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from './lib/ui-helpers.mjs';
 function upsertUi() {
  const ui = JSON.parse(readFileSync(UI_FILE, 'utf8'));
  const E = ui.ContentProto.Entities;
@@ -301,6 +301,7 @@ function writeCodeblocks() {
  const combat = codeblock('SlayDeckController', 'SlayDeckController', [
    prop('any', 'DrawPile'),
    prop('any', 'DiscardPile'),
+    prop('any', 'ExhaustPile'),
    prop('any', 'Hand'),
    prop('number', 'Energy', '0'),
    prop('number', 'MaxEnergy', '3'),
@@ -313,9 +314,6 @@ function writeCodeblocks() {
    prop('any', 'WarriorSelectHandler'),
    prop('any', 'ThiefSelectHandler'),
    prop('any', 'MageSelectHandler'),
-    prop('any', 'WarriorDeckHandler'),
-    prop('any', 'ThiefDeckHandler'),
-    prop('any', 'MageDeckHandler'),
    prop('any', 'WarriorDeckTabHandler'),
    prop('any', 'ThiefDeckTabHandler'),
    prop('any', 'MageDeckTabHandler'),
@@ -330,6 +328,7 @@ function writeCodeblocks() {
    prop('string', 'SelectedClass', '""'),
    prop('any', 'DrawPileHandler'),
    prop('any', 'DiscardPileHandler'),
+    prop('any', 'ExhaustPileHandler'),
    prop('any', 'DeckInspectCloseHandler'),
    prop('any', 'AllDeckHandler'),
    prop('any', 'AllDeckCloseHandler'),
@@ -354,6 +353,8 @@ function writeCodeblocks() {
    prop('number', 'PlayerHp', '0'),
    prop('number', 'PlayerMaxHp', '80'),
    prop('number', 'PlayerBlock', '0'),
+    prop('number', 'PlayerDex', '0'),
+    prop('number', 'PlayerThorns', '0'),
    prop('boolean', 'CombatOver', 'false'),
    prop('any', 'Monsters'),
    prop('any', 'Registered'),
@@ -399,6 +400,8 @@ function writeCodeblocks() {
    prop('string', 'PlayerJob', '""'),
    prop('number', 'DiscardSelectRemaining', '0'),
    prop('number', 'DiscardSelectTotal', '0'),
+    prop('number', 'DiscardPostShiv', '0'),
+    prop('number', 'DiscardShivPerPick', '0'),
  ], [
    method('OnBeginPlay', `${luaCardsTable(CARDS.cards)}
 ${luaFramesTable()}
@@ -541,30 +544,6 @@ if mage ~= nil and mage.ButtonComponent ~= nil then
 	end
 	self.MageSelectHandler = mage:ConnectEvent(ButtonClickEvent, function() self:SelectClass("magician") end)
 end
-local warriorDeck = _EntityService:GetEntityByPath("/ui/DefaultGroup/CharacterSelectHud/WarriorDeckButton")
-if warriorDeck ~= nil and warriorDeck.ButtonComponent ~= nil then
-	if self.WarriorDeckHandler ~= nil then
-		warriorDeck:DisconnectEvent(ButtonClickEvent, self.WarriorDeckHandler)
-		self.WarriorDeckHandler = nil
-	end
-	self.WarriorDeckHandler = warriorDeck:ConnectEvent(ButtonClickEvent, function() self:OpenClassDeck("warrior") end)
-end
-local thiefDeck = _EntityService:GetEntityByPath("/ui/DefaultGroup/CharacterSelectHud/ThiefDeckButton")
-if thiefDeck ~= nil and thiefDeck.ButtonComponent ~= nil then
-	if self.ThiefDeckHandler ~= nil then
-		thiefDeck:DisconnectEvent(ButtonClickEvent, self.ThiefDeckHandler)
-		self.ThiefDeckHandler = nil
-	end
-	self.ThiefDeckHandler = thiefDeck:ConnectEvent(ButtonClickEvent, function() self:OpenClassDeck("bandit") end)
-end
-local mageDeck = _EntityService:GetEntityByPath("/ui/DefaultGroup/CharacterSelectHud/MageDeckButton")
-if mageDeck ~= nil and mageDeck.ButtonComponent ~= nil then
-	if self.MageDeckHandler ~= nil then
-		mageDeck:DisconnectEvent(ButtonClickEvent, self.MageDeckHandler)
-		self.MageDeckHandler = nil
-	end
-	self.MageDeckHandler = mageDeck:ConnectEvent(ButtonClickEvent, function() self:OpenClassDeck("magician") end)
-end
 local allDeckClose = _EntityService:GetEntityByPath("/ui/DefaultGroup/DeckAllHud/Close")
 if allDeckClose ~= nil and allDeckClose.ButtonComponent ~= nil then
 	if self.AllDeckCloseHandler ~= nil then
@@ -902,6 +881,8 @@ self.MaxEnergy = 3
 self.Turn = 0
 self.PlayerBlock = 0
 self.PlayerStr = 0
+self.PlayerDex = 0
+self.PlayerThorns = 0
 self.PlayerWeak = 0
 self.PlayerVuln = 0
 self.PlayerPowers = {}
@@ -911,8 +892,11 @@ self.FirstHpLossDone = false
 self.ClayBlockNext = 0
 self.DiscardSelectRemaining = 0
 self.DiscardSelectTotal = 0
+self.DiscardPostShiv = 0
+self.DiscardShivPerPick = 0
 self.CombatOver = false
 self.DiscardPile = {}
+self.ExhaustPile = {}
 self.Hand = {}
 ${luaCardsTable(CARDS.cards)}
 self.DrawPile = {}
@@ -1065,6 +1049,14 @@ if discardPile ~= nil and discardPile.ButtonComponent ~= nil then
 	end
 	self.DiscardPileHandler = discardPile:ConnectEvent(ButtonClickEvent, function() self:OpenDeckInspect("discard") end)
 end
+local exhaustPile = _EntityService:GetEntityByPath("/ui/DefaultGroup/DeckHud/ExhaustPile")
+if exhaustPile ~= nil and exhaustPile.ButtonComponent ~= nil then
+	if self.ExhaustPileHandler ~= nil then
+		exhaustPile:DisconnectEvent(ButtonClickEvent, self.ExhaustPileHandler)
+		self.ExhaustPileHandler = nil
+	end
+	self.ExhaustPileHandler = exhaustPile:ConnectEvent(ButtonClickEvent, function() self:OpenDeckInspect("exhaust") end)
+end
 local inspectClose = _EntityService:GetEntityByPath("/ui/DefaultGroup/DeckInspectHud/Close")
 if inspectClose ~= nil and inspectClose.ButtonComponent ~= nil then
 	if self.DeckInspectCloseHandler ~= nil then
@@ -1255,6 +1247,9 @@ if self.PlayerPowers ~= nil then
 			elseif pc.powerEffect == "blockPerTurn" then
 				self.PlayerBlock = self.PlayerBlock + pc.value
 			end
+			if pc.turnStartShiv ~= nil then
+				self:AddCardsToHand("Shiv", pc.turnStartShiv)
+			end
 		end
 	end
 end
@@ -1326,6 +1321,24 @@ end`, [
      { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'amount' },
      { Type: 'boolean', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'animate' },
    ]),
+    method('AddCardsToHand', `if self.Hand == nil then
+	self.Hand = {}
+end
+if self.DiscardPile == nil then
+	self.DiscardPile = {}
+end
+for i = 1, amount do
+	if #self.Hand >= 10 then
+		table.insert(self.DiscardPile, cardId)
+	else
+		table.insert(self.Hand, cardId)
+	end
+end
+self:RenderHand(false)
+self:RenderPiles()`, [
+      { Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'cardId' },
+      { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'amount' },
+    ]),
    method('RecycleDiscardIntoDraw', `if self.DiscardPile == nil or #self.DiscardPile <= 0 then
 \treturn
 end
@@ -1335,8 +1348,9 @@ for i = 1, #self.DiscardPile do
 end
 self.DiscardPile = {}
 self:Shuffle(self.DrawPile)`),
-    method('RenderPiles', `self:SetText("/ui/DefaultGroup/DeckHud/DrawPile/Count", tostring(#self.DrawPile))
-self:SetText("/ui/DefaultGroup/DeckHud/DiscardPile/Count", tostring(#self.DiscardPile))
+    method('RenderPiles', `self:SetText("/ui/DefaultGroup/DeckHud/DrawPile/Count", self:FormatNumber(#self.DrawPile))
+self:SetText("/ui/DefaultGroup/DeckHud/DiscardPile/Count", self:FormatNumber(#self.DiscardPile))
+self:SetText("/ui/DefaultGroup/DeckHud/ExhaustPile/Count", self:FormatNumber(#(self.ExhaustPile or {})))
 self:SetText("/ui/DefaultGroup/DeckHud/EnergyOrb/Value", string.format("%d", self.Energy) .. "/" .. string.format("%d", self.MaxEnergy))
 local inspect = _EntityService:GetEntityByPath("/ui/DefaultGroup/DeckInspectHud")
 if inspect ~= nil and inspect.Enable == true and self.DeckInspectKind ~= "" then
@@ -1355,6 +1369,9 @@ local title = ""
 if kind == "discard" then
 	pile = self.DiscardPile or {}
 	title = "버린 덱"
+elseif kind == "exhaust" then
+	pile = self.ExhaustPile or {}
+	title = "소멸 덱"
 else
 	pile = self.DrawPile or {}
 	title = "뽑을 덱"
@@ -1729,6 +1746,17 @@ end`, [
      { Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'path' },
      { Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'value' },
    ]),
+    method('FormatNumber', `if value == nil then
+	return ""
+end
+local n = tonumber(value)
+if n == nil then
+	return tostring(value)
+end
+if math.abs(n - math.floor(n)) < 0.00001 then
+	return string.format("%d", math.floor(n))
+end
+return tostring(n)`, [{ Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'value' }], 0, 'string'),
    method('AnimateCardFrom', `local cardEntity = _EntityService:GetEntityByPath("/ui/DefaultGroup/CardHand/Card" .. tostring(slot))
 if cardEntity == nil or cardEntity.UITransformComponent == nil then
 \treturn
@@ -1751,6 +1779,15 @@ end, 1 / 60)`, [
      { Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'toPos' },
      { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'duration' },
    ]),
+    method('AddCardBlock', `local amount = base or 0
+if amount > 0 and self.PlayerDex ~= nil then
+	amount = amount + self.PlayerDex
+end
+if amount < 0 then
+	amount = 0
+end
+self.PlayerBlock = self.PlayerBlock + amount
+return amount`, [{ Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'base' }], 0, 'number'),
    method('CalcPlayerAttack', `local base2 = base
 self.FightAttackCount = self.FightAttackCount + 1
 if self.FightAttackCount == 1 and self:HasRelic("akabeko") then
@@ -1788,23 +1825,29 @@ if c.kind == "Attack" then
 		end
 	end
 	if c.block ~= nil then
-		self.PlayerBlock = self.PlayerBlock + c.block
+		self:AddCardBlock(c.block)
 	end
 	if free ~= true then
 		self:ApplyRelics("cardPlayed")
 	end
 elseif c.kind == "Skill" then
 	if c.block ~= nil then
-		self.PlayerBlock = self.PlayerBlock + c.block
+		self:AddCardBlock(c.block)
 	end
 elseif c.kind == "Power" then
-	if c.powerEffect ~= nil and free ~= true then
+	if free ~= true then
 		table.insert(self.PlayerPowers, cardId)
 	end
 end
 if c.strength ~= nil then
 	self.PlayerStr = self.PlayerStr + c.strength
 end
+if c.dex ~= nil then
+	self.PlayerDex = self.PlayerDex + c.dex
+end
+if c.thorns ~= nil then
+	self.PlayerThorns = self.PlayerThorns + c.thorns
+end
 if c.selfVuln ~= nil then
 	self.PlayerVuln = self.PlayerVuln + c.selfVuln
 end
@@ -1831,6 +1874,9 @@ if c.weak ~= nil or c.vuln ~= nil or c.poison ~= nil then
 end
 if c.draw ~= nil then
 	self:DrawCards(c.draw, true)
+end
+if c.addShiv ~= nil and c.discard == nil and c.discardAll ~= true then
+	self:AddCardsToHand("Shiv", c.addShiv)
 end`, [
      { Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'cardId' },
      { Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'c' },
@@ -1864,7 +1910,7 @@ if e == nil then
 end
 if self:IsDiscardSelecting() == true then
 	local picked = self.DiscardSelectTotal - self.DiscardSelectRemaining
-	self:SetText("/ui/DefaultGroup/CombatHud/DiscardPrompt", "버릴 카드 선택 " .. tostring(picked + 1) .. "/" .. tostring(self.DiscardSelectTotal))
+	self:SetText("/ui/DefaultGroup/CombatHud/DiscardPrompt", "버릴 카드 선택 " .. self:FormatNumber(picked + 1) .. "/" .. self:FormatNumber(self.DiscardSelectTotal))
 	e.Enable = true
 else
 	e.Enable = false
@@ -1883,12 +1929,26 @@ if n <= 0 then
 end
 self.DiscardSelectRemaining = n
 self.DiscardSelectTotal = n
+self.DiscardPostShiv = 0
+self.DiscardShivPerPick = 0
+if c.addShiv ~= nil then
+	self.DiscardPostShiv = c.addShiv
+end
+if c.addShivPerDiscard == true then
+	self.DiscardShivPerPick = 1
+end
 self:UpdateDiscardPrompt()
 self:Toast("버릴 카드를 선택하세요")
 return true`, [{ Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'c' }], 0, 'boolean'),
    method('FinishDiscardSelection', `self.DiscardSelectRemaining = 0
 self.DiscardSelectTotal = 0
+local shivCount = self.DiscardPostShiv or 0
+self.DiscardPostShiv = 0
+self.DiscardShivPerPick = 0
 self:UpdateDiscardPrompt()
+if shivCount > 0 then
+	self:AddCardsToHand("Shiv", shivCount)
+end
 self:RenderHand(false)
 self:RenderPiles()
 self:RenderCombat()
@@ -1899,7 +1959,11 @@ end
 if self.Hand == nil or self.Hand[slot] == nil then
 	return true
 end
+local discarded = self.Hand[slot]
 self:DiscardHandCard(slot, true)
+if discarded ~= nil and self.DiscardShivPerPick ~= nil and self.DiscardShivPerPick > 0 then
+	self.DiscardPostShiv = (self.DiscardPostShiv or 0) + self.DiscardShivPerPick
+end
 self.DiscardSelectRemaining = self.DiscardSelectRemaining - 1
 if self.DiscardSelectRemaining <= 0 or #self.Hand <= 0 then
 	self:FinishDiscardSelection()
@@ -1939,7 +2003,10 @@ end
 self.Energy = self.Energy - c.cost
 self:ResolveCardEffects(cardId, c, false)
 table.remove(self.Hand, slot)
-if c.kind ~= "Power" then
+if c.exhaust == true then
+	if self.ExhaustPile == nil then self.ExhaustPile = {} end
+	table.insert(self.ExhaustPile, cardId)
+elseif c.kind ~= "Power" then
 	table.insert(self.DiscardPile, cardId)
 end
 self:RenderHand(false)
@@ -2203,10 +2270,15 @@ if self.PlayerBlock > 0 then
 end
 if dmg > 0 then
 	self.PlayerHp = self.PlayerHp - dmg
-	if self:HasRelic("bronzeScales") and attackerSlot ~= nil and attackerSlot > 0 then
+	local reflect = self.PlayerThorns or 0
+	if self:HasRelic("bronzeScales") then
+		reflect = reflect + 3
+	end
+	if reflect > 0 and attackerSlot ~= nil and attackerSlot > 0 then
 		local am = self.Monsters[attackerSlot]
 		if am ~= nil and am.alive == true then
-			am.hp = am.hp - 3
+			am.hp = am.hp - reflect
+			self:ShowDmgPop(am.slot, reflect)
 			self:MonsterHitMotion(am.slot)
 			if am.hp <= 0 then
 				am.hp = 0
@@ -2310,9 +2382,12 @@ end
 _TimerService:SetTimerOnce(function() self:StartPlayerTurn() end, 0.45)`),
    method('ClearCombatCards', `self.DrawPile = {}
 self.DiscardPile = {}
+self.ExhaustPile = {}
 self.Hand = {}
 self.DiscardSelectRemaining = 0
 self.DiscardSelectTotal = 0
+self.DiscardPostShiv = 0
+self.DiscardShivPerPick = 0
 self:UpdateDiscardPrompt()
 self:RenderHand(false)
 self:RenderPiles()`),
@@ -2543,6 +2618,14 @@ self:SetHpBar("/ui/DefaultGroup/CombatHud/PlayerPanel/HpBarFill", self.PlayerHp,
 self:SetEntityEnabled("/ui/DefaultGroup/CombatHud/PlayerPanel/BlockBadge", self.PlayerBlock > 0)
 self:SetText("/ui/DefaultGroup/CombatHud/PlayerPanel/BlockBadge/Value", string.format("%d", self.PlayerBlock))
 local pb = self:BuffsLabel(self.PlayerStr, self.PlayerWeak, self.PlayerVuln, 0)
+if self.PlayerDex ~= nil and self.PlayerDex > 0 then
+	if pb ~= "" then pb = pb .. " " end
+	pb = pb .. "민첩+" .. tostring(self.PlayerDex)
+end
+if self.PlayerThorns ~= nil and self.PlayerThorns > 0 then
+	if pb ~= "" then pb = pb .. " " end
+	pb = pb .. "가시" .. tostring(self.PlayerThorns)
+end
 if self.PlayerPowers ~= nil and #self.PlayerPowers > 0 then
 	local names = {}
 	for i = 1, #self.PlayerPowers do
@@ -2773,7 +2856,7 @@ self:SetText("/ui/DefaultGroup/CombatHud/TopBar/Floor", floorText)
 self:SetText("/ui/DefaultGroup/CombatHud/TopBar/Gold", "메소 " .. string.format("%d", self.Gold))`),
    method('CardPool', `local pool = {}
 for id, c in pairs(self.Cards) do
-	if c.class == self.SelectedClass or (self.PlayerJob ~= "" and c.class == self.PlayerJob) then
+	if c.token ~= true and (c.class == self.SelectedClass or (self.PlayerJob ~= "" and c.class == self.PlayerJob)) then
 		table.insert(pool, id)
 	end
 end
@@ -3046,8 +3129,14 @@ end
 if c.retain == true or string.find(cardDesc, "보존", 1, true) ~= nil then
 	add("보존", "턴 종료 시 버려지지 않고 손에 남습니다.")
 end
-if string.find(cardDesc, "소멸", 1, true) ~= nil then
-	add("소멸", "사용 후 이번 전투 동안 제거됩니다.")
+if c.dex ~= nil and c.dex > 0 or string.find(cardDesc, "민첩", 1, true) ~= nil then
+	add("민첩", "카드로 얻는 방어도가 증가합니다.")
+end
+if c.thorns ~= nil and c.thorns > 0 or string.find(cardDesc, "가시", 1, true) ~= nil then
+	add("가시", "피해를 받으면 공격자에게 반사 피해를 줍니다.")
+end
+if c.exhaust == true or string.find(cardDesc, "소멸.", 1, true) ~= nil then
+	add("소멸", "사용 후 소멸 덱으로 이동해 이번 전투 동안 다시 나오지 않습니다.")
 end
 if string.find(cardDesc, "선천성", 1, true) ~= nil then
 	add("선천성", "전투 시작 시 손패에 들어옵니다.")
--- a/tools/deck/hud/board.mjs
+++ b/tools/deck/hud/board.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildBoard() {
  const board = [];
--- a/tools/deck/hud/charselect.mjs
+++ b/tools/deck/hud/charselect.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildCharSelect() {
  const select = [];
@@ -137,20 +137,6 @@ export function buildCharSelect() {
        ],
      }));
    }
-    select.push(entity({
-      id: guid('menu', 170 + i),
-      path: `/ui/DefaultGroup/CharacterSelectHud/${cls.key}DeckButton`,
-      modelId: 'uibutton',
-      entryId: 'UIButton',
-      componentNames: 'MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent,MOD.Core.ButtonComponent,MOD.Core.TextComponent',
-      displayOrder: 18 + i,
-      components: [
-        transform({ parentW: 1920, parentH: 1080, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0.5, y: 0.5 }, size: { x: 160, y: 46 }, pos: { x: cls.x, y: -160 }, align: ALIGN_CENTER }),
-        sprite({ color: { r: 0.11, g: 0.13, b: 0.16, a: 1 }, type: 1, raycast: true }),
-        button({ enabled: cls.enabled }),
-        text({ value: '\uB371 \uBCF4\uAE30', fontSize: 20, bold: true, color: GOLD, alignment: 0 }),
-      ],
-    }));
  }
  select.push(entity({
    id: guid('menu', 180),
--- a/tools/deck/hud/combat.mjs
+++ b/tools/deck/hud/combat.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildCombat() {
  const PANEL_BG = { r: 0.08, g: 0.09, b: 0.11, a: 0.78 };
--- a/tools/deck/hud/deckall.mjs
+++ b/tools/deck/hud/deckall.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildDeckAll() {
  const allDeck = [];
--- a/tools/deck/hud/deckhud.mjs
+++ b/tools/deck/hud/deckhud.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildDeckHud() {
  const hud = [];
@@ -20,6 +20,7 @@ export function buildDeckHud() {

  for (const pile of [
    { key: 'DrawPile', x: -590, label: '뽑을 덱', count: '10', color: { r: 0.17, g: 0.20, b: 0.25, a: 1 } },
+    { key: 'ExhaustPile', x: 430, label: '소멸 덱', count: '0', color: { r: 0.13, g: 0.13, b: 0.18, a: 1 } },
    { key: 'DiscardPile', x: 590, label: '버린 덱', count: '0', color: { r: 0.22, g: 0.18, b: 0.16, a: 1 } },
  ]) {
    add(entity({
@@ -28,7 +29,7 @@ export function buildDeckHud() {
      modelId: 'uisprite',
      entryId: 'UISprite',
      componentNames: 'MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent,MOD.Core.ButtonComponent',
-      displayOrder: pile.key === 'DrawPile' ? 0 : 1,
+      displayOrder: pile.key === 'DrawPile' ? 0 : pile.key === 'ExhaustPile' ? 1 : 2,
      components: [
        transform({ parentW: 1280, parentH: 330, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0.5, y: 0.5 }, size: { x: 132, y: 186 }, pos: { x: pile.x, y: 8 }, align: ALIGN_CENTER }),
        sprite({ color: pile.color, type: 1, raycast: true }),
--- a/tools/deck/hud/deckinspect.mjs
+++ b/tools/deck/hud/deckinspect.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildDeckInspect() {
  const inspect = [];
--- a/tools/deck/hud/jobchoice.mjs
+++ b/tools/deck/hud/jobchoice.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildJobChoice() {
  const jobChoice = [];
--- a/tools/deck/hud/jobselect.mjs
+++ b/tools/deck/hud/jobselect.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildJobSelect() {
  const jobSelect = [];
--- a/tools/deck/hud/lobby.mjs
+++ b/tools/deck/hud/lobby.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildLobby() {
  const lobby = [];
--- a/tools/deck/hud/mainmenu.mjs
+++ b/tools/deck/hud/mainmenu.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildMainMenu() {
  const menu = [];
--- a/tools/deck/hud/map.mjs
+++ b/tools/deck/hud/map.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildMap() {
  const TYPE_KO = { combat: '전투', elite: '엘리트', boss: '보스', shop: '상점', rest: '휴식' };
--- a/tools/deck/hud/rest.mjs
+++ b/tools/deck/hud/rest.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildRest() {
  const rest = [];
--- a/tools/deck/hud/reward.mjs
+++ b/tools/deck/hud/reward.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildReward() {
  const reward = [];
--- a/tools/deck/hud/shop.mjs
+++ b/tools/deck/hud/shop.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildShop() {
  const shop = [];
--- a/tools/deck/hud/soulshop.mjs
+++ b/tools/deck/hud/soulshop.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildSoulShop() {
  const soulShop = [];
--- a/tools/deck/hud/treasure.mjs
+++ b/tools/deck/hud/treasure.mjs
@@ -1,5 +1,5 @@
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';

 export function buildTreasure() {
  const treasure = [];
--- a/tools/deck/lib/data.mjs
+++ b/tools/deck/lib/data.mjs
@@ -156,6 +156,8 @@ function luaCardsTable(cards) {
    if (c.damage != null) fields.push(`damage = ${c.damage}`);
    if (c.block != null) fields.push(`block = ${c.block}`);
    if (c.strength != null) fields.push(`strength = ${c.strength}`);
+    if (c.dex != null) fields.push(`dex = ${c.dex}`);
+    if (c.thorns != null) fields.push(`thorns = ${c.thorns}`);
    if (c.weak != null) fields.push(`weak = ${c.weak}`);
    if (c.vuln != null) fields.push(`vuln = ${c.vuln}`);
    if (c.powerEffect != null) fields.push(`powerEffect = ${luaStr(c.powerEffect)}`);
@@ -171,11 +173,16 @@ function luaCardsTable(cards) {
    if (c.poison != null) fields.push(`poison = ${c.poison}`);
    if (c.discard != null) fields.push(`discard = ${c.discard}`);
    if (c.discardAll === true) fields.push('discardAll = true');
+    if (c.addShiv != null) fields.push(`addShiv = ${c.addShiv}`);
+    if (c.turnStartShiv != null) fields.push(`turnStartShiv = ${c.turnStartShiv}`);
+    if (c.addShivPerDiscard === true) fields.push('addShivPerDiscard = true');
    if (c.sly === true) fields.push('sly = true');
    if (c.retain === true) fields.push('retain = true');
+    if (c.exhaust === true || String(c.desc || '').includes('소멸.')) fields.push('exhaust = true');
    if (c.aoe === true) fields.push('aoe = true');
    if (c.unplayable === true) fields.push('unplayable = true');
    if (c.curse === true) fields.push('curse = true');
+    if (c.token === true) fields.push('token = true');
    if (c.endTurnDamage != null) fields.push(`endTurnDamage = ${c.endTurnDamage}`);
    if (c.fx != null) fields.push(`fx = ${luaStr(c.fx)}`);
    if (c.image != null) fields.push(`image = ${luaStr(c.image)}`);
@@ -187,4 +194,4 @@ function luaDeckTable(deck) {
  return `self.DrawPile = { ${deck.map(luaStr).join(', ')} }`;
 }

-export { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable };
+export { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, luaSoulShopTable, CARDFRAMES, RARITIES, frameRuid, luaFramesTable, luaNodeIconsTable, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, luaRelicsTable, POTIONS, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable };
--- a/tools/deck/lib/ui-helpers.mjs
+++ b/tools/deck/lib/ui-helpers.mjs
@@ -233,7 +233,7 @@ function scrollLayoutGroup({ cellSize, spacing, columns }) {
    ScrollBarHandleColor: { r: 0.94, g: 0.74, b: 0.26, a: 0.9 },
    ScrollBarHandleImageRUID: { DataId: '' },
    ScrollBarThickness: 12,
-    ScrollBarVisible: 1,
+    ScrollBarVisible: 2,
    SortingLayer: 'UI',
    Spacing: 0,
    StartAxis: 0,
@@ -337,5 +337,4 @@ function appendUiSection(ui, section, entities) {
  ui.ContentProto.Entities.push(...entities);
 }

-
 export { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection };
--- a/ui/DefaultGroup.ui
+++ b/ui/DefaultGroup.ui