Commit fad0f88f authored by mercury233's avatar mercury233

fix

parent 20f2224a
Pipeline #9904 passed with stages
in 1 minute
...@@ -73,6 +73,12 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -73,6 +73,12 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if dt~=0 then if dt~=0 then
aux.DrawReplaceCount=0 aux.DrawReplaceCount=0
aux.DrawReplaceMax=dt aux.DrawReplaceMax=dt
end
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
end
function s.thop(e,tp,eg,ep,ev,re,r,rp)
aux.DrawReplaceCount=aux.DrawReplaceCount+1
if aux.DrawReplaceCount<=aux.DrawReplaceMax then
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
...@@ -81,12 +87,6 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -81,12 +87,6 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
e1:SetReset(RESET_PHASE+PHASE_DRAW) e1:SetReset(RESET_PHASE+PHASE_DRAW)
e1:SetValue(0) e1:SetValue(0)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
end
function s.thop(e,tp,eg,ep,ev,re,r,rp)
aux.DrawReplaceCount=aux.DrawReplaceCount+1
if aux.DrawReplaceCount<=aux.DrawReplaceMax then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
......
...@@ -15,7 +15,8 @@ function s.initial_effect(c) ...@@ -15,7 +15,8 @@ function s.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function s.fsfilter1(c,e) function s.fsfilter1(c,e)
return c:IsAbleToDeck() and not c:IsImmuneToEffect(e) return (c:IsFaceup() or not c:IsLocation(LOCATION_REMOVED)) and c:IsType(TYPE_MONSTER)
and c:IsAbleToDeck() and not c:IsImmuneToEffect(e)
end end
function s.fsfilter2(c,e,tp,m,chkf) function s.fsfilter2(c,e,tp,m,chkf)
return c:IsType(TYPE_FUSION) and aux.IsMaterialListSetCard(c,0x8) return c:IsType(TYPE_FUSION) and aux.IsMaterialListSetCard(c,0x8)
......
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