밴딧 공용 효과와 문서 정리

2026-06-19 00:56:08 +09:00
parent 74d4824a1c
commit ba1651e52c
13 changed files with 1322 additions and 57 deletions
--- a/tools/deck/cb/combat.mjs
+++ b/tools/deck/cb/combat.mjs
@@ -3,6 +3,14 @@ import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_
 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';

 export const combatMethods = [
+    method('CanPlayCardNow', `if c == nil then
+	return false
+end
+if c.playableWhenDrawPileEmpty == true and self.DrawPile ~= nil and #self.DrawPile > 0 then
+	self:Toast("뽑을 카드 더미가 비어 있을 때만 사용할 수 있습니다.")
+	return false
+end
+return true`, [{ Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'c' }], 0, 'boolean'),
    method('PlayCard', `if self:IsDiscardSelecting() == true then
 	self:SelectDiscardSlot(slot)
 	return
@@ -11,6 +19,10 @@ if self:IsRetainSelecting() == true then
 	self:SelectRetainSlot(slot)
 	return
 end
+if self:IsReserveSelecting() == true then
+	self:SelectReserveSlot(slot)
+	return
+end
 if self.CombatOver == true or self.FxBusy == true or self.TurnBusy == true then
 	return
 end
@@ -29,12 +41,21 @@ if c.unplayable == true then
 	self:Toast("사용할 수 없는 카드입니다")
 	return
 end
+if self:CanPlayCardNow(c) ~= true then
+	return
+end
 if self.Energy < c.cost then
 	self:Toast("에너지가 부족합니다")
 	return
 end
 self.Energy = self.Energy - c.cost
-self:ResolveCardEffects(cardId, c, false)
+self:ResolveCardEffects(cardId, slot, c, false)
+if c.kind == "Attack" then
+	self.TurnAttackCardsPlayed = (self.TurnAttackCardsPlayed or 0) + 1
+end
+if self:HasPowerField("cardPlayedBlock") == true then
+	self:AddCardBlock(self:AddPowerFieldTotal("cardPlayedBlock"))
+end
 table.remove(self.Hand, slot)
 if c.exhaust == true then
 	if self.ExhaustPile == nil then self.ExhaustPile = {} end
@@ -48,6 +69,9 @@ self:RenderCombat()
 if self:BeginDiscardSelection(c) == true then
 	return
 end
+if self:BeginReserveSelection(c) == true then
+	return
+end
 self:RenderHand(false)
 self:RenderPiles()
 self:RenderCombat()
@@ -56,6 +80,8 @@ self:CheckCombatEnd()`, [{ Type: 'number', DefaultValue: null, SyncDirection: 0,
 	self:SelectDiscardSlot(slot)
 elseif self:IsRetainSelecting() == true then
 	self:SelectRetainSlot(slot)
+elseif self:IsReserveSelecting() == true then
+	self:SelectReserveSlot(slot)
 end`, [{ Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'slot' }]),
    method('FindMonsterAtTouch', `local best = 0
 local bestDist = 200
@@ -146,6 +172,10 @@ if self:IsRetainSelecting() == true then
 	self:SelectRetainSlot(slot)
 	return
 end
+if self:IsReserveSelecting() == true then
+	self:SelectReserveSlot(slot)
+	return
+end
 if self.CombatOver == true or self.FxBusy == true or self.TurnBusy == true then
 	return
 end
@@ -427,6 +457,17 @@ self.DiscardSelectTotal = 0
 self.DiscardPostShiv = 0
 self.DiscardShivPerPick = 0
 self.RetainSelectActive = false
+self.TurnAttackCardsPlayed = 0
+self.TurnDiscardedCards = 0
+self.ReserveSelectActive = false
+self.NextTurnBlock = 0
+self.NextTurnDraw = 0
+self.NextTurnKeepBlock = false
+self.NextTurnAttackMultiplier = 1
+self.TurnAttackMultiplier = 1
+self.NextTurnSelectPrompt = ""
+self.NextTurnSelectCopies = 0
+self.NextTurnAddCards = {}
 self:UpdateDiscardPrompt()
 self:RenderHand(false)
 self:RenderPiles()`),
--- a/tools/deck/cb/deckturn.mjs
+++ b/tools/deck/cb/deckturn.mjs
@@ -225,14 +225,27 @@ for i = 1, 3 do
 end`),
    method('StartPlayerTurn', `self.Turn = self.Turn + 1
 self.RetainSelectActive = false
+self.ReserveSelectActive = false
+self.TurnAttackCardsPlayed = 0
+self.TurnDiscardedCards = 0
+self.NextTurnSelectCopies = 0
+self.NextTurnSelectPrompt = ""
 self:UpdateDiscardPrompt()
 self.Energy = self.MaxEnergy
 self:ApplyRelics("turnStart")
-self.PlayerBlock = 0
+if self.NextTurnKeepBlock == true then
+	self.NextTurnKeepBlock = false
+else
+	self.PlayerBlock = 0
+end
 if self.ClayBlockNext > 0 then
 	self.PlayerBlock = self.PlayerBlock + self.ClayBlockNext
 	self.ClayBlockNext = 0
 end
+self.TurnAttackMultiplier = self.NextTurnAttackMultiplier or 1
+self.NextTurnAttackMultiplier = 1
+local powerTurnDraw = 0
+local powerTurnDiscard = 0
 if self.PlayerPowers ~= nil then
 	for i = 1, #self.PlayerPowers do
 		local pc = self.Cards[self.PlayerPowers[i]]
@@ -247,12 +260,59 @@ if self.PlayerPowers ~= nil then
 			if pc.turnStartShiv ~= nil then
 				self:AddCardsToHand("Shiv", pc.turnStartShiv)
 			end
+			if pc.turnStartDraw ~= nil then
+				powerTurnDraw = powerTurnDraw + pc.turnStartDraw
+			end
+			if pc.turnStartDiscard ~= nil then
+				powerTurnDiscard = powerTurnDiscard + pc.turnStartDiscard
+			end
 		end
 	end
 end
-self:DrawCards(5)
+if self.NextTurnBlock ~= nil and self.NextTurnBlock > 0 then
+	self:AddCardBlock(self.NextTurnBlock)
+	self.NextTurnBlock = 0
+end
+if self.NextTurnAddCards ~= nil then
+	for i = 1, #self.NextTurnAddCards do
+		local entry = self.NextTurnAddCards[i]
+		if entry ~= nil and entry.cardId ~= nil and entry.amount ~= nil and entry.amount > 0 then
+			self:AddCardsToHand(entry.cardId, entry.amount)
+		end
+	end
+	self.NextTurnAddCards = {}
+end
+local drawN = 5 + (self.NextTurnDraw or 0) + powerTurnDraw
+self.NextTurnDraw = 0
+self:DrawCards(drawN)
 self:RenderHand(true)
+self:RenderCombat()
+if powerTurnDiscard > 0 then
+	self:BeginDiscardSelection({ discard = math.min(powerTurnDiscard, #self.Hand) })
+	return
+end
 self:RenderCombat()`),
+    method('PrepareCombatDrawPile', `if self.DrawPile == nil or self.Cards == nil then
+	return
+end
+local rest = {}
+local innate = {}
+for i = 1, #self.DrawPile do
+	local cardId = self.DrawPile[i]
+	local c = self.Cards[cardId]
+	if c ~= nil and c.innate == true then
+		table.insert(innate, cardId)
+	else
+		table.insert(rest, cardId)
+	end
+end
+self.DrawPile = {}
+for i = 1, #rest do
+	table.insert(self.DrawPile, rest[i])
+end
+for i = 1, #innate do
+	table.insert(self.DrawPile, innate[i])
+end`, []),
    method('HasPowerEffect', `if self.PlayerPowers == nil then
 	return false
 end
@@ -263,6 +323,27 @@ for i = 1, #self.PlayerPowers do
 	end
 end
 return false`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'effect' }], 0, 'boolean'),
+    method('HasPowerField', `if self.PlayerPowers == nil then
+	return false
+end
+for i = 1, #self.PlayerPowers do
+	local pc = self.Cards[self.PlayerPowers[i]]
+	if pc ~= nil and pc[field] ~= nil and pc[field] ~= 0 then
+		return true
+	end
+end
+return false`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'field' }], 0, 'boolean'),
+    method('AddPowerFieldTotal', `local total = 0
+if self.PlayerPowers == nil then
+	return total
+end
+for i = 1, #self.PlayerPowers do
+	local pc = self.Cards[self.PlayerPowers[i]]
+	if pc ~= nil and pc[field] ~= nil then
+		total = total + pc[field]
+	end
+end
+return total`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'field' }], 0, 'number'),
    method('ShouldOfferRetain', `if self:HasPowerEffect("retainOne") ~= true then
 	return false
 end
@@ -291,12 +372,19 @@ if self:IsRetainSelecting() == true then
 	self:FinishPlayerTurn(0)
 	return
 end
+if self:IsReserveSelecting() == true then
+	self:Toast("예약할 카드를 먼저 선택하세요")
+	return
+end
 if self:ShouldOfferRetain() == true then
 	self:BeginRetainSelection()
 	return
 end
 self:FinishPlayerTurn(0)`),
    method('FinishPlayerTurn', `self.RetainSelectActive = false
+self.ReserveSelectActive = false
+self.NextTurnSelectCopies = 0
+self.NextTurnSelectPrompt = ""
 self:UpdateDiscardPrompt()
 local burn = 0
 for bi = 1, #self.Hand do
--- a/tools/deck/cb/hand.mjs
+++ b/tools/deck/cb/hand.mjs
@@ -274,6 +274,44 @@ if amount < 0 then
 end
 self.PlayerBlock = self.PlayerBlock + amount
 return amount`, [{ Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'base' }], 0, 'number'),
