Commit 83631096 authored by POLYMER's avatar POLYMER

fix

parent ef222bf3
......@@ -21,7 +21,7 @@ function cm.initial_effect(c)
c:RegisterEffect(e2)
end
function cm.filter(c)
return c:GetOriginalType()&0x21==0x21 and c:IsRace(RACE_INSECT) and c:IsFaceup()
return c:GetOriginalType()&TYPE_MONSTER>0 and ((c:IsLocation(LOCATION_MZONE) and c:IsRace(RACE_INSECT) and c:IsType(TYPE_EFFECT)) or (not c:IsLocation(LOCATION_MZONE) and c:GetOriginalRace()&RACE_INSECT>0 and c:GetOriginalType()&TYPE_EFFECT>0)) and c:IsFaceup()
end
function cm.filter2(c)
return c:IsType(TYPE_MONSTER) and c:IsFaceup() and c:IsAttackAbove(1000) and not c:IsHasEffect(EFFECT_REVERSE_UPDATE)
......
......@@ -47,7 +47,7 @@ function cm.spfilter(c)
return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToGraveAsCost()
end
function cm.thfilter(c)
return c:IsRace(RACE_INSECT) and c:GetOriginalType()&0x1>0
return c:GetOriginalType()&TYPE_MONSTER>0 and ((c:IsLocation(LOCATION_MZONE) and c:IsRace(RACE_INSECT)) or (not c:IsLocation(LOCATION_MZONE) and c:GetOriginalRace()&RACE_INSECT>0)
end
function cm.spcon(e,c)
if c==nil then return true end
......
......@@ -8,7 +8,8 @@ function s.initial_effect(c)
e0:SetCode(EFFECT_FUSION_MATERIAL)
e0:SetCondition(s.Chimera_Fusion_Condition())
e0:SetOperation(s.Chimera_Fusion_Operation())
c:RegisterEffect(e0)
--c:RegisterEffect(e0)
aux.AddFusionProcFunRep2(c,s.matfilter,2,99,true)
local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(id,0))
e1:SetCategory(CATEGORY_DRAW)
......@@ -49,6 +50,9 @@ function s.initial_effect(c)
e5:SetOperation(s.desop)
c:RegisterEffect(e5)
end
function s.matfilter(c,fc,sub,mg,sg)
return not sg or not sg:IsExists(Card.IsCode,1,c,c:GetCode())
end
function s.Chimera_Fusion_Gcheck(g,fc,tp,chkf,gc)
if g:IsExists(aux.TuneMagicianCheckX,1,nil,g,EFFECT_TUNE_MAGICIAN_F) then return false end
if gc and not g:IsContains(gc) then return false 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