도적 카드 공용 효과 추가

tools/deck/cb/combat.mjs

@@ -47,7 +47,9 @@ end
 local cost = c.cost or 0
 local skillFree = false
 if self.HandCostZeroThisTurn == true then
-\tcost = 0
+	cost = 0
+elseif c.useAllEnergy == true then
+	cost = self.Energy
 end
 if c.kind == "Skill" and self.NextSkillCostZero == true then
 	cost = 0
@@ -61,7 +63,7 @@ if self.Energy < cost then
 	return
 end
 self.Energy = self.Energy - cost
-self:ResolveCardEffects(cardId, slot, c, false)
+self:ResolveCardEffects(cardId, slot, c, false, cost)
 if c.kind == "Attack" then
 	self.TurnAttackCardsPlayed = (self.TurnAttackCardsPlayed or 0) + 1
 end
@@ -73,6 +75,12 @@ end
 if self:HasPowerField("cardPlayedBlock") == true then
 	self:AddCardBlock(self:AddPowerFieldTotal("cardPlayedBlock"))
 end
+if c.cardPlayedDamage ~= nil and c.cardPlayedDamage > 0 then
+	self:DealDirectDamageToTarget(c.cardPlayedDamage)
+end
+if c.cardPlayedRandomDamage ~= nil and c.cardPlayedRandomDamage > 0 then
+	self:DealDirectDamageToRandomMonster(c.cardPlayedRandomDamage)
+end
 table.remove(self.Hand, slot)
 if c.exhaust == true then
 	if self.ExhaustPile == nil then self.ExhaustPile = {} end
@@ -247,6 +255,12 @@ if m.block > 0 and pierce ~= true then
 	dmg = dmg - absorbed
 end
 m.hp = m.hp - dmg
+if dmg > 0 then
+	local poison = self:AddPowerFieldTotal("attackPoison")
+	if poison ~= nil and poison > 0 then
+		m.poison = (m.poison or 0) + poison
+	end
+end
 self:MonsterHitMotion(m.slot)
 if m.hp <= 0 then
 	m.hp = 0
