Commit df9a1345 authored by POLYMER's avatar POLYMER

fix

parent f4416cc2
...@@ -6805,7 +6805,7 @@ ...@@ -6805,7 +6805,7 @@
46060017 1 --Zoodiac Barrage 46060017 1 --Zoodiac Barrage
7394770 1 --Brilliant Fusion 7394770 1 --Brilliant Fusion
66730191 1 66730191 1
22007085 1 85106525 1
65681983 1 65681983 1
25311006 1 25311006 1
##TRAPS CARDS ##TRAPS CARDS
......
...@@ -61,7 +61,7 @@ function s.chkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -61,7 +61,7 @@ function s.chkop(e,tp,eg,ep,ev,re,r,rp)
Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+id,e,r,rp,ep,ev) Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+id,e,r,rp,ep,ev)
end end
function s.mfilter(c) function s.mfilter(c)
return c:GetLevel()>c:GetOriginalLevel() and c:IsAbleToDeckAsCost() return c:IsRace(RACE_WARRIOR) and c:GetLevel()>c:GetOriginalLevel() and c:IsAbleToDeckAsCost()
end end
function s.spcon(e,c) function s.spcon(e,c)
local c=e:GetHandler() local c=e:GetHandler()
...@@ -69,7 +69,7 @@ function s.spcon(e,c) ...@@ -69,7 +69,7 @@ function s.spcon(e,c)
local tp=c:GetControler() local tp=c:GetControler()
local p=Duel.GetTurnPlayer() local p=Duel.GetTurnPlayer()
local g=Duel.GetMatchingGroup(s.mfilter,tp,LOCATION_GRAVE,0,nil) local g=Duel.GetMatchingGroup(s.mfilter,tp,LOCATION_GRAVE,0,nil)
return Duel.GetLocationCount(1-p,LOCATION_MZONE)>0 and g:IsExists(s.mfilter,1,nil) return Duel.GetLocationCount(1-p,LOCATION_MZONE)>0 and c:IsCanBeSpecialSummoned(e,0,tp,true,true,POS_FACEUP,1-p) and g:IsExists(s.mfilter,1,nil)
end end
function s.spop(e,tp,eg,ep,ev,re,r,rp) function s.spop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
......
...@@ -208,7 +208,7 @@ function cm.rmfil(c,lv) ...@@ -208,7 +208,7 @@ function cm.rmfil(c,lv)
return c:IsType(TYPE_SYNCHRO) and c:IsLevelBelow(lv-1) and c:IsAbleToRemove() return c:IsType(TYPE_SYNCHRO) and c:IsLevelBelow(lv-1) and c:IsAbleToRemove()
end end
function cm.lvcon(e,tp,eg,ep,ev,re,r,rp) function cm.lvcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetHandler():GetFlagEffect(m)~=0 return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) --and e:GetHandler():GetFlagEffect(m)~=0
end end
function cm.ttlv(c) function cm.ttlv(c)
return c:GetOriginalLevel() return c:GetOriginalLevel()
...@@ -228,8 +228,8 @@ function cm.lvop(e,tp,eg,ep,ev,re,r,rp) ...@@ -228,8 +228,8 @@ function cm.lvop(e,tp,eg,ep,ev,re,r,rp)
local rg=Duel.GetMatchingGroup(cm.rmfil,tp,LOCATION_EXTRA,0,nil,xlv):Select(tp,1,1,nil) local rg=Duel.GetMatchingGroup(cm.rmfil,tp,LOCATION_EXTRA,0,nil,xlv):Select(tp,1,1,nil)
if rg and Duel.Remove(rg,POS_FACEUP,REASON_EFFECT) then if rg and Duel.Remove(rg,POS_FACEUP,REASON_EFFECT) then
local rmvg=Duel.GetOperatedGroup() local rmvg=Duel.GetOperatedGroup()
e:SetLabelObject(rmvg)
rmvg:KeepAlive() rmvg:KeepAlive()
e:SetLabelObject(rmvg)
local code=rmvg:GetFirst():GetCode() local code=rmvg:GetFirst():GetCode()
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
...@@ -20,8 +20,8 @@ function cm.initial_effect(c) ...@@ -20,8 +20,8 @@ function cm.initial_effect(c)
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetDescription(aux.Stringid(m,0)) e3:SetDescription(aux.Stringid(m,0))
e3:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE+CATEGORY_TODECK+CATEGORY_LEAVE_GRAVE) e3:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE+CATEGORY_TODECK+CATEGORY_LEAVE_GRAVE)
e3:SetType(EFFECT_TYPE_QUICK_O) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
e3:SetCode(EVENT_FREE_CHAIN) e3:SetCode(EVENT_PHASE+PHASE_END)
e3:SetRange(LOCATION_GRAVE) e3:SetRange(LOCATION_GRAVE)
e3:SetCountLimit(1) e3:SetCountLimit(1)
e3:SetOperation(cm.bkop) e3:SetOperation(cm.bkop)
......
...@@ -57,7 +57,7 @@ function cm.cfilter(c) ...@@ -57,7 +57,7 @@ function cm.cfilter(c)
return c:IsFaceup() return c:IsFaceup()
end end
function cm.negcon(e,tp,eg,ep,ev,re,r,rp) function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetFlagEffect(m)==0 and (re:IsActiveType(TYPE_SPELL) or re:IsActiveType(TYPE_TRAP) or re:IsActivatable(TYPE_MONSTER)) and rp~=tp and Duel.IsChainDisablable(ev) and Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_MZONE,0,1,nil) return e:GetHandler():GetFlagEffect(m)==0 and rp~=tp and Duel.IsChainDisablable(ev) and Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_MZONE,0,1,nil)
end end
function cm.negop(e,tp,eg,ep,ev,re,r,rp) function cm.negop(e,tp,eg,ep,ev,re,r,rp)
if Duel.SelectEffectYesNo(tp,e:GetHandler()) then if Duel.SelectEffectYesNo(tp,e:GetHandler()) then
......
...@@ -292,8 +292,7 @@ function Auxiliary.PreloadUds() ...@@ -292,8 +292,7 @@ function Auxiliary.PreloadUds()
function Duel.ReturnToField(c,...) function Duel.ReturnToField(c,...)
local res=_ReturnToField(c,...) local res=_ReturnToField(c,...)
if res then if res then
c:SetStatus(STATUS_SUMMON_TURN,false) c:SetStatus(0x100,false)
c:SetStatus(STATUS_SPSUMMON_TURN,false)
end end
return res return res
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