Commit 079dfe78 authored by POLYMER's avatar POLYMER

fix

parent c1064d1a
...@@ -34,19 +34,15 @@ function cm.initial_effect(c) ...@@ -34,19 +34,15 @@ function cm.initial_effect(c)
if cm.global_check==nil then if cm.global_check==nil then
cm.global_check=true cm.global_check=true
local _SpecialSummon=Duel.SpecialSummon local _SpecialSummon=Duel.SpecialSummon
local _SpecialSummonStep=Duel.SpecialSummonStep
function Duel.SpecialSummon(tg,...) function Duel.SpecialSummon(tg,...)
if aux.GetValueType(tg)=="Group" then if aux.GetValueType(tg)=="Group" then
tg:KeepAlive() tg:KeepAlive()
cm[1]=tg cm[1]=tg
end end
return _SpecialSummon(tg,...) local ct=_SpecialSummon(tg,...)
cm[1]=nil
return ct
end end
--[[function Duel.SpecialSummonStep(tg,...)
tg:KeepAlive()
cm[1]=tg
return _SpecialSummonStep(tg,...)
end--]]
end end
end end
function cm.matfilter(c) function cm.matfilter(c)
......
...@@ -99,7 +99,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -99,7 +99,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function cm.spop(e,tp,eg,ep,ev,re,r,rp) function cm.spop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) then if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)>0 then
local sg=Group.CreateGroup() local sg=Group.CreateGroup()
for tc in aux.Next(cm[0]) do for tc in aux.Next(cm[0]) do
local con=tc.condition3 local con=tc.condition3
......
...@@ -16,7 +16,7 @@ function c11561008.initial_effect(c) ...@@ -16,7 +16,7 @@ function c11561008.initial_effect(c)
e2:SetDescription(aux.Stringid(11561008,2)) e2:SetDescription(aux.Stringid(11561008,2))
e2:SetCategory(CATEGORY_ANNOUNCE) e2:SetCategory(CATEGORY_ANNOUNCE)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_HAND) e2:SetRange(LOCATION_HAND+LOCATION_GRAVE+LOCATION_REMOVED)
e2:SetCountLimit(1,21561008) e2:SetCountLimit(1,21561008)
e2:SetCost(c11561008.cancost) e2:SetCost(c11561008.cancost)
e2:SetTarget(c11561008.cgtg) e2:SetTarget(c11561008.cgtg)
......
...@@ -503,7 +503,7 @@ function Satl.HearogenehirpXyzLevelFreeCondition(f,gf,minct,maxct) ...@@ -503,7 +503,7 @@ function Satl.HearogenehirpXyzLevelFreeCondition(f,gf,minct,maxct)
else else
mg=Duel.GetMatchingGroup(Satl.XyzLevelFreeFilter,tp,LOCATION_MZONE,0,nil,c,f) mg=Duel.GetMatchingGroup(Satl.XyzLevelFreeFilter,tp,LOCATION_MZONE,0,nil,c,f)
end end
local sg=Auxiliary.GetMustMaterialGroup(tp,EFFECT_MUST_BE_XMATERIAL) local sg=Duel.GetMustMaterial(tp,EFFECT_MUST_BE_XMATERIAL)
if sg:IsExists(Auxiliary.MustMaterialCounterFilter,1,nil,mg) then return false end if sg:IsExists(Auxiliary.MustMaterialCounterFilter,1,nil,mg) then return false end
Duel.SetSelectedCard(sg) Duel.SetSelectedCard(sg)
Auxiliary.GCheckAdditional=Auxiliary.TuneMagicianCheckAdditionalX(EFFECT_TUNE_MAGICIAN_X) Auxiliary.GCheckAdditional=Auxiliary.TuneMagicianCheckAdditionalX(EFFECT_TUNE_MAGICIAN_X)
...@@ -529,7 +529,7 @@ function Satl.HearogenehirpXyzLevelFreeTarget(f,gf,minct,maxct) ...@@ -529,7 +529,7 @@ function Satl.HearogenehirpXyzLevelFreeTarget(f,gf,minct,maxct)
else else
mg=Duel.GetMatchingGroup(Satl.XyzLevelFreeFilter,tp,LOCATION_MZONE,0,nil,c,f) mg=Duel.GetMatchingGroup(Satl.XyzLevelFreeFilter,tp,LOCATION_MZONE,0,nil,c,f)
end end
local sg=Auxiliary.GetMustMaterialGroup(tp,EFFECT_MUST_BE_XMATERIAL) local sg=Duel.GetMustMaterial(tp,EFFECT_MUST_BE_XMATERIAL)
Duel.SetSelectedCard(sg) Duel.SetSelectedCard(sg)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
local cancel=Duel.IsSummonCancelable() local cancel=Duel.IsSummonCancelable()
......
...@@ -129,7 +129,7 @@ function s.eqop(e,tp,eg,ep,ev,re,r,rp) ...@@ -129,7 +129,7 @@ function s.eqop(e,tp,eg,ep,ev,re,r,rp)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
eqg2:AddCard(tc) eqg2:AddCard(tc)
tc=eqg:GetNext() tc=eqg:GetNext()
end end
Duel.RaiseEvent(eqg2,EVENT_SSET,e,REASON_EFFECT,tp,tp,0) Duel.RaiseEvent(eqg2,EVENT_SSET,e,REASON_EFFECT,tp,tp,0)
end end
local e0=Effect.CreateEffect(c) local e0=Effect.CreateEffect(c)
...@@ -169,10 +169,10 @@ function s.efcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -169,10 +169,10 @@ function s.efcon(e,tp,eg,ep,ev,re,r,rp)
return dg:GetCount()>0 return dg:GetCount()>0
end end
function s.efop(e,tp,eg,ep,ev,re,r,rp) function s.efop(e,tp,eg,ep,ev,re,r,rp)
local dg=eg:Filter(s.effilter,nil,e:GetHandler()) local dg=eg:Filter(s.effilter,nil,e:GetHandler())
dg:ForEach(s.addeffect) dg:ForEach(s.addeffect)
end end
function s.addeffect(c) function s.addeffect(c)
local efft={c:GetActivateEffect()} local efft={c:GetActivateEffect()}
for i,v in pairs(efft) do for i,v in pairs(efft) do
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
...@@ -205,7 +205,7 @@ function s.cost(ae) ...@@ -205,7 +205,7 @@ function s.cost(ae)
end end
end end
function s.condition(ae) function s.condition(ae)
return function (e,tp,eg,ep,ev,re,r,rp) return function (e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local fcon=ae:GetCondition() local fcon=ae:GetCondition()
return c:IsFacedown() and (not fcon or fcon(e,tp,eg,ep,ev,re,r,rp)) return c:IsFacedown() and (not fcon or fcon(e,tp,eg,ep,ev,re,r,rp))
...@@ -228,6 +228,8 @@ function s.operation(ae) ...@@ -228,6 +228,8 @@ function s.operation(ae)
local c=e:GetHandler() local c=e:GetHandler()
--e:GetHandler():ReleaseRelation(e:GetHandler():GetEquipTarget()) --e:GetHandler():ReleaseRelation(e:GetHandler():GetEquipTarget())
local fop=ae:GetOperation() local fop=ae:GetOperation()
fop(e,tp,eg,ep,ev,re,r,rp) if fop then
fop(e,tp,eg,ep,ev,re,r,rp)
end
end end
end end
\ No newline at end of file
...@@ -27,7 +27,7 @@ function s.initial_effect(c) ...@@ -27,7 +27,7 @@ function s.initial_effect(c)
e3:SetCode(EFFECT_LEAVE_FIELD_REDIRECT) e3:SetCode(EFFECT_LEAVE_FIELD_REDIRECT)
e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e3:SetCondition(s.recon) e3:SetCondition(s.recon)
e3:SetValue(LOCATION_DECK) e3:SetValue(LOCATION_DECKSHF)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function s.filter(c,e,tp,chk) function s.filter(c,e,tp,chk)
......
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