Commit 52b8b1ff authored by VanillaSalt's avatar VanillaSalt

fix

parent 99dd3dc0
...@@ -19,11 +19,11 @@ end ...@@ -19,11 +19,11 @@ end
function c11109820.filter2(c,e,tp,rk,ft) function c11109820.filter2(c,e,tp,rk,ft)
if c:IsControler(tp) then ft=ft+1 end if c:IsControler(tp) then ft=ft+1 end
return c:IsFaceup() and c:IsType(TYPE_XYZ) return c:IsFaceup() and c:IsType(TYPE_XYZ)
and Duel.IsExistingMatchingCard(c11109820.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp,rk+c:GetRank(),ft) and ft>0 and Duel.IsExistingMatchingCard(c11109820.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp,rk+c:GetRank())
end end
function c11109820.spfilter(c,e,tp,rk,ft) function c11109820.spfilter(c,e,tp,rk)
local crk=c:GetRank() local crk=c:GetRank()
return ft>0 and (crk==rk or crk==rk-1) and not c:IsSetCard(0x48) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return (crk==rk or crk==rk-1) and not c:IsSetCard(0x48) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c11109820.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c11109820.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return false end if chkc then return false end
...@@ -48,7 +48,8 @@ function c11109820.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -48,7 +48,8 @@ function c11109820.operation(e,tp,eg,ep,ev,re,r,rp)
local ft=Duel.GetLocationCount(tp,LOCATION_MZONE) local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
if tc1:IsControler(tp) then ft=ft+1 end if tc1:IsControler(tp) then ft=ft+1 end
if tc2:IsControler(tp) then ft=ft+1 end if tc2:IsControler(tp) then ft=ft+1 end
local sg=Duel.GetMatchingGroup(c11109820.spfilter,tp,LOCATION_EXTRA,0,nil,e,tp,tc1:GetRank()+tc2:GetRank(),ft) if ft<=0 then return end
local sg=Duel.GetMatchingGroup(c11109820.spfilter,tp,LOCATION_EXTRA,0,nil,e,tp,tc1:GetRank()+tc2:GetRank())
if sg:GetCount()==0 then return end if sg:GetCount()==0 then return end
Duel.SendtoGrave(g,REASON_EFFECT) Duel.SendtoGrave(g,REASON_EFFECT)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
......
...@@ -79,6 +79,7 @@ function c49838105.cfop(e,tp,eg,ep,ev,re,r,rp) ...@@ -79,6 +79,7 @@ function c49838105.cfop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoGrave(tc,REASON_EFFECT+REASON_REVEAL) Duel.SendtoGrave(tc,REASON_EFFECT+REASON_REVEAL)
else else
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ShuffleHand(tp)
end end
end end
end end
...@@ -27,7 +27,7 @@ function c57734012.regop(e,tp,eg,ep,ev,re,r,rp) ...@@ -27,7 +27,7 @@ function c57734012.regop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_PUBLIC) e1:SetCode(EFFECT_PUBLIC)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END) e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_MAIN1)
c:RegisterEffect(e1) c:RegisterEffect(e1)
c:RegisterFlagEffect(57734012,RESET_PHASE+PHASE_MAIN1,0,1) c:RegisterFlagEffect(57734012,RESET_PHASE+PHASE_MAIN1,0,1)
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