Commit c79d6c84 authored by Huangnan's avatar Huangnan

fix

parent d6d5325c
Pipeline #40593 failed with stages
in 3 minutes and 18 seconds
......@@ -44,7 +44,7 @@ function s.meff1(c)
c:RegisterEffect(e1)
end
function s.cpcon(e,tp,eg,ep,ev,re,r,rp)
return rp==1-tp and re:IsActiveType(TYPE_SPELL+TYPE_TRAP) and re:GetActivateLocation()==LOCATION_MZONE
return rp==1-tp and re:IsActiveType(TYPE_SPELL+TYPE_TRAP) and re:GetActivateLocation()&LOCATION_ONFIELD~=0
end
function s.cpcost(e,tp,eg,ep,ev,re,r,rp,chk)
e:SetLabel(1)
......@@ -77,9 +77,9 @@ function s.setfilter(c,tp)
end
function s.meff2tg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_GRAVE) and s.setfilter(chkc,tp) end
if chk==0 then return Duel.IsExistingTarget(s.setfilter,tp,0,LOCATION_GRAVE,1,nil,tp) end
if chk==0 then return Duel.IsExistingTarget(s.setfilter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil,tp) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
local g=Duel.SelectTarget(tp,s.setfilter,tp,0,LOCATION_GRAVE,1,1,nil,tp)
local g=Duel.SelectTarget(tp,s.setfilter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,1,nil,tp)
Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,g,1,0,0)
end
function s.meff2op(e,tp,eg,ep,ev,re,r,rp)
......
......@@ -46,7 +46,7 @@ function s.meff1(c)
c:RegisterEffect(e1)
end
function s.cpcon(e,tp,eg,ep,ev,re,r,rp)
return rp==1-tp and re:IsActiveType(TYPE_SPELL+TYPE_TRAP) and re:GetActivateLocation()==LOCATION_SZONE
return rp==1-tp and re:IsActiveType(TYPE_SPELL+TYPE_TRAP) and re:GetActivateLocation()&LOCATION_ONFIELD~=0
end
function s.cpcost(e,tp,eg,ep,ev,re,r,rp,chk)
e:SetLabel(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