Commit 08fa6ea4 authored by wind2009's avatar wind2009

Merge branch 'patch-1' into 'master'

fix--創星竜華-光巴

See merge request mycard/pre-release-database-cdb!91
parents 063f87b7 9b7e8ad3
...@@ -84,7 +84,6 @@ function s.pfilter(c,tp) ...@@ -84,7 +84,6 @@ function s.pfilter(c,tp)
end end
function s.gcheck2(g,tp) function s.gcheck2(g,tp)
return g:GetCount()<=Duel.GetLocationCount(tp,LOCATION_SZONE) return g:GetCount()<=Duel.GetLocationCount(tp,LOCATION_SZONE)
and aux.dncheck(g)
end end
function s.spop(e,tp,eg,ep,ev,re,r,rp) function s.spop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
...@@ -98,12 +97,13 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -98,12 +97,13 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
Duel.BreakEffect() Duel.BreakEffect()
local rg=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,0,nil) local rg=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,0,nil)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local sg=rg:SelectSubGroup(tp,s.gcheck1,true,1,2,tp) local sg=rg:SelectSubGroup(tp,s.gcheck1,false,1,2,tp)
local ct=Duel.Destroy(sg,REASON_EFFECT) local ct=Duel.Destroy(sg,REASON_EFFECT)
if ct>0 and Duel.GetLocationCount(tp,LOCATION_SZONE)>0 then if ct>0 and Duel.GetLocationCount(tp,LOCATION_SZONE)>0 then
if ct>2 then ct=2 end if ct>2 then ct=2 end
local dg=Duel.GetMatchingGroup(s.pfilter,tp,LOCATION_DECK,0,nil,tp) local dg=Duel.GetMatchingGroup(s.pfilter,tp,LOCATION_DECK,0,nil,tp)
local pg=dg:SelectSubGroup(tp,s.gcheck2,true,1,ct,tp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
local pg=dg:SelectSubGroup(tp,s.gcheck2,false,1,ct,tp)
for tc in aux.Next(pg) do for tc in aux.Next(pg) do
Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
end end
......
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