Commit 36cad0e1 authored by TanakaKotoha's avatar TanakaKotoha

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

parents 5b9ec44f 1aa5277e
...@@ -31,7 +31,7 @@ end ...@@ -31,7 +31,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.SendtoHand(c,tp,REASON_EFFECT) cc=Duel.SendtoHand(c,tp,REASON_EFFECT)
end end
if Duel.GetFlagEffect(tp,12034012)>0 or cc>0 then if Duel.GetFlagEffect(tp,12034012)>0 or cc>0 then
...@@ -53,4 +53,4 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -53,4 +53,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
...@@ -40,7 +40,7 @@ end ...@@ -40,7 +40,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
...@@ -80,4 +80,4 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -80,4 +80,4 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
local ae=e:GetHandler():GetActivateEffect() local ae=e:GetHandler():GetActivateEffect()
local fop=ae:GetOperation() local fop=ae:GetOperation()
fop(e,tp,eg,ep,ev,re,r,rp) fop(e,tp,eg,ep,ev,re,r,rp)
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