Commit 2e2d4efd authored by POLYMER's avatar POLYMER

fix

parent a1307239
...@@ -31,7 +31,7 @@ function s.initial_effect(c) ...@@ -31,7 +31,7 @@ function s.initial_effect(c)
-- --
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetDescription(aux.Stringid(id,0)) e3:SetDescription(aux.Stringid(id,0))
e3:SetCategory(CATEGORY_REMOVE) e3:SetCategory(CATEGORY_TOGRAVE)
e3:SetType(EFFECT_TYPE_QUICK_O) e3:SetType(EFFECT_TYPE_QUICK_O)
e3:SetCode(EVENT_FREE_CHAIN) e3:SetCode(EVENT_FREE_CHAIN)
e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_MZONE)
......
...@@ -66,8 +66,10 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -66,8 +66,10 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,e,tp,mg) local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,e,tp,mg)
local tc=g:GetFirst() local tc=g:GetFirst()
if not tc then return end if not tc then return end
Duel.ConfirmCards(tp,g) local hg=g:Filter(Card.IsLocation,nil,LOCATION_HAND+LOCATION_DECK)
Duel.ConfirmCards(1-tp,g) local og=g:Filter(Card.IsLocation,nil,LOCATION_GRAVE)
if #hg>0 then Duel.ConfirmCards(1-tp,hg) end
if #og>0 then Duel.HintSelection(og) end
if g:FilterCount(Card.IsLocation,nil,LOCATION_HAND)>=1 then if g:FilterCount(Card.IsLocation,nil,LOCATION_HAND)>=1 then
Duel.ShuffleHand(tp) Duel.ShuffleHand(tp)
end end
......
...@@ -100,8 +100,9 @@ function c9911451.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -100,8 +100,9 @@ function c9911451.thop(e,tp,eg,ep,ev,re,r,rp)
if tc1 and tc2 and aux.NecroValleyFilter()(tc2) then if tc1 and tc2 and aux.NecroValleyFilter()(tc2) then
local sg=Group.FromCards(tc1,tc2) local sg=Group.FromCards(tc1,tc2)
Duel.DisableShuffleCheck() Duel.DisableShuffleCheck()
tc1:SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
if Duel.SendtoHand(sg,tp,REASON_EFFECT)>0 then if Duel.SendtoHand(sg,tp,REASON_EFFECT)>0 then
Duel.ConfirmCards(1-tp,sg) Duel.ConfirmCards(1-tp,tc2)
Duel.ShuffleHand(tp) Duel.ShuffleHand(tp)
end end
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