Skip to content

Y
ygopro
Commit 76a7e126 authored by salix5's avatar salix5
Browse files
Options

Merge pull request #1404 from DailyShana/patch-5 

fix
parents 62ce34a1 27d3b8a2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 13 deletions
script/c1248895.lua
View file @ 76a7e126
...@@ -32,13 +32,8 @@ function c1248895.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -32,13 +32,8 @@ function c1248895.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
end end
function c1248895.activate(e,tp,eg,ep,ev,re,r,rp) function c1248895.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
local dg=nil
local tpe=tc:GetType() local tpe=tc:GetType()
if bit.band(tpe,TYPE_TOKEN)~=0 then return end if bit.band(tpe,TYPE_TOKEN)~=0 then return end
if bit.band(tpe,0x802040)~=0 then local dg=Duel.GetMatchingGroup(Card.IsCode,tc:GetControler(),LOCATION_DECK+LOCATION_HAND,0,nil,tc:GetCode())
dg=Duel.GetMatchingGroup(Card.IsCode,tc:GetControler(),LOCATION_EXTRA,0,nil,tc:GetCode())
else
dg=Duel.GetMatchingGroup(Card.IsCode,tc:GetControler(),LOCATION_DECK+LOCATION_HAND,0,nil,tc:GetCode())
end
Duel.Destroy(dg,REASON_EFFECT) Duel.Destroy(dg,REASON_EFFECT)
end end
script/c57139487.lua
View file @ 76a7e126
...@@ -35,14 +35,9 @@ function c57139487.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -35,14 +35,9 @@ function c57139487.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=sg:GetFirst() local tc=sg:GetFirst()
while tc do while tc do
if tc:IsLocation(LOCATION_REMOVED) then if tc:IsLocation(LOCATION_REMOVED) then
local g1=nil
local tpe=tc:GetType() local tpe=tc:GetType()
if bit.band(tpe,0x802040)~=0 then if bit.band(tpe,TYPE_TOKEN)==0 then
g1=Duel.GetMatchingGroup(Card.IsCode,tp,0,LOCATION_EXTRA,nil,tc:GetCode()) local g1=Duel.GetMatchingGroup(Card.IsCode,tp,0,LOCATION_DECK+LOCATION_HAND,nil,tc:GetCode())
rg:Merge(g1)
elseif bit.band(tpe,TYPE_TOKEN)~=0 then
else
g1=Duel.GetMatchingGroup(Card.IsCode,tp,0,LOCATION_DECK+LOCATION_HAND,nil,tc:GetCode())
rg:Merge(g1) rg:Merge(g1)
end end
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