Commit 56b702bb authored by POLYMER's avatar POLYMER

fix

parent 0cd92b99
...@@ -2021,11 +2021,11 @@ function s.chainactop(e,tp,eg,ep,ev,re,r,rp) ...@@ -2021,11 +2021,11 @@ function s.chainactop(e,tp,eg,ep,ev,re,r,rp)
local se=etable[1] local se=etable[1]
if #etable>1 then if #etable>1 then
local op=aux.SelectFromOptions(tp, local op=aux.SelectFromOptions(tp,
{etable[1],etable[1]:GetDescription()}, {#etable>=1 and etable[1],etable[1]:GetDescription()},
{etable[2],etable[2]:GetDescription()}, {#etable>=2 and etable[2],etable[2]:GetDescription()},
{etable[3],etable[3]:GetDescription()}, {#etable>=3 and etable[3],etable[3]:GetDescription()},
{etable[4],etable[4]:GetDescription()}, {#etable>=4 and etable[4],etable[4]:GetDescription()},
{etable[5],etable[5]:GetDescription()}) {#etable>=5 and etable[5],etable[5]:GetDescription()})
se=etable[op] se=etable[op]
end end
local code=sc:GetOriginalCode() local code=sc:GetOriginalCode()
......
...@@ -15,6 +15,10 @@ function c65899930.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -15,6 +15,10 @@ function c65899930.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
local ec=Duel.SelectMatchingCard(tp,aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,e:GetHandler()):GetFirst() local ec=Duel.SelectMatchingCard(tp,aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,e:GetHandler()):GetFirst()
if ec then if ec then
if ec:IsType(TYPE_XYZ) and ec:GetOverlayCount()>0 then
local mg=ec:GetOverlayGroup()
Duel.SendtoGrave(mg,REASON_RULE)
end
Duel.Exile(ec,0) Duel.Exile(ec,0)
end end
end end
\ No newline at end of file
...@@ -97,7 +97,7 @@ function s.spfilter1(c,e,tp) ...@@ -97,7 +97,7 @@ function s.spfilter1(c,e,tp)
return not c:IsType(TYPE_TOKEN) and c:IsLocation(LOCATION_GRAVE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP,1-tp) return not c:IsType(TYPE_TOKEN) and c:IsLocation(LOCATION_GRAVE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP,1-tp)
end end
function s.spfilter2(c,e,tp) function s.spfilter2(c,e,tp)
return not c:IsType(TYPE_TOKEN) and not c:IsLocation(LOCATION_GRAVE) and not c:IsLocation(LOCATION_EXTRA) and not c:IsLocation(LOCATION_DECK) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return not c:IsType(TYPE_TOKEN) and not (c:IsLocation(LOCATION_EXTRA) and c:IsFacedown()) and not c:IsLocation(LOCATION_DECK) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function s.desop(e,tp,eg,ep,ev,re,r,rp) function s.desop(e,tp,eg,ep,ev,re,r,rp)
local cg=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS) local cg=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
...@@ -113,7 +113,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -113,7 +113,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
if #spg1>0 and ft1>0 then if #spg1>0 and ft1>0 then
if #spg1>ft1 then if #spg1>ft1 then
local spg=spg1 local spg=spg1
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,4))
spg1=spg:Select(tp,ft1,ft1,nil) spg1=spg:Select(tp,ft1,ft1,nil)
end end
if Duel.SpecialSummon(spg1,0,tp,1-tp,false,false,POS_FACEUP)~=0 then if Duel.SpecialSummon(spg1,0,tp,1-tp,false,false,POS_FACEUP)~=0 then
...@@ -128,7 +128,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -128,7 +128,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
if #spg2>0 and ft2>0 then if #spg2>0 and ft2>0 then
if #spg2>ft2 then if #spg2>ft2 then
local spg=spg2 local spg=spg2
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,5))
spg2=spg:Select(tp,ft2,ft2,nil) spg2=spg:Select(tp,ft2,ft2,nil)
end end
Duel.SpecialSummon(spg2,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(spg2,0,tp,tp,false,false,POS_FACEUP)
......
...@@ -69,12 +69,13 @@ function s.initial_effect(c) ...@@ -69,12 +69,13 @@ function s.initial_effect(c)
-- --
if not s.global_effect then if not s.global_effect then
s.global_effect=true s.global_effect=true
local e3=Effect.CreateEffect(c) local ge3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD) ge3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
e3:SetCode(EVENT_CHAIN_SOLVED) ge3:SetCode(EVENT_CHAIN_SOLVED)
e3:SetCondition(s.trcon) ge3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e3:SetOperation(s.trop) ge3:SetCondition(s.trcon)
Duel.RegisterEffect(e3,0) ge3:SetOperation(s.trop)
Duel.RegisterEffect(ge3,0)
end end
end end
function s.rmcfilter(c) function s.rmcfilter(c)
......
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