Commit 1c8cff03 authored by POLYMER's avatar POLYMER

fix

parent 5c3c6abf
...@@ -261,7 +261,7 @@ function cm.retop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -261,7 +261,7 @@ function cm.retop2(e,tp,eg,ep,ev,re,r,rp)
local sg=g:Filter(cm.filter7,nil) local sg=g:Filter(cm.filter7,nil)
g:DeleteGroup() g:DeleteGroup()
local sg1=sg:Filter(Card.IsPreviousControler,nil,tp) local sg1=sg:Filter(Card.IsPreviousControler,nil,tp)
Duel.SendtoHand(sg,tp,REASON_EFFECT) Duel.SendtoHand(sg1,tp,REASON_EFFECT)
local sg2=sg:Filter(Card.IsPreviousControler,nil,1-tp) local sg2=sg:Filter(Card.IsPreviousControler,nil,1-tp)
Duel.SendtoHand(sg,1-tp,REASON_EFFECT) Duel.SendtoHand(sg2,1-tp,REASON_EFFECT)
end end
\ No newline at end of file
...@@ -91,18 +91,17 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -91,18 +91,17 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp) local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
local tc=g:GetFirst() local tc=g:GetFirst()
local ft=Duel.GetLocationCount(tp,LOCATION_MZONE) local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
if tc:IsAbleToHand() or ft>0 and tc:IsCanBeSpecialSummoned(e,0,tp,false,false) then local op=aux.SelectFromOptions(tp,{tc:IsAbleToHand(),1190},{ft>0 and tc:IsCanBeSpecialSummoned(e,0,tp,false,false),1152})
if Duel.SelectOption(tp,1190,1152)==0 then if op==0 then
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc) Duel.ConfirmCards(1-tp,tc)
elseif Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP) then elseif Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP) then
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetCode(EFFECT_CANNOT_ATTACK)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
Duel.SpecialSummonComplete() Duel.SpecialSummonComplete()
end
end end
end end
function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
......
...@@ -111,5 +111,7 @@ function c28333723.setop(e,tp,eg,ep,ev,re,r,rp) ...@@ -111,5 +111,7 @@ function c28333723.setop(e,tp,eg,ep,ev,re,r,rp)
sg:Sub(mg) sg:Sub(mg)
Duel.SpecialSummon(mg,0,tp,tp,false,false,POS_FACEDOWN_DEFENSE) Duel.SpecialSummon(mg,0,tp,tp,false,false,POS_FACEDOWN_DEFENSE)
end end
Duel.SSet(tp,sg) Duel.SSet(tp,sg,tp,false)
sg:Merge(mg)
Duel.ConfirmCards(1-tp,sg)
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