+    method('CountOtherHandSkills', `if self.Hand == nil then
+	return 0
+end
+local n = 0
+for i = 1, #self.Hand do
+	if i ~= slot then
+		local hc = self.Cards[self.Hand[i]]
+		if hc ~= nil and hc.kind == "Skill" then
+			n = n + 1
+		end
+	end
+end
+return n`, [{ Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'slot' }], 0, 'number'),
+    method('AttackBaseForCard', `local base2 = c.damage or 0
+local otherHand = 0
+if self.Hand ~= nil then
+	otherHand = #self.Hand - 1
+	if otherHand < 0 then otherHand = 0 end
+end
+if c.damagePerOtherHandCard ~= nil then
+	base2 = base2 + otherHand * c.damagePerOtherHandCard
+end
+if c.damagePerAttackPlayedThisTurn ~= nil then
+	base2 = base2 + (self.TurnAttackCardsPlayed or 0) * c.damagePerAttackPlayedThisTurn
+end
+if c.damagePerDiscardedThisTurn ~= nil then
+	base2 = base2 + (self.TurnDiscardedCards or 0) * c.damagePerDiscardedThisTurn
+end
+if c.damagePerSkillInHand ~= nil then
+	base2 = base2 + self:CountOtherHandSkills(slot) * c.damagePerSkillInHand
+end
+if base2 < 0 then
+	base2 = 0
+end
+return base2`, [
+      { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'slot' },
+      { Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'c' },
+    ], 0, 'number'),
    method('CalcPlayerAttack', `local base2 = base
 self.FightAttackCount = self.FightAttackCount + 1
 if self.FightAttackCount == 1 and self:HasRelic("akabeko") then
@@ -286,6 +324,9 @@ end
 if self.PlayerWeak > 0 then
 	dmg = math.floor(dmg * 0.75)
 end
+if self.TurnAttackMultiplier ~= nil and self.TurnAttackMultiplier > 1 then
+	dmg = dmg * self.TurnAttackMultiplier
+end
 if dmg > 0 and dmg < 5 and self:HasRelic("boot") then
 	dmg = 5
 end
@@ -293,16 +334,60 @@ if dmg < 0 then
 	dmg = 0
 end
 return dmg`, [{ Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'base' }], 0, 'number'),
