Commit fca91818 authored by POLYMER's avatar POLYMER

fix

parent 6abd7ef6
...@@ -13,7 +13,6 @@ function s.initial_effect(c) ...@@ -13,7 +13,6 @@ function s.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--spsummon --spsummon
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(id,2))
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_HAND) e2:SetRange(LOCATION_HAND)
...@@ -59,7 +58,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -59,7 +58,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.desfilter(c,e,tp) function s.desfilter(c,e,tp)
return Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_EXTRA+LOCATION_REMOVED,0,1,nil,e,tp,Group.FromCards(c)) return c:IsSetCard(0x541a) and c:IsType(TYPE_PENDULUM)and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_EXTRA+LOCATION_REMOVED,0,1,nil,e,tp,Group.FromCards(c))
end end
function s.spfilter(c,e,tp,dg) function s.spfilter(c,e,tp,dg)
local tc=dg:GetFirst() local tc=dg:GetFirst()
......
...@@ -9,7 +9,6 @@ function s.initial_effect(c) ...@@ -9,7 +9,6 @@ function s.initial_effect(c)
e2:SetType(EFFECT_TYPE_QUICK_O) e2:SetType(EFFECT_TYPE_QUICK_O)
e2:SetRange(LOCATION_PZONE) e2:SetRange(LOCATION_PZONE)
e2:SetCode(EVENT_CHAINING) e2:SetCode(EVENT_CHAINING)
e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e2:SetCountLimit(1,id) e2:SetCountLimit(1,id)
e2:SetCondition(s.condition) e2:SetCondition(s.condition)
e2:SetTarget(s.target) e2:SetTarget(s.target)
...@@ -30,6 +29,7 @@ function s.initial_effect(c) ...@@ -30,6 +29,7 @@ function s.initial_effect(c)
e3:SetType(EFFECT_TYPE_QUICK_O) e3:SetType(EFFECT_TYPE_QUICK_O)
e3:SetCode(EVENT_CHAINING) e3:SetCode(EVENT_CHAINING)
e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_MZONE)
e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e3:SetCountLimit(1,id+20000) e3:SetCountLimit(1,id+20000)
e3:SetCondition(s.chcon) e3:SetCondition(s.chcon)
e3:SetTarget(s.chtg) e3:SetTarget(s.chtg)
...@@ -86,14 +86,12 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -86,14 +86,12 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function s.chcon(e,tp,eg,ep,ev,re,r,rp)
return ep~=tp
end
function s.dsfilter(c) function s.dsfilter(c)
return c:IsType(TYPE_PENDULUM) and c:IsFaceup() return c:IsType(TYPE_PENDULUM) and c:IsFaceup()
end end
function s.chcon(e,tp,eg,ep,ev,re,r,rp)
local rep=re:GetOperation()
if not rep then return true end
return (re:IsActiveType(TYPE_SPELL) or re:IsActiveType(TYPE_TRAP))
end
function s.chtg(e,tp,eg,ep,ev,re,r,rp,chk) function s.chtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(s.dsfilter,rp,0,LOCATION_ONFIELD,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(s.dsfilter,rp,0,LOCATION_ONFIELD,1,nil) end
end end
......
...@@ -30,7 +30,8 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -30,7 +30,8 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
{b2,aux.Stringid(m,1)}, {b2,aux.Stringid(m,1)},
{b3,aux.Stringid(m,2)}) {b3,aux.Stringid(m,2)})
if op==1 then if op==1 then
Duel.SelectTarget(tp,aux.NegateEffectMonsterFilter,tp,0,LOCATION_MZONE,1,1,nil) local g=Duel.SelectTarget(tp,aux.NegateEffectMonsterFilter,tp,0,LOCATION_MZONE,1,1,nil)
Duel.HintSelection(g)
e:SetCategory(CATEGORY_DISABLE) e:SetCategory(CATEGORY_DISABLE)
if Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_QUICKPLAY)>=3 then if Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_QUICKPLAY)>=3 then
e:SetCategory(CATEGORY_DISABLE+CATEGORY_CONTROL) end e:SetCategory(CATEGORY_DISABLE+CATEGORY_CONTROL) end
......
...@@ -32,7 +32,8 @@ if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and ...@@ -32,7 +32,8 @@ if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and
{b1,aux.Stringid(m,0)}, {b1,aux.Stringid(m,0)},
{b2,aux.Stringid(m,1)}, {b2,aux.Stringid(m,1)},
{b3,aux.Stringid(m,2)}) {b3,aux.Stringid(m,2)})
if op==1 then Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,0,1,1,nil) if op==1 then local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,0,1,1,nil)
Duel.HintSelection(g)
if Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_QUICKPLAY)>=3 then Duel.SetChainLimit(cm.chainlm) end if Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_QUICKPLAY)>=3 then Duel.SetChainLimit(cm.chainlm) end
e:GetHandler():RegisterFlagEffect(1,RESET_PHASE+PHASE_END,0,1) e:GetHandler():RegisterFlagEffect(1,RESET_PHASE+PHASE_END,0,1)
elseif op==2 then elseif op==2 then
......
...@@ -37,6 +37,7 @@ local spchk=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 ...@@ -37,6 +37,7 @@ local spchk=Duel.GetLocationCount(tp,LOCATION_MZONE)>0
{b3,aux.Stringid(m,2)}) {b3,aux.Stringid(m,2)})
if op==1 then if op==1 then
local g=Duel.SelectTarget(tp,cm.filter,tp,0,LOCATION_GRAVE,1,1,nil,e,tp,spchk) local g=Duel.SelectTarget(tp,cm.filter,tp,0,LOCATION_GRAVE,1,1,nil,e,tp,spchk)
Duel.HintSelection(g)
e:SetCategory(CATEGORY_REMOVE+CATEGORY_SPECIAL_SUMMON+CATEGORY_GRAVE_ACTION+CATEGORY_GRAVE_SPSUMMON) e:SetCategory(CATEGORY_REMOVE+CATEGORY_SPECIAL_SUMMON+CATEGORY_GRAVE_ACTION+CATEGORY_GRAVE_SPSUMMON)
e:GetHandler():RegisterFlagEffect(1,RESET_PHASE+PHASE_END,0,1) e:GetHandler():RegisterFlagEffect(1,RESET_PHASE+PHASE_END,0,1)
elseif op==2 then elseif op==2 then
......
...@@ -32,6 +32,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -32,6 +32,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
{b3,aux.Stringid(m,2)}) {b3,aux.Stringid(m,2)})
if op==1 then if op==1 then
local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil) local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
Duel.HintSelection(g)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
e:GetHandler():RegisterFlagEffect(1,RESET_PHASE+PHASE_END,0,1) e:GetHandler():RegisterFlagEffect(1,RESET_PHASE+PHASE_END,0,1)
elseif op==2 then elseif op==2 then
......
...@@ -38,6 +38,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -38,6 +38,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
{b3,aux.Stringid(m,2)}) {b3,aux.Stringid(m,2)})
if op==1 then if op==1 then
local g=Duel.SelectTarget(tp,cm.filter1,tp,LOCATION_GRAVE,0,1,1,nil,e,tp) local g=Duel.SelectTarget(tp,cm.filter1,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
Duel.HintSelection(g)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE)
e:GetHandler():RegisterFlagEffect(1,RESET_PHASE+PHASE_END,0,1) e:GetHandler():RegisterFlagEffect(1,RESET_PHASE+PHASE_END,0,1)
elseif op==2 then elseif op==2 then
......
...@@ -34,6 +34,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -34,6 +34,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
{b3,aux.Stringid(m,2)}) {b3,aux.Stringid(m,2)})
if op==1 then if op==1 then
local g=Duel.SelectTarget(tp,Card.IsType,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,e:GetHandler(),TYPE_SPELL+TYPE_TRAP) local g=Duel.SelectTarget(tp,Card.IsType,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,e:GetHandler(),TYPE_SPELL+TYPE_TRAP)
Duel.HintSelection(g)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
e:GetHandler():RegisterFlagEffect(1,RESET_PHASE+PHASE_END,0,1) e:GetHandler():RegisterFlagEffect(1,RESET_PHASE+PHASE_END,0,1)
elseif op==2 then elseif op==2 then
......
...@@ -34,7 +34,8 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -34,7 +34,8 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
{b2,aux.Stringid(m,1)}, {b2,aux.Stringid(m,1)},
{b3,aux.Stringid(m,2)}) {b3,aux.Stringid(m,2)})
if op==1 then if op==1 then
Duel.SelectTarget(tp,cm.fit,tp,LOCATION_ONFIELD,0,1,1,nil) local g=Duel.SelectTarget(tp,cm.fit,tp,LOCATION_ONFIELD,0,1,1,nil)
Duel.HintSelection(g)
e:GetHandler():RegisterFlagEffect(1,RESET_PHASE+PHASE_END,0,1) e:GetHandler():RegisterFlagEffect(1,RESET_PHASE+PHASE_END,0,1)
elseif op==2 then elseif op==2 then
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
......
...@@ -16,6 +16,7 @@ function c91030025.initial_effect(c) ...@@ -16,6 +16,7 @@ function c91030025.initial_effect(c)
--remove --remove
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(m,0)) e2:SetDescription(aux.Stringid(m,0))
e2:SetCategory(CATEGORY_TOHAND)
e2:SetType(EFFECT_TYPE_QUICK_O) e2:SetType(EFFECT_TYPE_QUICK_O)
e2:SetCode(EVENT_FREE_CHAIN) e2:SetCode(EVENT_FREE_CHAIN)
e2:SetProperty(EFFECT_FLAG_CARD_TARGET) e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
...@@ -60,11 +61,11 @@ function c91030025.lcheck(g,lc) ...@@ -60,11 +61,11 @@ function c91030025.lcheck(g,lc)
return g:IsExists(Card.IsLinkSetCard,1,nil,0x9d3) return g:IsExists(Card.IsLinkSetCard,1,nil,0x9d3)
end end
function cm.cpfilter(c) function cm.cpfilter(c)
return c:IsType(TYPE_QUICKPLAY) and c:IsSetCard(0x9d3) and c:CheckActivateEffect(true,true,false) return c:IsType(TYPE_QUICKPLAY) and c:IsSetCard(0x9d3) and c:IsAbleToHand()
end end
function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and cm.thfilter(chkc) end if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and cm.cpfilter(chkc) end
if chk==0 then return Duel.IsExistingTarget(cm.thfilter,tp,LOCATION_GRAVE,0,1,nil) end if chk==0 then return Duel.IsExistingTarget(cm.cpfilter,tp,LOCATION_GRAVE,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectTarget(tp,cm.cpfilter,tp,LOCATION_GRAVE,0,1,1,nil) local g=Duel.SelectTarget(tp,cm.cpfilter,tp,LOCATION_GRAVE,0,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
...@@ -75,7 +76,3 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -75,7 +76,3 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
end end
end end
function cm.condition2(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
return c:IsReason(REASON_BATTLE+REASON_EFFECT)
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