gahusb/maplecontest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge branch 'main' of https://gitea.gahusb.synology.me/gahusb/maplecontest"

Browse Source 
This reverts commit 17200d47ec, reversing
changes made to 95d6155086.
This commit is contained in:
gahusb
2026-06-30 00:49:30 +09:00
parent 17200d47ec
commit 5e2fd5db22
7 changed files with 58 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/deck/cb/combat.mjs
View File

@@ -52,14 +52,14 @@ if self.HandCostZeroThisTurn == true then
elseif c.useAllEnergy == true then
cost = self.Energy
end
if c.kind == "Skill" and c.useAllEnergy ~= true and self.NextSkillCostZero == true then
if c.kind == "Skill" and self.NextSkillCostZero == true then
cost = 0
skillFree = true
end
if c.kind == "Skill" and c.useAllEnergy ~= true and self.SkillCostReductionThisTurn ~= nil and self.SkillCostReductionThisTurn > 0 then
if c.kind == "Skill" and self.SkillCostReductionThisTurn ~= nil and self.SkillCostReductionThisTurn > 0 then
cost = math.max(0, cost - self.SkillCostReductionThisTurn)
end
if c.useAllEnergy ~= true and self.CombatCardCostReduction ~= nil and self.CombatCardCostReduction[cardId] ~= nil then
if self.CombatCardCostReduction ~= nil and self.CombatCardCostReduction[cardId] ~= nil then
cost = math.max(0, cost - self.CombatCardCostReduction[cardId])
end
if c.kind == "Skill" and self.NextSkillRepeatCount ~= nil and self.NextSkillRepeatCount > 0 then
@@ -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 isAttack == true and m.vuln > 0 then
if m.vuln > 0 then
dmg = math.floor(dmg * 1.5)
end
if m.block > 0 then
@@ -392,12 +392,6 @@ for i = 1, #self.Monsters do
m.hp = m.hp - dmg
if dmg > 0 then
self.DamageDealtThisTurn = (self.DamageDealtThisTurn or 0) + dmg
if isAttack == true then
local poison = self:AddPowerFieldTotal("attackPoison")
if poison ~= nil and poison > 0 then
self:ApplyPoisonToMonster(m, poison)
end
end
end
self:ShowDmgPop(i, dmg)
self:MonsterHitMotion(i)
@@ -415,7 +409,6 @@ 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
@@ -689,10 +682,7 @@ self.NextTurnAddCards = {}
self:UpdateDiscardPrompt()
self:RenderHand(false)
self:RenderPiles()`),
method('CheckCombatEnd', `if self.CombatOver == true then
return
end
local anyAlive = false
method('CheckCombatEnd', `local anyAlive = false
for i = 1, #self.Monsters do
if self.Monsters[i].alive == true then anyAlive = true; break end
end