Commit b793bb77 authored by salix5's avatar salix5

Merge pull request #1193 from Tianchenglipu/patch-1

Fix for Xyz Procedure
parents 3c2d49c9 73667087
...@@ -204,10 +204,26 @@ end ...@@ -204,10 +204,26 @@ end
function Auxiliary.XyzOperation(f,lv,minc,maxc) function Auxiliary.XyzOperation(f,lv,minc,maxc)
return function(e,tp,eg,ep,ev,re,r,rp,c,og) return function(e,tp,eg,ep,ev,re,r,rp,c,og)
if og then if og then
local sg=Group.CreateGroup()
local tc=og:GetFirst()
while tc do
local sg1=tc:GetOverlayGroup()
sg:Merge(sg1)
tc=og:GetNext()
end
Duel.SendtoGrave(sg,REASON_RULE)
c:SetMaterial(og) c:SetMaterial(og)
Duel.Overlay(c,og) Duel.Overlay(c,og)
else else
local mg=Duel.SelectXyzMaterial(tp,c,f,lv,minc,maxc) local mg=Duel.SelectXyzMaterial(tp,c,f,lv,minc,maxc)
local sg=Group.CreateGroup()
local tc=mg:GetFirst()
while tc do
local sg1=tc:GetOverlayGroup()
sg:Merge(sg1)
tc=mg:GetNext()
end
Duel.SendtoGrave(sg,REASON_RULE)
c:SetMaterial(mg) c:SetMaterial(mg)
Duel.Overlay(c,mg) Duel.Overlay(c,mg)
end end
...@@ -230,6 +246,14 @@ end ...@@ -230,6 +246,14 @@ end
function Auxiliary.XyzOperation2(f,lv,minc,maxc,alterf,desc,op) function Auxiliary.XyzOperation2(f,lv,minc,maxc,alterf,desc,op)
return function(e,tp,eg,ep,ev,re,r,rp,c,og) return function(e,tp,eg,ep,ev,re,r,rp,c,og)
if og then if og then
local sg=Group.CreateGroup()
local tc=og:GetFirst()
while tc do
local sg1=tc:GetOverlayGroup()
sg:Merge(sg1)
tc=og:GetNext()
end
Duel.SendtoGrave(sg,REASON_RULE)
c:SetMaterial(og) c:SetMaterial(og)
Duel.Overlay(c,og) Duel.Overlay(c,og)
else else
...@@ -250,6 +274,14 @@ function Auxiliary.XyzOperation2(f,lv,minc,maxc,alterf,desc,op) ...@@ -250,6 +274,14 @@ function Auxiliary.XyzOperation2(f,lv,minc,maxc,alterf,desc,op)
Duel.Overlay(c,mg) Duel.Overlay(c,mg)
else else
local mg=Duel.SelectXyzMaterial(tp,c,f,lv,minc,maxc) local mg=Duel.SelectXyzMaterial(tp,c,f,lv,minc,maxc)
local sg=Group.CreateGroup()
local tc=mg:GetFirst()
while tc do
local sg1=tc:GetOverlayGroup()
sg:Merge(sg1)
tc=mg:GetNext()
end
Duel.SendtoGrave(sg,REASON_RULE)
c:SetMaterial(mg) c:SetMaterial(mg)
Duel.Overlay(c,mg) Duel.Overlay(c,mg)
end 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