@@ -255,6 +269,48 @@ end`, [
       { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'amount' },
       { Type: 'boolean', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'pierce' },
     ]),
+    method('DealDirectDamageToTarget', `local m = self.Monsters[self.TargetIndex]
+if m == nil or m.alive ~= true then
+	m = nil
+	for i = 1, #self.Monsters do
+		if self.Monsters[i].alive == true then m = self.Monsters[i]; self.TargetIndex = i; break end
+	end
+end
+if m == nil then
+	return
+end
+m.hp = m.hp - amount
+self:ShowDmgPop(m.slot, amount)
+self:MonsterHitMotion(m.slot)
+if m.hp <= 0 then
+	m.hp = 0
+	self:KillMonster(m.slot)
+end`, [
+      { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'amount' },
+    ]),
+    method('DealDirectDamageToRandomMonster', `local alive = {}
+for i = 1, #self.Monsters do
+	local m = self.Monsters[i]
+	if m ~= nil and m.alive == true then
+		table.insert(alive, m)
+	end
+end
+if #alive <= 0 then
+	return
+end
+local m = alive[math.random(1, #alive)]
+if m == nil then
+	return
+end
+m.hp = m.hp - amount
+self:ShowDmgPop(m.slot, amount)
+self:MonsterHitMotion(m.slot)
+if m.hp <= 0 then
+	m.hp = 0
+	self:KillMonster(m.slot)
+end`, [
+      { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'amount' },
+    ]),
     method('PlayAttackFx', `local m = self.Monsters[targetIndex]
 if m == nil or m.alive ~= true or m.entity == nil or not isvalid(m.entity) then
 	self:DealDamageToTarget(damage, pierce)
@@ -320,6 +376,12 @@ _TimerService:SetTimerOnce(function()
 				dmg = dmg - absorbed
 			end
 			m.hp = m.hp - dmg
+			if dmg > 0 then
+				local poison = self:AddPowerFieldTotal("attackPoison")
+				if poison ~= nil and poison > 0 then
+					m.poison = (m.poison or 0) + poison
+				end
+			end
 			self:ShowDmgPop(i, dmg)
 			self:MonsterHitMotion(i)
 			if m.hp <= 0 then

tools/deck/cb/deckturn.mjs

@@ -246,6 +246,7 @@ if self.ClayBlockNext > 0 then
 end
 self.TurnAttackMultiplier = self.NextTurnAttackMultiplier or 1
 self.NextTurnAttackMultiplier = 1
+self.CardsDrawnThisCombat = self.CardsDrawnThisCombat or 0
 self.HandCostZeroThisTurn = false
 self.DrawDisabledThisTurn = false
 local powerTurnDraw = 0
@@ -445,6 +446,7 @@ for i = 1, amount do
 \tend
 \tlocal cardId = table.remove(self.DrawPile)
 \ttable.insert(drawnCards, cardId)
+\tself.CardsDrawnThisCombat = (self.CardsDrawnThisCombat or 0) + 1
 \tif #self.Hand >= 10 then
 \t\ttable.insert(self.DiscardPile, cardId)
 \t\tself:TriggerSly(cardId)

tools/deck/cb/hand.mjs

@@ -308,6 +308,9 @@ end
 if c.damagePerSkillInHand ~= nil then
 	base2 = base2 + self:CountOtherHandSkills(slot) * c.damagePerSkillInHand
 end
+if c.damagePerCardDrawnThisCombat ~= nil then
+	base2 = base2 + (self.CardsDrawnThisCombat or 0) * c.damagePerCardDrawnThisCombat
+end
 if base2 < 0 then
 	base2 = 0
 end
@@ -388,10 +391,20 @@ end
 if c.drawDisabledThisTurn == true then
 	self.DrawDisabledThisTurn = true
 end
+local xEnergy = energySpent or 0
+local weakAmount = c.weak or 0
+local vulnAmount = c.vuln or 0
+local poisonAmount = c.poison or 0
+if c.xWeakPerEnergy ~= nil and c.xWeakPerEnergy > 0 then
+	weakAmount = weakAmount + xEnergy * c.xWeakPerEnergy
+end
 if c.kind == "Attack" then
-	if c.damage ~= nil then
+	if c.damage ~= nil or c.xDamagePerEnergy ~= nil then
 		self:PlayerAttackMotion()
 		local baseDmg = self:AttackBaseForCard(slot, c)
+		if c.xDamagePerEnergy ~= nil and c.xDamagePerEnergy > 0 then
+			baseDmg = xEnergy * c.xDamagePerEnergy
+		end
 		local total = 0
 		local hitN = c.hits or 1
 		if c.otherHandAtLeast ~= nil and c.bonusHitsWhenOtherHandAtLeast ~= nil then
@@ -447,7 +460,7 @@ 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
+if c.weak ~= nil or c.vuln ~= nil or c.poison ~= nil or c.xWeakPerEnergy ~= nil then
 	local tm = self.Monsters[self.TargetIndex]
 	if tm == nil or tm.alive ~= true then
 		for i = 1, #self.Monsters do
@@ -455,10 +468,10 @@ if c.weak ~= nil or c.vuln ~= nil or c.poison ~= nil then
 		end
 	end
 	if tm ~= nil and tm.alive == true then
-		if c.weak ~= nil then tm.weak = tm.weak + c.weak end
-		if c.poison ~= nil then tm.poison = (tm.poison or 0) + c.poison end
-		if c.vuln ~= nil then
-			tm.vuln = tm.vuln + c.vuln
+		if weakAmount ~= nil and weakAmount > 0 then tm.weak = tm.weak + weakAmount end
+		if poisonAmount ~= nil and poisonAmount > 0 then tm.poison = (tm.poison or 0) + poisonAmount end
+		if vulnAmount ~= nil and vulnAmount > 0 then
+			tm.vuln = tm.vuln + vulnAmount
 			if self:HasRelic("championBelt") then
 				tm.weak = tm.weak + 1
 			end
@@ -500,13 +513,14 @@ end`, [
       { 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' },
+      { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'energySpent' },
     ]),
     method('TriggerSly', `local c = self.Cards[cardId]
 if c == nil or c.sly ~= true then
 	return
 end
 self:Toast("교활 발동: " .. c.name)
-self:ResolveCardEffects(cardId, 0, c, true)`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'cardId' }]),
+self:ResolveCardEffects(cardId, 0, c, true, 0)`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'cardId' }]),
     method('DiscardHandCard', `if self.Hand == nil then
 	return
 end

tools/deck/cb/run.mjs

@@ -68,6 +68,7 @@ self.MaxEnergy = 3
 self.Turn = 0
 self.PlayerBlock = 0
 self.BlockGainMultiplier = 1
+self.CardsDrawnThisCombat = 0
 self.HandCostZeroThisTurn = false
 self.DrawDisabledThisTurn = false
 self.NextSkillCostZero = false

tools/deck/lib/data.mjs

@@ -162,8 +162,12 @@ function luaCardsTable(cards) {
     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.damagePerCardDrawnThisCombat != null) fields.push(`damagePerCardDrawnThisCombat = ${c.damagePerCardDrawnThisCombat}`);
     if (c.damagePerTurn != null) fields.push(`damagePerTurn = ${c.damagePerTurn}`);
+    if (c.cardPlayedDamage != null) fields.push(`cardPlayedDamage = ${c.cardPlayedDamage}`);
+    if (c.cardPlayedRandomDamage != null) fields.push(`cardPlayedRandomDamage = ${c.cardPlayedRandomDamage}`);
     if (c.poisonPerTurn != null) fields.push(`poisonPerTurn = ${c.poisonPerTurn}`);
+    if (c.attackPoison != null) fields.push(`attackPoison = ${c.attackPoison}`);
     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}`);
@@ -198,6 +202,9 @@ function luaCardsTable(cards) {
     if (c.handCostZeroThisTurn === true) fields.push('handCostZeroThisTurn = true');
     if (c.drawDisabledThisTurn === true) fields.push('drawDisabledThisTurn = true');
     if (c.addShivPerDiscard === true) fields.push('addShivPerDiscard = true');
+    if (c.useAllEnergy === true) fields.push('useAllEnergy = true');
+    if (c.xDamagePerEnergy != null) fields.push(`xDamagePerEnergy = ${c.xDamagePerEnergy}`);
+    if (c.xWeakPerEnergy != null) fields.push(`xWeakPerEnergy = ${c.xWeakPerEnergy}`);
     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');