Commit 22f77745 authored by 花桃白音's avatar 花桃白音

fix #124s

parent f522220e
Pipeline #33111 passed with stages
in 35 minutes and 3 seconds
......@@ -25,7 +25,6 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
local g1=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.tdfilter),tp,LOCATION_HAND+LOCATION_MZONE+LOCATION_GRAVE,0,nil)
local g2=Duel.GetMatchingGroup(aux.TRUE,tp,0,LOCATION_ONFIELD,nil)
local g3=Duel.GetMatchingGroup(Card.IsAbleToGrave,tp,LOCATION_HAND+LOCATION_ONFIELD,0,c)
local g3=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_HAND+LOCATION_ONFIELD,0,nil)
local g4=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.spfilter),tp,LOCATION_DECK+LOCATION_GRAVE,0,nil,e,tp)
local b1=#g1>0 and #g2>0
local b2=#g3>0 and #g4>0
......@@ -50,7 +49,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
local sg1=g1:Select(tp,1,1,nil)
if #sg1>0 then
if Duel.SendtoDeck(sg1,nil,2,REASON_EFFECT)~0 and (sg1:GetFirst():IsLocation(LOCATION_DECK) or
if Duel.SendtoDeck(sg1,nil,2,REASON_EFFECT)~=0 and (sg1:GetFirst():IsLocation(LOCATION_DECK) or
sg1:GetFirst():IsLocation(LOCATION_EXTRA)) and #g2>0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local sg2=g2:Select(tp,1,1,nil)
......
......@@ -61,10 +61,10 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.mobfilter),tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp)
local tc=g:GetFirst()
local b1=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and tc:IsCanBeSpecialSummoned(e,0,tp,false,false)
local b1=Duel.GetLocationCount(tp,LOCATION_MZONE)>0
local b2=Duel.GetLocationCount(tc:GetOwner(),LOCATION_SZONE)>0
if tc then
local op=aux.SelectFromOptions(tp,{b1,1118},{b2,aux.Stringid(id,4)})
local op=aux.SelectFromOptions(tp,{b1,1190},{b2,aux.Stringid(id,4)})
if op==1 then
Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
end
......@@ -102,7 +102,6 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local dg=Duel.SelectMatchingCard(tp,aux.TRUE,tp,0,LOCATION_ONFIELD,1,1,nil)
if #dg>0 then
Duel.HintSelection(dg)
Duel.Destroy(dg,REASON_EFFECT)
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