Commit 9e40038e authored by Amiya's avatar Amiya

修复

parent b9d1ed8f
...@@ -31,7 +31,7 @@ function s.spcon(e,c) ...@@ -31,7 +31,7 @@ function s.spcon(e,c)
if c==nil then return true end if c==nil then return true end
local tp=c:GetControler() local tp=c:GetControler()
return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
and Duel.GetFieldGroupCount(aux.AND(Card.IsSetCard,Card.IsFaceupEx),tp,LOCATION_MZONE+LOCATION_GRAVE,0,nil,0x2c0)==0 and Duel.GetFieldGroupCount(aux.AND(Card.IsSetCard,Card.IsFaceupEx),tp,LOCATION_MZONE+LOCATION_GRAVE,0,nil,0x2bf)==0
end end
function s.spop(e,tp,eg,ep,ev,re,r,rp,c) function s.spop(e,tp,eg,ep,ev,re,r,rp,c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
...@@ -54,7 +54,7 @@ function s.spcost2(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -54,7 +54,7 @@ function s.spcost2(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SendtoGrave(g,REASON_COST) Duel.SendtoGrave(g,REASON_COST)
end end
function s.spfilter2(c,e,tp) function s.spfilter2(c,e,tp)
return not c:IsCode(id) and c:IsSetCard(0x2c0) return not c:IsCode(id) and c:IsSetCard(0x2bf)
and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
end end
function s.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
......
...@@ -57,7 +57,7 @@ function s.splimit(e,c) ...@@ -57,7 +57,7 @@ function s.splimit(e,c)
return not (c:IsType(TYPE_XYZ) and c:IsRank(4)) and c:IsLocation(LOCATION_EXTRA) return not (c:IsType(TYPE_XYZ) and c:IsRank(4)) and c:IsLocation(LOCATION_EXTRA)
end end
function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
return c:IsSetCard(0x2c0) and not c:IsCode(id) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsSetCard(0x2bf) and not c:IsCode(id) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function s.sptg2(e,tp,eg,ep,ev,re,r,rp,chk) function s.sptg2(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
......
...@@ -35,7 +35,7 @@ function s.initial_effect(c) ...@@ -35,7 +35,7 @@ function s.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function s.cfilter(c,tp) function s.cfilter(c,tp)
return (c:IsAbleToDeckAsCost() or c:IsAbleToExtraAsCost()) and c:IsSetCard(0x2c0) return (c:IsAbleToDeckAsCost() or c:IsAbleToExtraAsCost()) and c:IsSetCard(0x2bf)
end end
function s.spcon(e,c) function s.spcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -38,7 +38,7 @@ function s.initial_effect(c) ...@@ -38,7 +38,7 @@ function s.initial_effect(c)
c:RegisterEffect(e4) c:RegisterEffect(e4)
end end
function s.mtfilter(c,e) function s.mtfilter(c,e)
return c:IsSetCard(0x2c0) and c:IsType(TYPE_MONSTER) return c:IsSetCard(0x2bf) and c:IsType(TYPE_MONSTER)
and c:IsCanOverlay() and not (e and c:IsImmuneToEffect(e)) and c:IsCanOverlay() and not (e and c:IsImmuneToEffect(e))
end end
function s.mttg(e,tp,eg,ep,ev,re,r,rp,chk) function s.mttg(e,tp,eg,ep,ev,re,r,rp,chk)
...@@ -61,7 +61,7 @@ function s.val2(e,c) ...@@ -61,7 +61,7 @@ function s.val2(e,c)
return e:GetHandler():GetOverlayCount()*(-100) return e:GetHandler():GetOverlayCount()*(-100)
end end
function s.thfilter(c) function s.thfilter(c)
return c:IsSetCard(0x2c0) and c:IsAbleToHand() return c:IsSetCard(0x2bf) and c:IsAbleToHand()
end end
function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
local g=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_DECK,0,nil) local g=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_DECK,0,nil)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
local s,id,o=GetID() local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
--xyz summon --xyz summon
aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x2c0),4,2,nil,nil,99) aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x2bf),4,2,nil,nil,99)
c:EnableReviveLimit() c:EnableReviveLimit()
--material --material
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
...@@ -13,7 +13,7 @@ function s.initial_effect(c) ...@@ -13,7 +13,7 @@ function s.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
return c:IsFaceupEx() and (c:IsSetCard(0x2c0) or c:IsType(TYPE_XYZ)) return c:IsFaceupEx() and (c:IsSetCard(0x2bf) or c:IsType(TYPE_XYZ))
and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
...@@ -29,7 +29,7 @@ function s.xyzfilter(c,e,tp) ...@@ -29,7 +29,7 @@ function s.xyzfilter(c,e,tp)
and Duel.IsExistingMatchingCard(s.mtfilter,tp,LOCATION_DECK,0,1,nil,e) and Duel.IsExistingMatchingCard(s.mtfilter,tp,LOCATION_DECK,0,1,nil,e)
end end
function s.mtfilter(c,e) function s.mtfilter(c,e)
return c:IsSetCard(0x2c0) return c:IsSetCard(0x2bf)
and c:IsCanOverlay() and not (e and c:IsImmuneToEffect(e)) and c:IsCanOverlay() and not (e and c:IsImmuneToEffect(e))
end end
function s.activate(e,tp,eg,ep,ev,re,r,rp) function s.activate(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -27,7 +27,7 @@ function s.initial_effect(c) ...@@ -27,7 +27,7 @@ function s.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function s.cfilter(c) function s.cfilter(c)
return c:IsFaceup() and c:IsSetCard(0x2c0) and c:IsType(TYPE_XYZ) return c:IsFaceup() and c:IsSetCard(0x2bf) and c:IsType(TYPE_XYZ)
end end
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) end if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) end
...@@ -61,7 +61,7 @@ function s.fselect(sg,tp) ...@@ -61,7 +61,7 @@ function s.fselect(sg,tp)
return mg:CheckSubGroup(s.matfilter,1,#mg,tp,sg) return mg:CheckSubGroup(s.matfilter,1,#mg,tp,sg)
end end
function s.matfilter(sg,tp,g) function s.matfilter(sg,tp,g)
if sg:Filter(Card.IsSetCard,nil,0x2c0):GetCount()==0 then return false end if sg:Filter(Card.IsSetCard,nil,0x2bf):GetCount()==0 then return false end
return Duel.IsExistingMatchingCard(s.xyzfilter,tp,LOCATION_EXTRA,0,1,nil,sg) return Duel.IsExistingMatchingCard(s.xyzfilter,tp,LOCATION_EXTRA,0,1,nil,sg)
end end
function s.xyzfilter(c,mg) function s.xyzfilter(c,mg)
...@@ -76,7 +76,7 @@ function s.xyzfilter2(c) ...@@ -76,7 +76,7 @@ function s.xyzfilter2(c)
return mg:CheckSubGroup(s.gselect,1,#mg,c) return mg:CheckSubGroup(s.gselect,1,#mg,c)
end end
function s.gselect(sg,c) function s.gselect(sg,c)
if sg:Filter(Card.IsSetCard,nil,0x2c0):GetCount()==0 then return false end if sg:Filter(Card.IsSetCard,nil,0x2bf):GetCount()==0 then return false end
return c:IsXyzSummonable(sg,#sg,#sg) return c:IsXyzSummonable(sg,#sg,#sg)
end end
function s.xyzop(e,tp,eg,ep,ev,re,r,rp) function s.xyzop(e,tp,eg,ep,ev,re,r,rp)
......
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