Commit 737894dc authored by xiaoye's avatar xiaoye

fix

parent 9f5f243f
...@@ -27,6 +27,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -27,6 +27,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(vgf.IsLevel,tp,LOCATION_HAND,0,3,nil,3) end if chk==0 then return Duel.IsExistingMatchingCard(vgf.IsLevel,tp,LOCATION_HAND,0,3,nil,3) end
local g=vgf.SelectMatchingCard(HINTMSG_CONFIRM,e,tp,vgf.IsLevel,tp,LOCATION_HAND,0,3,3,nil,3) local g=vgf.SelectMatchingCard(HINTMSG_CONFIRM,e,tp,vgf.IsLevel,tp,LOCATION_HAND,0,3,3,nil,3)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
Duel.ShuffleHand(tp)
end end
function cm.condition(e,c) function cm.condition(e,c)
local tp=e:GetHandlerPlayer() local tp=e:GetHandlerPlayer()
......
...@@ -9,6 +9,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -9,6 +9,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(vgf.IsLevel,tp,LOCATION_HAND,0,2,nil,3) end if chk==0 then return Duel.IsExistingMatchingCard(vgf.IsLevel,tp,LOCATION_HAND,0,2,nil,3) end
local g=vgf.SelectMatchingCard(HINTMSG_CONFIRM,e,tp,vgf.IsLevel,tp,LOCATION_HAND,0,2,2,nil,3) local g=vgf.SelectMatchingCard(HINTMSG_CONFIRM,e,tp,vgf.IsLevel,tp,LOCATION_HAND,0,2,2,nil,3)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
Duel.ShuffleHand(tp)
end end
function cm.operation(e,tp,eg,ep,ev,re,r,rp) function cm.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmDecktop(tp,1) Duel.ConfirmDecktop(tp,1)
......
...@@ -17,7 +17,6 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -17,7 +17,6 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
vgf.Sendto(LOCATION_MZONE,g,0,tp) vgf.Sendto(LOCATION_MZONE,g,0,tp)
else else
vgf.Sendto(LOCATION_HAND,g,nil,REASON_EFFECT) vgf.Sendto(LOCATION_HAND,g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g)
end end
end end
function cm.operation2(e,tp,eg,ep,ev,re,r,rp) function cm.operation2(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -15,6 +15,5 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -15,6 +15,5 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
vgf.Sendto(LOCATION_MZONE,g,0,tp) vgf.Sendto(LOCATION_MZONE,g,0,tp)
else else
vgf.Sendto(LOCATION_HAND,g,nil,REASON_EFFECT) vgf.Sendto(LOCATION_HAND,g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g)
end end
end end
\ No newline at end of file
...@@ -30,8 +30,6 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -30,8 +30,6 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
local sg=g:FilterSelect(tp,cm.filter,1,1,nil) local sg=g:FilterSelect(tp,cm.filter,1,1,nil)
Duel.DisableShuffleCheck() Duel.DisableShuffleCheck()
vgf.Sendto(LOCATION_HAND,sg,nil,REASON_EFFECT) vgf.Sendto(LOCATION_HAND,sg,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,sg)
Duel.ShuffleHand(tp)
g:RemoveCard(vgf.ReturnCard(sg)) g:RemoveCard(vgf.ReturnCard(sg))
elseif (sel==1 and a and b) or (sel==0 and not a and b) then elseif (sel==1 and a and b) or (sel==0 and not a and b) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CALL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CALL)
......
...@@ -21,10 +21,9 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -21,10 +21,9 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
local sg=g:FilterSelect(tp,cm.filter,0,1,nil) local sg=g:FilterSelect(tp,cm.filter,0,1,nil)
if sg:GetCount()>0 then if sg:GetCount()>0 then
vgf.Sendto(LOCATION_HAND,sg,nil,REASON_EFFECT) vgf.Sendto(LOCATION_HAND,sg,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,sg)
else else
Duel.Draw(tp,1,REASON_EFFECT)
Duel.ShuffleDeck(tp) Duel.ShuffleDeck(tp)
Duel.Draw(tp,1,REASON_EFFECT)
end end
end end
function cm.filter(c) function cm.filter(c)
......
...@@ -22,7 +22,6 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -22,7 +22,6 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP_ATTACK) Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP_ATTACK)
else else
vgf.Sendto(LOCATION_HAND,g,nil,REASON_EFFECT) vgf.Sendto(LOCATION_HAND,g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g)
local tg=vgf.SelectMatchingCard(HINTMSG_DISCARD,e,tp,nil,tp,LOCATION_HAND,0,1,1,nil) local tg=vgf.SelectMatchingCard(HINTMSG_DISCARD,e,tp,nil,tp,LOCATION_HAND,0,1,1,nil)
vgf.Sendto(LOCATION_DROP,tg,REASON_COST) vgf.Sendto(LOCATION_DROP,tg,REASON_COST)
end end
......
...@@ -23,10 +23,8 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -23,10 +23,8 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.DisableShuffleCheck() Duel.DisableShuffleCheck()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local sg=g:FilterSelect(tp,cm.filter,0,1,nil) local sg=g:FilterSelect(tp,cm.filter,0,1,nil)
if #sg > 0 then if #sg>0 then
vgf.Sendto(LOCATION_HAND,sg,nil,REASON_EFFECT) vgf.Sendto(LOCATION_HAND,sg,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,sg)
Duel.ShuffleHand(tp)
g:RemoveCard(vgf.ReturnCard(sg)) g:RemoveCard(vgf.ReturnCard(sg))
end end
for i=1,#g do for i=1,#g do
......
...@@ -25,8 +25,6 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -25,8 +25,6 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
local sg=g:FilterSelect(tp,cm.filter,0,1,nil) local sg=g:FilterSelect(tp,cm.filter,0,1,nil)
if #sg > 0 then if #sg > 0 then
vgf.Sendto(LOCATION_HAND,sg,nil,REASON_EFFECT) vgf.Sendto(LOCATION_HAND,sg,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,sg)
Duel.ShuffleHand(tp)
g:RemoveCard(vgf.ReturnCard(sg)) g:RemoveCard(vgf.ReturnCard(sg))
end end
for i=1,#g do for i=1,#g do
......
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