Skip to content

no81cards
no81cards
Commit 5bc0ad4d authored by POLYMER's avatar POLYMER
Browse files
Options

fix

parent fbb27808
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
expansions/script/c11451485.lua
View file @ 5bc0ad4d
...@@ -67,7 +67,7 @@ function cm.hand(g) ...@@ -67,7 +67,7 @@ function cm.hand(g)
return g:FilterCount(Card.IsLocation,nil,LOCATION_HAND)<=1 return g:FilterCount(Card.IsLocation,nil,LOCATION_HAND)<=1
end end
function cm.hand2(g) function cm.hand2(g)
return g:FilterCount(function(c) return c:IsAttribute(ATTRIBUTE_FIRE) and c:IsRace(RACE_FAIRY) and c:IsLocation(LOCATION_HAND) and not c:IsXyzLevel(sc,8) and not c:IsRank(8) end,nil)<=1 return g:FilterCount(function(c) return c:IsAttribute(ATTRIBUTE_FIRE) and c:IsRace(RACE_FAIRY) and c:IsLocation(LOCATION_HAND) and not c:IsLevel(8) and not c:IsRank(8) end,nil)<=1
end end
function cm.spcon(e,c,og,min,max) function cm.spcon(e,c,og,min,max)
if c==nil then return true end if c==nil then return true end
...@@ -84,7 +84,7 @@ function cm.spcon(e,c,og,min,max) ...@@ -84,7 +84,7 @@ function cm.spcon(e,c,og,min,max)
local exchk=cm.hand local exchk=cm.hand
if og then if og then
mg=og:Filter(cm.spfilter2,c,c) mg=og:Filter(cm.spfilter2,c,c)
exchk=cm.hand2 exchk=aux.TRUE --cm.hand2
else else
mg=g mg=g
end end
...@@ -105,7 +105,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,c,og,min,max) ...@@ -105,7 +105,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,c,og,min,max)
if max<maxc then maxc=max end if max<maxc then maxc=max end
end end
local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,c,c) local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,c,c)
local exchk=cm.hand local exchk=aux.TRUE --cm.hand
local mg=nil local mg=nil
if og then if og then
mg=og:Filter(cm.spfilter2,c,c) mg=og:Filter(cm.spfilter2,c,c)
......
expansions/script/c11451486.lua
View file @ 5bc0ad4d
...@@ -65,7 +65,7 @@ function cm.hand(g) ...@@ -65,7 +65,7 @@ function cm.hand(g)
return g:FilterCount(Card.IsLocation,nil,LOCATION_HAND)<=1 return g:FilterCount(Card.IsLocation,nil,LOCATION_HAND)<=1
end end
function cm.hand2(g) function cm.hand2(g)
return g:FilterCount(function(c) return c:IsAttribute(ATTRIBUTE_WATER) and c:IsRace(RACE_FAIRY) and c:IsLocation(LOCATION_HAND) and not c:IsXyzLevel(sc,8) and not c:IsRank(8) end,nil)<=1 return g:FilterCount(function(c) return c:IsAttribute(ATTRIBUTE_WATER) and c:IsRace(RACE_FAIRY) and c:IsLocation(LOCATION_HAND) and not c:IsLevel(8) and not c:IsRank(8) end,nil)<=1
end end
function cm.spcon(e,c,og,min,max) function cm.spcon(e,c,og,min,max)
if c==nil then return true end if c==nil then return true end
...@@ -82,7 +82,7 @@ function cm.spcon(e,c,og,min,max) ...@@ -82,7 +82,7 @@ function cm.spcon(e,c,og,min,max)
local exchk=cm.hand local exchk=cm.hand
if og then if og then
mg=og:Filter(cm.spfilter2,c,c) mg=og:Filter(cm.spfilter2,c,c)
exchk=cm.hand2 exchk=aux.TRUE --cm.hand2
else else
mg=g mg=g
end end
...@@ -107,7 +107,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,c,og,min,max) ...@@ -107,7 +107,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,c,og,min,max)
local mg=nil local mg=nil
if og then if og then
mg=og:Filter(cm.spfilter2,c,c) mg=og:Filter(cm.spfilter2,c,c)
exchk=cm.hand2 exchk=aux.TRUE --cm.hand2
else else
mg=g mg=g
end end
...@@ -297,5 +297,5 @@ function cm.imop(e,tp,eg,ep,ev,re,r,rp) ...@@ -297,5 +297,5 @@ function cm.imop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function cm.efilter(e,re) function cm.efilter(e,re)
return re:GetOwner()~=e:GetOwner() return re:GetOwner()~=e:GetOwner() --or (re:IsActivated() and not re:GetOwner():IsRelateToEffect(re))
end end
\ No newline at end of file
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