Commit b9ae2ca1 authored by POLYMER's avatar POLYMER

fix

parent ea817c15
...@@ -57,10 +57,11 @@ end ...@@ -57,10 +57,11 @@ end
function s.rmop(e,tp,eg,ep,ev,re,r,rp) function s.rmop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_CARD,0,id) Duel.Hint(HINT_CARD,0,id)
local g=Duel.GetMatchingGroup(s.rmfilter,tp,LOCATION_MZONE,0,nil) local g=Duel.GetMatchingGroup(s.rmfilter,tp,LOCATION_MZONE,0,nil)
for tc in aux.Next(g) do if Duel.Remove(g,0,REASON_EFFECT+REASON_TEMPORARY)==0 then return end
if Duel.Remove(tc,0,REASON_EFFECT+REASON_TEMPORARY)>0 and tc:IsLocation(LOCATION_REMOVED) then local rg=Duel.GetOperatedGroup():Filter(Card.IsLocation,nil,LOCATION_REMOVED)
for tc in aux.Next(rg) do
local dis=1<<tc:GetPreviousSequence() local dis=1<<tc:GetPreviousSequence()
if dis&SNNM.DisMZone(tp)>0 then return end if dis&SNNM.DisMZone(tp)==0 then
local zone=dis local zone=dis
if tc:GetPreviousControler()==1 then dis=((dis&0xffff)<<16)|((dis>>16)&0xffff) end if tc:GetPreviousControler()==1 then dis=((dis&0xffff)<<16)|((dis>>16)&0xffff) end
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
...@@ -89,7 +90,7 @@ function s.retcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -89,7 +90,7 @@ function s.retcon(e,tp,eg,ep,ev,re,r,rp)
end end
function s.retop(e,tp,eg,ep,ev,re,r,rp) function s.retop(e,tp,eg,ep,ev,re,r,rp)
local tc=e:GetLabelObject() local tc=e:GetLabelObject()
Duel.ReturnToField(tc,tc:GetPreviousPosition(),e:GetLabel()) Duel.MoveToField(tc,tp,tp,LOCATION_MZONE,tc:GetPreviousPosition(),false,e:GetLabel())
e:Reset() e:Reset()
end end
function s.tffilter(c,tp) function s.tffilter(c,tp)
......
...@@ -36,7 +36,8 @@ end ...@@ -36,7 +36,8 @@ end
function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
local g=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,0,nil) local g=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,0,nil)
local ac=g:GetFirst() local ac=g:GetFirst()
for i=1,#g do local num=#g
for i=1,num do
if talon[ac:GetCode()]==nil then if talon[ac:GetCode()]==nil then
g:RemoveCard(ac) g:RemoveCard(ac)
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