Commit 356fb070 authored by DailyShana's avatar DailyShana

fix

parent 47eb3e46
...@@ -38,7 +38,7 @@ function c41209827.initial_effect(c) ...@@ -38,7 +38,7 @@ function c41209827.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c41209827.ffilter(c) function c41209827.ffilter(c)
return c:IsFusionAttribute(ATTRIBUTE_DARK) and c:IsLocation(LOCATION_MZONE) and not c:IsType(TYPE_TOKEN) return c:IsFusionAttribute(ATTRIBUTE_DARK) and c:IsLocation(LOCATION_ONFIELD) and not c:IsType(TYPE_TOKEN)
end end
function c41209827.atkcon(e,tp,eg,ep,ev,re,r,rp) function c41209827.atkcon(e,tp,eg,ep,ev,re,r,rp)
return bit.band(e:GetHandler():GetSummonType(),SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION return bit.band(e:GetHandler():GetSummonType(),SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION
......
...@@ -31,7 +31,7 @@ function c49306994.initial_effect(c) ...@@ -31,7 +31,7 @@ function c49306994.initial_effect(c)
e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F) e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
e4:SetRange(LOCATION_SZONE) e4:SetRange(LOCATION_SZONE)
e4:SetCode(EVENT_ATTACK_ANNOUNCE) e4:SetCode(EVENT_ATTACK_ANNOUNCE)
e4:SetCondition(c49306994.actcon) e4:SetCondition(c49306994.discon)
e4:SetOperation(c49306994.disop) e4:SetOperation(c49306994.disop)
c:RegisterEffect(e4) c:RegisterEffect(e4)
--destroy --destroy
...@@ -77,9 +77,11 @@ function c49306994.aclimit(e,re,tp) ...@@ -77,9 +77,11 @@ function c49306994.aclimit(e,re,tp)
end end
function c49306994.actcon(e) function c49306994.actcon(e)
local tc=e:GetHandler():GetEquipTarget() local tc=e:GetHandler():GetEquipTarget()
local a=Duel.GetAttacker() return Duel.GetAttacker()==tc or Duel.GetAttackTarget()==tc
local d=Duel.GetAttackTarget() end
return (a and a==tc) or (d and d==tc) function c49306994.discon(e,tp,eg,ep,ev,re,r,rp)
local tc=e:GetHandler():GetEquipTarget()
return Duel.GetAttacker()==tc or Duel.GetAttackTarget()==tc
end end
function c49306994.disfilter(c) function c49306994.disfilter(c)
return aux.disfilter1(c) and c:IsType(TYPE_SPELL+TYPE_TRAP) return aux.disfilter1(c) and c:IsType(TYPE_SPELL+TYPE_TRAP)
......
...@@ -9,29 +9,10 @@ function c65646587.initial_effect(c) ...@@ -9,29 +9,10 @@ function c65646587.initial_effect(c)
e1:SetTarget(c65646587.target) e1:SetTarget(c65646587.target)
e1:SetOperation(c65646587.activate) e1:SetOperation(c65646587.activate)
c:RegisterEffect(e1) c:RegisterEffect(e1)
if not c65646587.global_check then
c65646587.global_check=true
local f=Card.IsCanBeFusionMaterial
Card.IsCanBeFusionMaterial=function(c,fc,ismon)
if (c:GetSequence()==6 or c:GetSequence()==7) and c:IsLocation(LOCATION_SZONE) then
return f(c,fc,true)
end
if c:IsCode(80604091) then return f(c,fc,true) end
return f(c,fc,ismon)
end
local f2=Card.IsType
Card.IsType=function(c,tp)
if (c:GetSequence()==6 or c:GetSequence()==7) and c:IsLocation(LOCATION_SZONE) then
local opt=bit.bor(c:GetOriginalType(),TYPE_SPELL)
return bit.band(tp,opt)~=0
end
return f2(c,tp)
end
end
end end
function c65646587.filter0(c,e) function c65646587.filter0(c,e)
local seq=c:GetSequence() local seq=c:GetSequence()
return (seq==6 or seq==7) and c:IsCanBeFusionMaterial(nil,true) and not c:IsImmuneToEffect(e) return (seq==6 or seq==7) and c:IsCanBeFusionMaterial() and not c:IsImmuneToEffect(e)
end end
function c65646587.filter1(c,e) function c65646587.filter1(c,e)
return c:IsCanBeFusionMaterial() and not c:IsImmuneToEffect(e) return c:IsCanBeFusionMaterial() and not c:IsImmuneToEffect(e)
......
...@@ -445,7 +445,7 @@ function Auxiliary.XyzOperation2(f,lv,minc,maxc,alterf,desc,op) ...@@ -445,7 +445,7 @@ function Auxiliary.XyzOperation2(f,lv,minc,maxc,alterf,desc,op)
end end
end end
function Auxiliary.FConditionCheckF(c,chkf) function Auxiliary.FConditionCheckF(c,chkf)
return c:IsOnField() and c:IsControler(chkf) return c:IsLocation(LOCATION_MZONE) and c:IsControler(chkf)
end end
--Fusion monster, name + name --Fusion monster, name + name
--material_count: number of different names in material list --material_count: number of different names in material list
......
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