+    method('QueueNextTurnAddCard', `if cardId == nil or cardId == "" or amount == nil or amount <= 0 then
+	return
+end
+if self.NextTurnAddCards == nil then
+	self.NextTurnAddCards = {}
+end
+for i = 1, #self.NextTurnAddCards do
+	local entry = self.NextTurnAddCards[i]
+	if entry ~= nil and entry.cardId == cardId then
+		entry.amount = (entry.amount or 0) + amount
+		return
+	end
+end
+table.insert(self.NextTurnAddCards, { cardId = cardId, amount = amount })`, [
+      { Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'cardId' },
+      { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'amount' },
+    ]),
+    method('QueueNextTurnEffects', `if c == nil then
+	return
+end
+if c.nextTurnBlock ~= nil then
+	self.NextTurnBlock = (self.NextTurnBlock or 0) + c.nextTurnBlock
+end
+if c.nextTurnDraw ~= nil then
+	self.NextTurnDraw = (self.NextTurnDraw or 0) + c.nextTurnDraw
+end
+if c.nextTurnKeepBlock == true then
+	self.NextTurnKeepBlock = true
+end
+if c.nextTurnAttackMultiplier ~= nil and c.nextTurnAttackMultiplier > 0 then
+	local cur = self.NextTurnAttackMultiplier or 1
+	self.NextTurnAttackMultiplier = cur * c.nextTurnAttackMultiplier
+end`, [{ Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'c' }]),
    method('ResolveCardEffects', `if c == nil then
 	return
 end
 if c.kind == "Attack" then
 	if c.damage ~= nil then
 		self:PlayerAttackMotion()
+		local baseDmg = self:AttackBaseForCard(slot, c)
 		local total = 0
 		local hitN = c.hits or 1
+		if c.otherHandAtLeast ~= nil and c.bonusHitsWhenOtherHandAtLeast ~= nil then
+			local otherHand = 0
+			if self.Hand ~= nil then
+				otherHand = #self.Hand - 1
+				if otherHand < 0 then otherHand = 0 end
+			end
+			if otherHand >= c.otherHandAtLeast then
+				hitN = hitN + c.bonusHitsWhenOtherHandAtLeast
+			end
+		end
 		for h = 1, hitN do
-			total = total + self:CalcPlayerAttack(c.damage)
+			total = total + self:CalcPlayerAttack(baseDmg)
 		end
 		if c.aoe == true then
 			self:PlayAoeFx(c.fx or c.image, total)
@@ -340,6 +425,10 @@ end
 if c.heal ~= nil then
 	self.PlayerHp = math.min(self.PlayerHp + c.heal, self.PlayerMaxHp)
 end
+if c.gainEnergy ~= nil and c.gainEnergy ~= 0 then
+	self.Energy = self.Energy + c.gainEnergy
+end
+self:QueueNextTurnEffects(c)
 if c.weak ~= nil or c.vuln ~= nil or c.poison ~= nil then
 	local tm = self.Monsters[self.TargetIndex]
 	if tm == nil or tm.alive ~= true then
@@ -361,10 +450,24 @@ end
 if c.draw ~= nil then
 	self:DrawCards(c.draw, true)
 end
+if c.drawUntilHandSize ~= nil and c.drawUntilHandSize > 0 then
+	local currentHand = 0
+	if self.Hand ~= nil then
+		currentHand = #self.Hand
+		if slot ~= nil and slot > 0 and self.Hand[slot] == cardId then
+			currentHand = currentHand - 1
+		end
+	end
+	local need = c.drawUntilHandSize - currentHand
+	if need > 0 then
+		self:DrawCards(need, true)
+	end
+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: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'slot' },
      { Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'c' },
      { Type: 'boolean', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'free' },
    ]),
@@ -373,7 +476,7 @@ if c == nil or c.sly ~= true then
 	return
 end
 self:Toast("교활 발동: " .. c.name)
-self:ResolveCardEffects(cardId, c, true)`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'cardId' }]),
+self:ResolveCardEffects(cardId, 0, c, true)`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'cardId' }]),
    method('DiscardHandCard', `if self.Hand == nil then
 	return
 end
