Commit 633f190b authored by Amiya's avatar Amiya

修复

parent 4d328f76
Pipeline #40540 passed with stages
in 2 minutes and 11 seconds
...@@ -47,11 +47,9 @@ end ...@@ -47,11 +47,9 @@ end
function s.setfilter(c,tp) function s.setfilter(c,tp)
return c:IsSetCard(0xef) and c:IsType(TYPE_SPELL) and c:IsSSetable() return c:IsSetCard(0xef) and c:IsType(TYPE_SPELL) and c:IsSSetable()
and (Duel.GetLocationCount(tp,LOCATION_SZONE)>1 or c:IsType(TYPE_FIELD)) and (Duel.GetLocationCount(tp,LOCATION_SZONE)>1 or c:IsType(TYPE_FIELD))
and Duel.IsExistingMatchingCard(s.setfilter2,tp,LOCATION_DECK,0,1,nil,tp,c)
end end
function s.setfilter2(c) function s.setfilter2(c,tp,tc)
return c:IsSetCard(0xef) and c:IsType(TYPE_TRAP) and c:IsSSetable()
end
function s.setfilter3(c,tp,tc)
return c:IsSetCard(0xef) and c:IsType(TYPE_TRAP) and c:IsSSetable() return c:IsSetCard(0xef) and c:IsType(TYPE_TRAP) and c:IsSSetable()
and (Duel.GetLocationCount(tp,LOCATION_SZONE)>1 or tc:IsType(TYPE_FIELD)) and (Duel.GetLocationCount(tp,LOCATION_SZONE)>1 or tc:IsType(TYPE_FIELD))
end end
...@@ -66,7 +64,7 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp) ...@@ -66,7 +64,7 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp)
local g1=Duel.SelectMatchingCard(tp,s.setfilter,tp,LOCATION_DECK,0,1,1,nil,tp) local g1=Duel.SelectMatchingCard(tp,s.setfilter,tp,LOCATION_DECK,0,1,1,nil,tp)
if not g1 or g1:GetCount()==0 then return end if not g1 or g1:GetCount()==0 then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
local g2=Duel.SelectMatchingCard(tp,s.setfilter3,tp,LOCATION_DECK,0,1,1,nil,tp,g1:GetFirst()) local g2=Duel.SelectMatchingCard(tp,s.setfilter2,tp,LOCATION_DECK,0,1,1,nil,tp,g1:GetFirst())
if not g2 or g2:GetCount()==0 then return end if not g2 or g2:GetCount()==0 then return end
g1:Merge(g2) g1:Merge(g2)
if g1:GetCount()>0 then if g1:GetCount()>0 then
......
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