diff --git a/tools/deck/gen-slaydeck.mjs b/tools/deck/gen-slaydeck.mjs
index a287fae..fc8d7c0 100644
--- a/tools/deck/gen-slaydeck.mjs
+++ b/tools/deck/gen-slaydeck.mjs
@@ -898,37 +898,75 @@ function upsertUi() {
     }));
   }
   let cmbN = 2;
+  const PP = '/ui/DefaultGroup/CombatHud/PlayerPanel';
   combat.push(entity({
-    id: guid('cmb', cmbN++),
-    path: '/ui/DefaultGroup/CombatHud/PlayerBg',
-    modelId: 'uisprite',
-    entryId: 'UISprite',
+    id: guid('cmb', 210), path: PP, modelId: 'uisprite', entryId: 'UISprite',
     componentNames: 'MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent',
     displayOrder: 5,
     components: [
-      transform({ parentW: 1920, parentH: 1080, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0.5, y: 0.5 }, size: { x: 300, y: 110 }, pos: { x: -760, y: -260 }, align: ALIGN_CENTER }),
+      transform({ parentW: 1920, parentH: 1080, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0.5, y: 0.5 }, size: { x: 300, y: 96 }, pos: { x: -760, y: -480 }, align: ALIGN_CENTER }),
       sprite({ color: PANEL_BG, type: 1 }),
     ],
   }));
