Commit 568714f3 authored by Vury Leo's avatar Vury Leo

Support cancel for new fusion fusion spells

parent cb01adad
...@@ -953,7 +953,8 @@ function Auxiliary.FOperationMix(insf,sub,...) ...@@ -953,7 +953,8 @@ function Auxiliary.FOperationMix(insf,sub,...)
local hexsealed=chkfnf&0x100>0 local hexsealed=chkfnf&0x100>0
local notfusion=chkfnf&0x200>0 local notfusion=chkfnf&0x200>0
local sub2=(sub or hexsealed) and not notfusion local sub2=(sub or hexsealed) and not notfusion
local cancel=notfusion and Duel.GetCurrentChain()==0 --- only not fusion fusion spell does not support cancellation now.
local cancel=(not notfusion) or Duel.GetCurrentChain()==0
local mg=eg:Filter(Auxiliary.FConditionFilterMix,c,c,sub2,notfusion,table.unpack(funs)) local mg=eg:Filter(Auxiliary.FConditionFilterMix,c,c,sub2,notfusion,table.unpack(funs))
if gc then Duel.SetSelectedCard(gc) end if gc then Duel.SetSelectedCard(gc) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
...@@ -1080,7 +1081,8 @@ function Auxiliary.FOperationMixRep(insf,sub,fun1,minc,maxc,...) ...@@ -1080,7 +1081,8 @@ function Auxiliary.FOperationMixRep(insf,sub,fun1,minc,maxc,...)
local hexsealed=chkfnf&0x100>0 local hexsealed=chkfnf&0x100>0
local notfusion=chkfnf&0x200>0 local notfusion=chkfnf&0x200>0
local sub2=(sub or hexsealed) and not notfusion local sub2=(sub or hexsealed) and not notfusion
local cancel=notfusion and Duel.GetCurrentChain()==0 --- only not fusion fusion spell does not support cancellation now.
local cancel=(not notfusion) or Duel.GetCurrentChain()==0
local mg=eg:Filter(Auxiliary.FConditionFilterMix,c,c,sub2,notfusion,fun1,table.unpack(funs)) local mg=eg:Filter(Auxiliary.FConditionFilterMix,c,c,sub2,notfusion,fun1,table.unpack(funs))
local sg=Group.CreateGroup() local sg=Group.CreateGroup()
if gc then sg:AddCard(gc) end if gc then sg:AddCard(gc) end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment