Skip to content

Y
ygopro-pre-data
Commit e67f52af authored by mercury233's avatar mercury233
Browse files
Options

fix

parent 57c0cff3
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
script/c101106006.lua
View file @ e67f52af
...@@ -90,9 +90,9 @@ function c101106006.remfilter(c) ...@@ -90,9 +90,9 @@ function c101106006.remfilter(c)
return c:IsAbleToRemove() return c:IsAbleToRemove()
end end
function c101106006.remtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c101106006.remtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE+LOCATION_GRAVE) and c101106006.remfilter(chkc) end if chkc then return chkc:IsLocation(LOCATION_ONFIELD+LOCATION_GRAVE) and c101106006.remfilter(chkc) end
if chk==0 then return Duel.IsExistingTarget(c101106006.remfilter,tp,LOCATION_MZONE+LOCATION_GRAVE,LOCATION_MZONE+LOCATION_GRAVE,1,nil) end if chk==0 then return Duel.IsExistingTarget(c101106006.remfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_ONFIELD+LOCATION_GRAVE,1,nil) end
local b1=Duel.IsExistingTarget(c101106006.remfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) local b1=Duel.IsExistingTarget(c101106006.remfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b2=Duel.IsExistingTarget(c101106006.remfilter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil) local b2=Duel.IsExistingTarget(c101106006.remfilter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil)
local op=0 local op=0
if b1 and b2 then if b1 and b2 then
...@@ -103,11 +103,11 @@ function c101106006.remtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -103,11 +103,11 @@ function c101106006.remtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g=nil local g=nil
if op==0 then if op==0 then
g=Duel.SelectTarget(tp,c101106006.remfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil) g=Duel.SelectTarget(tp,c101106006.remfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
elseif op==1 then elseif op==1 then
g=Duel.SelectTarget(tp,c101106006.remfilter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,1,nil) g=Duel.SelectTarget(tp,c101106006.remfilter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,1,nil)
else else
g=Duel.SelectTarget(tp,c101106006.remfilter,tp,LOCATION_MZONE+LOCATION_GRAVE,LOCATION_MZONE+LOCATION_GRAVE,1,1,nil) g=Duel.SelectTarget(tp,c101106006.remfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_ONFIELD+LOCATION_GRAVE,1,1,nil)
end end
Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
end end
......
script/c101106056.lua
View file @ e67f52af
...@@ -15,7 +15,7 @@ function c101106056.cfilter(c,code) ...@@ -15,7 +15,7 @@ function c101106056.cfilter(c,code)
return c:IsCode(code) and (c:IsFaceup() or not c:IsOnField()) return c:IsCode(code) and (c:IsFaceup() or not c:IsOnField())
end end
function c101106056.thfilter(c,tp) function c101106056.thfilter(c,tp)
return c:IsSetCard(0x26c) and c:IsType(TYPE_SPELL) and c:IsAbleToHand() return c:IsSetCard(0x26c) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
and not Duel.IsExistingMatchingCard(c101106056.cfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,1,nil,c:GetCode()) and not Duel.IsExistingMatchingCard(c101106056.cfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,1,nil,c:GetCode())
end end
function c101106056.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function c101106056.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
......
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