Commit 5d7ec0fa authored by mercury233's avatar mercury233

fix

parent 6209072d
...@@ -17,7 +17,7 @@ function s.tgfilter(c) ...@@ -17,7 +17,7 @@ function s.tgfilter(c)
end end
function s.spfilter(c,e,tp,g) function s.spfilter(c,e,tp,g)
if not (aux.IsCodeListed(c,25652259) and aux.IsCodeListed(c,64788463) and aux.IsCodeListed(c,90876561)) then return false end if not (aux.IsCodeListed(c,25652259) and aux.IsCodeListed(c,64788463) and aux.IsCodeListed(c,90876561)) then return false end
local proc=c:IsCode(100290001) local proc=c:IsCode(100290001) and e:GetHandler():IsCode(id)
if not c:IsCanBeSpecialSummoned(e,0,tp,proc,proc) then return false end if not c:IsCanBeSpecialSummoned(e,0,tp,proc,proc) then return false end
return (not c:IsLocation(LOCATION_EXTRA) and Duel.GetMZoneCount(tp,g)>0 return (not c:IsLocation(LOCATION_EXTRA) and Duel.GetMZoneCount(tp,g)>0
or c:IsLocation(LOCATION_EXTRA) and Duel.GetLocationCountFromEx(tp,tp,g,c)>0) or c:IsLocation(LOCATION_EXTRA) and Duel.GetLocationCountFromEx(tp,tp,g,c)>0)
......
...@@ -79,13 +79,6 @@ function c100290029.ctop(e,tp,eg,ep,ev,re,r,rp) ...@@ -79,13 +79,6 @@ function c100290029.ctop(e,tp,eg,ep,ev,re,r,rp)
e1:SetCondition(c100290029.ctcon) e1:SetCondition(c100290029.ctcon)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetCode(EFFECT_DISABLE_EFFECT)
e2:SetValue(RESET_TURN_SET)
e2:SetCondition(c100290029.ctcon)
e2:SetReset(RESET_EVENT+RESETS_STANDARD)
tc:RegisterEffect(e2)
elseif sel==1 then elseif sel==1 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
local g2=Duel.SelectMatchingCard(tp,c100290029.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil) local g2=Duel.SelectMatchingCard(tp,c100290029.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
......
...@@ -84,13 +84,6 @@ function c100290030.counterop(e,tp,eg,ep,ev,re,r,rp) ...@@ -84,13 +84,6 @@ function c100290030.counterop(e,tp,eg,ep,ev,re,r,rp)
e1:SetCondition(c100290030.ctcon) e1:SetCondition(c100290030.ctcon)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetCode(EFFECT_DISABLE_EFFECT)
e2:SetValue(RESET_TURN_SET)
e2:SetCondition(c100290030.ctcon)
e2:SetReset(RESET_EVENT+RESETS_STANDARD)
tc:RegisterEffect(e2)
end end
end end
end end
...@@ -33,7 +33,7 @@ end ...@@ -33,7 +33,7 @@ end
function c100290037.damcon(e) function c100290037.damcon(e)
local c=e:GetHandler() local c=e:GetHandler()
local bc=c:GetBattleTarget() local bc=c:GetBattleTarget()
return not bc:IsLevelAbove(0) return bc and not bc:IsLevelAbove(0)
end end
function c100290037.regop(e,tp,eg,ep,ev,re,r,rp) function c100290037.regop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
--Script by Lyris12 --Script by Lyris12
local s,id,o=GetID() local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
aux.AddCodeList(c,45001322,101108087)
--ritual summon --ritual summon
aux.AddRitualProcGreater(c,aux.FilterBoolFunction(Card.IsSetCard,0x17c),LOCATION_HAND,nil,nil,false,s.op) aux.AddRitualProcGreater(c,aux.FilterBoolFunction(Card.IsSetCard,0x17c),LOCATION_HAND,nil,nil,false,s.op)
end end
...@@ -9,7 +10,7 @@ function s.filter(c) ...@@ -9,7 +10,7 @@ function s.filter(c)
return c:IsCode(45001322) and c:IsPreviousLocation(LOCATION_ONFIELD) return c:IsCode(45001322) and c:IsPreviousLocation(LOCATION_ONFIELD)
end end
function s.op(e,tp,eg,ep,ev,re,r,rp,tc,g) function s.op(e,tp,eg,ep,ev,re,r,rp,tc,g)
if not (g:IsExists(s.filter,1,nil) and tc:IsCode(88106656)) then return end if not (g:IsExists(s.filter,1,nil) and tc:IsCode(101108087)) then return end
local c=e:GetHandler() local c=e:GetHandler()
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(id,0)) e1:SetDescription(aux.Stringid(id,0))
......
...@@ -90,7 +90,7 @@ function c101110042.regop(e,tp,eg,ep,ev,re,r,rp) ...@@ -90,7 +90,7 @@ function c101110042.regop(e,tp,eg,ep,ev,re,r,rp)
end end
function c101110042.damcon(e,tp,eg,ep,ev,re,r,rp) function c101110042.damcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
return ep~=tp and c:GetFlagEffect(101110042)~=0 return ep~=tp and c:GetFlagEffect(101110042)~=0 and re:IsActiveType(TYPE_MONSTER)
end end
function c101110042.damop(e,tp,eg,ep,ev,re,r,rp) function c101110042.damop(e,tp,eg,ep,ev,re,r,rp)
e:GetHandler():AddCounter(0x10,1) e:GetHandler():AddCounter(0x10,1)
......
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