Commit e48261e1 authored by POLYMER's avatar POLYMER

fix

parent 969cf657
...@@ -43,7 +43,7 @@ function c12869025.matfilter(c) ...@@ -43,7 +43,7 @@ function c12869025.matfilter(c)
return c:IsLinkSetCard(0x6a70) or c:IsCode(12869000) return c:IsLinkSetCard(0x6a70) or c:IsCode(12869000)
end end
function c12869025.q(c) function c12869025.q(c)
return c:IsFaceup() and c:IsSetCard(0x6a70) return c:IsFaceup() and c:IsSetCard(0x6a70) and c:IsType(TYPE_MONSTER)
end end
function c12869025.con(e,tp,eg,ep,ev,re,r,rp) function c12869025.con(e,tp,eg,ep,ev,re,r,rp)
local tp=e:GetHandlerPlayer() local tp=e:GetHandlerPlayer()
......
...@@ -40,7 +40,7 @@ function c12869030.lcheck(g) ...@@ -40,7 +40,7 @@ function c12869030.lcheck(g)
return g:IsExists(Card.IsLinkSetCard,1,nil,0x6a70) return g:IsExists(Card.IsLinkSetCard,1,nil,0x6a70)
end end
function c12869030.q(c) function c12869030.q(c)
return c:IsFaceup() and c:IsSetCard(0x6a70) return c:IsFaceup() and c:IsSetCard(0x6a70) and c:IsType(TYPE_MONSTER)
end end
function c12869030.con(e,tp,eg,ep,ev,re,r,rp) function c12869030.con(e,tp,eg,ep,ev,re,r,rp)
local tp=e:GetHandlerPlayer() local tp=e:GetHandlerPlayer()
......
...@@ -40,7 +40,7 @@ function c12869035.lcheck(g) ...@@ -40,7 +40,7 @@ function c12869035.lcheck(g)
return g:IsExists(Card.IsLinkSetCard,1,nil,0x6a70) return g:IsExists(Card.IsLinkSetCard,1,nil,0x6a70)
end end
function c12869035.q(c) function c12869035.q(c)
return c:IsFaceup() and c:IsSetCard(0x6a70) return c:IsFaceup() and c:IsSetCard(0x6a70) and c:IsType(TYPE_MONSTER)
end end
function c12869035.con(e,tp,eg,ep,ev,re,r,rp) function c12869035.con(e,tp,eg,ep,ev,re,r,rp)
local tp=e:GetHandlerPlayer() local tp=e:GetHandlerPlayer()
......
...@@ -40,7 +40,7 @@ function c12869040.lcheck(g) ...@@ -40,7 +40,7 @@ function c12869040.lcheck(g)
return g:IsExists(Card.IsLinkSetCard,1,nil,0x6a70) return g:IsExists(Card.IsLinkSetCard,1,nil,0x6a70)
end end
function c12869040.q(c) function c12869040.q(c)
return c:IsFaceup() and c:IsSetCard(0x6a70) return c:IsFaceup() and c:IsSetCard(0x6a70) and c:IsType(TYPE_MONSTER)
end end
function c12869040.con(e,tp,eg,ep,ev,re,r,rp) function c12869040.con(e,tp,eg,ep,ev,re,r,rp)
local tp=e:GetHandlerPlayer() local tp=e:GetHandlerPlayer()
......
--灰灭融火者 --灰灭融火者
local s,id,o=GetID() local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
--Debug.Message("2")
--fusion material --fusion material
c:EnableReviveLimit() c:EnableReviveLimit()
aux.AddFusionProcFunRep(c,aux.FilterBoolFunction(Card.IsRace,RACE_PYRO),2,true) aux.AddFusionProcFunRep(c,aux.FilterBoolFunction(Card.IsRace,RACE_PYRO),2,true)
...@@ -83,8 +84,8 @@ function s.filter3(c,e) ...@@ -83,8 +84,8 @@ function s.filter3(c,e)
return c:IsOnField() and not c:IsImmuneToEffect(e) return c:IsOnField() and not c:IsImmuneToEffect(e)
end end
function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToDeckAsCost() end if chk==0 then return e:GetHandler():IsAbleToExtraAsCost() end
Duel.SendtoDeck(e:GetHandler(),nil,SEQ_DECKSHUFFLE,REASON_COST) Duel.SendtoDeck(e:GetHandler(),nil,SEQ_DECKTOP,REASON_COST)
end end
function s.fscon1(e,tp,eg,ep,ev,re,r,rp) function s.fscon1(e,tp,eg,ep,ev,re,r,rp)
return (Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2) and not Duel.IsExistingMatchingCard(s.cfilter1,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) return (Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2) and not Duel.IsExistingMatchingCard(s.cfilter1,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
...@@ -108,10 +109,8 @@ function s.fstg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -108,10 +109,8 @@ function s.fstg(e,tp,eg,ep,ev,re,r,rp,chk)
res=Duel.IsExistingMatchingCard(s.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg3,mf,chkf) res=Duel.IsExistingMatchingCard(s.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg3,mf,chkf)
end end
end end
return Duel.GetFlagEffect(tp,id+o)==0 and res return res
end end
Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
Duel.RegisterFlagEffect(tp,id+o,RESET_PHASE+PHASE_END,0,1)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
end end
function s.fsop(e,tp,eg,ep,ev,re,r,rp) function s.fsop(e,tp,eg,ep,ev,re,r,rp)
...@@ -146,5 +145,6 @@ function s.fsop(e,tp,eg,ep,ev,re,r,rp) ...@@ -146,5 +145,6 @@ function s.fsop(e,tp,eg,ep,ev,re,r,rp)
local fop=ce:GetOperation() local fop=ce:GetOperation()
fop(ce,e,tp,tc,mat2) fop(ce,e,tp,tc,mat2)
end end
tc:CompleteProcedure()
end end
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