Skip to content

Y
ygopro-scripts
Commit c1e1540b authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

fix

parent ecb824ad
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 41 deletions
c18386170.lua
View file @ c1e1540b
...@@ -84,18 +84,18 @@ end ...@@ -84,18 +84,18 @@ end
function c18386170.fscon(e,g,gc,chkf) function c18386170.fscon(e,g,gc,chkf)
if g==nil then return true end if g==nil then return true end
if gc then if gc then
local mg=g:Filter(Card.IsSetCard,nil,0xb1) local mg=g:Filter(Card.IsFusionSetCard,nil,0xb1)
mg:AddCard(gc) mg:AddCard(gc)
return gc:IsSetCard(0xb1) and mg:GetClassCount(Card.GetCode)>=3 return gc:IsFusionSetCard(0xb1) and mg:GetClassCount(Card.GetCode)>=3
end end
local fs=false local fs=false
local mg=g:Filter(Card.IsSetCard,nil,0xb1) local mg=g:Filter(Card.IsFusionSetCard,nil,0xb1)
if mg:IsExists(aux.FConditionCheckF,1,nil,chkf) then fs=true end if mg:IsExists(aux.FConditionCheckF,1,nil,chkf) then fs=true end
return mg:GetClassCount(Card.GetCode)>=3 and (fs or chkf==PLAYER_NONE) return mg:GetClassCount(Card.GetCode)>=3 and (fs or chkf==PLAYER_NONE)
end end
function c18386170.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf) function c18386170.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf)
if gc then if gc then
local sg=eg:Filter(Card.IsSetCard,gc,0xb1) local sg=eg:Filter(Card.IsFusionSetCard,gc,0xb1)
sg:Remove(Card.IsCode,nil,gc:GetCode()) sg:Remove(Card.IsCode,nil,gc:GetCode())
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
local g1=sg:Select(tp,1,1,nil) local g1=sg:Select(tp,1,1,nil)
...@@ -106,7 +106,7 @@ function c18386170.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf) ...@@ -106,7 +106,7 @@ function c18386170.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf)
Duel.SetFusionMaterial(g1) Duel.SetFusionMaterial(g1)
return return
end end
local sg=eg:Filter(Card.IsSetCard,nil,0xb1) local sg=eg:Filter(Card.IsFusionSetCard,nil,0xb1)
local g1=nil local g1=nil
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
if chkf~=PLAYER_NONE then g1=sg:FilterSelect(tp,aux.FConditionCheckF,1,1,nil,chkf) if chkf~=PLAYER_NONE then g1=sg:FilterSelect(tp,aux.FConditionCheckF,1,1,nil,chkf)
......
c19261966.lua
View file @ c1e1540b
...@@ -38,7 +38,7 @@ function c19261966.initial_effect(c) ...@@ -38,7 +38,7 @@ function c19261966.initial_effect(c)
c:RegisterEffect(e4) c:RegisterEffect(e4)
end end
function c19261966.ffilter1(c) function c19261966.ffilter1(c)
return c:IsSetCard(0x9d) return c:IsFusionSetCard(0x9d)
end end
function c19261966.ffilter2(c) function c19261966.ffilter2(c)
return c:IsAttribute(ATTRIBUTE_WATER) or c:IsHasEffect(4904633) return c:IsAttribute(ATTRIBUTE_WATER) or c:IsHasEffect(4904633)
......
c20366274.lua
View file @ c1e1540b
...@@ -49,7 +49,7 @@ function c20366274.initial_effect(c) ...@@ -49,7 +49,7 @@ function c20366274.initial_effect(c)
c:RegisterEffect(e5) c:RegisterEffect(e5)
end end
function c20366274.ffilter1(c) function c20366274.ffilter1(c)
return c:IsSetCard(0x9d) return c:IsFusionSetCard(0x9d)
end end
function c20366274.ffilter2(c) function c20366274.ffilter2(c)
return c:IsAttribute(ATTRIBUTE_LIGHT) or c:IsHasEffect(4904633) return c:IsAttribute(ATTRIBUTE_LIGHT) or c:IsHasEffect(4904633)
......
c31111109.lua
View file @ c1e1540b
...@@ -30,11 +30,11 @@ end ...@@ -30,11 +30,11 @@ end
function c31111109.fuscon(e,g,gc,chkf) function c31111109.fuscon(e,g,gc,chkf)
if g==nil then return false end if g==nil then return false end
if gc then return false end if gc then return false end
local g1=g:Filter(Card.IsSetCard,nil,0x9) local g1=g:Filter(Card.IsFusionSetCard,nil,0x9)
local c1=g1:GetCount() local c1=g1:GetCount()
local g2=g:Filter(Card.IsSetCard,nil,0x1f) local g2=g:Filter(Card.IsFusionSetCard,nil,0x1f)
local c2=g2:GetCount() local c2=g2:GetCount()
local g3=g:Filter(Card.IsSetCard,nil,0x8) local g3=g:Filter(Card.IsFusionSetCard,nil,0x8)
local c3=g3:GetCount() local c3=g3:GetCount()
local ag=g1:Clone() local ag=g1:Clone()
ag:Merge(g2) ag:Merge(g2)
...@@ -44,9 +44,9 @@ function c31111109.fuscon(e,g,gc,chkf) ...@@ -44,9 +44,9 @@ function c31111109.fuscon(e,g,gc,chkf)
end end
function c31111109.fusop(e,tp,eg,ep,ev,re,r,rp,gc,chkf) function c31111109.fusop(e,tp,eg,ep,ev,re,r,rp,gc,chkf)
if gc then return end if gc then return end
local g1=eg:Filter(Card.IsSetCard,nil,0x9) local g1=eg:Filter(Card.IsFusionSetCard,nil,0x9)
local g2=eg:Filter(Card.IsSetCard,nil,0x1f) local g2=eg:Filter(Card.IsFusionSetCard,nil,0x1f)
local g3=eg:Filter(Card.IsSetCard,nil,0x8) local g3=eg:Filter(Card.IsFusionSetCard,nil,0x8)
local ag=g1:Clone() local ag=g1:Clone()
ag:Merge(g2) ag:Merge(g2)
ag:Merge(g3) ag:Merge(g3)
......
c48424886.lua
View file @ c1e1540b
...@@ -41,7 +41,7 @@ function c48424886.initial_effect(c) ...@@ -41,7 +41,7 @@ function c48424886.initial_effect(c)
c:RegisterEffect(e4) c:RegisterEffect(e4)
end end
function c48424886.ffilter1(c) function c48424886.ffilter1(c)
return c:IsSetCard(0x9d) return c:IsFusionSetCard(0x9d)
end end
function c48424886.ffilter2(c) function c48424886.ffilter2(c)
return c:IsAttribute(ATTRIBUTE_FIRE) or c:IsHasEffect(4904633) return c:IsAttribute(ATTRIBUTE_FIRE) or c:IsHasEffect(4904633)
......
c74009824.lua
View file @ c1e1540b
...@@ -40,7 +40,7 @@ function c74009824.initial_effect(c) ...@@ -40,7 +40,7 @@ function c74009824.initial_effect(c)
c:RegisterEffect(e4) c:RegisterEffect(e4)
end end
function c74009824.ffilter1(c) function c74009824.ffilter1(c)
return c:IsSetCard(0x9d) return c:IsFusionSetCard(0x9d)
end end
function c74009824.ffilter2(c) function c74009824.ffilter2(c)
return c:IsAttribute(ATTRIBUTE_WIND) or c:IsHasEffect(4904633) return c:IsAttribute(ATTRIBUTE_WIND) or c:IsHasEffect(4904633)
......
c74506079.lua
View file @ c1e1540b
...@@ -17,7 +17,7 @@ function c74506079.initial_effect(c) ...@@ -17,7 +17,7 @@ function c74506079.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function c74506079.ffilter(c) function c74506079.ffilter(c)
return c:IsSetCard(0x3e) and c:IsRace(RACE_REPTILE) return c:IsFusionSetCard(0x3e) and c:IsRace(RACE_REPTILE)
end end
function c74506079.fscondition(e,g,gc) function c74506079.fscondition(e,g,gc)
if g==nil then return true end if g==nil then return true end
......
c74822425.lua
View file @ c1e1540b
...@@ -42,7 +42,7 @@ function c74822425.initial_effect(c) ...@@ -42,7 +42,7 @@ function c74822425.initial_effect(c)
c:RegisterEffect(e4) c:RegisterEffect(e4)
end end
function c74822425.ffilter1(c) function c74822425.ffilter1(c)
return c:IsSetCard(0x9d) return c:IsFusionSetCard(0x9d)
end end
function c74822425.ffilter2(c) function c74822425.ffilter2(c)
return c:IsAttribute(ATTRIBUTE_EARTH) or c:IsHasEffect(4904633) return c:IsAttribute(ATTRIBUTE_EARTH) or c:IsHasEffect(4904633)
......
c82734805.lua
View file @ c1e1540b
...@@ -97,21 +97,20 @@ function c82734805.op(e,tp,eg,ep,ev,re,r,rp) ...@@ -97,21 +97,20 @@ function c82734805.op(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c82734805.fcfilter1(c,code1,code2,g) function c82734805.fcfilter1(c,code1,code2,g)
local code=c:GetCode() return (c:IsFusionCode(code1) or c:IsFusionCode(code2)) and g:IsExists(Card.IsFusionSetCard,1,c,0xbb)
return (code==code1 or code==code2) and g:IsExists(Card.IsSetCard,1,c,0xbb)
end end
function c82734805.fcfilter2(c,code,g) function c82734805.fcfilter2(c,code,g)
return (c:IsCode(code) or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE)) and g:IsExists(Card.IsSetCard,1,c,0xbb) return (c:IsFusionCode(code) or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE)) and g:IsExists(Card.IsFusionSetCard,1,c,0xbb)
end end
function c82734805.fcfilter3(c,g) function c82734805.fcfilter3(c,g)
return ((c:IsCode(14799437) or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE)) and g:IsExists(Card.IsCode,1,c,23440231)) return ((c:IsFusionCode(14799437) or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE)) and g:IsExists(Card.IsFusionCode,1,c,23440231))
or ((c:IsCode(23440231) or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE)) and g:IsExists(Card.IsCode,1,c,14799437)) or ((c:IsFusionCode(23440231) or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE)) and g:IsExists(Card.IsFusionCode,1,c,14799437))
end end
function c82734805.fcfilter4(c,code) function c82734805.fcfilter4(c,code)
return c:IsCode(code) or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE) return c:IsFusionCode(code) or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE)
end end
function c82734805.fcfilter7(c,chkf) function c82734805.fcfilter7(c,chkf)
return aux.FConditionCheckF(c,chkf) and (c:IsSetCard(0xbb) or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE)) return aux.FConditionCheckF(c,chkf) and (c:IsFusionSetCard(0xbb) or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE))
end end
function c82734805.fscon(e,g,gc,chkf) function c82734805.fscon(e,g,gc,chkf)
if g==nil then return true end if g==nil then return true end
...@@ -120,11 +119,11 @@ function c82734805.fscon(e,g,gc,chkf) ...@@ -120,11 +119,11 @@ function c82734805.fscon(e,g,gc,chkf)
mg:RemoveCard(gc) mg:RemoveCard(gc)
if gc:IsHasEffect(EFFECT_FUSION_SUBSTITUTE) then if gc:IsHasEffect(EFFECT_FUSION_SUBSTITUTE) then
return mg:IsExists(c82734805.fcfilter1,1,nil,14799437,23440231,mg) return mg:IsExists(c82734805.fcfilter1,1,nil,14799437,23440231,mg)
elseif gc:IsCode(14799437) then elseif gc:IsFusionCode(14799437) then
return mg:IsExists(c82734805.fcfilter2,1,nil,23440231,mg) return mg:IsExists(c82734805.fcfilter2,1,nil,23440231,mg)
elseif gc:IsCode(23440231) then elseif gc:IsFusionCode(23440231) then
return mg:IsExists(c82734805.fcfilter2,1,nil,14799437,mg) return mg:IsExists(c82734805.fcfilter2,1,nil,14799437,mg)
elseif gc:IsSetCard(0xbb) then elseif gc:IsFusionSetCard(0xbb) then
return mg:IsExists(c82734805.fcfilter3,1,nil,mg) return mg:IsExists(c82734805.fcfilter3,1,nil,mg)
else else
return false return false
...@@ -136,11 +135,11 @@ function c82734805.fscon(e,g,gc,chkf) ...@@ -136,11 +135,11 @@ function c82734805.fscon(e,g,gc,chkf)
while tc do while tc do
if tc:IsHasEffect(EFFECT_FUSION_SUBSTITUTE) then if tc:IsHasEffect(EFFECT_FUSION_SUBSTITUTE) then
bs=1 if aux.FConditionCheckF(tc,chkf) then fs=true end bs=1 if aux.FConditionCheckF(tc,chkf) then fs=true end
elseif tc:IsCode(14799437) then elseif tc:IsFusionCode(14799437) then
if b1==0 then b1=1 else b3=1 end if aux.FConditionCheckF(tc,chkf) then fs=true end if b1==0 then b1=1 else b3=1 end if aux.FConditionCheckF(tc,chkf) then fs=true end
elseif tc:IsCode(23440231) then elseif tc:IsFusionCode(23440231) then
if b2==0 then b2=1 else b3=1 end if aux.FConditionCheckF(tc,chkf) then fs=true end if b2==0 then b2=1 else b3=1 end if aux.FConditionCheckF(tc,chkf) then fs=true end
elseif tc:IsSetCard(0xbb) then elseif tc:IsFusionSetCard(0xbb) then
b3=1 if aux.FConditionCheckF(tc,chkf) then fs=true end b3=1 if aux.FConditionCheckF(tc,chkf) then fs=true end
end end
tc=g:GetNext() tc=g:GetNext()
...@@ -166,24 +165,24 @@ function c82734805.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf) ...@@ -166,24 +165,24 @@ function c82734805.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
local sg=mg:FilterSelect(tp,c82734805.fcfilter1,1,1,nil,14799437,23440231,mg) local sg=mg:FilterSelect(tp,c82734805.fcfilter1,1,1,nil,14799437,23440231,mg)
g1:Merge(sg) g1:Merge(sg)
elseif gc:IsCode(14799437) then elseif gc:IsFusionCode(14799437) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
local sg=mg:FilterSelect(tp,c82734805.fcfilter2,1,1,nil,23440231,mg) local sg=mg:FilterSelect(tp,c82734805.fcfilter2,1,1,nil,23440231,mg)
g1:Merge(sg) g1:Merge(sg)
elseif gc:IsCode(23440231) then elseif gc:IsFusionCode(23440231) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
local sg=mg:FilterSelect(tp,c82734805.fcfilter2,1,1,nil,14799437,mg) local sg=mg:FilterSelect(tp,c82734805.fcfilter2,1,1,nil,14799437,mg)
g1:Merge(sg) g1:Merge(sg)
elseif gc:IsSetCard(0xbb) then elseif gc:IsFusionSetCard(0xbb) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
local sg=mg:FilterSelect(tp,c82734805.fcfilter3,1,1,nil,14799437,23440231,mg) local sg=mg:FilterSelect(tp,c82734805.fcfilter3,1,1,nil,14799437,23440231,mg)
g1:Merge(sg) g1:Merge(sg)
local tc1=sg:GetFirst() local tc1=sg:GetFirst()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
if tc1:IsCode(14799437) then if tc1:IsFusionCode(14799437) then
local sg=mg:FilterSelect(tp,c82734805.fcfilter4,1,1,nil,23440231) local sg=mg:FilterSelect(tp,c82734805.fcfilter4,1,1,nil,23440231)
g1:Merge(sg) g1:Merge(sg)
elseif tc1:IsCode(23440231) then elseif tc1:IsFusionCode(23440231) then
local sg=mg:FilterSelect(tp,c82734805.fcfilter4,1,1,nil,14799437) local sg=mg:FilterSelect(tp,c82734805.fcfilter4,1,1,nil,14799437)
g1:Merge(sg) g1:Merge(sg)
else else
...@@ -197,19 +196,19 @@ function c82734805.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf) ...@@ -197,19 +196,19 @@ function c82734805.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
local sg1=mg2:Select(tp,1,1,nil) local sg1=mg2:Select(tp,1,1,nil)
local tc1=sg1:GetFirst() local tc1=sg1:GetFirst()
if not mg:IsExists(Card.IsSetCard,2,tc1,0xbb) then if not mg:IsExists(Card.IsFusionSetCard,2,tc1,0xbb) then
mg2:Remove(Card.IsSetCard,nil,0xbb) mg2:Remove(Card.IsFusionSetCard,nil,0xbb)
end end
if tc1:IsHasEffect(EFFECT_FUSION_SUBSTITUTE) then if tc1:IsHasEffect(EFFECT_FUSION_SUBSTITUTE) then
mg2:Remove(Card.IsHasEffect,nil,EFFECT_FUSION_SUBSTITUTE) mg2:Remove(Card.IsHasEffect,nil,EFFECT_FUSION_SUBSTITUTE)
else mg2:Remove(Card.IsCode,nil,tc1:GetCode()) end else mg2:Remove(Card.IsFusionCode,nil,tc1:GetCode()) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
local sg2=mg2:Select(tp,1,1,nil) local sg2=mg2:Select(tp,1,1,nil)
g1:Merge(sg1) g1:Merge(sg1)
g1:Merge(sg2) g1:Merge(sg2)
end end
mg:Sub(g1) mg:Sub(g1)
mg=mg:Filter(Card.IsSetCard,nil,0xbb) mg=mg:Filter(Card.IsFusionSetCard,nil,0xbb)
if mg:GetCount()==0 or (ok and not Duel.SelectYesNo(tp,93)) then if mg:GetCount()==0 or (ok and not Duel.SelectYesNo(tp,93)) then
Duel.SetFusionMaterial(g1) Duel.SetFusionMaterial(g1)
return return
......
c84058253.lua
View file @ c1e1540b
...@@ -30,7 +30,7 @@ function c84058253.initial_effect(c) ...@@ -30,7 +30,7 @@ function c84058253.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c84058253.ffilter(c) function c84058253.ffilter(c)
return c:IsSetCard(0x1093) return c:IsFusionSetCard(0x1093)
end end
function c84058253.fscondition(e,g,gc,chkf) function c84058253.fscondition(e,g,gc,chkf)
if g==nil then return false end if g==nil then return false end
......
c94977269.lua
View file @ c1e1540b
...@@ -47,7 +47,7 @@ function c94977269.initial_effect(c) ...@@ -47,7 +47,7 @@ function c94977269.initial_effect(c)
c:RegisterEffect(e5) c:RegisterEffect(e5)
end end
function c94977269.ffilter1(c) function c94977269.ffilter1(c)
return c:IsSetCard(0x9d) return c:IsFusionSetCard(0x9d)
end end
function c94977269.ffilter2(c) function c94977269.ffilter2(c)
return c:IsAttribute(ATTRIBUTE_DARK) or c:IsHasEffect(4904633) return c:IsAttribute(ATTRIBUTE_DARK) or c:IsHasEffect(4904633)
......
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