Commit 64625434 authored by mercury233's avatar mercury233

fix Rapid Trigger etc.

parent b8deac90
...@@ -97,5 +97,7 @@ function c20071842.indval(e,c) ...@@ -97,5 +97,7 @@ function c20071842.indval(e,c)
return c:IsSummonLocation(LOCATION_EXTRA) return c:IsSummonLocation(LOCATION_EXTRA)
end end
function c20071842.immval(e,te) function c20071842.immval(e,te)
return te:IsActiveType(TYPE_MONSTER) and te:IsActivated() and te:GetHandler():IsSummonLocation(LOCATION_EXTRA) local tc=te:GetOwner()
return tc~=e:GetHandler() and te:IsActiveType(TYPE_MONSTER) and te:IsActivated()
and te:GetActivateLocation()==LOCATION_MZONE and tc:IsSummonLocation(LOCATION_EXTRA)
end end
...@@ -63,8 +63,9 @@ function c41373230.imop(e,tp,eg,ep,ev,re,r,rp) ...@@ -63,8 +63,9 @@ function c41373230.imop(e,tp,eg,ep,ev,re,r,rp)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c41373230.efilter(e,te) function c41373230.efilter(e,te)
return e:GetHandler()~=te:GetHandler() and te:GetActivateLocation()==LOCATION_MZONE and te:IsActiveType(TYPE_MONSTER) local tc=te:GetOwner()
and te:IsActivated() and te:GetHandler():IsSummonLocation(LOCATION_EXTRA) return tc~=e:GetHandler() and te:IsActiveType(TYPE_MONSTER) and te:IsActivated()
and te:GetActivateLocation()==LOCATION_MZONE and tc:IsSummonLocation(LOCATION_EXTRA)
end end
function c41373230.regop(e,tp,eg,ep,ev,re,r,rp) function c41373230.regop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
......
...@@ -52,6 +52,8 @@ function c43582229.condition(e) ...@@ -52,6 +52,8 @@ function c43582229.condition(e)
return Duel.IsExistingMatchingCard(c43582229.imfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,3,nil) return Duel.IsExistingMatchingCard(c43582229.imfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,3,nil)
end end
function c43582229.efilter(e,te) function c43582229.efilter(e,te)
local tc=te:GetOwner()
return te:IsActiveType(TYPE_MONSTER) and te:IsActivated() return te:IsActiveType(TYPE_MONSTER) and te:IsActivated()
and te:GetOwnerPlayer()==1-e:GetHandlerPlayer() and te:GetHandler():IsSummonLocation(LOCATION_EXTRA) and te:GetOwnerPlayer()==1-e:GetHandlerPlayer()
and te:GetActivateLocation()==LOCATION_MZONE and tc:IsSummonLocation(LOCATION_EXTRA)
end end
...@@ -36,9 +36,9 @@ function c55787576.initial_effect(c) ...@@ -36,9 +36,9 @@ function c55787576.initial_effect(c)
c:RegisterEffect(e4) c:RegisterEffect(e4)
end end
function c55787576.immval(e,te) function c55787576.immval(e,te)
local tc=te:GetHandler() local tc=te:GetOwner()
return te:GetOwner()~=e:GetHandler() and te:IsActiveType(TYPE_MONSTER) return tc~=e:GetHandler() and te:IsActiveType(TYPE_MONSTER) and te:IsActivated()
and te:IsActivated() and tc:IsSummonType(SUMMON_TYPE_SPECIAL) and tc:IsSummonLocation(LOCATION_EXTRA) and te:GetActivateLocation()==LOCATION_MZONE and tc:IsSummonLocation(LOCATION_EXTRA)
end end
function c55787576.tgtg(e,c) function c55787576.tgtg(e,c)
return e:GetHandler()==c or (c:IsSetCard(0xfe) and e:GetHandler():GetColumnGroup():IsContains(c)) return e:GetHandler()==c or (c:IsSetCard(0xfe) and e:GetHandler():GetColumnGroup():IsContains(c))
......
...@@ -101,6 +101,7 @@ function c67526112.bttg(e,c) ...@@ -101,6 +101,7 @@ function c67526112.bttg(e,c)
return not c:IsSummonLocation(LOCATION_EXTRA) return not c:IsSummonLocation(LOCATION_EXTRA)
end end
function c67526112.immval(e,te) function c67526112.immval(e,te)
return te:GetOwner()~=e:GetHandler() and te:IsActiveType(TYPE_MONSTER) and te:IsActivated() local tc=te:GetOwner()
and te:GetOwner():IsSummonLocation(LOCATION_EXTRA) return tc~=e:GetHandler() and te:IsActiveType(TYPE_MONSTER) and te:IsActivated()
and te:GetActivateLocation()==LOCATION_MZONE and tc:IsSummonLocation(LOCATION_EXTRA)
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