Commit c3856b0b authored by POLYMER's avatar POLYMER

fix

parent c0b537d7
...@@ -101,6 +101,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -101,6 +101,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
e1:SetValue(cm.filter) e1:SetValue(cm.filter)
e1:SetReset(RESET_PHASE+PHASE_MAIN1) e1:SetReset(RESET_PHASE+PHASE_MAIN1)
Duel.RegisterFlagEffect(tp,m,RESET_PHASE+PHASE_MAIN1,0,1) Duel.RegisterFlagEffect(tp,m,RESET_PHASE+PHASE_MAIN1,0,1)
Duel.RegisterEffect(e1,tp)
elseif Duel.GetCurrentPhase()==PHASE_MAIN2 then elseif Duel.GetCurrentPhase()==PHASE_MAIN2 then
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
...@@ -109,10 +110,10 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -109,10 +110,10 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0xa620)) e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0xa620))
e1:SetValue(cm.filter) e1:SetValue(cm.filter)
e1:SetReset(RESET_PHASE+PHASE_MAIN2) e1:SetReset(RESET_PHASE+PHASE_MAIN2)
Duel.RegisterFlagEffect(tp,m,RESET_PHASE+PHASE_MAIN2,0,1) Duel.RegisterFlagEffect(tp,m,RESET_PHASE+PHASE_MAIN2,0,1)
else Duel.RegisterEffect(e1,tp)
end end
Duel.RegisterEffect(e1,tp)
end end
Duel.RegisterFlagEffect(tp,60002009,RESET_PHASE+PHASE_END,0,1000) Duel.RegisterFlagEffect(tp,60002009,RESET_PHASE+PHASE_END,0,1000)
if Duel.IsExistingMatchingCard(cm.ofilter,tp,LOCATION_FZONE,0,1,c) then if Duel.IsExistingMatchingCard(cm.ofilter,tp,LOCATION_FZONE,0,1,c) then
......
...@@ -78,7 +78,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -78,7 +78,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
end end
if Duel.IsExistingMatchingCard(cm.ofilter,tp,LOCATION_FZONE,0,1,c) then if Duel.IsExistingMatchingCard(cm.ofilter,tp,LOCATION_FZONE,0,1,c) then
local sg=Duel.GetMatchingGroup(aux.TRUE,tp,0,LOCATION_MZONE,nil) local sg=Duel.GetMatchingGroup(aux.TRUE,tp,0,LOCATION_MZONE,nil)
Duel.Destroy(sg,REASON_EFFECT) Duel.Remove(sg,POS_FACEUP,REASON_EFFECT)
end end
end end
function cm.ofilter(c) function cm.ofilter(c)
......
...@@ -90,7 +90,7 @@ function c9911651.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -90,7 +90,7 @@ function c9911651.thop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c9911651.cfilter(c,tp) function c9911651.cfilter(c,tp)
return c:IsSetCard(0x5957) and c:IsType(TYPE_MONSTER) and c:IsControler(tp) return c:IsSetCard(0x5957) and c:IsType(TYPE_MONSTER) and c:IsControler(tp) and c:IsLocation(LOCATION_GRAVE)
end end
function c9911651.rcccon(e,tp,eg,ep,ev,re,r,rp) function c9911651.rcccon(e,tp,eg,ep,ev,re,r,rp)
return aux.exccon(e) and eg:IsExists(c9911651.cfilter,1,nil,tp) and not eg:IsContains(e:GetHandler()) return aux.exccon(e) and eg:IsExists(c9911651.cfilter,1,nil,tp) and not eg:IsContains(e:GetHandler())
......
...@@ -85,7 +85,7 @@ function c9911656.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -85,7 +85,7 @@ function c9911656.spop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c9911656.cfilter(c,tp) function c9911656.cfilter(c,tp)
return c:IsSetCard(0x5957) and c:IsType(TYPE_MONSTER) and c:IsControler(tp) return c:IsSetCard(0x5957) and c:IsType(TYPE_MONSTER) and c:IsControler(tp) and c:IsLocation(LOCATION_GRAVE)
end end
function c9911656.rcccon(e,tp,eg,ep,ev,re,r,rp) function c9911656.rcccon(e,tp,eg,ep,ev,re,r,rp)
return aux.exccon(e) and eg:IsExists(c9911656.cfilter,1,nil,tp) and not eg:IsContains(e:GetHandler()) return aux.exccon(e) and eg:IsExists(c9911656.cfilter,1,nil,tp) and not eg:IsContains(e:GetHandler())
......
...@@ -73,7 +73,7 @@ function c9911659.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -73,7 +73,7 @@ function c9911659.spop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c9911659.cfilter(c,tp) function c9911659.cfilter(c,tp)
return c:IsSetCard(0x5957) and c:IsType(TYPE_MONSTER) and c:IsControler(tp) return c:IsSetCard(0x5957) and c:IsType(TYPE_MONSTER) and c:IsControler(tp) and c:IsLocation(LOCATION_GRAVE)
end end
function c9911659.rcccon(e,tp,eg,ep,ev,re,r,rp) function c9911659.rcccon(e,tp,eg,ep,ev,re,r,rp)
return aux.exccon(e) and eg:IsExists(c9911659.cfilter,1,nil,tp) and not eg:IsContains(e:GetHandler()) return aux.exccon(e) and eg:IsExists(c9911659.cfilter,1,nil,tp) and not eg:IsContains(e:GetHandler())
......
...@@ -83,7 +83,7 @@ function c9911665.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -83,7 +83,7 @@ function c9911665.disop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c9911665.cfilter(c,tp) function c9911665.cfilter(c,tp)
return c:IsSetCard(0x5957) and c:IsType(TYPE_MONSTER) and c:IsControler(tp) return c:IsSetCard(0x5957) and c:IsType(TYPE_MONSTER) and c:IsControler(tp) and c:IsLocation(LOCATION_GRAVE)
end end
function c9911665.rcccon(e,tp,eg,ep,ev,re,r,rp) function c9911665.rcccon(e,tp,eg,ep,ev,re,r,rp)
return aux.exccon(e) and eg:IsExists(c9911665.cfilter,1,nil,tp) and not eg:IsContains(e:GetHandler()) return aux.exccon(e) and eg:IsExists(c9911665.cfilter,1,nil,tp) and not eg:IsContains(e:GetHandler())
......
...@@ -85,7 +85,7 @@ function c9911668.xyzop(e,tp,eg,ep,ev,re,r,rp) ...@@ -85,7 +85,7 @@ function c9911668.xyzop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c9911668.cfilter(c,tp) function c9911668.cfilter(c,tp)
return c:IsSetCard(0x5957) and c:IsType(TYPE_MONSTER) and c:IsControler(tp) return c:IsSetCard(0x5957) and c:IsType(TYPE_MONSTER) and c:IsControler(tp) and c:IsLocation(LOCATION_GRAVE)
end end
function c9911668.rcccon(e,tp,eg,ep,ev,re,r,rp) function c9911668.rcccon(e,tp,eg,ep,ev,re,r,rp)
return aux.exccon(e) and eg:IsExists(c9911668.cfilter,1,nil,tp) and not eg:IsContains(e:GetHandler()) return aux.exccon(e) and eg:IsExists(c9911668.cfilter,1,nil,tp) and not eg:IsContains(e:GetHandler())
......
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