Commit 13596551 authored by salix5's avatar salix5

fix 水属性以外

parent e7f5ef07
...@@ -63,5 +63,5 @@ function c50074392.lvop(e,tp,eg,ep,ev,re,r,rp) ...@@ -63,5 +63,5 @@ function c50074392.lvop(e,tp,eg,ep,ev,re,r,rp)
Duel.RegisterEffect(e2,tp) Duel.RegisterEffect(e2,tp)
end end
function c50074392.actfilter(e,c) function c50074392.actfilter(e,c)
return c:GetControler()==e:GetHandlerPlayer() and c:IsType(TYPE_MONSTER) and not c:IsAttribute(ATTRIBUTE_WATER) return c:GetControler()==e:GetHandlerPlayer() and c:IsType(TYPE_MONSTER) and c:IsAttribute(ATTRIBUTE_ALL-ATTRIBUTE_WATER)
end end
...@@ -24,7 +24,7 @@ function c54059040.cfilter(c) ...@@ -24,7 +24,7 @@ function c54059040.cfilter(c)
return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_WATER) return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_WATER)
end end
function c54059040.pfilter(c,e) function c54059040.pfilter(c,e)
return c:IsPosition(POS_FACEUP_ATTACK) and not c:IsAttribute(ATTRIBUTE_WATER) and (not e or c:IsRelateToEffect(e)) return c:IsPosition(POS_FACEUP_ATTACK) and c:IsAttribute(ATTRIBUTE_ALL-ATTRIBUTE_WATER) and (not e or c:IsRelateToEffect(e))
end end
function c54059040.target(e,tp,eg,ep,ev,re,r,rp,chk) function c54059040.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c54059040.cfilter,tp,LOCATION_MZONE,0,1,nil) if chk==0 then return Duel.IsExistingMatchingCard(c54059040.cfilter,tp,LOCATION_MZONE,0,1,nil)
......
...@@ -35,7 +35,7 @@ function c58203736.eftg(e,c) ...@@ -35,7 +35,7 @@ function c58203736.eftg(e,c)
end end
function c58203736.efilter(e,re,rp) function c58203736.efilter(e,re,rp)
local rc=re:GetHandler() local rc=re:GetHandler()
return re:IsActiveType(TYPE_MONSTER) and rc:IsControler(1-e:GetHandlerPlayer()) and not rc:IsAttribute(ATTRIBUTE_WATER) return re:IsActiveType(TYPE_MONSTER) and rc:IsControler(1-e:GetHandlerPlayer()) and rc:IsAttribute(ATTRIBUTE_ALL-ATTRIBUTE_WATER)
end end
function c58203736.spfilter(c,e,tp) function c58203736.spfilter(c,e,tp)
return (aux.IsCodeListed(c,22702055) or (c:IsType(TYPE_NORMAL) and c:IsAttribute(ATTRIBUTE_WATER))) return (aux.IsCodeListed(c,22702055) or (c:IsType(TYPE_NORMAL) and c:IsAttribute(ATTRIBUTE_WATER)))
......
...@@ -49,7 +49,7 @@ function c73659078.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -49,7 +49,7 @@ function c73659078.operation(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c73659078.atktg(e,c) function c73659078.atktg(e,c)
return not c:IsAttribute(ATTRIBUTE_WATER) return c:IsAttribute(ATTRIBUTE_ALL-ATTRIBUTE_WATER)
end end
function c73659078.atkval(e,c) function c73659078.atkval(e,c)
return Duel.GetCounter(0,1,1,0x1015)*-200 return Duel.GetCounter(0,1,1,0x1015)*-200
......
...@@ -87,7 +87,7 @@ function c82321037.spcon2(e,tp,eg,ep,ev,re,r,rp) ...@@ -87,7 +87,7 @@ function c82321037.spcon2(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsReason(REASON_EFFECT) return e:GetHandler():IsReason(REASON_EFFECT)
end end
function c82321037.thfilter(c,e,tp) function c82321037.thfilter(c,e,tp)
return not c:IsAttribute(ATTRIBUTE_WATER) and c:IsRace(RACE_WYRM) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE) return c:IsAttribute(ATTRIBUTE_ALL-ATTRIBUTE_WATER) and c:IsRace(RACE_WYRM) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
end end
function c82321037.sptg2(e,tp,eg,ep,ev,re,r,rp,chk) function c82321037.sptg2(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
......
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