Commit 57337f33 authored by VanillaSalt's avatar VanillaSalt

revert cf257b76

parent 7e07afd9
...@@ -14,15 +14,7 @@ function c15248873.condition(e,tp,eg,ep,ev,re,r,rp) ...@@ -14,15 +14,7 @@ function c15248873.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetFieldCard(tp,LOCATION_SZONE,5)==nil and Duel.GetFieldCard(1-tp,LOCATION_SZONE,5)~=nil return Duel.GetFieldCard(tp,LOCATION_SZONE,5)==nil and Duel.GetFieldCard(1-tp,LOCATION_SZONE,5)~=nil
end end
function c15248873.filter(c,tp) function c15248873.filter(c,tp)
if not c:IsType(TYPE_FIELD) or c:IsForbidden() then return false end return c:IsType(TYPE_FIELD) and c:GetActivateEffect():IsActivatable(tp)
local te=c:GetActivateEffect()
local con=te:GetCondition()
if con and not con(te,tp,nil,0,0,nil,0,0) then return false end
local cost=te:GetCost()
if cost and not cost(te,tp,nil,0,0,nil,0,0,0) then return false end
local tg=te:GetTarget()
if tg and not tg(te,tp,nil,0,0,nil,0,0,0) then return false end
return true
end end
function c15248873.target(e,tp,eg,ep,ev,re,r,rp,chk) function c15248873.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c15248873.filter,tp,LOCATION_DECK,0,1,nil,tp) end if chk==0 then return Duel.IsExistingMatchingCard(c15248873.filter,tp,LOCATION_DECK,0,1,nil,tp) end
......
...@@ -17,15 +17,7 @@ function c22900598.condition(e,tp,eg,ep,ev,re,r,rp) ...@@ -17,15 +17,7 @@ function c22900598.condition(e,tp,eg,ep,ev,re,r,rp)
return g:GetCount()>0 and g:FilterCount(Card.IsRace,nil,RACE_ZOMBIE)==g:GetCount() return g:GetCount()>0 and g:FilterCount(Card.IsRace,nil,RACE_ZOMBIE)==g:GetCount()
end end
function c22900598.filter(c,tp) function c22900598.filter(c,tp)
if not c:IsCode(62188962) or c:IsForbidden() then return false end return c:IsCode(62188962) and c:GetActivateEffect():IsActivatable(tp)
local te=c:GetActivateEffect()
local con=te:GetCondition()
if con and not con(te,tp,nil,0,0,nil,0,0) then return false end
local cost=te:GetCost()
if cost and not cost(te,tp,nil,0,0,nil,0,0,0) then return false end
local tg=te:GetTarget()
if tg and not tg(te,tp,nil,0,0,nil,0,0,0) then return false end
return true
end end
function c22900598.target(e,tp,eg,ep,ev,re,r,rp,chk) function c22900598.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c22900598.filter,tp,LOCATION_DECK,0,1,nil,tp) end if chk==0 then return Duel.IsExistingMatchingCard(c22900598.filter,tp,LOCATION_DECK,0,1,nil,tp) end
......
...@@ -51,15 +51,7 @@ function c32912040.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -51,15 +51,7 @@ function c32912040.desop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c32912040.filter(c,tp,code) function c32912040.filter(c,tp,code)
if not (c:IsType(TYPE_FIELD) and c:IsSetCard(0xe2) and not c:IsCode(code)) or c:IsForbidden() then return false end return c:IsType(TYPE_FIELD) and c:IsSetCard(0xe2) and c:GetActivateEffect():IsActivatable(tp) and not c:IsCode(code)
local te=c:GetActivateEffect()
local con=te:GetCondition()
if con and not con(te,tp,nil,0,0,nil,0,0) then return false end
local cost=te:GetCost()
if cost and not cost(te,tp,nil,0,0,nil,0,0,0) then return false end
local tg=te:GetTarget()
if tg and not tg(te,tp,nil,0,0,nil,0,0,0) then return false end
return true
end end
function c32912040.condition(e,tp,eg,ep,ev,re,r,rp) function c32912040.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnPlayer()~=tp return Duel.GetTurnPlayer()~=tp
......
...@@ -16,15 +16,7 @@ function c48934760.condition(e,tp,eg,ep,ev,re,r,rp) ...@@ -16,15 +16,7 @@ function c48934760.condition(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c48934760.cfilter,1,nil,tp) return eg:IsExists(c48934760.cfilter,1,nil,tp)
end end
function c48934760.filter(c,tp) function c48934760.filter(c,tp)
if not c:IsType(TYPE_FIELD) or c:IsForbidden() then return false end return c:IsType(TYPE_FIELD) and c:GetActivateEffect():IsActivatable(tp)
local te=c:GetActivateEffect()
local con=te:GetCondition()
if con and not con(te,tp,nil,0,0,nil,0,0) then return false end
local cost=te:GetCost()
if cost and not cost(te,tp,nil,0,0,nil,0,0,0) then return false end
local tg=te:GetTarget()
if tg and not tg(te,tp,nil,0,0,nil,0,0,0) then return false end
return true
end end
function c48934760.target(e,tp,eg,ep,ev,re,r,rp,chk) function c48934760.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c48934760.filter,tp,LOCATION_DECK,0,1,nil,tp) end if chk==0 then return Duel.IsExistingMatchingCard(c48934760.filter,tp,LOCATION_DECK,0,1,nil,tp) end
......
...@@ -60,15 +60,7 @@ function c69529337.tdop(e,tp,eg,ep,ev,re,r,rp) ...@@ -60,15 +60,7 @@ function c69529337.tdop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c69529337.filter(c,tp,code) function c69529337.filter(c,tp,code)
if not (c:IsType(TYPE_FIELD) and c:IsSetCard(0xe2) and not c:IsCode(code)) or c:IsForbidden() then return false end return c:IsType(TYPE_FIELD) and c:IsSetCard(0xe2) and c:GetActivateEffect():IsActivatable(tp) and not c:IsCode(code)
local te=c:GetActivateEffect()
local con=te:GetCondition()
if con and not con(te,tp,nil,0,0,nil,0,0) then return false end
local cost=te:GetCost()
if cost and not cost(te,tp,nil,0,0,nil,0,0,0) then return false end
local tg=te:GetTarget()
if tg and not tg(te,tp,nil,0,0,nil,0,0,0) then return false end
return true
end end
function c69529337.condition(e,tp,eg,ep,ev,re,r,rp) function c69529337.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnPlayer()~=tp return Duel.GetTurnPlayer()~=tp
......
...@@ -29,15 +29,7 @@ function c95923441.sumcon(e) ...@@ -29,15 +29,7 @@ function c95923441.sumcon(e)
return tc and tc:IsFaceup() return tc and tc:IsFaceup()
end end
function c95923441.filter(c,tp,code) function c95923441.filter(c,tp,code)
if not (c:IsType(TYPE_FIELD) and c:IsSetCard(0xe2) and not c:IsCode(code)) or c:IsForbidden() then return false end return c:IsType(TYPE_FIELD) and c:IsSetCard(0xe2) and c:GetActivateEffect():IsActivatable(tp) and not c:IsCode(code)
local te=c:GetActivateEffect()
local con=te:GetCondition()
if con and not con(te,tp,nil,0,0,nil,0,0) then return false end
local cost=te:GetCost()
if cost and not cost(te,tp,nil,0,0,nil,0,0,0) then return false end
local tg=te:GetTarget()
if tg and not tg(te,tp,nil,0,0,nil,0,0,0) then return false end
return true
end end
function c95923441.condition(e,tp,eg,ep,ev,re,r,rp) function c95923441.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnPlayer()~=tp return Duel.GetTurnPlayer()~=tp
......
...@@ -13,15 +13,7 @@ function c97970833.condition(e,tp,eg,ep,ev,re,r,rp) ...@@ -13,15 +13,7 @@ function c97970833.condition(e,tp,eg,ep,ev,re,r,rp)
return tp~=Duel.GetTurnPlayer() return tp~=Duel.GetTurnPlayer()
end end
function c97970833.filter(c,tp) function c97970833.filter(c,tp)
if not c:IsCode(34487429) or c:IsForbidden() then return false end return c:IsCode(34487429) and c:GetActivateEffect():IsActivatable(tp)
local te=c:GetActivateEffect()
local con=te:GetCondition()
if con and not con(te,tp,nil,0,0,nil,0,0) then return false end
local cost=te:GetCost()
if cost and not cost(te,tp,nil,0,0,nil,0,0,0) then return false end
local tg=te:GetTarget()
if tg and not tg(te,tp,nil,0,0,nil,0,0,0) then return false end
return true
end end
function c97970833.target(e,tp,eg,ep,ev,re,r,rp,chk) function c97970833.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c97970833.filter,tp,LOCATION_DECK,0,1,nil,tp) end if chk==0 then return Duel.IsExistingMatchingCard(c97970833.filter,tp,LOCATION_DECK,0,1,nil,tp) 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