Commit 996d1e1f authored by mercury233's avatar mercury233

update

parent 8b2019d3
......@@ -28,7 +28,7 @@ function c11613567.ntcon(e,c,minc)
and Duel.IsExistingMatchingCard(c11613567.ntfilter,c:GetControler(),LOCATION_MZONE,0,1,nil)
end
function c11613567.filter(c)
return not c:IsType(TYPE_LINK)
return c:IsCanChangePosition()
end
function c11613567.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c11613567.filter(chkc) end
......
......@@ -41,7 +41,7 @@ function c12800777.poscon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnPlayer()~=tp
end
function c12800777.filter(c)
return c:IsFaceup() and not c:IsType(TYPE_LINK)
return c:IsFaceup() and c:IsCanChangePosition()
end
function c12800777.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c12800777.filter(chkc) end
......
......@@ -78,7 +78,7 @@ function c22790789.desop(e,tp,eg,ep,ev,re,r,rp)
end
end
function c22790789.filter(c)
return c:IsPosition(POS_FACEUP_ATTACK) and not c:IsType(TYPE_LINK)
return c:IsPosition(POS_FACEUP_ATTACK) and c:IsCanChangePosition()
end
function c22790789.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c22790789.filter(chkc) end
......
......@@ -45,7 +45,7 @@ function c23874409.spop(e,tp,eg,ep,ev,re,r,rp)
end
end
function c23874409.filter(c)
return not c:IsType(TYPE_LINK)
return c:IsCanChangePosition()
end
function c23874409.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c23874409.filter(chkc) end
......
......@@ -48,7 +48,7 @@ function c2519690.thop(e,tp,eg,ep,ev,re,r,rp)
end
function c2519690.postg(e,tp,eg,ep,ev,re,r,rp,chk)
local d=Duel.GetAttackTarget()
if chk==0 then return d and d:IsControler(1-tp) and not d:IsType(TYPE_LINK) end
if chk==0 then return d and d:IsControler(1-tp) and d:IsCanChangePosition() end
Duel.SetOperationInfo(0,CATEGORY_POSITION,d,1,0,0)
end
function c2519690.posop(e,tp,eg,ep,ev,re,r,rp)
......
......@@ -16,7 +16,7 @@ function c25262697.poscon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsEnvironment(47355498)
end
function c25262697.filter(c)
return c:IsFaceup() and not c:IsType(TYPE_LINK)
return c:IsFaceup() and c:IsCanChangePosition()
end
function c25262697.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and c25262697.filter(chkc) end
......
......@@ -16,7 +16,7 @@ function c25652655.condition(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsLocation(LOCATION_GRAVE) and r==REASON_SYNCHRO
end
function c25652655.filter(c)
return not c:IsType(TYPE_LINK)
return c:IsCanChangePosition()
end
function c25652655.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c25652655.filter(chkc) end
......
......@@ -11,7 +11,7 @@ function c25880422.initial_effect(c)
c:RegisterEffect(e1)
end
function c25880422.filter(c)
return c:IsPosition(POS_FACEUP_ATTACK) and not c:IsType(TYPE_LINK)
return c:IsPosition(POS_FACEUP_ATTACK) and c:IsCanChangePosition()
end
function c25880422.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c25880422.filter(chkc) end
......
......@@ -28,7 +28,7 @@ end
function c26533075.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local tg=Duel.GetAttacker()
if chkc then return chkc==tg end
if chk==0 then return tg:IsOnField() and not tg:IsType(TYPE_LINK) and tg:IsCanBeEffectTarget(e) end
if chk==0 then return tg:IsOnField() and tg:IsCanChangePosition() and tg:IsCanBeEffectTarget(e) end
Duel.SetTargetCard(tg)
Duel.SetOperationInfo(0,CATEGORY_POSITION,tg,1,0,0)
end
......
......@@ -28,7 +28,7 @@ end
function c33245030.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then
local at=Duel.GetAttacker()
return at:IsAttackPos() and not at:IsType(TYPE_LINK)
return at:IsAttackPos() and at:IsCanChangePosition()
end
end
function c33245030.operation(e,tp,eg,ep,ev,re,r,rp)
......
......@@ -13,7 +13,7 @@ function c36033786.initial_effect(c)
c:RegisterEffect(e1)
end
function c36033786.posfilter(c)
return c:IsPosition(POS_FACEUP_ATTACK) and not c:IsType(TYPE_LINK)
return c:IsPosition(POS_FACEUP_ATTACK) and c:IsCanChangePosition()
end
function c36033786.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and c36033786.posfilter(chkc) end
......
......@@ -42,7 +42,7 @@ function c37993923.condition2(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
end
function c37993923.filter(c)
return not c:IsType(TYPE_LINK)
return c:IsCanChangePosition()
end
function c37993923.target2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c37993923.filter(chkc) end
......
......@@ -24,7 +24,7 @@ function c39751093.initial_effect(c)
c:RegisterEffect(e5)
end
function c39751093.filter(c)
return c:IsFaceup() and not c:IsType(TYPE_LINK)
return c:IsFaceup() and c:IsCanChangePosition()
end
function c39751093.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and c39751093.filter(chkc) end
......
......@@ -12,7 +12,7 @@ function c40619741.initial_effect(c)
c:RegisterEffect(e1)
end
function c40619741.filter(c)
return not c:IsType(TYPE_LINK)
return c:IsCanChangePosition()
end
function c40619741.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c40619741.filter(chkc) end
......
......@@ -18,7 +18,7 @@ function c42647539.initial_effect(c)
c:RegisterEffect(e3)
end
function c42647539.filter(c)
return c:IsFaceup() and not c:IsType(TYPE_LINK)
return c:IsFaceup() and c:IsCanChangePosition()
end
function c42647539.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c42647539.filter(chkc) end
......
......@@ -69,7 +69,7 @@ function c4417407.poscost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.Release(g,REASON_COST)
end
function c4417407.filter(c)
return not c:IsPosition(POS_FACEUP_DEFENSE) and not c:IsType(TYPE_LINK)
return not c:IsPosition(POS_FACEUP_DEFENSE) and c:IsCanChangePosition()
end
function c4417407.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and c4417407.filter(chkc) end
......
......@@ -20,7 +20,7 @@ function c47579719.cost(e,tp,eg,ep,ev,re,r,rp,chk)
e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
end
function c47579719.filter(c)
return not c:IsPosition(POS_FACEUP_DEFENSE) and not c:IsType(TYPE_LINK)
return not c:IsPosition(POS_FACEUP_DEFENSE) and c:IsCanChangePosition()
end
function c47579719.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c47579719.filter,tp,0,LOCATION_MZONE,1,nil) end
......
......@@ -11,7 +11,7 @@ function c50122883.initial_effect(c)
c:RegisterEffect(e1)
end
function c50122883.filter(c)
return c:IsFaceup() and not c:IsType(TYPE_LINK)
return c:IsFaceup() and c:IsCanChangePosition()
end
function c50122883.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c50122883.filter(chkc) end
......
......@@ -12,7 +12,7 @@ function c50896944.initial_effect(c)
c:RegisterEffect(e1)
end
function c50896944.filter(c)
return not c:IsPosition(POS_FACEUP_DEFENSE) and not c:IsType(TYPE_LINK)
return not c:IsPosition(POS_FACEUP_DEFENSE) and c:IsCanChangePosition()
end
function c50896944.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c50896944.filter(chkc) end
......
......@@ -43,7 +43,7 @@ function c52551211.poscon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsReason(REASON_EFFECT)
end
function c52551211.posfilter(c)
return not c:IsType(TYPE_LINK)
return c:IsCanChangePosition()
end
function c52551211.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c52551211.posfilter(chkc) end
......
......@@ -47,7 +47,7 @@ function c55106249.splimit(e,c,tp,sumtp,sumpos)
return not c:IsSetCard(0xab) and bit.band(sumtp,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM
end
function c55106249.filter(c)
return not c:IsType(TYPE_LINK)
return c:IsCanChangePosition()
end
function c55106249.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c55106249.filter(chkc) end
......
......@@ -36,7 +36,7 @@ end
function c55470553.postg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then
local at=Duel.GetAttacker()
return at:IsAttackPos() and not at:IsType(TYPE_LINK)
return at:IsAttackPos() and at:IsCanChangePosition()
end
end
function c55470553.posop(e,tp,eg,ep,ev,re,r,rp)
......
......@@ -17,7 +17,7 @@ function c58464739.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(c58464739.cfilter,tp,LOCATION_MZONE,0,1,nil)
end
function c58464739.filter(c)
return c:IsPosition(POS_FACEUP_ATTACK) and not c:IsType(TYPE_LINK)
return c:IsPosition(POS_FACEUP_ATTACK) and c:IsCanChangePosition()
end
function c58464739.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end
......
......@@ -49,7 +49,7 @@ function c58569561.poscon(e,tp,eg,ep,ev,re,r,rp)
return ep==tp
end
function c58569561.filter(c)
return c:IsFaceup() and not c:IsType(TYPE_LINK)
return c:IsFaceup() and c:IsCanChangePosition()
end
function c58569561.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c58569561.filter(chkc) end
......
......@@ -66,7 +66,7 @@ function c58859575.poscost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
end
function c58859575.filter(c)
return not c:IsType(TYPE_LINK)
return c:IsCanChangePosition()
end
function c58859575.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c58859575.filter(chkc) end
......
......@@ -13,7 +13,7 @@ function c60410769.initial_effect(c)
c:RegisterEffect(e1)
end
function c60410769.filter(c)
return c:IsPosition(POS_FACEUP_ATTACK) and not c:IsType(TYPE_LINK)
return c:IsPosition(POS_FACEUP_ATTACK) and c:IsCanChangePosition()
end
function c60410769.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c60410769.filter(chkc) end
......
......@@ -43,7 +43,7 @@ function c60950180.poscon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetFlagEffect(60950180)>0
end
function c60950180.filter(c)
return c:IsPosition(POS_FACEUP_ATTACK) and not c:IsType(TYPE_LINK)
return c:IsPosition(POS_FACEUP_ATTACK) and c:IsCanChangePosition()
end
function c60950180.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c60950180.filter(chkc) end
......
......@@ -18,7 +18,7 @@ function c61864793.poscon(e,tp,eg,ep,ev,re,r,rp)
return not c:IsStatus(STATUS_CONTINUOUS_POS) and ((np<3 and pp>3) or (pp<3 and np>3))
end
function c61864793.filter(c)
return not c:IsType(TYPE_LINK)
return c:IsCanChangePosition()
end
function c61864793.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c61864793.filter(chkc) end
......
......@@ -23,7 +23,7 @@ function c66506689.cost(e,tp,eg,ep,ev,re,r,rp,chk)
e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
end
function c66506689.filter(c)
return not c:IsType(TYPE_LINK)
return c:IsCanChangePosition()
end
function c66506689.tg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and c66506689.filter(chkc) end
......
......@@ -38,7 +38,7 @@ function c66625883.posop(e,tp,eg,ep,ev,re,r,rp)
end
end
function c66625883.filter(c)
return not c:IsType(TYPE_LINK)
return c:IsCanChangePosition()
end
function c66625883.tg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c66625883.filter(chkc) end
......
......@@ -26,7 +26,7 @@ end
function c67270095.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local d=Duel.GetAttackTarget()
if chkc then return chkc==d end
if chk==0 then return d and d:IsAttackPos() and not d:IsType(TYPE_LINK) and d:IsCanBeEffectTarget(e) end
if chk==0 then return d and d:IsAttackPos() and d:IsCanChangePosition() and d:IsCanBeEffectTarget(e) end
Duel.SetTargetCard(d)
Duel.SetOperationInfo(0,CATEGORY_POSITION,d,1,0,0)
end
......
......@@ -36,7 +36,7 @@ function c68215963.repop(e,tp,eg,ep,ev,re,r,rp)
Duel.RaiseEvent(c,EVENT_CUSTOM+47408488,e,0,tp,0,0)
end
function c68215963.filter(c)
return c:IsAttackPos() and c:GetAttackedCount()>0 and not c:IsType(TYPE_LINK)
return c:IsAttackPos() and c:GetAttackedCount()>0 and c:IsCanChangePosition()
end
function c68215963.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c68215963.filter(chkc) end
......
......@@ -21,7 +21,7 @@ function c69514125.initial_effect(c)
c:RegisterEffect(e2)
end
function c69514125.filter(c)
return c:IsFaceup() and not c:IsType(TYPE_LINK)
return c:IsFaceup() and c:IsCanChangePosition()
end
function c69514125.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c69514125.filter(chkc) end
......
......@@ -33,7 +33,7 @@ function c73652465.condition(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsLocation(LOCATION_GRAVE) and r==REASON_SYNCHRO
end
function c73652465.posfilter(c)
return not c:IsType(TYPE_LINK)
return c:IsCanChangePosition()
end
function c73652465.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c73652465.posfilter(chkc) end
......
......@@ -14,7 +14,7 @@ function c7541475.initial_effect(c)
end
function c7541475.postg(e,tp,eg,ep,ev,re,r,rp,chk)
local d=Duel.GetAttackTarget()
if chk==0 then return d and d:GetControler()~=Duel.GetAttacker():GetControler() and not d:IsType(TYPE_LINK) end
if chk==0 then return d and d:GetControler()~=Duel.GetAttacker():GetControler() and d:IsCanChangePosition() end
Duel.SetOperationInfo(0,CATEGORY_POSITION,d,1,0,0)
end
function c7541475.posop(e,tp,eg,ep,ev,re,r,rp)
......
......@@ -14,7 +14,7 @@ function c76520646.initial_effect(c)
c:RegisterEffect(e1)
end
function c76520646.filter(c)
return c:IsFaceup() and not c:IsType(TYPE_LINK)
return c:IsFaceup() and c:IsCanChangePosition()
end
function c76520646.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and c76520646.filter(chkc) end
......
......@@ -87,7 +87,7 @@ end
function c84243274.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return false end
local bc=Duel.GetAttackTarget()
if chk==0 then return bc and not bc:IsType(TYPE_LINK) and bc:IsCanBeEffectTarget(e) end
if chk==0 then return bc and bc:IsCanChangePosition() and bc:IsCanBeEffectTarget(e) end
Duel.SetTargetCard(bc)
Duel.SetOperationInfo(0,CATEGORY_POSITION,bc,1,0,0)
end
......
......@@ -21,7 +21,7 @@ function c9109991.condition(e,tp,eg,ep,ev,re,r,rp)
return ep~=tp and Duel.GetAttackTarget()==nil
end
function c9109991.filter(c)
return c:IsAttackPos() and not c:IsType(TYPE_LINK)
return c:IsAttackPos() and c:IsCanChangePosition()
end
function c9109991.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and c9109991.filter(chkc) end
......
......@@ -13,7 +13,7 @@ function c96146814.initial_effect(c)
c:RegisterEffect(e1)
end
function c96146814.filter(c)
return not c:IsType(TYPE_LINK)
return c:IsCanChangePosition()
end
function c96146814.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c96146814.filter(chkc) end
......
......@@ -49,7 +49,7 @@ function c97362768.operation(e,tp,eg,ep,ev,re,r,rp)
end
end
function c97362768.posfilter(c)
return c:IsFaceup() and not c:IsType(TYPE_LINK)
return c:IsFaceup() and c:IsCanChangePosition()
end
function c97362768.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c97362768.posfilter(chkc) end
......
......@@ -17,7 +17,7 @@ function c98045062.cost(e,tp,eg,ep,ev,re,r,rp,chk)
return true
end
function c98045062.filter1(c)
return c:IsFaceup() and not c:IsType(TYPE_LINK)
return c:IsFaceup() and c:IsCanChangePosition()
end
function c98045062.filter2(c)
return c:IsFaceup() and c:IsControlerCanBeChanged(true)
......
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