Commit 517216c4 authored by POLYMER's avatar POLYMER

fix

parent 8f069866
...@@ -110,13 +110,14 @@ end ...@@ -110,13 +110,14 @@ end
function cm.thop(e,tp,eg,ep,ev,re,r,rp) function cm.thop(e,tp,eg,ep,ev,re,r,rp)
if rp==1-tp and e:GetLabel()==1 then return end if rp==1-tp and e:GetLabel()==1 then return end
local g=Duel.GetMatchingGroup(Card.IsAbleToHand,rp,LOCATION_DECK,0,nil) local g=Duel.GetMatchingGroup(Card.IsAbleToHand,rp,LOCATION_DECK,0,nil)
if #g>0 then--and Duel.SelectYesNo(rp,aux.Stringid(m,1)) then if #g>0 then --and Duel.SelectYesNo(rp,aux.Stringid(m,1)) then
Duel.Hint(HINT_CARD,0,m)
Duel.Hint(HINT_SELECTMSG,rp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,rp,HINTMSG_ATOHAND)
local tc=g:Select(rp,0,1,nil):GetFirst() local tc=g:Select(rp,0,1,nil):GetFirst()
if not tc then return end if not tc then return end
if Duel.SendtoHand(tc,nil,REASON_EFFECT)>0 then if Duel.SendtoHand(tc,nil,REASON_EFFECT)>0 then
Duel.ConfirmCards(1-rp,tc) Duel.ConfirmCards(1-rp,tc)
--Duel.HintSelection(Group.FromCards(tc)) Duel.HintSelection(Group.FromCards(tc))
tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1) tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1)
local e2=Effect.CreateEffect(e:GetHandler()) local e2=Effect.CreateEffect(e:GetHandler())
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
...@@ -141,5 +142,5 @@ function cm.descon(e,tp,eg,ep,ev,re,r,rp) ...@@ -141,5 +142,5 @@ function cm.descon(e,tp,eg,ep,ev,re,r,rp)
end end
function cm.desop(e,tp,eg,ep,ev,re,r,rp) function cm.desop(e,tp,eg,ep,ev,re,r,rp)
local tc=e:GetLabelObject() local tc=e:GetLabelObject()
Duel.SendtoDeck(tc,nil,2,REASON_EFFECT) if tc:GetFlagEffect(m)~=0 then Duel.SendtoDeck(tc,nil,2,REASON_EFFECT) end
end end
\ No newline at end of file
...@@ -70,6 +70,7 @@ function cm.trop(e,tp,eg,ep,ev,re,r,rp) ...@@ -70,6 +70,7 @@ function cm.trop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e1:SetCode(EVENT_CHAIN_END) e1:SetCode(EVENT_CHAIN_END)
e1:SetCountLimit(1)
e1:SetOperation(cm.regop) e1:SetOperation(cm.regop)
e1:SetReset(RESET_PHASE+PHASE_END) e1:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
...@@ -78,10 +79,12 @@ function cm.regop(e,tp,eg,ep,ev,re,r,rp) ...@@ -78,10 +79,12 @@ function cm.regop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e1:SetCode(EVENT_CHAIN_SOLVING) e1:SetCode(EVENT_CHAIN_SOLVING)
e1:SetCountLimit(1)
e1:SetCondition(cm.negcon) e1:SetCondition(cm.negcon)
e1:SetOperation(cm.negop) e1:SetOperation(cm.negop)
e1:SetReset(RESET_PHASE+PHASE_END) e1:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
e:Reset()
end end
function cm.negcon(e,tp,eg,ep,ev,re,r,rp) function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsChainDisablable(ev) and ep~=tp return Duel.IsChainDisablable(ev) and ep~=tp
......
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