Commit e3a0a300 authored by wind2009's avatar wind2009

Fix material

parent 2b7078dc
Pipeline #32442 passed with stages
in 1 minute and 26 seconds
...@@ -99,7 +99,7 @@ function s.sxfilter(c,tp,xc,eid) ...@@ -99,7 +99,7 @@ function s.sxfilter(c,tp,xc,eid)
local te=c:IsHasEffect(81096431,tp) local te=c:IsHasEffect(81096431,tp)
if te and te:GetValue()==eid then if te and te:GetValue()==eid then
local etg=te:GetTarget() local etg=te:GetTarget()
return etg(te,xc) return not etg or etg(te,xc)
end end
end end
function s.Drake_shark_gf(int_ct,int_tp,xc) function s.Drake_shark_gf(int_ct,int_tp,xc)
...@@ -241,7 +241,7 @@ function Auxiliary.Drake_Solve(tp,g,maxct,minct) ...@@ -241,7 +241,7 @@ function Auxiliary.Drake_Solve(tp,g,maxct,minct)
local et=maxct-g:GetCount() local et=maxct-g:GetCount()
local exg=g:Filter(Card.IsHasEffect,nil,81096431,tp) local exg=g:Filter(Card.IsHasEffect,nil,81096431,tp)
local ext=exg:GetClassCount(s.eftfilter,tp) local ext=exg:GetClassCount(s.eftfilter,tp)
if (et==0 or 2-et==ext) and #exg>0 then if (et==0 or et==ext) and #exg>0 then
for ttc in aux.Next(exg) do for ttc in aux.Next(exg) do
local tte=ttc:IsHasEffect(81096431,tp) local tte=ttc:IsHasEffect(81096431,tp)
if tte then if tte then
...@@ -250,7 +250,7 @@ function Auxiliary.Drake_Solve(tp,g,maxct,minct) ...@@ -250,7 +250,7 @@ function Auxiliary.Drake_Solve(tp,g,maxct,minct)
end end
end end
else else
local st=2-et local st=et
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RESOLVECARD) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RESOLVECARD)
local reg=exg:SelectSubGroup(tp,s.gcheck,false,st,st,tp) local reg=exg:SelectSubGroup(tp,s.gcheck,false,st,st,tp)
for ttc in aux.Next(reg) do for ttc in aux.Next(reg) do
...@@ -262,4 +262,4 @@ function Auxiliary.Drake_Solve(tp,g,maxct,minct) ...@@ -262,4 +262,4 @@ function Auxiliary.Drake_Solve(tp,g,maxct,minct)
end end
end end
end end
end end
\ No newline at end of file
...@@ -55,7 +55,7 @@ function s.sxfilter(c,tp,xc,eid) ...@@ -55,7 +55,7 @@ function s.sxfilter(c,tp,xc,eid)
local te=c:IsHasEffect(id,tp) local te=c:IsHasEffect(id,tp)
if te and te:GetValue()==eid then if te and te:GetValue()==eid then
local etg=te:GetTarget() local etg=te:GetTarget()
return etg(te,xc) return not etg or etg(te,xc)
end end
end end
function s.Drake_shark_gf(int_ct,int_tp,xc) function s.Drake_shark_gf(int_ct,int_tp,xc)
...@@ -237,7 +237,7 @@ function Auxiliary.Drake_Solve(tp,g,maxct,minct) ...@@ -237,7 +237,7 @@ function Auxiliary.Drake_Solve(tp,g,maxct,minct)
local et=maxct-g:GetCount() local et=maxct-g:GetCount()
local exg=g:Filter(Card.IsHasEffect,nil,81096431,tp) local exg=g:Filter(Card.IsHasEffect,nil,81096431,tp)
local ext=exg:GetClassCount(s.eftfilter,tp) local ext=exg:GetClassCount(s.eftfilter,tp)
if (et==0 or 2-et==ext) and #exg>0 then if (et==0 or et==ext) and #exg>0 then
for ttc in aux.Next(exg) do for ttc in aux.Next(exg) do
local tte=ttc:IsHasEffect(81096431,tp) local tte=ttc:IsHasEffect(81096431,tp)
if tte then if tte then
...@@ -246,7 +246,7 @@ function Auxiliary.Drake_Solve(tp,g,maxct,minct) ...@@ -246,7 +246,7 @@ function Auxiliary.Drake_Solve(tp,g,maxct,minct)
end end
end end
else else
local st=2-et local st=et
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RESOLVECARD) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RESOLVECARD)
local reg=exg:SelectSubGroup(tp,s.gcheck,false,st,st,tp) local reg=exg:SelectSubGroup(tp,s.gcheck,false,st,st,tp)
for ttc in aux.Next(reg) do for ttc in aux.Next(reg) do
......
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