Commit 61a3ee67 authored by POLYMER's avatar POLYMER

fix

parent 6b16f434
...@@ -76,9 +76,11 @@ function s.spcon2(e,tp,eg,ep,ev,re,r,rp) ...@@ -76,9 +76,11 @@ function s.spcon2(e,tp,eg,ep,ev,re,r,rp)
end end
function s.descon(e,tp,eg,ep,ev,re,r,rp) function s.descon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(function(c) return Duel.IsExistingMatchingCard(s.desconfilter,tp,LOCATION_MZONE,0,1,nil)
return c:IsFaceup() and c:IsSetCard(0x3f50) and c~=e:GetHandler() end
end, tp, LOCATION_MZONE, 0, 1, nil)
function s.desconfilter(c)
return c:IsFaceup() and c:IsSetCard(0x3f50) and not c:IsCode(id)
end end
function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
......
...@@ -108,9 +108,11 @@ function s.spop1(e,tp,eg,ep,ev,re,r,rp) ...@@ -108,9 +108,11 @@ function s.spop1(e,tp,eg,ep,ev,re,r,rp)
end end
function s.thcon(e,tp,eg,ep,ev,re,r,rp) function s.thcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(function(c) return Duel.IsExistingMatchingCard(s.thconfilter,tp,LOCATION_MZONE,0,1,nil)
return c:IsSetCard(0x3f50) and c~=e:GetHandler() end
end, tp, LOCATION_MZONE, 0, 1, nil)
function s.thconfilter(c)
return c:IsFaceup() and c:IsSetCard(0x3f50) and not c:IsCode(id)
end end
function s.thfilter(c) function s.thfilter(c)
......
...@@ -108,9 +108,11 @@ function s.spop1(e,tp,eg,ep,ev,re,r,rp) ...@@ -108,9 +108,11 @@ function s.spop1(e,tp,eg,ep,ev,re,r,rp)
end end
function s.thcon(e,tp,eg,ep,ev,re,r,rp) function s.thcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(function(c) return Duel.IsExistingMatchingCard(s.thconfilter,tp,LOCATION_MZONE,0,1,nil)
return c:IsSetCard(0x3f50) and c~=e:GetHandler() end
end, tp, LOCATION_MZONE, 0, 1, nil)
function s.thconfilter(c)
return c:IsFaceup() and c:IsSetCard(0x3f50) and not c:IsCode(id)
end end
function s.thfilter(c) function s.thfilter(c)
......
...@@ -148,9 +148,11 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -148,9 +148,11 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.descon(e,tp,eg,ep,ev,re,r,rp) function s.descon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(function(c) return Duel.IsExistingMatchingCard(s.thconfilter,tp,LOCATION_MZONE,0,1,nil)
return c:IsFaceup() and c:IsSetCard(0x3f50) and c~=e:GetHandler() end
end, tp, LOCATION_MZONE, 0, 1, nil)
function s.desonfilter(c)
return c:IsFaceup() and c:IsSetCard(0x3f50) and not c:IsCode(id)
end end
function s.discost(e,tp,eg,ep,ev,re,r,rp,chk) function s.discost(e,tp,eg,ep,ev,re,r,rp,chk)
......
...@@ -87,9 +87,11 @@ function s.spop1(e,tp,eg,ep,ev,re,r,rp) ...@@ -87,9 +87,11 @@ function s.spop1(e,tp,eg,ep,ev,re,r,rp)
end end
function s.thcon(e,tp,eg,ep,ev,re,r,rp) function s.thcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(function(c) return Duel.IsExistingMatchingCard(s.thconfilter,tp,LOCATION_MZONE,0,1,nil)
return c:IsFaceup() and c:IsSetCard(0x3f50) and c~=e:GetHandler() end
end, tp, LOCATION_MZONE, 0, 1, nil)
function s.thconfilter(c)
return c:IsFaceup() and c:IsSetCard(0x3f50) and not c:IsCode(id)
end end
function s.thfilter(c,e,tp) function s.thfilter(c,e,tp)
......
...@@ -101,11 +101,16 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -101,11 +101,16 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.thcon(e,tp,eg,ep,ev,re,r,rp) function s.thcon(e,tp,eg,ep,ev,re,r,rp)
local res=not Duel.IsExistingMatchingCard(function(c) return c:IsFaceup() and c:IsSetCard(0x3f50) and c~=e:GetHandler() end,tp,LOCATION_MZONE,0,1,nil) local res=not Duel.IsExistingMatchingCard(s.quick_check_filter,tp,LOCATION_MZONE,0,1,nil,id)
return Duel.GetTurnPlayer()==tp and res return Duel.GetTurnPlayer()==tp and res
end end
function s.thcon_quick(e,tp,eg,ep,ev,re,r,rp) function s.thcon_quick(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(function(c) return c:IsFaceup() and c:IsSetCard(0x3f50) and c~=e:GetHandler() end,tp,LOCATION_MZONE,0,1,nil) return Duel.IsExistingMatchingCard(s.quick_check_filter,tp,LOCATION_MZONE,0,1,nil,id)
end
function s.quick_check_filter(c,id)
return c:IsFaceup() and c:IsSetCard(0x3f50) and not c:IsCode(id)
end end
function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
......
...@@ -83,12 +83,16 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -83,12 +83,16 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.atkcon(e,tp,eg,ep,ev,re,r,rp) function s.atkcon(e,tp,eg,ep,ev,re,r,rp)
local res=not Duel.IsExistingMatchingCard(function(c) return c:IsFaceup() and c:IsSetCard(0x3f50) and c~=e:GetHandler() end,tp,LOCATION_MZONE,0,1,nil) local res=not Duel.IsExistingMatchingCard(s.quick_check_filter,tp,LOCATION_MZONE,0,1,nil,id)
return Duel.GetTurnPlayer()==tp and res return Duel.GetTurnPlayer()==tp and res
end end
function s.atkcon_quick(e,tp,eg,ep,ev,re,r,rp) function s.atkcon_quick(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(function(c) return c:IsFaceup() and c:IsSetCard(0x3f50) and c~=e:GetHandler() end,tp,LOCATION_MZONE,0,1,nil) return Duel.IsExistingMatchingCard(s.quick_check_filter,tp,LOCATION_MZONE,0,1,nil,id)
end
function s.quick_check_filter(c,id)
return c:IsFaceup() and c:IsSetCard(0x3f50) and not c:IsCode(id)
end end
function s.atkfilter(c) function s.atkfilter(c)
......
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