Commit d1b9bd50 authored by POLYMER's avatar POLYMER

fix

parent c666e0a6
...@@ -49,7 +49,7 @@ end ...@@ -49,7 +49,7 @@ end
function s.limitcheck(e,tp,eg,ep,ev,re,r,rp) function s.limitcheck(e,tp,eg,ep,ev,re,r,rp)
local tc=eg:GetFirst() local tc=eg:GetFirst()
while tc do while tc do
if (Duel.GetTurnPlayer()==1-tc:GetControler() or Duel.GetCurrentPhase()~=PHASE_DRAW) and tc:GetPreviousControler()==tc:GetControler() and tc:GetPreviousLocation()&LOCATION_DECK>0 then if (Duel.GetTurnPlayer()==1-tc:GetControler() or Duel.GetCurrentPhase()~=PHASE_DRAW) and tc:GetPreviousControler()==tc:GetControler() and tc:GetPreviousLocation()&LOCATION_DECK>0 and Duel.GetTurnCount()>0 then
Duel.RegisterFlagEffect(tc:GetControler(),id,RESET_PHASE+PHASE_END,0,1) Duel.RegisterFlagEffect(tc:GetControler(),id,RESET_PHASE+PHASE_END,0,1)
end end
tc=eg:GetNext() tc=eg:GetNext()
......
...@@ -53,7 +53,7 @@ function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -53,7 +53,7 @@ function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
end end
function cm.thop(e,tp,eg,ep,ev,re,r,rp) function cm.thop(e,tp,eg,ep,ev,re,r,rp)
--local tp=e:GetHandlerPlayer() local p=e:GetHandlerPlayer()
local num=Duel.GetFlagEffect(p,60010002) local num=Duel.GetFlagEffect(p,60010002)
Duel.ConfirmDecktop(p,num) Duel.ConfirmDecktop(p,num)
local g=Duel.GetDecktopGroup(p,num) local g=Duel.GetDecktopGroup(p,num)
......
...@@ -39,6 +39,7 @@ function cm.oop(e,tp,eg,ep,ev,re,r,rp) ...@@ -39,6 +39,7 @@ function cm.oop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local x=Duel.TossDice(tp,1) local x=Duel.TossDice(tp,1)
Duel.Draw(tp,x,REASON_EFFECT) Duel.Draw(tp,x,REASON_EFFECT)
Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
local hg=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_HAND,0,nil):Select(tp,x,x,nil) local hg=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_HAND,0,nil):Select(tp,x,x,nil)
Duel.SendtoDeck(hg,tp,0,REASON_EFFECT) Duel.SendtoDeck(hg,tp,0,REASON_EFFECT)
...@@ -102,6 +103,9 @@ function cm.oop(e,tp,eg,ep,ev,re,r,rp) ...@@ -102,6 +103,9 @@ function cm.oop(e,tp,eg,ep,ev,re,r,rp)
Duel.ShuffleHand(1-tp) Duel.ShuffleHand(1-tp)
end end
end end
if c:IsRelateToEffect(e) and c:IsLocation(LOCATION_REMOVED) then
Duel.SendtoDeck(c,nil,2,REASON_EFFECT)
end
end end
function cm.ActivateCard(c,tp,oe) function cm.ActivateCard(c,tp,oe)
local e=c:GetActivateEffect() local e=c:GetActivateEffect()
......
...@@ -39,6 +39,7 @@ function cm.oop(e,tp,eg,ep,ev,re,r,rp) ...@@ -39,6 +39,7 @@ function cm.oop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local x=Duel.TossDice(tp,1) local x=Duel.TossDice(tp,1)
Duel.Draw(tp,x,REASON_EFFECT) Duel.Draw(tp,x,REASON_EFFECT)
Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
local hg=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_HAND,0,nil):Select(tp,x,x,nil) local hg=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_HAND,0,nil):Select(tp,x,x,nil)
Duel.SendtoDeck(hg,tp,0,REASON_EFFECT) Duel.SendtoDeck(hg,tp,0,REASON_EFFECT)
...@@ -90,6 +91,9 @@ function cm.oop(e,tp,eg,ep,ev,re,r,rp) ...@@ -90,6 +91,9 @@ function cm.oop(e,tp,eg,ep,ev,re,r,rp)
e3:SetReset(RESET_PHASE+PHASE_END,1) e3:SetReset(RESET_PHASE+PHASE_END,1)
Duel.RegisterEffect(e3,tp) Duel.RegisterEffect(e3,tp)
end end
if c:IsRelateToEffect(e) and c:IsLocation(LOCATION_REMOVED) then
Duel.SendtoDeck(c,nil,2,REASON_EFFECT)
end
end end
function cm.negop1(e,tp,eg,ep,ev,re,r,rp) function cm.negop1(e,tp,eg,ep,ev,re,r,rp)
local rc=re:GetHandler() local rc=re:GetHandler()
......
...@@ -23,6 +23,7 @@ function cm.initial_effect(c) ...@@ -23,6 +23,7 @@ function cm.initial_effect(c)
e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCode(EVENT_SPSUMMON_SUCCESS)
e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetCountLimit(1,m+o) e2:SetCountLimit(1,m+o)
e2:SetCondition(cm.thcon)
e2:SetCost(cm.thcost) e2:SetCost(cm.thcost)
e2:SetOperation(cm.thop) e2:SetOperation(cm.thop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
...@@ -30,6 +31,9 @@ end ...@@ -30,6 +31,9 @@ end
function cm.lcheck(g) function cm.lcheck(g)
return g:GetClassCount(Card.GetLinkAttribute)==1 return g:GetClassCount(Card.GetLinkAttribute)==1
end end
function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
end
function cm.costfilter(c) function cm.costfilter(c)
return c:IsType(TYPE_MONSTER) and c:IsDiscardable() return c:IsType(TYPE_MONSTER) and c:IsDiscardable()
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