Commit 323467d7 authored by mercury233's avatar mercury233

fix union monster spell type check

parent 4d466adf
...@@ -38,7 +38,8 @@ function c22091647.initial_effect(c) ...@@ -38,7 +38,8 @@ function c22091647.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c22091647.costfilter(c) function c22091647.costfilter(c)
return (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup() or c:GetEquipTarget()) and c:GetType()==TYPE_EQUIP+TYPE_SPELL return (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup() or c:GetEquipTarget())
and c:GetType()&(TYPE_EQUIP+TYPE_SPELL)>0
and c:IsAbleToRemoveAsCost() and c:IsAbleToRemoveAsCost()
end end
function c22091647.spcost(e,tp,eg,ep,ev,re,r,rp,chk) function c22091647.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
......
...@@ -11,7 +11,8 @@ function c55749927.initial_effect(c) ...@@ -11,7 +11,8 @@ function c55749927.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c55749927.rmfilter(c) function c55749927.rmfilter(c)
return (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup() or c:GetEquipTarget()) and c:GetType()==TYPE_EQUIP+TYPE_SPELL return (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup() or c:GetEquipTarget())
and c:GetType()&(TYPE_EQUIP+TYPE_SPELL)>0
and c:IsAbleToRemove() and c:IsAbleToRemove()
end end
function c55749927.desfilter(c,tp,g) function c55749927.desfilter(c,tp,g)
......
...@@ -29,7 +29,8 @@ function c58346901.initial_effect(c) ...@@ -29,7 +29,8 @@ function c58346901.initial_effect(c)
end end
function c58346901.cfilter(c,tp) function c58346901.cfilter(c,tp)
return (c:IsLocation(LOCATION_HAND) or c:IsFaceup()) return (c:IsLocation(LOCATION_HAND) or c:IsFaceup())
and ((c:IsRace(RACE_WARRIOR) and c:IsAttribute(ATTRIBUTE_FIRE)) or c:GetType()==TYPE_EQUIP+TYPE_SPELL) and (c:IsRace(RACE_WARRIOR) and c:IsAttribute(ATTRIBUTE_FIRE)
or c:GetType()&(TYPE_EQUIP+TYPE_SPELL)>0)
and c:IsAbleToGraveAsCost() and Duel.GetMZoneCount(tp,c)>0 and c:IsAbleToGraveAsCost() and Duel.GetMZoneCount(tp,c)>0
end end
function c58346901.cost(e,tp,eg,ep,ev,re,r,rp,chk) function c58346901.cost(e,tp,eg,ep,ev,re,r,rp,chk)
......
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