Skip to content

Y
ygopro-scripts
Commit 12d36d45 authored by mallu11's avatar mallu11 Committed by mercury233
Browse files
Options

fix DisableShuffleCheck (#1240)

parent dd976dca
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
c31706048.lua
View file @ 12d36d45
...@@ -24,6 +24,7 @@ function c31706048.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -24,6 +24,7 @@ function c31706048.activate(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetDecktopGroup(tp,5) local g=Duel.GetDecktopGroup(tp,5)
if g:GetCount()>0 then if g:GetCount()>0 then
if g:IsExists(c31706048.filter,1,nil) then if g:IsExists(c31706048.filter,1,nil) then
Duel.DisableShuffleCheck()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local sg=g:FilterSelect(tp,c31706048.filter,1,1,nil) local sg=g:FilterSelect(tp,c31706048.filter,1,1,nil)
Duel.SendtoHand(sg,nil,REASON_EFFECT) Duel.SendtoHand(sg,nil,REASON_EFFECT)
......
c81558967.lua
View file @ 12d36d45
...@@ -44,6 +44,7 @@ function c81558967.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -44,6 +44,7 @@ function c81558967.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmDecktop(tp,ct) Duel.ConfirmDecktop(tp,ct)
tg=g:Filter(c81558967.thfilter,nil) tg=g:Filter(c81558967.thfilter,nil)
if tg:GetCount()>0 then if tg:GetCount()>0 then
Duel.DisableShuffleCheck()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local tc=tg:Select(tp,1,1,nil):GetFirst() local tc=tg:Select(tp,1,1,nil):GetFirst()
if tc:IsAbleToHand() then if tc:IsAbleToHand() then
...@@ -55,8 +56,9 @@ function c81558967.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -55,8 +56,9 @@ function c81558967.operation(e,tp,eg,ep,ev,re,r,rp)
end end
g:RemoveCard(tc) g:RemoveCard(tc)
Duel.SendtoGrave(g,REASON_EFFECT+REASON_REVEAL) Duel.SendtoGrave(g,REASON_EFFECT+REASON_REVEAL)
else
Duel.ShuffleDeck(tp)
end end
Duel.ShuffleDeck(tp)
end end
function c81558967.spfilter(c,e,tp) function c81558967.spfilter(c,e,tp)
return c:IsSetCard(0x122) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsSetCard(0x122) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
......
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