Commit 45d20023 authored by salix5's avatar salix5

fix

parent 9253d9c6
...@@ -24,7 +24,7 @@ function c29401950.initial_effect(c) ...@@ -24,7 +24,7 @@ function c29401950.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c29401950.filter(c,tp,ep) function c29401950.filter(c,tp,ep)
return c:IsFaceup() and c:GetAttack()>=1500 return c:IsLocation(LOCATION_MZONE) and c:IsFaceup() and c:GetAttack()>=1500
and ep~=tp and c:IsDestructable() and c:IsAbleToRemove() and ep~=tp and c:IsDestructable() and c:IsAbleToRemove()
end end
function c29401950.target(e,tp,eg,ep,ev,re,r,rp,chk) function c29401950.target(e,tp,eg,ep,ev,re,r,rp,chk)
...@@ -41,7 +41,7 @@ function c29401950.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -41,7 +41,7 @@ function c29401950.activate(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c29401950.filter2(c,tp) function c29401950.filter2(c,tp)
return c:IsFaceup() and c:GetAttack()>=1500 and c:GetSummonPlayer()~=tp return c:IsLocation(LOCATION_MZONE) and c:IsFaceup() and c:GetAttack()>=1500 and c:GetSummonPlayer()~=tp
and c:IsDestructable() and c:IsAbleToRemove() and c:IsDestructable() and c:IsAbleToRemove()
end end
function c29401950.target2(e,tp,eg,ep,ev,re,r,rp,chk) function c29401950.target2(e,tp,eg,ep,ev,re,r,rp,chk)
......
...@@ -26,6 +26,7 @@ end ...@@ -26,6 +26,7 @@ end
function c36484016.filter2(c,e,tp,m,f,chkf) function c36484016.filter2(c,e,tp,m,f,chkf)
return c:IsType(TYPE_FUSION) and c:IsSetCard(0x101) and (not f or f(c)) return c:IsType(TYPE_FUSION) and c:IsSetCard(0x101) and (not f or f(c))
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
and (not c:IsCode(17412721) or m:IsExists(Card.IsType,1,nil,TYPE_SYNCHRO))
end end
function c36484016.target(e,tp,eg,ep,ev,re,r,rp,chk) function c36484016.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then if chk==0 then
......
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