Commit b3810254 authored by POLYMER's avatar POLYMER

fix

parent aab06952
...@@ -76,8 +76,7 @@ function c60151016.distg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -76,8 +76,7 @@ function c60151016.distg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
end end
function c60151016.disop2(e,tp,eg,ep,ev,re,r,rp) function c60151016.disop2(e,tp,eg,ep,ev,re,r,rp)
Duel.NegateActivation(ev) if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
if re:GetHandler():IsRelateToEffect(re) then
local tc=eg:GetFirst() local tc=eg:GetFirst()
if tc:IsType(TYPE_SPELL+TYPE_TRAP) then if tc:IsType(TYPE_SPELL+TYPE_TRAP) then
tc:CancelToGrave() tc:CancelToGrave()
...@@ -92,8 +91,7 @@ function c60151016.immcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -92,8 +91,7 @@ function c60151016.immcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentChain()<2 and e:GetHandler():GetMaterial():FilterCount(c60151016.ccfilter,nil)>0 return Duel.GetCurrentChain()<2 and e:GetHandler():GetMaterial():FilterCount(c60151016.ccfilter,nil)>0
end end
function c60151016.efilter(e,te) function c60151016.efilter(e,te)
if te:IsActiveType(TYPE_SPELL+TYPE_TRAP) and te:IsHasType(EFFECT_TYPE_ACTIVATE) then return true end return te:GetOwner()~=e:GetOwner()
if te:IsActiveType(TYPE_MONSTER) and te:IsActivated() then return true end
end end
function c60151016.regcon(e,tp,eg,ep,ev,re,r,rp) function c60151016.regcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
......
...@@ -76,7 +76,7 @@ function c60151411.eqop(e,tp,eg,ep,ev,re,r,rp) ...@@ -76,7 +76,7 @@ function c60151411.eqop(e,tp,eg,ep,ev,re,r,rp)
tc:RegisterFlagEffect(60151411,RESET_EVENT+0x1fe0000,0,0) tc:RegisterFlagEffect(60151411,RESET_EVENT+0x1fe0000,0,0)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetProperty(EFFECT_FLAG_COPY_INHERIT+EFFECT_FLAG_OWNER_RELATE) e1:SetProperty(EFFECT_FLAG_OWNER_RELATE)
e1:SetCode(EFFECT_EQUIP_LIMIT) e1:SetCode(EFFECT_EQUIP_LIMIT)
e1:SetReset(RESET_EVENT+0x1fe0000) e1:SetReset(RESET_EVENT+0x1fe0000)
e1:SetValue(c60151411.eqlimit) e1:SetValue(c60151411.eqlimit)
......
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