Commit 6e979463 authored by wind2009's avatar wind2009

Fix

parent ca465b77
Pipeline #42068 canceled with stages
in 8 seconds
...@@ -90,7 +90,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -90,7 +90,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then if chk==0 then
local chkf=tp local chkf=tp
local mg1=Duel.GetFusionMaterial(tp):Filter(s.filter1,nil,e) local mg1=Duel.GetFusionMaterial(tp):Filter(s.filter1,nil,e)
local mg2=Duel.GetMatchingGroup(s.ffiltr,tp,0,LOCATION_MZONE,nil) local mg2=Duel.GetMatchingGroup(s.ffiltr,tp,0,LOCATION_MZONE,nil,e)
mg1:Merge(mg2) mg1:Merge(mg2)
local res=Duel.IsExistingMatchingCard(s.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,c,chkf) local res=Duel.IsExistingMatchingCard(s.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,c,chkf)
if not res then if not res then
......
...@@ -50,8 +50,8 @@ function s.effop(e,tp,eg,ep,ev,re,r,rp) ...@@ -50,8 +50,8 @@ function s.effop(e,tp,eg,ep,ev,re,r,rp)
local op=0 local op=0
if b1 or b2 then if b1 or b2 then
op=aux.SelectFromOptions(1-tp, op=aux.SelectFromOptions(1-tp,
{b1,aux.Stringid(id,1),1}, {b1,aux.Stringid(id,2),1},
{b2,aux.Stringid(id,2),2}) {b2,aux.Stringid(id,3),2})
end end
if op==1 then if op==1 then
Duel.ConfirmDecktop(tp,1) Duel.ConfirmDecktop(tp,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