Commit 9641f102 authored by DailyShana's avatar DailyShana

fix

parent 12a505df
...@@ -42,7 +42,7 @@ function c27541563.discon(e,tp,eg,ep,ev,re,r,rp) ...@@ -42,7 +42,7 @@ function c27541563.discon(e,tp,eg,ep,ev,re,r,rp)
return ep==1-tp and re:IsActiveType(TYPE_MONSTER) and Duel.IsChainNegatable(ev) return ep==1-tp and re:IsActiveType(TYPE_MONSTER) and Duel.IsChainNegatable(ev)
end end
function c27541563.discfilter(c) function c27541563.discfilter(c)
return c:IsFaceup() and c:IsSetCard(0x103) and c:IsAbleToGraveAsCost() return c:IsFaceup() and c:IsSetCard(0x103) and c:IsAbleToGraveAsCost() and not c:IsStatus(STATUS_BATTLE_DESTROYED)
end end
function c27541563.discost(e,tp,eg,ep,ev,re,r,rp,chk) function c27541563.discost(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
......
...@@ -25,7 +25,7 @@ function c31189536.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -25,7 +25,7 @@ function c31189536.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=g:GetFirst() local tc=g:GetFirst()
if tc and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then if tc and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then
local fid=e:GetHandler():GetFieldID() local fid=e:GetHandler():GetFieldID()
tc:RegisterFlagEffect(31189536,RESET_EVENT+RESETS_STANDARD,0,1,fid) tc:RegisterFlagEffect(31189536,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1,fid)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e1:SetCode(EVENT_PHASE+PHASE_END) e1:SetCode(EVENT_PHASE+PHASE_END)
...@@ -35,15 +35,12 @@ function c31189536.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -35,15 +35,12 @@ function c31189536.activate(e,tp,eg,ep,ev,re,r,rp)
e1:SetLabelObject(tc) e1:SetLabelObject(tc)
e1:SetCondition(c31189536.descon) e1:SetCondition(c31189536.descon)
e1:SetOperation(c31189536.desop) e1:SetOperation(c31189536.desop)
e:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
end end
function c31189536.descon(e,tp,eg,ep,ev,re,r,rp) function c31189536.descon(e,tp,eg,ep,ev,re,r,rp)
local tc=e:GetLabelObject() return tc:GetFlagEffectLabel(31189536)==e:GetLabel()
if tc:GetFlagEffectLabel(31189536)~=e:GetLabel() then
e:Reset()
return false
else return true end
end end
function c31189536.desop(e,tp,eg,ep,ev,re,r,rp) function c31189536.desop(e,tp,eg,ep,ev,re,r,rp)
Duel.Destroy(e:GetLabelObject(),REASON_EFFECT) Duel.Destroy(e:GetLabelObject(),REASON_EFFECT)
......
...@@ -35,7 +35,7 @@ function c78700060.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -35,7 +35,7 @@ function c78700060.target(e,tp,eg,ep,ev,re,r,rp,chk)
end end
end end
function c78700060.operation(e,tp,eg,ep,ev,re,r,rp) function c78700060.operation(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetCurrentChain()~=ev+1 then return end if Duel.GetCurrentChain()~=ev+1 then return end
if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
Duel.Destroy(eg,REASON_EFFECT) Duel.Destroy(eg,REASON_EFFECT)
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