Commit 26d28191 authored by POLYMER's avatar POLYMER

fix

parent 8de48232
...@@ -15,7 +15,8 @@ function s.initial_effect(c) ...@@ -15,7 +15,8 @@ function s.initial_effect(c)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(id,1)) e2:SetDescription(aux.Stringid(id,1))
e2:SetCategory(CATEGORY_TOHAND) e2:SetCategory(CATEGORY_TOHAND)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_QUICK_O)
e2:SetCode(EVENT_FREE_CHAIN)
e2:SetRange(LOCATION_GRAVE) e2:SetRange(LOCATION_GRAVE)
e2:SetCountLimit(1,id+o) e2:SetCountLimit(1,id+o)
e2:SetCondition(aux.exccon) e2:SetCondition(aux.exccon)
......
...@@ -89,7 +89,7 @@ function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -89,7 +89,7 @@ function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
local rc=re:GetHandler() local rc=re:GetHandler()
if not rc:IsRelateToEffect(re) then return end if not rc:IsRelateToEffect(re) then return end
local proc=rc:IsCode(12866705) and c:IsCode(12866600) local proc=rc:IsCode(12866705,12866890) and c:IsCode(12866600)
local b1=rc:IsAbleToGrave() and not rc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) local b1=rc:IsAbleToGrave() and not rc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED)
local b2=(Duel.GetLocationCount(tp,LOCATION_MZONE)>0 local b2=(Duel.GetLocationCount(tp,LOCATION_MZONE)>0
and (rc:IsCanBeSpecialSummoned(e,0,tp,false,false)) or rc:IsCanBeSpecialSummoned(e,0,tp,proc,proc)) and (rc:IsCanBeSpecialSummoned(e,0,tp,false,false)) or rc:IsCanBeSpecialSummoned(e,0,tp,proc,proc))
...@@ -119,7 +119,7 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp) ...@@ -119,7 +119,7 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp)
local rc=re:GetHandler() local rc=re:GetHandler()
if rc:IsRelateToEffect(re) then if rc:IsRelateToEffect(re) then
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
local proc=tc:IsCode(12866705) and c:IsCode(12866600) local proc=tc:IsCode(12866705,12866890) and c:IsCode(12866600)
local b1=tc:IsAbleToGrave() and not tc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) local b1=tc:IsAbleToGrave() and not tc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED)
local b2=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and (tc:IsCanBeSpecialSummoned(e,0,tp,false,false) or tc:IsCanBeSpecialSummoned(e,0,tp,proc,proc)) and aux.NecroValleyFilter()(tc) local b2=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and (tc:IsCanBeSpecialSummoned(e,0,tp,false,false) or tc:IsCanBeSpecialSummoned(e,0,tp,proc,proc)) and aux.NecroValleyFilter()(tc)
local off=1 local off=1
......
...@@ -123,13 +123,13 @@ end ...@@ -123,13 +123,13 @@ end
-- local tempg=mg-sg -- local tempg=mg-sg
-- for c in aux.Next(tempg) do -- for c in aux.Next(tempg) do
-- if eg:IsContains(c) then -- if eg:IsContains(c) then
-- sg:AddCard(c) -- sg:AddCard(c)
-- ct=ct+1 -- ct=ct+1
-- if Auxiliary.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc,mgchk) or (ct<maxc and Auxiliary.SynMixCheckRecursive(c,tp,sg,eg,ct,minc,maxc,syncard,sg1,smat,gc,mgchk)) then return true end -- if Auxiliary.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc,mgchk) or (ct<maxc and Auxiliary.SynMixCheckRecursive(c,tp,sg,eg,ct,minc,maxc,syncard,sg1,smat,gc,mgchk)) then return true end
-- sg:RemoveCard(c) -- sg:RemoveCard(c)
-- ct=ct-1 -- ct=ct-1
--eg:RemoveCard(c) --eg:RemoveCard(c)
-- eg:Sub(eg:Filter(cm.slfilter,nil,syncard,c:GetSynchroLevel(syncard))) -- eg:Sub(eg:Filter(cm.slfilter,nil,syncard,c:GetSynchroLevel(syncard)))
-- end -- end
-- end -- end
-- return false -- return false
...@@ -154,7 +154,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -154,7 +154,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then if chk==0 then
cm.SubGroupParams={nil,Card.GetLevel,nil,false,true} cm.SubGroupParams={nil,Card.GetLevel,nil,false,true}
--local res=Group.CheckSubGroup(g,cm.symgck,1,3,e,tp) --local res=Group.CheckSubGroup(g,cm.symgck,1,3,e,tp)
local res=Group.CheckSubGroup(g,tp,cm.symgck,false,1,3,e,tp) local res=Group.CheckSubGroup(g,cm.symgck,1,3,e,tp)
cm.SubGroupParams={} cm.SubGroupParams={}
return res return res
end end
...@@ -162,10 +162,10 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -162,10 +162,10 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function cm.espfil3(c,g,e,tp) function cm.espfil3(c,g,e,tp)
cm.SubGroupParams={nil,Card.GetLevel,nil,false,true} cm.SubGroupParams={nil,Card.GetLevel,nil,false,true}
--local res=Group.CheckSubGroup(g,cm.symgck,1,3,e,tp) local res=Group.CheckSubGroup(g,cm.symgck,1,3,e,tp)
local res=Group.SelectSubGroup(g,tp,cm.espfilr,false,1,3,e,tp,c) --local res=Group.SelectSubGroup(g,tp,cm.espfilr,false,1,3,e,tp,c)
cm.SubGroupParams={} cm.SubGroupParams={}
return res return res and c:IsType(TYPE_SYNCHRO)
--return c:IsSynchroSummonable(nil,g) --return c:IsSynchroSummonable(nil,g)
end end
function cm.espfilr(mg,e,tp,c) function cm.espfilr(mg,e,tp,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