@@ -384,6 +487,7 @@ end
 local startX = self:GetHandSlotX(slot)
 table.remove(self.Hand, slot)
 table.insert(self.DiscardPile, cardId)
+self.TurnDiscardedCards = (self.TurnDiscardedCards or 0) + 1
 if triggerSly == true then
 	self:TriggerSly(cardId)
 end
@@ -396,6 +500,7 @@ end`, [
    ]),
    method('IsDiscardSelecting', `return self.DiscardSelectRemaining ~= nil and self.DiscardSelectRemaining > 0`, [], 0, 'boolean'),
    method('IsRetainSelecting', `return self.RetainSelectActive == true`, [], 0, 'boolean'),
+    method('IsReserveSelecting', `return self.ReserveSelectActive == true`, [], 0, 'boolean'),
    method('UpdateDiscardPrompt', `local e = _EntityService:GetEntityByPath("/ui/RunUIGroup/CombatHud/DiscardPrompt")
 if e == nil then
 	return
@@ -407,6 +512,13 @@ if self:IsDiscardSelecting() == true then
 elseif self:IsRetainSelecting() == true then
 	self:SetText("/ui/RunUIGroup/CombatHud/DiscardPrompt", "보존할 카드 선택 (턴 종료: 건너뛰기)")
 	e.Enable = true
