Commit 90ed3454 authored by Satty's avatar Satty

fix

parent 862a0d23
...@@ -74,6 +74,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -74,6 +74,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then if chk==0 then
local chkf=tp local chkf=tp
local mg1=Group.CreateGroup() local mg1=Group.CreateGroup()
local mg4=Group.CreateGroup()
local mg3=Duel.GetMatchingGroup(s.filter3,tp,LOCATION_HAND,0,c) local mg3=Duel.GetMatchingGroup(s.filter3,tp,LOCATION_HAND,0,c)
if #mg3>0 and Duel.GetFlagEffect(1-tp,id)>0 then if #mg3>0 and Duel.GetFlagEffect(1-tp,id)>0 then
mg1:Merge(mg3) mg1:Merge(mg3)
...@@ -95,14 +96,19 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -95,14 +96,19 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
mg1:Merge(mg7) mg1:Merge(mg7)
end end
local ge=c:IsHasEffect(EFFECT_TO_GRAVE_REDIRECT) local ge=c:IsHasEffect(EFFECT_TO_GRAVE_REDIRECT)
if ge and ge:GetValue()&LOCATION_DECK and c:IsCanBeFusionMaterial()
and c:IsAbleToGrave() and Duel.GetFlagEffect(1-tp,id+1)>0 then
mg4:AddCard(c)
end
if not ge and c:IsCanBeFusionMaterial() if not ge and c:IsCanBeFusionMaterial()
and c:IsAbleToRemove() and Duel.GetFlagEffect(1-tp,id+3)>0 then and c:IsAbleToRemove() and Duel.GetFlagEffect(1-tp,id+3)>0 then
mg1:AddCard(c) mg4:AddCard(c)
end end
if ge and ge:GetValue()&LOCATION_REMOVED and c:IsCanBeFusionMaterial() if ge and ge:GetValue()&LOCATION_REMOVED and c:IsCanBeFusionMaterial()
and c:IsAbleToDeck() and Duel.GetFlagEffect(1-tp,id+4)>0 then and c:IsAbleToDeck() and Duel.GetFlagEffect(1-tp,id+4)>0 then
mg1:AddCard(c) mg4:AddCard(c)
end end
if #mg4>0 then mg1:Merge(mg4) end
Auxiliary.FCheckAdditional=s.fcheck Auxiliary.FCheckAdditional=s.fcheck
Auxiliary.GCheckAdditional=s.gcheck Auxiliary.GCheckAdditional=s.gcheck
local res=Duel.IsExistingMatchingCard(s.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,chkf) local res=Duel.IsExistingMatchingCard(s.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,chkf)
......
...@@ -23,7 +23,7 @@ function s.initial_effect(c) ...@@ -23,7 +23,7 @@ function s.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function s.cfilter(c) function s.cfilter(c)
return c:IsFaceup() and c:IsSetCard(3570) return c:IsFaceup() and c:IsSetCard(0x3570)
end end
function s.spcon1(e,tp,eg,ep,ev,re,r,rp) function s.spcon1(e,tp,eg,ep,ev,re,r,rp)
local ct=Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0) local ct=Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)
......
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