Commit c6b9e2cf authored by Amiya's avatar Amiya

修复

parent d2a6f4c1
Pipeline #41359 passed with stages
in 2 minutes and 55 seconds
...@@ -106,8 +106,10 @@ function s.FShaddollFilter3(c) ...@@ -106,8 +106,10 @@ function s.FShaddollFilter3(c)
return c:IsFusionAttribute(ATTRIBUTE_EARTH) return c:IsFusionAttribute(ATTRIBUTE_EARTH)
end end
function s.FShaddollSpFilter1(c,fc,tp,mg,exg,chkf) function s.FShaddollSpFilter1(c,fc,tp,mg,exg,chkf)
local emg=mg local emg=mg:Clone()
emg:Merge(exg) if exg then
emg:Merge(exg)
end
return mg:CheckSubGroup(s.FShaddollgcheck,3,3,c,fc,tp,c,chkf) return mg:CheckSubGroup(s.FShaddollgcheck,3,3,c,fc,tp,c,chkf)
or (exg and emg:CheckSubGroup(s.FShaddollgcheck,3,3,c,fc,tp,c,chkf)) or (exg and emg:CheckSubGroup(s.FShaddollgcheck,3,3,c,fc,tp,c,chkf))
end end
......
...@@ -33,8 +33,7 @@ function s.thfilter(c) ...@@ -33,8 +33,7 @@ function s.thfilter(c)
return c:IsSetCard(0x9d) and c:IsAbleToHand() return c:IsSetCard(0x9d) and c:IsAbleToHand()
end end
function s.gcheck(g,c) function s.gcheck(g,c)
local mg=Group.FromCards() local mg=g:Clone()
mg:Merge(g)
mg:AddCard(c) mg:AddCard(c)
return mg:FilterCount(Card.IsType,nil,TYPE_MONSTER)==1 return mg:FilterCount(Card.IsType,nil,TYPE_MONSTER)==1
and mg:FilterCount(Card.IsType,nil,TYPE_SPELL)==1 and mg:FilterCount(Card.IsType,nil,TYPE_SPELL)==1
......
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