+elseif self:IsReserveSelecting() == true then
+	local msg = self.NextTurnSelectPrompt or ""
+	if msg == "" then
+		msg = "다음 턴에 예약할 카드를 선택하세요"
+	end
+	self:SetText("/ui/RunUIGroup/CombatHud/DiscardPrompt", msg)
+	e.Enable = true
 else
 	e.Enable = false
 end`),
@@ -427,15 +539,56 @@ self.DiscardSelectRemaining = n
 self.DiscardSelectTotal = n
 self.DiscardPostShiv = 0
 self.DiscardShivPerPick = 0
+self.DiscardPostDraw = 0
+self.DiscardDrawPerPick = 0
 if c.addShiv ~= nil then
 	self.DiscardPostShiv = c.addShiv
 end
 if c.addShivPerDiscard == true then
 	self.DiscardShivPerPick = 1
 end
+if c.drawPerDiscarded ~= nil and c.drawPerDiscarded > 0 then
+	self.DiscardDrawPerPick = c.drawPerDiscarded
+end
 self:UpdateDiscardPrompt()
 self:Toast("버릴 카드를 선택하세요")
 return true`, [{ Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'c' }], 0, 'boolean'),
+    method('BeginReserveSelection', `if c == nil or c.nextTurnSelectHandCard ~= true or c.nextTurnCopies == nil or c.nextTurnCopies <= 0 then
+	return false
+end
+if self.Hand == nil or #self.Hand <= 0 then
+	return false
+end
+self.ReserveSelectActive = true
+self.NextTurnSelectCopies = c.nextTurnCopies
+self.NextTurnSelectPrompt = c.nextTurnSelectPrompt or ""
+self:UpdateDiscardPrompt()
+self:Toast("예약할 카드를 선택하세요")
+self:RenderHand(false)
+return true`, [{ Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'c' }], 0, 'boolean'),
+    method('SelectReserveSlot', `if self:IsReserveSelecting() ~= true then
+	return false
+end
+if self.Hand == nil or self.Hand[slot] == nil then
+	return true
+end
+local cardId = self.Hand[slot]
+local amount = self.NextTurnSelectCopies or 0
+self.ReserveSelectActive = false
+self.NextTurnSelectCopies = 0
+self.NextTurnSelectPrompt = ""
+self:UpdateDiscardPrompt()
+if amount > 0 and cardId ~= nil then
+	self:QueueNextTurnAddCard(cardId, amount)
+	local label = cardId
+	if self.Cards[cardId] ~= nil and self.Cards[cardId].name ~= nil then
+		label = self.Cards[cardId].name
+	end
+	self:Toast("다음 턴 예약: " .. label .. " " .. self:FormatNumber(amount) .. "장")
+end
+self:RenderPiles()
+self:RenderCombat()
+return true`, [{ Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'slot' }], 0, 'boolean'),
    method('SelectRetainSlot', `if self:IsRetainSelecting() ~= true then
 	return false
 end
@@ -457,6 +610,7 @@ for i = 1, n do
 	table.insert(startXs, self:GetHandSlotX(i))
 	table.insert(slots, i)
 	table.insert(self.DiscardPile, cardId)
+	self.TurnDiscardedCards = (self.TurnDiscardedCards or 0) + 1
 end
 self.Hand = {}
 local shivCount = 0
@@ -466,6 +620,8 @@ self.DiscardSelectRemaining = 0
 self.DiscardSelectTotal = 0
 self.DiscardPostShiv = 0
 self.DiscardShivPerPick = 0
+self.DiscardPostDraw = 0
+self.DiscardDrawPerPick = 0
 self:UpdateDiscardPrompt()
 self:AnimateDiscardCards(cardIds, startXs, slots)
 for i = 1, #cardIds do
@@ -480,6 +636,9 @@ _TimerService:SetTimerOnce(function()
 		self:RenderHand(false)
 		self:RenderPiles()
 	end
+	if c.drawPerDiscarded ~= nil and c.drawPerDiscarded > 0 then
+		self:DrawCards(n * c.drawPerDiscarded, true)
+	end
 	self:RenderCombat()
 	self:CheckCombatEnd()
 end, 0.22)
@@ -487,8 +646,11 @@ return true`, [{ Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes:
    method('FinishDiscardSelection', `self.DiscardSelectRemaining = 0
 self.DiscardSelectTotal = 0
 local shivCount = self.DiscardPostShiv or 0
+local drawCount = self.DiscardPostDraw or 0
 self.DiscardPostShiv = 0
+self.DiscardPostDraw = 0
 self.DiscardShivPerPick = 0
+self.DiscardDrawPerPick = 0
 self:UpdateDiscardPrompt()
 local finish = function()
 	if shivCount > 0 then
@@ -497,6 +659,9 @@ local finish = function()
 		self:RenderHand(false)
 		self:RenderPiles()
 	end
+	if drawCount > 0 then
+		self:DrawCards(drawCount, true)
+	end
 	self:RenderCombat()
 	self:CheckCombatEnd()
 end
@@ -516,6 +681,9 @@ self:DiscardHandCard(slot, true, true)
 if discarded ~= nil and self.DiscardShivPerPick ~= nil and self.DiscardShivPerPick > 0 then
 	self.DiscardPostShiv = (self.DiscardPostShiv or 0) + self.DiscardShivPerPick
 end
+if discarded ~= nil and self.DiscardDrawPerPick ~= nil and self.DiscardDrawPerPick > 0 then
+	self.DiscardPostDraw = (self.DiscardPostDraw or 0) + self.DiscardDrawPerPick
+end
 self.DiscardSelectRemaining = self.DiscardSelectRemaining - 1
 if self.DiscardSelectRemaining <= 0 or #self.Hand <= 0 then
 	self:FinishDiscardSelection(true)
--- a/tools/deck/cb/run.mjs
+++ b/tools/deck/cb/run.mjs
@@ -74,6 +74,8 @@ self.PlayerWeak = 0
 self.PlayerVuln = 0
 self.PlayerPowers = {}
 self.FightAttackCount = 0
+self.TurnAttackCardsPlayed = 0
+self.TurnDiscardedCards = 0
 self.DmgPopSeq = 0
 self.FirstHpLossDone = false
 self.ClayBlockNext = 0
@@ -82,6 +84,15 @@ self.DiscardSelectTotal = 0
 self.DiscardPostShiv = 0
 self.DiscardShivPerPick = 0
 self.RetainSelectActive = false
+self.ReserveSelectActive = false
+self.NextTurnBlock = 0
+self.NextTurnDraw = 0
+self.NextTurnKeepBlock = false
+self.NextTurnAttackMultiplier = 1
+self.TurnAttackMultiplier = 1
+self.NextTurnSelectPrompt = ""
+self.NextTurnSelectCopies = 0
+self.NextTurnAddCards = {}
 self.CombatOver = false
 self.DiscardPile = {}
 self.ExhaustPile = {}
@@ -92,6 +103,7 @@ for i = 1, #self.RunDeck do
 	self.DrawPile[i] = self.RunDeck[i]
 end
 self:Shuffle(self.DrawPile)
+self:PrepareCombatDrawPile()
 self:BuildMonsters()
 self:RenderCombat()
 self:StartPlayerTurn()
--- a/tools/deck/gen-slaydeck.mjs
+++ b/tools/deck/gen-slaydeck.mjs
@@ -119,6 +119,8 @@ function writeCodeblocks() {
    prop('string', 'ShopPotion', '""'),
    prop('boolean', 'ShopPotionBought', 'false'),
    prop('number', 'FightAttackCount', '0'),
+    prop('number', 'TurnAttackCardsPlayed', '0'),
+    prop('number', 'TurnDiscardedCards', '0'),
    prop('boolean', 'FirstHpLossDone', 'false'),
    prop('number', 'ClayBlockNext', '0'),
    prop('number', 'PotionMenuSlot', '0'),
@@ -131,6 +133,15 @@ function writeCodeblocks() {
    prop('number', 'DiscardPostShiv', '0'),
    prop('number', 'DiscardShivPerPick', '0'),
    prop('boolean', 'RetainSelectActive', 'false'),
+    prop('boolean', 'ReserveSelectActive', 'false'),
+    prop('number', 'NextTurnBlock', '0'),
+    prop('number', 'NextTurnDraw', '0'),
+    prop('boolean', 'NextTurnKeepBlock', 'false'),
+    prop('number', 'NextTurnAttackMultiplier', '1'),
+    prop('number', 'TurnAttackMultiplier', '1'),
+    prop('string', 'NextTurnSelectPrompt', '""'),
+    prop('number', 'NextTurnSelectCopies', '0'),
+    prop('any', 'NextTurnAddCards'),
  ], [
    ...bootMethods,
    ...stateMethods,
--- a/tools/deck/lib/data.mjs
+++ b/tools/deck/lib/data.mjs
@@ -158,10 +158,17 @@ function luaCardsTable(cards) {
  const lines = Object.entries(cards).map(([id, c]) => {
    const fields = [`name = ${luaStr(c.name)}`, `cost = ${c.cost}`, `desc = ${luaStr(c.desc)}`, `kind = ${luaStr(c.kind)}`];
    if (c.damage != null) fields.push(`damage = ${c.damage}`);
+    if (c.damagePerOtherHandCard != null) fields.push(`damagePerOtherHandCard = ${c.damagePerOtherHandCard}`);
+    if (c.damagePerAttackPlayedThisTurn != null) fields.push(`damagePerAttackPlayedThisTurn = ${c.damagePerAttackPlayedThisTurn}`);
+    if (c.damagePerDiscardedThisTurn != null) fields.push(`damagePerDiscardedThisTurn = ${c.damagePerDiscardedThisTurn}`);
+    if (c.damagePerSkillInHand != null) fields.push(`damagePerSkillInHand = ${c.damagePerSkillInHand}`);
+    if (c.otherHandAtLeast != null) fields.push(`otherHandAtLeast = ${c.otherHandAtLeast}`);
+    if (c.bonusHitsWhenOtherHandAtLeast != null) fields.push(`bonusHitsWhenOtherHandAtLeast = ${c.bonusHitsWhenOtherHandAtLeast}`);
    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.cardPlayedBlock != null) fields.push(`cardPlayedBlock = ${c.cardPlayedBlock}`);
    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)}`);
@@ -173,13 +180,27 @@ function luaCardsTable(cards) {
    if (c.pierce === true) fields.push('pierce = true');
    if (c.selfVuln != null) fields.push(`selfVuln = ${c.selfVuln}`);
    if (c.draw != null) fields.push(`draw = ${c.draw}`);
+    if (c.drawUntilHandSize != null) fields.push(`drawUntilHandSize = ${c.drawUntilHandSize}`);
    if (c.heal != null) fields.push(`heal = ${c.heal}`);
+    if (c.gainEnergy != null) fields.push(`gainEnergy = ${c.gainEnergy}`);
    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.drawPerDiscarded != null) fields.push(`drawPerDiscarded = ${c.drawPerDiscarded}`);
    if (c.addShiv != null) fields.push(`addShiv = ${c.addShiv}`);
    if (c.turnStartShiv != null) fields.push(`turnStartShiv = ${c.turnStartShiv}`);
+    if (c.turnStartDraw != null) fields.push(`turnStartDraw = ${c.turnStartDraw}`);
+    if (c.turnStartDiscard != null) fields.push(`turnStartDiscard = ${c.turnStartDiscard}`);
    if (c.addShivPerDiscard === true) fields.push('addShivPerDiscard = true');
+    if (c.nextTurnBlock != null) fields.push(`nextTurnBlock = ${c.nextTurnBlock}`);
+    if (c.nextTurnDraw != null) fields.push(`nextTurnDraw = ${c.nextTurnDraw}`);
+    if (c.nextTurnKeepBlock === true) fields.push('nextTurnKeepBlock = true');
+    if (c.nextTurnAttackMultiplier != null) fields.push(`nextTurnAttackMultiplier = ${c.nextTurnAttackMultiplier}`);
+    if (c.nextTurnCopies != null) fields.push(`nextTurnCopies = ${c.nextTurnCopies}`);
+    if (c.nextTurnSelectHandCard === true) fields.push('nextTurnSelectHandCard = true');
+    if (c.nextTurnSelectPrompt != null) fields.push(`nextTurnSelectPrompt = ${luaStr(c.nextTurnSelectPrompt)}`);
+    if (c.innate === true) fields.push('innate = true');
+    if (c.playableWhenDrawPileEmpty === true) fields.push('playableWhenDrawPileEmpty = 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');