Commit 4d52c866 authored by POLYMER's avatar POLYMER

fix

parent 5fc5d147
......@@ -41,7 +41,8 @@ function s.filter(c,tp)
return c:IsFaceup() and c:IsSetCard(0x9a7b) and g:GetClassCount(Card.GetCode)>=7
end
function s.tgfilter(c,code)
return c:IsFaceupEx() and c:IsSetCard(0x9a7b) and not c:IsCode(code) and c:IsAbleToRemove()
return c:IsFaceupEx() and c:IsSetCard(0x9a7b) and not c:IsCode(code) and c:IsAbleToRemove() and
c:IsType(TYPE_MONSTER)
end
function s.skitg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local c=e:GetHandler()
......
......@@ -19,7 +19,7 @@ function cm.initial_effect(c)
e2:SetDescription(aux.Stringid(m,1))
e2:SetCategory(CATEGORY_REMOVE)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_CHAINING)
e2:SetCode(EVENT_CUSTOM+53757098)
e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
e2:SetRange(LOCATION_MZONE)
e2:SetCondition(cm.trcon)
......@@ -102,8 +102,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) end
end
function cm.trcon(e,tp,eg,ep,ev,re,r,rp)
local tc=eg:GetFirst()
return tc:IsCode(m-1) or tc==e:GetHandler()
return eg:IsExists(Card.IsCode,1,nil,m-1) or eg:IsContains(e:GetHandler())
end
function cm.trtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_ONFIELD) and chkc:IsControler(1-tp) and chkc:IsAbleToRemove() end
......
......@@ -18,7 +18,7 @@ function cm.initial_effect(c)
e2:SetDescription(aux.Stringid(m,1))
e2:SetCategory(CATEGORY_REMOVE)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_CHAINING)
e2:SetCode(EVENT_CUSTOM+53757098)
e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetRange(LOCATION_MZONE)
e2:SetCondition(cm.trcon)
......@@ -49,8 +49,7 @@ function cm.pop(e,tp,eg,ep,ev,re,r,rp)
end
end
function cm.trcon(e,tp,eg,ep,ev,re,r,rp)
local tc=eg:GetFirst()
return tc:IsCode(m-1) or tc==e:GetHandler()
return eg:IsExists(Card.IsCode,1,nil,m-1) or eg:IsContains(e:GetHandler())
end
function cm.cfilter(c,s)
if not c:IsRace(RACE_DRAGON) or not c:GetType()&0x20002~=0x20002 then return false end
......
......@@ -21,7 +21,7 @@ function cm.initial_effect(c)
e2:SetDescription(aux.Stringid(m,1))
e2:SetCategory(CATEGORY_REMOVE)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_CHAINING)
e2:SetCode(EVENT_CUSTOM+53757098)
e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetRange(LOCATION_MZONE)
e2:SetCondition(cm.trcon)
......@@ -45,8 +45,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) end
end
function cm.trcon(e,tp,eg,ep,ev,re,r,rp)
local tc=eg:GetFirst()
return tc:IsCode(m-1) or tc==e:GetHandler()
return eg:IsExists(Card.IsCode,1,nil,m-1) or eg:IsContains(e:GetHandler())
end
function cm.trtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_HAND,1,nil,tp,POS_FACEDOWN) end
......
......@@ -19,7 +19,7 @@ function cm.initial_effect(c)
e2:SetDescription(aux.Stringid(m,1))
e2:SetCategory(CATEGORY_ATKCHANGE)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_CHAINING)
e2:SetCode(EVENT_CUSTOM+53757098)
e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetRange(LOCATION_MZONE)
e2:SetCondition(cm.trcon)
......@@ -65,8 +65,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) end
end
function cm.trcon(e,tp,eg,ep,ev,re,r,rp)
local tc=eg:GetFirst()
return tc:IsCode(m-1) or tc==e:GetHandler()
return eg:IsExists(Card.IsCode,1,nil,m-1) or eg:IsContains(e:GetHandler())
end
function cm.atkfilter(c)
return c:IsFaceup() and c:IsLevel(3)
......
......@@ -59,8 +59,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
end
end
function cm.trcon(e,tp,eg,ep,ev,re,r,rp)
local tc=eg:GetFirst()
return tc:IsCode(m-1) or tc==e:GetHandler()
return eg:IsExists(Card.IsCode,1,nil,m-1) or eg:IsContains(e:GetHandler())
end
function cm.trtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chk==0 then return true 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