tools/deck/cb/combat.mjs

@@ -381,7 +381,7 @@ for i = 1, #self.Monsters do
 	local m = self.Monsters[i]
 	if m ~= nil and m.alive == true then
 		local dmg = amount
-		if m.vuln > 0 then
+		if isAttack == true and m.vuln > 0 then
 			dmg = math.floor(dmg * 1.5)
 		end
 		if m.block > 0 then
@@ -392,9 +392,11 @@ for i = 1, #self.Monsters do
 		m.hp = m.hp - dmg
 		if dmg > 0 then
 			self.DamageDealtThisTurn = (self.DamageDealtThisTurn or 0) + dmg
-			local poison = self:AddPowerFieldTotal("attackPoison")
+			if isAttack == true then
-			if poison ~= nil and poison > 0 then
+				local poison = self:AddPowerFieldTotal("attackPoison")
-				self:ApplyPoisonToMonster(m, poison)
+				if poison ~= nil and poison > 0 then
+					self:ApplyPoisonToMonster(m, poison)
+				end
 			end
 		end
 		self:ShowDmgPop(i, dmg)
@@ -413,6 +415,7 @@ self:RenderCombat()
 self:CheckCombatEnd()
 return killCount > 0`, [
       { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'amount' },
+      { Type: 'boolean', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'isAttack' },
     ], 0, 'boolean'),
     method('PlayAttackFx', `local m = self.Monsters[targetIndex]
 if m == nil or m.alive ~= true or m.entity == nil or not isvalid(m.entity) then

tools/deck/cb/hand.mjs

@@ -542,7 +542,7 @@ if c.kind == "Attack" then
 		local function resolveAttackRound()
 			local roundKilled = false
 			if useAoe == true then
-				local killed = self:DealDamageToAllMonsters(total)
+				local killed = self:DealDamageToAllMonsters(total, true)
 				if killed == true then roundKilled = true end
 			elseif c.randomTargetEachHit == true then
 				for h = 1, hitN do