Commit e11aa44f authored by VanillaSalt's avatar VanillaSalt

fix

parent ac95b63e
......@@ -16,7 +16,7 @@ function c16114248.initial_effect(c)
c:RegisterEffect(e2)
end
function c16114248.filter(c,fc)
return c:IsRace(RACE_MACHINE) and c:IsCanBeFusionMaterial(fc)
return c:IsRace(RACE_MACHINE) and not c:IsHasEffect(6205579) and c:IsCanBeFusionMaterial(fc)
end
function c16114248.spfilter(c,mg)
return mg:IsExists(c16114248.spfilter2,1,c,c)
......
......@@ -81,21 +81,24 @@ function c18386170.hdop(e,tp,eg,ep,ev,re,r,rp)
local sg=g:RandomSelect(tp,1)
Duel.SendtoGrave(sg,REASON_EFFECT)
end
function c18386170.ffilter(c)
return c:IsFusionSetCard(0xb1) and not c:IsHasEffect(6205579)
end
function c18386170.fscon(e,g,gc,chkf)
if g==nil then return true end
if gc then
local mg=g:Filter(Card.IsFusionSetCard,nil,0xb1)
local mg=g:Filter(c18386170.ffilter,nil)
mg:AddCard(gc)
return gc:IsFusionSetCard(0xb1) and mg:GetClassCount(Card.GetCode)>=3
return c18386170.ffilter(gc) and mg:GetClassCount(Card.GetCode)>=3
end
local fs=false
local mg=g:Filter(Card.IsFusionSetCard,nil,0xb1)
local mg=g:Filter(c18386170.ffilter,nil)
if mg:IsExists(aux.FConditionCheckF,1,nil,chkf) then fs=true end
return mg:GetClassCount(Card.GetCode)>=3 and (fs or chkf==PLAYER_NONE)
end
function c18386170.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf)
if gc then
local sg=eg:Filter(Card.IsFusionSetCard,gc,0xb1)
local sg=eg:Filter(c18386170.ffilter,gc)
sg:Remove(Card.IsCode,nil,gc:GetCode())
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
local g1=sg:Select(tp,1,1,nil)
......@@ -106,7 +109,7 @@ function c18386170.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf)
Duel.SetFusionMaterial(g1)
return
end
local sg=eg:Filter(Card.IsFusionSetCard,nil,0xb1)
local sg=eg:Filter(c18386170.ffilter,nil)
local g1=nil
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
if chkf~=PLAYER_NONE then g1=sg:FilterSelect(tp,aux.FConditionCheckF,1,1,nil,chkf)
......
......@@ -38,10 +38,10 @@ function c19261966.initial_effect(c)
c:RegisterEffect(e4)
end
function c19261966.ffilter1(c)
return c:IsFusionSetCard(0x9d)
return c:IsFusionSetCard(0x9d) and not c:IsHasEffect(6205579)
end
function c19261966.ffilter2(c)
return c:IsFusionAttribute(ATTRIBUTE_WATER) or c:IsHasEffect(4904633)
return (c:IsFusionAttribute(ATTRIBUTE_WATER) or c:IsHasEffect(4904633)) and not c:IsHasEffect(6205579)
end
function c19261966.exfilter(c,g)
return c:IsFaceup() and c:IsCanBeFusionMaterial() and not g:IsContains(c)
......
......@@ -49,10 +49,10 @@ function c20366274.initial_effect(c)
c:RegisterEffect(e5)
end
function c20366274.ffilter1(c)
return c:IsFusionSetCard(0x9d)
return c:IsFusionSetCard(0x9d) and not c:IsHasEffect(6205579)
end
function c20366274.ffilter2(c)
return c:IsFusionAttribute(ATTRIBUTE_LIGHT) or c:IsHasEffect(4904633)
return (c:IsFusionAttribute(ATTRIBUTE_LIGHT) or c:IsHasEffect(4904633)) and not c:IsHasEffect(6205579)
end
function c20366274.exfilter(c,g)
return c:IsFaceup() and c:IsCanBeFusionMaterial() and not g:IsContains(c)
......
......@@ -36,7 +36,7 @@ function c28016193.initial_effect(c)
c:RegisterEffect(e3)
end
function c28016193.filter(c)
return c:IsFusionSetCard(0xe1)
return c:IsFusionSetCard(0xe1) and not c:IsHasEffect(6205579)
end
function c28016193.fscon(e,g,gc,chkfnf)
if g==nil then return true end
......
......@@ -27,14 +27,17 @@ function c31111109.initial_effect(c)
e3:SetValue(aux.fuslimit)
c:RegisterEffect(e3)
end
function c31111109.ffilter(c,cat)
return c:IsFusionSetCard(cat) and not c:IsHasEffect(6205579)
end
function c31111109.fuscon(e,g,gc,chkf)
if g==nil then return false end
if gc then return false end
local g1=g:Filter(Card.IsFusionSetCard,nil,0x9)
local g1=g:Filter(c31111109.ffilter,nil,0x9)
local c1=g1:GetCount()
local g2=g:Filter(Card.IsFusionSetCard,nil,0x1f)
local g2=g:Filter(c31111109.ffilter,nil,0x1f)
local c2=g2:GetCount()
local g3=g:Filter(Card.IsFusionSetCard,nil,0x8)
local g3=g:Filter(c31111109.ffilter,nil,0x8)
local c3=g3:GetCount()
local ag=g1:Clone()
ag:Merge(g2)
......@@ -44,9 +47,9 @@ function c31111109.fuscon(e,g,gc,chkf)
end
function c31111109.fusop(e,tp,eg,ep,ev,re,r,rp,gc,chkf)
if gc then return end
local g1=eg:Filter(Card.IsFusionSetCard,nil,0x9)
local g2=eg:Filter(Card.IsFusionSetCard,nil,0x1f)
local g3=eg:Filter(Card.IsFusionSetCard,nil,0x8)
local g1=eg:Filter(c31111109.ffilter,nil,0x9)
local g2=eg:Filter(c31111109.ffilter,nil,0x1f)
local g3=eg:Filter(c31111109.ffilter,nil,0x8)
local ag=g1:Clone()
ag:Merge(g2)
ag:Merge(g3)
......
......@@ -31,14 +31,14 @@ function c4688231.initial_effect(c)
c:RegisterEffect(e3)
end
function c4688231.filter1(c)
return c:IsFusionSetCard(0xe1)
return c:IsFusionSetCard(0xe1) and not c:IsHasEffect(6205579)
end
--additional condition for 77693536 effect
function c4688231.filter2(c)
if c:IsLocation(LOCATION_MZONE) then
return c:IsType(TYPE_PENDULUM)
return c:IsType(TYPE_PENDULUM) and not c:IsHasEffect(6205579)
else
return bit.band(c:GetOriginalType(),TYPE_PENDULUM)~=0
return bit.band(c:GetOriginalType(),TYPE_PENDULUM)~=0 and not c:IsHasEffect(6205579)
end
end
function c4688231.fscon(e,g,gc,chkfnf)
......
......@@ -41,10 +41,10 @@ function c48424886.initial_effect(c)
c:RegisterEffect(e4)
end
function c48424886.ffilter1(c)
return c:IsFusionSetCard(0x9d)
return c:IsFusionSetCard(0x9d) and not c:IsHasEffect(6205579)
end
function c48424886.ffilter2(c)
return c:IsFusionAttribute(ATTRIBUTE_FIRE) or c:IsHasEffect(4904633)
return (c:IsFusionAttribute(ATTRIBUTE_FIRE) or c:IsHasEffect(4904633)) and not c:IsHasEffect(6205579)
end
function c48424886.exfilter(c,g)
return c:IsFaceup() and c:IsCanBeFusionMaterial() and not g:IsContains(c)
......
......@@ -11,10 +11,10 @@ function c54401832.initial_effect(c)
c:RegisterEffect(e1)
end
function c54401832.filter1(c)
return c:IsFusionSetCard(0xe1)
return c:IsFusionSetCard(0xe1) and not c:IsHasEffect(6205579)
end
function c54401832.filter2(c)
return c:IsAttackBelow(3000)
return c:IsAttackBelow(3000) and not c:IsHasEffect(6205579)
end
function c54401832.fscon(e,g,gc,chkfnf)
if g==nil then return true end
......
......@@ -6,7 +6,8 @@ function c6205579.initial_effect(c)
e1:SetCode(EFFECT_FUSION_SUBSTITUTE)
e1:SetCondition(c6205579.subcon)
c:RegisterEffect(e1)
local e2=e1:Clone()
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
e2:SetCode(6205579)
c:RegisterEffect(e2)
......
......@@ -40,10 +40,10 @@ function c74009824.initial_effect(c)
c:RegisterEffect(e4)
end
function c74009824.ffilter1(c)
return c:IsFusionSetCard(0x9d)
return c:IsFusionSetCard(0x9d) and not c:IsHasEffect(6205579)
end
function c74009824.ffilter2(c)
return c:IsFusionAttribute(ATTRIBUTE_WIND) or c:IsHasEffect(4904633)
return (c:IsFusionAttribute(ATTRIBUTE_WIND) or c:IsHasEffect(4904633)) and not c:IsHasEffect(6205579)
end
function c74009824.exfilter(c,g)
return c:IsFaceup() and c:IsCanBeFusionMaterial() and not g:IsContains(c)
......
......@@ -17,7 +17,7 @@ function c74506079.initial_effect(c)
c:RegisterEffect(e2)
end
function c74506079.ffilter(c)
return c:IsFusionSetCard(0x3e) and c:IsRace(RACE_REPTILE)
return c:IsFusionSetCard(0x3e) and c:IsRace(RACE_REPTILE) and not c:IsHasEffect(6205579)
end
function c74506079.fscondition(e,g,gc)
if g==nil then return true end
......
......@@ -42,10 +42,10 @@ function c74822425.initial_effect(c)
c:RegisterEffect(e4)
end
function c74822425.ffilter1(c)
return c:IsFusionSetCard(0x9d)
return c:IsFusionSetCard(0x9d) and not c:IsHasEffect(6205579)
end
function c74822425.ffilter2(c)
return c:IsFusionAttribute(ATTRIBUTE_EARTH) or c:IsHasEffect(4904633)
return (c:IsFusionAttribute(ATTRIBUTE_EARTH) or c:IsHasEffect(4904633)) and not c:IsHasEffect(6205579)
end
function c74822425.exfilter(c,g)
return c:IsFaceup() and c:IsCanBeFusionMaterial() and not g:IsContains(c)
......
......@@ -39,14 +39,14 @@ function c77693536.initial_effect(c)
c:RegisterEffect(e3)
end
function c77693536.filter1(c)
return c:IsFusionSetCard(0xe1)
return c:IsFusionSetCard(0xe1) and not c:IsHasEffect(6205579)
end
--additional condition for 77693536 effect
function c77693536.filter2(c)
if c:IsLocation(LOCATION_MZONE) then
return c:IsType(TYPE_NORMAL)
return c:IsType(TYPE_NORMAL) and not c:IsHasEffect(6205579)
else
return bit.band(c:GetOriginalType(),TYPE_NORMAL)~=0
return bit.band(c:GetOriginalType(),TYPE_NORMAL)~=0 and not c:IsHasEffect(6205579)
end
end
function c77693536.fscon(e,g,gc,chkfnf)
......
......@@ -11,10 +11,10 @@ function c81612598.initial_effect(c)
c:RegisterEffect(e1)
end
function c81612598.filter1(c)
return c:IsFusionSetCard(0xe1)
return c:IsFusionSetCard(0xe1) and not c:IsHasEffect(6205579)
end
function c81612598.filter2(c)
return c:IsAttackBelow(2500)
return c:IsAttackBelow(2500) and not c:IsHasEffect(6205579)
end
function c81612598.fscon(e,g,gc,chkfnf)
if g==nil then return true end
......
......@@ -30,7 +30,7 @@ function c84058253.initial_effect(c)
c:RegisterEffect(e3)
end
function c84058253.ffilter(c)
return c:IsFusionSetCard(0x1093)
return c:IsFusionSetCard(0x1093) and not c:IsHasEffect(6205579)
end
function c84058253.fscondition(e,g,gc,chkf)
if g==nil then return false end
......
......@@ -47,10 +47,10 @@ function c94977269.initial_effect(c)
c:RegisterEffect(e5)
end
function c94977269.ffilter1(c)
return c:IsFusionSetCard(0x9d)
return c:IsFusionSetCard(0x9d) and not c:IsHasEffect(6205579)
end
function c94977269.ffilter2(c)
return c:IsFusionAttribute(ATTRIBUTE_DARK) or c:IsHasEffect(4904633)
return (c:IsFusionAttribute(ATTRIBUTE_DARK) or c:IsHasEffect(4904633)) and not c:IsHasEffect(6205579)
end
function c94977269.exfilter(c,g)
return c:IsFaceup() and c:IsCanBeFusionMaterial() and not g:IsContains(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