Commit 1d4ef4cf authored by POLYMER's avatar POLYMER

fix

parent c67d481c
...@@ -7586,6 +7586,7 @@ ...@@ -7586,6 +7586,7 @@
21196525 0 21196525 0
21196530 0 21196530 0
21196535 0 21196535 0
17339100 0
#limit #limit
#semi limit #semi limit
##MAIN DECK MONSTERS ##MAIN DECK MONSTERS
......
...@@ -82,7 +82,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -82,7 +82,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE) e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE)
e2:SetCode(id) e2:SetCode(id)
e2:SetTargetRange(1,1) e2:SetTargetRange(1,1)
e2:Reset(RESET_EVENT+PHASE_END) e2:Reset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e2,tp) Duel.RegisterEffect(e2,tp)
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD) e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
...@@ -90,7 +90,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -90,7 +90,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
e3:SetCode(EVENT_ADJUST) e3:SetCode(EVENT_ADJUST)
e3:SetCondition(s.discon) e3:SetCondition(s.discon)
e3:SetOperation(s.disop) e3:SetOperation(s.disop)
e3:Reset(RESET_EVENT+PHASE_END) e3:Reset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e3,tp) Duel.RegisterEffect(e3,tp)
local e4=Effect.CreateEffect(c) local e4=Effect.CreateEffect(c)
e4:SetDescription(aux.Stringid(id,0)) e4:SetDescription(aux.Stringid(id,0))
......
...@@ -38,7 +38,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -38,7 +38,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local tg=Duel.SelectTarget(tp,aux.TRUE,tp,0,LOCATION_ONFIELD,2,2,nil) local tg=Duel.SelectTarget(tp,aux.TRUE,tp,0,LOCATION_ONFIELD,2,2,nil)
tg:Merge(cg) tg:Merge(cg)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,tg,4,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,tg,4,0,0)
if not Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,e:GetHandler(),1,nil) and e:IsHasType(EFFECT_TYPE_ACTIVATE) then if not Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,0,1,e:GetHandler()) and e:IsHasType(EFFECT_TYPE_ACTIVATE) then
Duel.SetChainLimit(s.chainlm) Duel.SetChainLimit(s.chainlm)
end end
end end
......
...@@ -33,7 +33,7 @@ function s.cfilter(c,tp) ...@@ -33,7 +33,7 @@ function s.cfilter(c,tp)
return c:IsRace(RACE_FIEND) and not c:IsPublic() and c:IsAbleToGrave() and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil,attr) return c:IsRace(RACE_FIEND) and not c:IsPublic() and c:IsAbleToGrave() and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil,attr)
end end
function s.thfilter(c,attr) function s.thfilter(c,attr)
return not c:IsSummonableCard() and c:IsRace(RACE_FIEND) and c:IsAttribute(attr) return not c:IsSummonableCard() and c:IsRace(RACE_FIEND) and c:IsAttribute(attr) and c:IsAbleToHand()
end end
function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk) function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_EXTRA,0,1,nil,tp) end if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_EXTRA,0,1,nil,tp) end
......
...@@ -44,7 +44,6 @@ function s.initial_effect(c) ...@@ -44,7 +44,6 @@ 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+1) e3:SetCountLimit(1,id+1)
e3:SetCondition(s.negcon) e3:SetCondition(s.negcon)
e3:SetCost(s.negcost) e3:SetCost(s.negcost)
......
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