Commit 59d6e56c authored by VanillaSalt's avatar VanillaSalt

fix

parent c02cd281
......@@ -20,7 +20,7 @@ function c12071500.filter2(c,e,tp,m,f,chkf)
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION+0x10,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
end
function c12071500.filter3(c)
return c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
end
function c12071500.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then
......
......@@ -47,7 +47,7 @@ function c31444249.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SendtoGrave(e:GetHandler(),REASON_COST)
end
function c31444249.filter0(c)
return c:IsCanBeFusionMaterial() and c:IsAbleToGrave()
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToGrave()
end
function c31444249.filter1(c,e)
return not c:IsImmuneToEffect(e)
......
......@@ -34,7 +34,7 @@ function c36484016.filter3(c,fusc,m,chkf)
return c:IsType(TYPE_SYNCHRO) and fusc:CheckFusionMaterial(m,c,chkf)
end
function c36484016.filter4(c)
return c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
end
function c36484016.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then
......
......@@ -20,7 +20,7 @@ function c3659803.filter2(c,e,tp,m,f,chkf)
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
end
function c3659803.filter3(c)
return c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
end
function c3659803.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then
......
......@@ -11,7 +11,7 @@ function c44394295.initial_effect(c)
c:RegisterEffect(e1)
end
function c44394295.filter0(c)
return c:IsCanBeFusionMaterial() and c:IsAbleToGrave()
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToGrave()
end
function c44394295.filter1(c,e)
return not c:IsImmuneToEffect(e)
......
......@@ -20,7 +20,7 @@ function c45906428.filter2(c,e,tp,m,f,chkf)
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
end
function c45906428.filter3(c)
return c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
end
function c45906428.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then
......
......@@ -43,7 +43,7 @@ function c47705572.filter2(c,e,tp,m,f,chkf)
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
end
function c47705572.filter3(c)
return c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
end
function c47705572.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then
......
......@@ -11,10 +11,10 @@ function c48130397.initial_effect(c)
e1:SetOperation(c48130397.activate)
c:RegisterEffect(e1)
end
function c48130397.filter0(c,tp)
function c48130397.filter0(c)
return c:IsFaceup() and c:IsCanBeFusionMaterial()
end
function c48130397.filter1(c,e,tp)
function c48130397.filter1(c,e)
return c:IsFaceup() and c:IsCanBeFusionMaterial() and not c:IsImmuneToEffect(e)
end
function c48130397.filter2(c,e,tp,m,f,chkf)
......@@ -22,7 +22,7 @@ function c48130397.filter2(c,e,tp,m,f,chkf)
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
end
function c48130397.filter3(c,e)
return not c:IsImmuneToEffect(e)
return c:IsOnField() and not c:IsImmuneToEffect(e)
end
function c48130397.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,e:GetHandler()) end
......@@ -31,7 +31,7 @@ end
function c48130397.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then
local chkf=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and PLAYER_NONE or tp
local mg1=Duel.GetFusionMaterial(tp)
local mg1=Duel.GetFusionMaterial(tp):Filter(Card.IsOnField,nil)
local mg2=Duel.GetMatchingGroup(c48130397.filter0,tp,0,LOCATION_MZONE,nil)
mg1:Merge(mg2)
local res=Duel.IsExistingMatchingCard(c48130397.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,chkf)
......
......@@ -21,7 +21,7 @@ function c6077601.filter2(c,e,tp,m,f,chkf)
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
end
function c6077601.filter3(c)
return c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
end
function c6077601.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then
......
......@@ -30,7 +30,7 @@ function c6172122.splimit(e,c,sump,sumtype,sumpos,targetp,se)
return se~=e:GetLabelObject()
end
function c6172122.filter0(c)
return c:IsCanBeFusionMaterial() and c:IsAbleToGrave()
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToGrave()
end
function c6172122.filter1(c,e)
return not c:IsImmuneToEffect(e)
......
......@@ -28,13 +28,13 @@ function c73360025.initial_effect(c)
c:RegisterEffect(e3)
end
function c73360025.mfilter0(c)
return c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
end
function c73360025.mfilter1(c,e)
return not c:IsImmuneToEffect(e)
end
function c73360025.mfilter2(c,e)
return c:IsCanBeFusionMaterial() and c:IsAbleToRemove() and not c:IsImmuneToEffect(e)
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove() and not c:IsImmuneToEffect(e)
end
function c73360025.spfilter1(c,e,tp,m,f,chkf)
return c:IsType(TYPE_FUSION) and c:IsRace(RACE_FIEND) and (not f or f(c))
......
......@@ -31,7 +31,7 @@ function c74063034.mfilter2(c,e)
return c:IsOnField() and c:IsAbleToRemove() and not c:IsImmuneToEffect(e)
end
function c74063034.mfilter3(c)
return c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
end
function c74063034.spfilter1(c,e,tp,m,f,chkf)
return c:IsType(TYPE_FUSION) and (not f or f(c))
......@@ -44,10 +44,11 @@ end
function c74063034.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then
local chkf=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and PLAYER_NONE or tp
local mg1=Duel.GetFusionMaterial(tp):Filter(Card.IsLocation,nil,LOCATION_HAND)
local mg=Duel.GetFusionMaterial(tp)
local mg1=mg:Filter(Card.IsLocation,nil,LOCATION_HAND)
local res=Duel.IsExistingMatchingCard(c74063034.spfilter1,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,chkf)
if res then return true end
local mg2=Duel.GetFusionMaterial(tp):Filter(c74063034.mfilter0,nil)
local mg2=mg:Filter(c74063034.mfilter0,nil)
local mg3=Duel.GetMatchingGroup(c74063034.mfilter3,tp,LOCATION_GRAVE,LOCATION_GRAVE,nil)
mg2:Merge(mg1)
mg2:Merge(mg3)
......@@ -67,10 +68,11 @@ function c74063034.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
end
function c74063034.spop(e,tp,eg,ep,ev,re,r,rp)
local chkf=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and PLAYER_NONE or tp
local mg1=Duel.GetFusionMaterial(tp):Filter(c74063034.mfilter1,nil,e)
local mg=Duel.GetFusionMaterial(tp)
local mg1=mg:Filter(c74063034.mfilter1,nil,e)
local sg1=Duel.GetMatchingGroup(c74063034.spfilter1,tp,LOCATION_EXTRA,0,nil,e,tp,mg1,nil,chkf)
local mg2=Duel.GetFusionMaterial(tp):Filter(c74063034.mfilter2,nil,e)
local mg3=Duel.GetMatchingGroup(c74063034.mfilter3,tp,LOCATION_GRAVE,0,nil)
local mg2=mg:Filter(c74063034.mfilter2,nil,e)
local mg3=Duel.GetMatchingGroup(c74063034.mfilter3,tp,LOCATION_GRAVE,LOCATION_GRAVE,nil)
mg2:Merge(mg1)
mg2:Merge(mg3)
local sg2=Duel.GetMatchingGroup(c74063034.spfilter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg2,nil,chkf)
......
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