Commit 5f933e40 authored by POLYMER's avatar POLYMER

fix

parent 2cd4ac4b
...@@ -58,7 +58,7 @@ if not Duel.GetMustMaterial then ...@@ -58,7 +58,7 @@ if not Duel.GetMustMaterial then
end end
end end
function cm.spfilter(c,sc) function cm.spfilter(c,sc)
return c:IsCanBeXyzMaterial(sc) and ((c:IsOnField() and c:IsFaceup() and (c:IsXyzLevel(sc,8) or c:IsRank(8) or (c:IsAttribute(ATTRIBUTE_FIRE) and c:IsRace(RACE_FAIRY)))) or (c:IsLocation(LOCATION_HAND) and (c:IsAttribute(ATTRIBUTE_FIRE) and c:IsRace(RACE_FAIRY)))) return c:IsCanBeXyzMaterial(sc) and ((c:IsOnField() and c:IsFaceup() and (c:IsXyzLevel(sc,8) or c:IsRank(8) or (c:IsAttribute(ATTRIBUTE_FIRE) and c:IsRace(RACE_FAIRY)))) or (c:IsLocation(LOCATION_HAND) and (c:IsAttribute(ATTRIBUTE_FIRE) and c:IsRace(RACE_FAIRY))) or (c:IsXyzLevel(sc,8) or c:IsRank(8)))
end end
function cm.hand(g) function cm.hand(g)
return g:FilterCount(Card.IsLocation,nil,LOCATION_HAND)<=1 return g:FilterCount(Card.IsLocation,nil,LOCATION_HAND)<=1
...@@ -73,6 +73,7 @@ function cm.spcon(e,c,og,min,max) ...@@ -73,6 +73,7 @@ function cm.spcon(e,c,og,min,max)
maxc=math.min(maxc,max) maxc=math.min(maxc,max)
end end
if maxc<minc then return false end if maxc<minc then return false end
local mg=nil
local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,c,c) local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,c,c)
if og then if og then
mg=og:Filter(cm.spfilter,c,c) mg=og:Filter(cm.spfilter,c,c)
...@@ -96,6 +97,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,c,og,min,max) ...@@ -96,6 +97,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,c,og,min,max)
if max<maxc then maxc=max end if max<maxc then maxc=max end
end end
local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,c,c) local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,c,c)
local mg=nil
if og then if og then
mg=og:Filter(cm.spfilter,c,c) mg=og:Filter(cm.spfilter,c,c)
else else
......
...@@ -56,7 +56,7 @@ if not Duel.GetMustMaterial then ...@@ -56,7 +56,7 @@ if not Duel.GetMustMaterial then
end end
end end
function cm.spfilter(c,sc) function cm.spfilter(c,sc)
return c:IsCanBeXyzMaterial(sc) and ((c:IsOnField() and c:IsFaceup() and (c:IsXyzLevel(sc,8) or c:IsRank(8) or (c:IsAttribute(ATTRIBUTE_WATER) and c:IsRace(RACE_FAIRY)))) or (c:IsLocation(LOCATION_HAND) and (c:IsAttribute(ATTRIBUTE_WATER) and c:IsRace(RACE_FAIRY)))) return c:IsCanBeXyzMaterial(sc) and ((c:IsOnField() and c:IsFaceup() and (c:IsXyzLevel(sc,8) or c:IsRank(8) or (c:IsAttribute(ATTRIBUTE_WATER) and c:IsRace(RACE_FAIRY)))) or (c:IsLocation(LOCATION_HAND) and (c:IsAttribute(ATTRIBUTE_WATER) and c:IsRace(RACE_FAIRY))) or (c:IsXyzLevel(sc,8) or c:IsRank(8)))
end end
function cm.hand(g) function cm.hand(g)
return g:FilterCount(Card.IsLocation,nil,LOCATION_HAND)<=1 return g:FilterCount(Card.IsLocation,nil,LOCATION_HAND)<=1
...@@ -71,6 +71,7 @@ function cm.spcon(e,c,og,min,max) ...@@ -71,6 +71,7 @@ function cm.spcon(e,c,og,min,max)
maxc=math.min(maxc,max) maxc=math.min(maxc,max)
end end
if maxc<minc then return false end if maxc<minc then return false end
local mg=nil
local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,c,c) local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,c,c)
if og then if og then
mg=og:Filter(cm.spfilter,c,c) mg=og:Filter(cm.spfilter,c,c)
...@@ -94,6 +95,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,c,og,min,max) ...@@ -94,6 +95,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,c,og,min,max)
if max<maxc then maxc=max end if max<maxc then maxc=max end
end end
local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,c,c) local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,c,c)
local mg=nil
if og then if og then
mg=og:Filter(cm.spfilter,c,c) mg=og:Filter(cm.spfilter,c,c)
else else
......
...@@ -160,6 +160,7 @@ end ...@@ -160,6 +160,7 @@ end
function cm.desop(e,tp,eg,ep,ev,re,r,rp) function cm.desop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tg=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS) local tg=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
if not tg then return end
local cg=tg:Filter(cm.imfilter,nil,e,re) local cg=tg:Filter(cm.imfilter,nil,e,re)
if c:IsRelateToEffect(e) and #cg>0 then if c:IsRelateToEffect(e) and #cg>0 then
Duel.Overlay(c,cg) Duel.Overlay(c,cg)
......
...@@ -98,7 +98,7 @@ end ...@@ -98,7 +98,7 @@ end
function s.locfilter1(c) function s.locfilter1(c)
return c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsLocation(LOCATION_ONFIELD) return c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsLocation(LOCATION_ONFIELD)
and (c:GetPreviousSequence()~=c:GetSequence() or c:GetPreviousControler()~=c:GetControler() or c:GetPreviousLocation()~=c:GetLocation()) and (c:GetPreviousSequence()~=c:GetSequence() or c:GetPreviousControler()~=c:GetControler() or c:GetPreviousLocation()~=c:GetLocation())
and c:GetFlagEffect(id)==0 and c:GetFlagEffect(id+1)==0
end end
function s.descon(e,tp,eg,ep,ev,re,r,rp) function s.descon(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -8,7 +8,6 @@ function c98500310.initial_effect(c) ...@@ -8,7 +8,6 @@ function c98500310.initial_effect(c)
e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_TOGRAVE) e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_TOGRAVE)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCondition(c98500310.condition2)
e1:SetTarget(c98500310.target) e1:SetTarget(c98500310.target)
e1:SetOperation(c98500310.activate) e1:SetOperation(c98500310.activate)
c:RegisterEffect(e1) c:RegisterEffect(e1)
...@@ -19,7 +18,6 @@ function c98500310.initial_effect(c) ...@@ -19,7 +18,6 @@ function c98500310.initial_effect(c)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCountLimit(1,98500311) e2:SetCountLimit(1,98500311)
e2:SetCondition(c98500310.condition2)
e2:SetTarget(c98500310.sptg) e2:SetTarget(c98500310.sptg)
e2:SetOperation(c98500310.spop) e2:SetOperation(c98500310.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
...@@ -30,7 +28,6 @@ function c98500310.initial_effect(c) ...@@ -30,7 +28,6 @@ function c98500310.initial_effect(c)
e3:SetType(EFFECT_TYPE_IGNITION) e3:SetType(EFFECT_TYPE_IGNITION)
e3:SetRange(LOCATION_SZONE) e3:SetRange(LOCATION_SZONE)
e3:SetCountLimit(1,98500311) e3:SetCountLimit(1,98500311)
e3:SetCondition(c98500310.condition2)
e3:SetTarget(c98500310.fstg) e3:SetTarget(c98500310.fstg)
e3:SetOperation(c98500310.fsop) e3:SetOperation(c98500310.fsop)
c:RegisterEffect(e3) c:RegisterEffect(e3)
......
--无名的法老 --无名的法老
function c98500320.initial_effect(c) function c98500320.initial_effect(c)
aux.AddCodeList(c,46986414,985003200,10000010,10000020) aux.AddCodeList(c,46986414,10000000,10000010,10000020)
--to hand --to hand
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(98500320,0)) e1:SetDescription(aux.Stringid(98500320,0))
......
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