-  const playerTexts = [
-    ['PlayerHp', { x: -760, y: -238 }, { x: 280, y: 44 }, 'HP 80/80', 26, true, { r: 1, g: 1, b: 1, a: 1 }],
-    ['PlayerBlock', { x: -760, y: -284 }, { x: 280, y: 38 }, '방어 0', 22, false, { r: 0.6, g: 0.8, b: 1, a: 1 }],
-  ];
-  for (const [suffix, pos, size, value, fontSize, bold, color] of playerTexts) {
-    combat.push(entity({
-      id: guid('cmb', cmbN++),
-      path: `/ui/DefaultGroup/CombatHud/${suffix}`,
-      modelId: 'uitext',
-      entryId: 'UIText',
-      componentNames: 'MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent,MOD.Core.TextComponent',
-      displayOrder: 6 + playerTexts.findIndex(([s]) => s === suffix),
-      components: [
-        transform({ parentW: 1920, parentH: 1080, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0.5, y: 0.5 }, size, pos }),
-        sprite({ color: TRANSPARENT }),
-        text({ value, fontSize, bold, color }),
-      ],
-    }));
-  }
+  combat.push(entity({
+    id: guid('cmb', 211), path: `${PP}/Name`, modelId: 'uitext', entryId: 'UIText',
+    componentNames: 'MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent,MOD.Core.TextComponent',
+    displayOrder: 0,
+    components: [
+      transform({ parentW: 300, parentH: 96, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0.5, y: 0.5 }, size: { x: 280, y: 28 }, pos: { x: 0, y: 28 } }),
+      sprite({ color: TRANSPARENT }),
+      text({ value: '플레이어', fontSize: 18, bold: true, color: GOLD, alignment: 4 }),
+    ],
+  }));
+  combat.push(entity({
+    id: guid('cmb', 212), path: `${PP}/HpBarBg`, modelId: 'uisprite', entryId: 'UISprite',
+    componentNames: 'MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent',
+    displayOrder: 1,
+    components: [
+      transform({ parentW: 300, parentH: 96, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0.5, y: 0.5 }, size: { x: 220, y: 16 }, pos: { x: 16, y: -6 } }),
+      sprite({ color: { r: 0.18, g: 0.05, b: 0.06, a: 1 }, type: 1 }),
+    ],
+  }));
+  combat.push(entity({
+    id: guid('cmb', 213), path: `${PP}/HpBarFill`, modelId: 'uisprite', entryId: 'UISprite',
+    componentNames: 'MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent',
+    displayOrder: 2,
+    components: [
+      transform({ parentW: 300, parentH: 96, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0, y: 0.5 }, size: { x: 220, y: 16 }, pos: { x: -94, y: -6 } }),
+      sprite({ color: { r: 0.3, g: 0.78, b: 0.36, a: 1 }, type: 1 }),
+    ],
+  }));
+  combat.push(entity({
+    id: guid('cmb', 214), path: `${PP}/HpText`, modelId: 'uitext', entryId: 'UIText',
+    componentNames: 'MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent,MOD.Core.TextComponent',
+    displayOrder: 3,
+    components: [
+      transform({ parentW: 300, parentH: 96, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0.5, y: 0.5 }, size: { x: 220, y: 24 }, pos: { x: 16, y: -30 } }),
+      sprite({ color: TRANSPARENT }),
+      text({ value: '80/80', fontSize: 16, bold: true, color: { r: 1, g: 1, b: 1, a: 1 }, alignment: 4 }),
+    ],
+  }));
+  const blockBadge = entity({
+    id: guid('cmb', 215), path: `${PP}/BlockBadge`, modelId: 'uisprite', entryId: 'UISprite',
+    componentNames: 'MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent',
+    displayOrder: 4,
+    components: [
+      transform({ parentW: 300, parentH: 96, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0.5, y: 0.5 }, size: { x: 44, y: 40 }, pos: { x: -122, y: -12 } }),
+      sprite({ color: { r: 0.32, g: 0.5, b: 0.85, a: 1 }, type: 1 }),
+    ],
+  });
+  blockBadge.jsonString.enable = false;
+  combat.push(blockBadge);
+  combat.push(entity({
+    id: guid('cmb', 216), path: `${PP}/BlockBadge/Value`, modelId: 'uitext', entryId: 'UIText',
+    componentNames: 'MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent,MOD.Core.TextComponent',
+    displayOrder: 0,
+    components: [
+      transform({ parentW: 44, parentH: 40, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0.5, y: 0.5 }, size: { x: 44, y: 36 }, pos: { x: 0, y: 0 } }),
+      sprite({ color: TRANSPARENT }),
+      text({ value: '0', fontSize: 18, bold: true, color: { r: 1, g: 1, b: 1, a: 1 }, alignment: 4 }),
+    ],
+  }));
   combat.push(entity({
     id: guid('cmb', 200),
     path: '/ui/DefaultGroup/CombatHud/TopBar',
@@ -2349,13 +2387,15 @@ end`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], N
 		end
 		if i == self.TargetIndex then t = "[타겟] " .. t end
 		self:SetText(base .. "/Intent", t)
-		self:SetHpBar(base .. "/HpBarFill", m.hp, m.maxHp)
+		self:SetHpBar(base .. "/HpBarFill", m.hp, m.maxHp, ${HP_BAR_W})
 	else
 		self:SetEntityEnabled(base, false)
 	end
 end
-self:SetText("/ui/DefaultGroup/CombatHud/PlayerHp", "HP " .. string.format("%d", self.PlayerHp) .. "/" .. string.format("%d", self.PlayerMaxHp))
-self:SetText("/ui/DefaultGroup/CombatHud/PlayerBlock", "방어 " .. string.format("%d", self.PlayerBlock))
+self:SetText("/ui/DefaultGroup/CombatHud/PlayerPanel/HpText", string.format("%d", self.PlayerHp) .. "/" .. string.format("%d", self.PlayerMaxHp))
+self:SetHpBar("/ui/DefaultGroup/CombatHud/PlayerPanel/HpBarFill", self.PlayerHp, self.PlayerMaxHp, 220)
+self:SetEntityEnabled("/ui/DefaultGroup/CombatHud/PlayerPanel/BlockBadge", self.PlayerBlock > 0)
+self:SetText("/ui/DefaultGroup/CombatHud/PlayerPanel/BlockBadge/Value", string.format("%d", self.PlayerBlock))
 self:RenderRun()`),
     method('SetHpBar', `local e = _EntityService:GetEntityByPath(path)
 if e == nil or e.UITransformComponent == nil then
@@ -2364,11 +2404,12 @@ end
 local ratio = 0
 if maxHp > 0 then ratio = hp / maxHp end
 if ratio < 0 then ratio = 0 end
-local w = ${HP_BAR_W} * ratio
+local w = width * ratio
 e.UITransformComponent.RectSize = Vector2(w, 14)`, [
       { Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'path' },
       { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'hp' },
       { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'maxHp' },
+      { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'width' },
     ]),
     method('PositionMonsterSlot', `local m = self.Monsters[slot]
 if m == nil or m.entity == nil or not isvalid(m.entity) then