Commit 6e9c9ac7 authored by 花桃白音's avatar 花桃白音

fix #163s,791

parent cb612f52
...@@ -121,7 +121,7 @@ function c16372014.setop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -121,7 +121,7 @@ function c16372014.setop2(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetLocationCount(tp,LOCATION_SZONE)<1 then return end if Duel.GetLocationCount(tp,LOCATION_SZONE)<1 then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
local tc=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c16372014.setfilter),tp,LOCATION_GRAVE,0,1,1,nil):GetFirst() local tc=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c16372014.setfilter),tp,LOCATION_GRAVE,0,1,1,nil):GetFirst()
if tc and Duel.MoveToField(tc,tp,p,LOCATION_SZONE,POS_FACEUP,true) then if tc and Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) then
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetCode(EFFECT_CHANGE_TYPE)
......
...@@ -52,8 +52,7 @@ function c16372019.bfgcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -52,8 +52,7 @@ function c16372019.bfgcost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST) Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)
end end
function c16372019.ffilter(c,e,tp) function c16372019.ffilter(c,e,tp)
return c:IsType(TYPE_FUSION) return Duel.IsExistingMatchingCard(c16372019.spfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil,c,e,tp)
and Duel.IsExistingMatchingCard(c16372019.spfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil,c,e,tp)
end end
function c16372019.spfilter(c,fc,e,tp) function c16372019.spfilter(c,fc,e,tp)
return aux.IsCodeListed(fc,c:GetCode()) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return aux.IsCodeListed(fc,c:GetCode()) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
......
...@@ -22,7 +22,7 @@ local e2=Effect.CreateEffect(c) ...@@ -22,7 +22,7 @@ local e2=Effect.CreateEffect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function cm.filter0(c) function cm.filter0(c)
return c:IsAbleToRemove() and c:IsLocation(LOCATION_MZONE) return c:IsAbleToRemove()
end end
function cm.filter1(c,e) function cm.filter1(c,e)
return c:IsAbleToRemove() and not c:IsImmuneToEffect(e) return c:IsAbleToRemove() and not c:IsImmuneToEffect(e)
......
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