Commit 3124b512 authored by TanakaKotoha's avatar TanakaKotoha

fix 2

parent c6285d14
...@@ -74,8 +74,11 @@ end ...@@ -74,8 +74,11 @@ end
function cm.scon2(e,tp,eg,ep,ev,re,r,rp) function cm.scon2(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPIRIT)>=5 return Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPIRIT)>=5
end end
function cm.sfilter(c,att)
return c:IsAttribute(att) and c:IsType(TYPE_SPIRIT)
end
function cm.filter2(c,tp) function cm.filter2(c,tp)
return c:IsType(TYPE_SPIRIT) and c:IsAbleToHand() and not Duel.IsExistingMatchingCard(Card.IsAttribute,tp,LOCATION_GRAVE,0,1,nil,c:GetAttribute()) return c:IsType(TYPE_SPIRIT) and c:IsAbleToHand() and not Duel.IsExistingMatchingCard(cm.sfilter,tp,LOCATION_GRAVE,0,1,nil,c:GetAttribute())
end end
function cm.stg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function cm.stg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chk==0 then return Duel.IsExistingMatchingCard(cm.filter2,tp,LOCATION_DECK,0,1,nil,tp) end if chk==0 then return Duel.IsExistingMatchingCard(cm.filter2,tp,LOCATION_DECK,0,1,nil,tp) end
......
...@@ -71,7 +71,7 @@ function c26809023.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -71,7 +71,7 @@ function c26809023.spop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c26809023.cfilter(c) function c26809023.cfilter(c)
return c:IsType(TYPE_EFFECT) return c:IsType(TYPE_EFFECT) and c:IsFaceup()
end end
function c26809023.handcon(e) function c26809023.handcon(e)
local tp=e:GetHandlerPlayer() local tp=e:GetHandlerPlayer()
......
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