Commit c31c17bb authored by argon.sun's avatar argon.sun

fix

parent c91a58f9
...@@ -13,7 +13,7 @@ function c10456559.initial_effect(c) ...@@ -13,7 +13,7 @@ function c10456559.initial_effect(c)
end end
function c10456559.condition(e,tp,eg,ep,ev,re,r,rp) function c10456559.condition(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
return c:IsLocation(LOCATION_GRAVE) and tp==c:GetPreviousControler() return c:IsLocation(LOCATION_GRAVE) and tp==c:GetPreviousControler() and c:IsReason(REASON_BATTLE)
end end
function c10456559.filter(c) function c10456559.filter(c)
return c:IsCode(10456559) and c:IsAbleToHand() return c:IsCode(10456559) and c:IsAbleToHand()
......
...@@ -17,7 +17,7 @@ function c15313433.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -17,7 +17,7 @@ function c15313433.cost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SendtoGrave(g,REASON_COST+REASON_DISCARD) Duel.SendtoGrave(g,REASON_COST+REASON_DISCARD)
end end
function c15313433.filter(c,e,tp) function c15313433.filter(c,e,tp)
return c:IsSetCard(0xb) and c:IsLocation(LOCATION_GRAVE) and c:GetPreviousControler()==tp return c:IsSetCard(0xb) and c:IsLocation(LOCATION_GRAVE) and c:GetPreviousControler()==tp and c:IsReason(REASON_BATTLE)
and c:IsCanBeEffectTarget(e) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsCanBeEffectTarget(e) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c15313433.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c15313433.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
......
...@@ -13,7 +13,7 @@ function c16111820.initial_effect(c) ...@@ -13,7 +13,7 @@ function c16111820.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c16111820.filter(c,tp) function c16111820.filter(c,tp)
return c:GetPreviousControler()==tp and c:GetControler()==tp and c:IsLocation(LOCATION_GRAVE) and c:IsPreviousPosition(POS_DEFENCE) return c:GetPreviousControler()==tp and c:IsPreviousPosition(POS_DEFENCE) and c:IsReason(REASON_BATTLE) and c:IsLocation(LOCATION_GRAVE)
and c:IsSetCard(0x22) and c:GetCode()~=16111820 and c:IsSetCard(0x22) and c:GetCode()~=16111820
end end
function c16111820.condition(e,tp,eg,ep,ev,re,r,rp) function c16111820.condition(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -22,7 +22,7 @@ function c21296383.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -22,7 +22,7 @@ function c21296383.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local sg=Duel.GetMatchingGroup(c21296383.spfilter,tp,LOCATION_GRAVE,0,nil,e,tp) local sg=Duel.GetMatchingGroup(c21296383.spfilter,tp,LOCATION_GRAVE,0,nil,e,tp)
if chkc then return sg:IsContains(chkc) and chkc:IsLevelBelow(e:GetLabel()) end if chkc then return sg:IsContains(chkc) and chkc:IsLevelBelow(e:GetLabel()) end
if sg:GetCount()==0 then return false end if sg:GetCount()==0 then return false end
local sg,mlv=sg:GetMinGroup(Card.GetLevel) local mg,mlv=sg:GetMinGroup(Card.GetLevel)
local elv=e:GetHandler():GetLevel() local elv=e:GetHandler():GetLevel()
local lv=(elv>=mlv) and 1 or (mlv-elv) local lv=(elv>=mlv) and 1 or (mlv-elv)
if chk==0 then return e:GetHandler():IsAbleToRemoveAsCost() if chk==0 then return e:GetHandler():IsAbleToRemoveAsCost()
...@@ -32,7 +32,7 @@ function c21296383.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -32,7 +32,7 @@ function c21296383.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
g:AddCard(e:GetHandler()) g:AddCard(e:GetHandler())
Duel.Remove(g,POS_FACEUP,REASON_COST) Duel.Remove(g,POS_FACEUP,REASON_COST)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
e:SetLevel(elv+g:GetFirst():GetLevel()) e:SetLabel(elv+g:GetFirst():GetLevel())
local g=sg:FilterSelect(tp,Card.IsLevelBelow,1,1,nil,elv+g:GetFirst():GetLevel()) local g=sg:FilterSelect(tp,Card.IsLevelBelow,1,1,nil,elv+g:GetFirst():GetLevel())
Duel.SetTargetCard(g) Duel.SetTargetCard(g)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
......
...@@ -12,7 +12,7 @@ function c3030892.initial_effect(c) ...@@ -12,7 +12,7 @@ function c3030892.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c3030892.condition(e,tp,eg,ep,ev,re,r,rp) function c3030892.condition(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsLocation(LOCATION_GRAVE) return e:GetHandler():IsLocation(LOCATION_GRAVE) and e:GetHandler():IsReason(REASON_BATTLE)
end end
function c3030892.filter(c,e,tp) function c3030892.filter(c,e,tp)
return c:IsLevelBelow(4) and c:IsSetCard(0x19) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsLevelBelow(4) and c:IsSetCard(0x19) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
......
...@@ -13,7 +13,7 @@ function c33248692.initial_effect(c) ...@@ -13,7 +13,7 @@ function c33248692.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c33248692.filter(c,tp) function c33248692.filter(c,tp)
return c:GetPreviousControler()==tp and c:IsLocation(LOCATION_GRAVE) return c:GetPreviousControler()==tp and c:IsLocation(LOCATION_GRAVE) and c:IsReason(REASON_BATTLE)
end end
function c33248692.condition(e,tp,eg,ep,ev,re,r,rp,chk) function c33248692.condition(e,tp,eg,ep,ev,re,r,rp,chk)
return eg:IsExists(c33248692.filter,1,nil,tp) return eg:IsExists(c33248692.filter,1,nil,tp)
......
...@@ -28,15 +28,22 @@ function c42874792.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -28,15 +28,22 @@ function c42874792.operation(e,tp,eg,ep,ev,re,r,rp)
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_STANDBY) e1:SetCode(EVENT_PHASE+PHASE_STANDBY)
e1:SetReset(RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN) e1:SetRange(LOCATION_REMOVED)
e1:SetLabelObject(tc)
e1:SetCountLimit(1) e1:SetCountLimit(1)
if Duel.GetTurnPlayer()==tp and Duel.GetCurrentPhase()==PHASE_STANDBY then
e1:SetLabel(Duel.GetTurnCount())
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,2)
else
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN)
end
e1:SetCondition(c42874792.retcon)
e1:SetOperation(c42874792.retop) e1:SetOperation(c42874792.retop)
Duel.RegisterEffect(e1,tp) tc:RegisterEffect(e1)
end end
end end
function c42874792.retcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnPlayer()==tp and Duel.GetTurnCount()~=e:GetLabel()
end
function c42874792.retop(e,tp,eg,ep,ev,re,r,rp) function c42874792.retop(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetTurnPlayer()==tp then Duel.ReturnToField(e:GetHandler())
Duel.ReturnToField(e:GetLabelObject())
end
end end
...@@ -10,7 +10,7 @@ function c47121070.initial_effect(c) ...@@ -10,7 +10,7 @@ function c47121070.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c47121070.filter(c,tp) function c47121070.filter(c,tp)
return c:IsSetCard(0x34) and c:IsLocation(LOCATION_GRAVE) and c:GetPreviousControler()==tp return c:IsSetCard(0x34) and c:IsLocation(LOCATION_GRAVE) and c:GetPreviousControler()==tp and c:IsReason(REASON_BATTLE)
end end
function c47121070.tfcon(e,tp,eg,ep,ev,re,r,rp) function c47121070.tfcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c47121070.filter,1,nil,tp) return eg:IsExists(c47121070.filter,1,nil,tp)
......
--オレイカルコスの結界
function c48179393.initial_effect(c)
--Activate
local e1=Effect.CreateEffect(c)
e1:SetCategory(CATEGORY_DESTROY)
e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCost(c48179393.actcost)
e1:SetTarget(c48179393.acttg)
e1:SetOperation(c48179393.actop)
c:RegisterEffect(e1)
--spsummon limit
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_FIELD)
e2:SetRange(LOCATION_SZONE)
e2:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e2:SetTargetRange(1,0)
e2:SetTarget(c48179393.sumlimit)
c:RegisterEffect(e2)
--
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_FIELD)
e3:SetRange(LOCATION_SZONE)
e3:SetCode(EFFECT_UPDATE_ATTACK)
e3:SetTargetRange(LOCATION_MZONE,0)
e3:SetValue(500)
c:RegisterEffect(e3)
--
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE)
e4:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e4:SetRange(LOCATION_SZONE)
e4:SetCode(EFFECT_INDESTRUCTABLE_COUNT)
e4:SetCountLimit(1)
e4:SetValue(c48179393.valcon)
c:RegisterEffect(e4)
--
local e5=Effect.CreateEffect(c)
e5:SetType(EFFECT_TYPE_FIELD)
e5:SetRange(LOCATION_SZONE)
e5:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
e5:SetTargetRange(LOCATION_MZONE,0)
e5:SetCondition(c48179393.atkcon)
e5:SetTarget(c48179393.atktg)
e5:SetValue(1)
c:RegisterEffect(e5)
end
function c48179393.actcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetFlagEffect(tp,48179393)==0 end
Duel.RegisterFlagEffect(tp,48179393,0,0,0)
end
function c48179393.desfilter(c)
return bit.band(c:GetSummonType(),SUMMON_TYPE_SPECIAL)~=0 and c:IsDestructable()
end
function c48179393.acttg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end
local g=Duel.GetMatchingGroup(c48179393.desfilter,tp,LOCATION_MZONE,0,nil)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
end
function c48179393.actop(e,tp,eg,ep,ev,re,r,rp)
if not e:GetHandler():IsRelateToEffect(e) then return end
local g=Duel.GetMatchingGroup(c48179393.desfilter,tp,LOCATION_MZONE,0,nil)
if g:GetCount()>0 then
Duel.Destroy(g,REASON_EFFECT)
end
end
function c48179393.sumlimit(e,c,sump,sumtype,sumpos,targetp)
return c:IsLocation(LOCATION_EXTRA)
end
function c48179393.valcon(e,re,r,rp)
return bit.band(r,REASON_EFFECT)~=0
end
function c48179393.atkcon(e)
return Duel.IsExistingMatchingCard(Card.IsPosition,e:GetHandlerPlayer(),LOCATION_MZONE,0,2,nil,POS_FACEUP_ATTACK)
end
function c48179393.atkfilter(c,atk)
return c:IsFaceup() and c:GetAttack()<atk
end
function c48179393.atktg(e,c)
return not Duel.IsExistingMatchingCard(c48179393.atkfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,c,c:GetAttack())
end
...@@ -26,6 +26,7 @@ end ...@@ -26,6 +26,7 @@ end
function c525110.operation(e,tp,eg,ep,ev,re,r,rp) function c525110.operation(e,tp,eg,ep,ev,re,r,rp)
local ft=Duel.GetLocationCount(tp,LOCATION_MZONE) local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
if ft<=0 then return end if ft<=0 then return end
if ft>=2 then ft=2 end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,c525110.filter,tp,LOCATION_DECK,0,1,ft,nil,e,tp) local g=Duel.SelectMatchingCard(tp,c525110.filter,tp,LOCATION_DECK,0,1,ft,nil,e,tp)
if g:GetCount()>0 then if g:GetCount()>0 then
......
...@@ -55,7 +55,9 @@ function c52601736.eqlimit(e,c) ...@@ -55,7 +55,9 @@ function c52601736.eqlimit(e,c)
return e:GetOwner()==c and not c:IsDisabled() return e:GetOwner()==c and not c:IsDisabled()
end end
function c52601736.dacon(e,tp,eg,ep,ev,re,r,rp) function c52601736.dacon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()==PHASE_MAIN1 local tc=e:GetHandler():GetEquipTarget()
return Duel.GetTurnCount()~=1 and Duel.GetCurrentPhase()==PHASE_MAIN1
and tc:IsAttackable() and tc:GetEffectCount(EFFECT_DIRECT_ATTACK)==0
end end
function c52601736.ftarget(e,c) function c52601736.ftarget(e,c)
return e:GetLabel()~=c:GetFieldID() return e:GetLabel()~=c:GetFieldID()
...@@ -63,8 +65,7 @@ end ...@@ -63,8 +65,7 @@ end
function c52601736.dacost(e,tp,eg,ep,ev,re,r,rp,chk) function c52601736.dacost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end
local tc=e:GetHandler():GetEquipTarget() local tc=e:GetHandler():GetEquipTarget()
e:SetLabelObject(tc) Duel.SetTargetCard(tc)
tc:CreateEffectRelation(e)
Duel.SendtoGrave(e:GetHandler(),REASON_COST) Duel.SendtoGrave(e:GetHandler(),REASON_COST)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
...@@ -77,7 +78,7 @@ function c52601736.dacost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -77,7 +78,7 @@ function c52601736.dacost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
function c52601736.daop(e,tp,eg,ep,ev,re,r,rp) function c52601736.daop(e,tp,eg,ep,ev,re,r,rp)
local tc=e:GetLabelObject() local tc=Duel.GetFirstTarget()
if tc:IsFaceup() and tc:IsRelateToEffect(e) then if tc:IsFaceup() and tc:IsRelateToEffect(e) then
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
...@@ -12,7 +12,7 @@ function c5498296.initial_effect(c) ...@@ -12,7 +12,7 @@ function c5498296.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c5498296.condition(e,tp,eg,ep,ev,re,r,rp) function c5498296.condition(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsLocation(LOCATION_GRAVE) return e:GetHandler():IsLocation(LOCATION_GRAVE) and e:GetHandler():IsReason(REASON_BATTLE)
end end
function c5498296.target(e,tp,eg,ep,ev,re,r,rp,chk) function c5498296.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
......
...@@ -26,7 +26,6 @@ function c67159705.initial_effect(c) ...@@ -26,7 +26,6 @@ function c67159705.initial_effect(c)
e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e3:SetCode(EFFECT_DESTROY_SUBSTITUTE) e3:SetCode(EFFECT_DESTROY_SUBSTITUTE)
e3:SetCondition(c67159705.uncon) e3:SetCondition(c67159705.uncon)
e3:SetValue(c67159705.repval)
c:RegisterEffect(e3) c:RegisterEffect(e3)
--eqlimit --eqlimit
local e4=Effect.CreateEffect(c) local e4=Effect.CreateEffect(c)
......
...@@ -13,7 +13,8 @@ function c74095602.initial_effect(c) ...@@ -13,7 +13,8 @@ function c74095602.initial_effect(c)
end end
function c74095602.condition(e,tp,eg,ep,ev,re,r,rp,chk) function c74095602.condition(e,tp,eg,ep,ev,re,r,rp,chk)
local tc=eg:GetFirst() local tc=eg:GetFirst()
return tc:GetPreviousControler()==tp and tc:IsType(TYPE_FUSION) and tc:IsLocation(LOCATION_GRAVE) and tc:IsSetCard(0x3008) return tc:GetPreviousControler()==tp and tc:IsType(TYPE_FUSION) and tc:IsSetCard(0x3008)
and tc:IsLocation(LOCATION_GRAVE) and tc:IsReason(REASON_BATTLE)
end end
function c74095602.target(e,tp,eg,ep,ev,re,r,rp,chk) function c74095602.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
......
...@@ -14,7 +14,7 @@ function c74130411.initial_effect(c) ...@@ -14,7 +14,7 @@ function c74130411.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c74130411.cfilter(c,tp) function c74130411.cfilter(c,tp)
return c:GetPreviousControler()==tp and c:IsLocation(LOCATION_GRAVE) and c:IsRace(RACE_MACHINE) return c:GetPreviousControler()==tp and c:IsLocation(LOCATION_GRAVE) and c:IsRace(RACE_MACHINE) and c:IsReason(REASON_BATTLE)
end end
function c74130411.thcon(e,tp,eg,ep,ev,re,r,rp) function c74130411.thcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c74130411.cfilter,1,nil,tp) return eg:IsExists(c74130411.cfilter,1,nil,tp)
......
...@@ -12,7 +12,7 @@ function c77044671.initial_effect(c) ...@@ -12,7 +12,7 @@ function c77044671.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c77044671.condition(e,tp,eg,ep,ev,re,r,rp) function c77044671.condition(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsLocation(LOCATION_GRAVE) return e:GetHandler():IsLocation(LOCATION_GRAVE) and e:GetHandler():IsReason(REASON_BATTLE)
end end
function c77044671.filter(c,e,tp) function c77044671.filter(c,e,tp)
return c:IsDefenceBelow(2000) and c:IsRace(RACE_ZOMBIE) return c:IsDefenceBelow(2000) and c:IsRace(RACE_ZOMBIE)
......
...@@ -12,7 +12,7 @@ function c79544790.initial_effect(c) ...@@ -12,7 +12,7 @@ function c79544790.initial_effect(c)
end end
function c79544790.filter(c,e,tp) function c79544790.filter(c,e,tp)
return c:IsLocation(LOCATION_GRAVE) and c:IsCanBeEffectTarget(e) return c:IsLocation(LOCATION_GRAVE) and c:IsCanBeEffectTarget(e)
and c:GetPreviousControler()==tp and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:GetPreviousControler()==tp and c:IsReason(REASON_BATTLE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c79544790.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c79544790.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return eg:IsContains(chkc) and c79544790.filter(chkc,e,tp) end if chkc then return eg:IsContains(chkc) and c79544790.filter(chkc,e,tp) end
......
...@@ -40,5 +40,5 @@ function c80495985.atfilter(c) ...@@ -40,5 +40,5 @@ function c80495985.atfilter(c)
return c:IsFaceup() and c:IsCode(80495985) return c:IsFaceup() and c:IsCode(80495985)
end end
function c80495985.atcon(e) function c80495985.atcon(e)
return not Duel.IsExistingMatchingCard(c80495985.atfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,e:GetHandler()) return not Duel.IsExistingMatchingCard(c80495985.atfilter,e:GetHandlerPlayer(),LOCATION_ONFIELD,0,1,e:GetHandler())
end end
...@@ -12,7 +12,7 @@ function c84136000.initial_effect(c) ...@@ -12,7 +12,7 @@ function c84136000.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c84136000.cfilter(c,tp) function c84136000.cfilter(c,tp)
return c:IsLocation(LOCATION_GRAVE) and c:GetPreviousControler()==tp return c:IsLocation(LOCATION_GRAVE) and c:GetPreviousControler()==tp and c:IsReason(REASON_BATTLE)
end end
function c84136000.condition(e,tp,eg,ep,ev,re,r,rp) function c84136000.condition(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c84136000.cfilter,1,nil,tp) return eg:IsExists(c84136000.cfilter,1,nil,tp)
......
...@@ -40,7 +40,7 @@ function c91438994.initial_effect(c) ...@@ -40,7 +40,7 @@ function c91438994.initial_effect(c)
c:RegisterEffect(e5) c:RegisterEffect(e5)
end end
function c91438994.filter1(c,tp) function c91438994.filter1(c,tp)
return c:GetPreviousControler()==tp and c:GetPreviousLocation()==LOCATION_MZONE return c:GetPreviousControler()==tp and c:GetPreviousLocation()==LOCATION_MZONE and c:IsReason(REASON_BATTLE)
end end
function c91438994.addc1(e,tp,eg,ep,ev,re,r,rp) function c91438994.addc1(e,tp,eg,ep,ev,re,r,rp)
if eg:IsExists(c91438994.filter1,1,nil,tp) then if eg:IsExists(c91438994.filter1,1,nil,tp) then
......
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