Commit e827b705 authored by mercury233's avatar mercury233

fix

parent ff1c2cc5
...@@ -43,15 +43,16 @@ function c2930675.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -43,15 +43,16 @@ function c2930675.activate(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c2930675.cfilter(c,seq2) function c2930675.cfilter(c,seq2)
local seq1=c:GetSequence() local seq1=aux.MZoneSequence(c:GetSequence())
return c:IsFaceup() and c:IsSetCard(0x10c) return c:IsFaceup() and c:IsSetCard(0x10c) and seq1==4-seq2
and (seq1==4-seq2 or (seq2==5 and seq1==3) or (seq2==6 and seq1==1))
end end
function c2930675.discon(e,tp,eg,ep,ev,re,r,rp) function c2930675.discon(e,tp,eg,ep,ev,re,r,rp)
local loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE) local loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE)
seq=aux.MZoneSequence(seq)
return rp~=tp and re:IsActiveType(TYPE_TRAP) and loc==LOCATION_SZONE return rp~=tp and re:IsActiveType(TYPE_TRAP) and loc==LOCATION_SZONE
and Duel.IsExistingMatchingCard(c2930675.cfilter,tp,LOCATION_MZONE,0,1,nil,seq) and Duel.IsExistingMatchingCard(c2930675.cfilter,tp,LOCATION_MZONE,0,1,nil,seq)
end end
function c2930675.disop(e,tp,eg,ep,ev,re,r,rp) function c2930675.disop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_CARD,0,2930675)
Duel.NegateEffect(ev) Duel.NegateEffect(ev)
end end
...@@ -58,15 +58,16 @@ function c62530723.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -58,15 +58,16 @@ function c62530723.activate(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c62530723.cfilter(c,seq2) function c62530723.cfilter(c,seq2)
local seq1=c:GetSequence() local seq1=aux.MZoneSequence(c:GetSequence())
return c:IsFaceup() and c:IsSetCard(0x10c) return c:IsFaceup() and c:IsSetCard(0x10c) and seq1==4-seq2
and (seq1==4-seq2 or (seq2==5 and seq1==3) or (seq2==6 and seq1==1))
end end
function c62530723.discon(e,tp,eg,ep,ev,re,r,rp) function c62530723.discon(e,tp,eg,ep,ev,re,r,rp)
local loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE) local loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE)
seq=aux.MZoneSequence(seq)
return rp~=tp and re:IsActiveType(TYPE_SPELL) and loc&LOCATION_SZONE==LOCATION_SZONE return rp~=tp and re:IsActiveType(TYPE_SPELL) and loc&LOCATION_SZONE==LOCATION_SZONE
and Duel.IsExistingMatchingCard(c62530723.cfilter,tp,LOCATION_MZONE,0,1,nil,seq) and Duel.IsExistingMatchingCard(c62530723.cfilter,tp,LOCATION_MZONE,0,1,nil,seq)
end end
function c62530723.disop(e,tp,eg,ep,ev,re,r,rp) function c62530723.disop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_CARD,0,62530723)
Duel.NegateEffect(ev) Duel.NegateEffect(ev)
end end
...@@ -72,12 +72,12 @@ function c98935722.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -72,12 +72,12 @@ function c98935722.desop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c98935722.cfilter(c,seq2) function c98935722.cfilter(c,seq2)
local seq1=c:GetSequence() local seq1=aux.MZoneSequence(c:GetSequence())
return c:IsFaceup() and c:IsSetCard(0x10c) return c:IsFaceup() and c:IsSetCard(0x10c) and seq1==4-seq2
and (seq1==4-seq2 or (seq2==5 and seq1==3) or (seq2==6 and seq1==1))
end end
function c98935722.discon(e,tp,eg,ep,ev,re,r,rp) function c98935722.discon(e,tp,eg,ep,ev,re,r,rp)
local loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE) local loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE)
seq=aux.MZoneSequence(seq)
return rp~=tp and re:IsActiveType(TYPE_MONSTER) and loc==LOCATION_MZONE return rp~=tp and re:IsActiveType(TYPE_MONSTER) and loc==LOCATION_MZONE
and Duel.IsExistingMatchingCard(c98935722.cfilter,tp,LOCATION_MZONE,0,1,nil,seq) and Duel.IsExistingMatchingCard(c98935722.cfilter,tp,LOCATION_MZONE,0,1,nil,seq)
end end
......
...@@ -1903,6 +1903,11 @@ function Auxiliary.GetColumn(c,p) ...@@ -1903,6 +1903,11 @@ function Auxiliary.GetColumn(c,p)
else return nil end else return nil end
if c:IsControler(p or 0) then return seq else return 4-seq end if c:IsControler(p or 0) then return seq else return 4-seq end
end end
function Auxiliary.MZoneSequence(seq)
if seq==5 then return 1 end
if seq==6 then return 3 end
return seq
end
--card effect disable filter(target) --card effect disable filter(target)
function Auxiliary.disfilter1(c) function Auxiliary.disfilter1(c)
return c:IsFaceup() and not c:IsDisabled() and (not c:IsType(TYPE_NORMAL) or c:GetOriginalType()&TYPE_EFFECT~=0) return c:IsFaceup() and not c:IsDisabled() and (not c:IsType(TYPE_NORMAL) or c:GetOriginalType()&TYPE_EFFECT~=0)
......
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