Skip to content

Y
ygopro-222DIY-cards
Commit 1b580e67 authored by TanakaKotoha's avatar TanakaKotoha
Browse files
Options

Merge branch 'master' of github.com:alstroemeria-silentlove/ygopro-222DIY-cards

parents 36cad0e1 f35fa650
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
expansions/script/c12034012.lua
View file @ 1b580e67
...@@ -35,7 +35,7 @@ end ...@@ -35,7 +35,7 @@ end
function cm.thop(e,tp,eg,ep,ev,re,r,rp) function cm.thop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local cc=0 local cc=0
if Duel.GetFlagEffect(tp,12034012)==0 then if Duel.GetFlagEffect(tp,12034012)==0 and c:IsRelateToEffect(e) then
cc=Duel.SendtoDeck(c,tp,0,REASON_EFFECT) cc=Duel.SendtoDeck(c,tp,0,REASON_EFFECT)
end end
if Duel.GetFlagEffect(tp,12034012)>0 or cc>0 then if Duel.GetFlagEffect(tp,12034012)>0 or cc>0 then
...@@ -61,4 +61,4 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -61,4 +61,4 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.RegisterFlagEffect(tp,m,RESET_EVENT+RESET_PHASE+PHASE_END,0,1) Duel.RegisterFlagEffect(tp,m,RESET_EVENT+RESET_PHASE+PHASE_END,0,1)
end end
end end
end end
\ No newline at end of file
expansions/script/c12034013.lua
View file @ 1b580e67
...@@ -36,7 +36,7 @@ end ...@@ -36,7 +36,7 @@ end
function cm.thop(e,tp,eg,ep,ev,re,r,rp) function cm.thop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local cc=0 local cc=0
if Duel.GetFlagEffect(tp,12034012)==0 then if Duel.GetFlagEffect(tp,12034012)==0 and c:IsRelateToEffect(e) then
cc=Duel.SendtoDeck(c,tp,0,REASON_EFFECT) cc=Duel.SendtoDeck(c,tp,0,REASON_EFFECT)
end end
if Duel.GetFlagEffect(tp,12034012)>0 or cc>0 then if Duel.GetFlagEffect(tp,12034012)>0 or cc>0 then
...@@ -71,4 +71,4 @@ function cm.imfilter(c) ...@@ -71,4 +71,4 @@ function cm.imfilter(c)
end end
function cm.efilter(e,re) function cm.efilter(e,re)
return e:GetOwnerPlayer()~=re:GetOwnerPlayer() and re:IsActivated() return e:GetOwnerPlayer()~=re:GetOwnerPlayer() and re:IsActivated()
end end
\ No newline at end of file
expansions/script/c12034014.lua
View file @ 1b580e67
...@@ -30,7 +30,7 @@ end ...@@ -30,7 +30,7 @@ end
function cm.thop(e,tp,eg,ep,ev,re,r,rp) function cm.thop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local cc=0 local cc=0
if Duel.GetFlagEffect(tp,12034012)==0 then if Duel.GetFlagEffect(tp,12034012)==0 and c:IsRelateToEffect(e) then
cc=Duel.SendtoDeck(c,tp,0,REASON_EFFECT) cc=Duel.SendtoDeck(c,tp,0,REASON_EFFECT)
end end
if Duel.GetFlagEffect(tp,12034012)>0 or cc>0 then if Duel.GetFlagEffect(tp,12034012)>0 or cc>0 then
...@@ -68,4 +68,4 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -68,4 +68,4 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.RegisterEffect(e3,tp) Duel.RegisterEffect(e3,tp)
end end
end end
end end
\ No newline at end of file
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