Commit 54086e3f authored by POLYMER's avatar POLYMER

fix

parent d8dc71e6
...@@ -135,6 +135,7 @@ function cm.desop3(e,tp,eg,ep,ev,re,r,rp) ...@@ -135,6 +135,7 @@ function cm.desop3(e,tp,eg,ep,ev,re,r,rp)
end end
function cm.chkop(e,tp,eg,ep,ev,re,r,rp) function cm.chkop(e,tp,eg,ep,ev,re,r,rp)
local tc=eg:GetFirst() local tc=eg:GetFirst()
if rp~=0 and rp~=1 then return end
while tc do while tc do
if tc:IsLocation(LOCATION_MZONE) and tc:IsPreviousLocation(LOCATION_MZONE) and (tc:GetPreviousSequence()~=tc:GetSequence() or tc:GetPreviousControler()~=tc:GetControler()) then if tc:IsLocation(LOCATION_MZONE) and tc:IsPreviousLocation(LOCATION_MZONE) and (tc:GetPreviousSequence()~=tc:GetSequence() or tc:GetPreviousControler()~=tc:GetControler()) then
tc:RegisterFlagEffect(m+rp,RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET,0,1) tc:RegisterFlagEffect(m+rp,RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET,0,1)
...@@ -147,6 +148,7 @@ function cm.chkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -147,6 +148,7 @@ function cm.chkop(e,tp,eg,ep,ev,re,r,rp)
end end
function cm.chkop2(e,tp,eg,ep,ev,re,r,rp) function cm.chkop2(e,tp,eg,ep,ev,re,r,rp)
local tc=eg:GetFirst() local tc=eg:GetFirst()
if rp~=0 and rp~=1 then return end
while tc do while tc do
tc:RegisterFlagEffect(m+rp,RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET,0,1) tc:RegisterFlagEffect(m+rp,RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET,0,1)
cm[rp][tc:GetCode()]=true cm[rp][tc:GetCode()]=true
...@@ -202,7 +204,7 @@ function cm.desop11(e,tp,eg,ep,ev,re,r,rp) ...@@ -202,7 +204,7 @@ function cm.desop11(e,tp,eg,ep,ev,re,r,rp)
local hg=eg:Filter(Card.IsPreviousLocation,nil,LOCATION_HAND) local hg=eg:Filter(Card.IsPreviousLocation,nil,LOCATION_HAND)
local left=#hg>0 --==#eg local left=#hg>0 --==#eg
if #g>0 then if #g>0 then
for p=0,1 do for p in aux.TurnPlayers() do
for loc=LOCATION_SZONE,LOCATION_MZONE,LOCATION_MZONE-LOCATION_SZONE do for loc=LOCATION_SZONE,LOCATION_MZONE,LOCATION_MZONE-LOCATION_SZONE do
if left then if left then
for seq=0,4 do for seq=0,4 do
......
...@@ -120,9 +120,11 @@ function s.sccon(e,tp,eg,ep,ev,re,r,rp) ...@@ -120,9 +120,11 @@ function s.sccon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetFlagEffect(id)>0 return e:GetHandler():GetFlagEffect(id)>0
end end
-- 效果②:赋予场发效果 -- 效果②:赋予场发效果
function s.sctg(e,tp,eg,ep,ev,re,r,rp,chk) function s.sctg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return Duel.IsExistingMatchingCard(s.dcfilter,tp,LOCATION_HAND,0,1,nil) end
Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,tp,1) Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,tp,1)
end end
......
...@@ -164,9 +164,5 @@ function s.scop(e,tp,eg,ep,ev,re,r,rp) ...@@ -164,9 +164,5 @@ function s.scop(e,tp,eg,ep,ev,re,r,rp)
e0:SetTarget(s.mttg2) e0:SetTarget(s.mttg2)
e0:SetOperation(s.mtop2) e0:SetOperation(s.mtop2)
c:RegisterEffect(e0) c:RegisterEffect(e0)
if b and Duel.IsExistingMatchingCard(nil,tp,0,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id, 3)) then
local rc=Duel.SelectMatchingCard(tp,nil,tp,0,LOCATION_ONFIELD,1,1,nil)
Duel.SendtoHand(rc,nil,REASON_EFFECT)
end
end end
end end
\ No newline at end of file
...@@ -53,11 +53,12 @@ end ...@@ -53,11 +53,12 @@ end
function s.rttg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.rttg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and s.rtfilter(chkc) end if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and s.rtfilter(chkc) end
if chk==0 then return Duel.IsExistingTarget(s.rtfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) if chk==0 then return Duel.IsExistingTarget(s.rtfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil)
and ((Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,nil,e,tp) and Duel.IsExistingMatchingCard(s.tgfilter1,tp,LOCATION_DECK,0,1,nil) and Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)>0) and ((Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,nil,e,tp) and Duel.IsExistingMatchingCard(s.tgfilter1,tp,LOCATION_DECK,0,1,nil) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0)
or Duel.IsExistingMatchingCard(s.nbfilter,tp,0,LOCATION_ONFIELD,1,nil) and Duel.IsExistingMatchingCard(s.tgfilter2,tp,LOCATION_DECK,0,1,nil)) or Duel.IsExistingMatchingCard(s.nbfilter,tp,0,LOCATION_ONFIELD,1,nil) and Duel.IsExistingMatchingCard(s.tgfilter2,tp,LOCATION_DECK,0,1,nil))
end end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
local g=Duel.SelectTarget(tp,s.rtfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,3,nil) local g=Duel.SelectTarget(tp,s.rtfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,3,nil)
Duel.HintSelection(g)
Duel.SetOperationInfo(0,CATEGORY_TODECK,g,3,0,0) Duel.SetOperationInfo(0,CATEGORY_TODECK,g,3,0,0)
end end
......
...@@ -47,7 +47,7 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,7 +47,7 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp)
Duel.Remove(eg,POS_FACEUP,REASON_EFFECT) Duel.Remove(eg,POS_FACEUP,REASON_EFFECT)
end end
local cg=e:GetHandler():GetColumnGroup():Filter(Card.IsControler,nil,1-tp) local cg=e:GetHandler():GetColumnGroup():Filter(Card.IsControler,nil,1-tp)
if #cg and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then if #cg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then
Duel.Destroy(cg,REASON_EFFECT) Duel.Destroy(cg,REASON_EFFECT)
end end
end end
--炯眼之吽 --炯眼之吽
local s,id,o=GetID() local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
aux.AddCodeList(c,89490004)
local e1=aux.AddRitualProcGreater2Code(c,89490004,LOCATION_HAND,nil,nil,true,s.extraop) local e1=aux.AddRitualProcGreater2Code(c,89490004,LOCATION_HAND,nil,nil,true,s.extraop)
e1:SetCategory(e1:GetCategory()|CATEGORY_DRAW) e1:SetCategory(e1:GetCategory()|CATEGORY_DRAW)
c:RegisterEffect(e1) c:RegisterEffect(e1)
...@@ -14,8 +13,11 @@ function s.initial_effect(c) ...@@ -14,8 +13,11 @@ function s.initial_effect(c)
e2:SetOperation(s.repop) e2:SetOperation(s.repop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function s.filter(c)
return c:IsSetCard(0xc30) and c:IsReason(REASON_RELEASE)
end
function s.extraop(e,tp,eg,ep,ev,re,r,rp,tc,mat) function s.extraop(e,tp,eg,ep,ev,re,r,rp,tc,mat)
if mat:IsExists(Card.IsSetCard,1,nil,0xc30) then if mat:IsExists(s.filter,1,nil) then
Duel.BreakEffect() Duel.BreakEffect()
Duel.Draw(tp,1,REASON_EFFECT) Duel.Draw(tp,1,REASON_EFFECT)
end end
......
...@@ -41,10 +41,11 @@ function s.initial_effect(c) ...@@ -41,10 +41,11 @@ function s.initial_effect(c)
c:RegisterEffect(e4) c:RegisterEffect(e4)
end end
function s.atlimit(e,c) function s.atlimit(e,c)
return c:IsLevel(0) and not c:IsImmuneToEffect(e) return c:IsType(TYPE_MONSTER) and c:IsLevel(0) and not c:IsImmuneToEffect(e)
end end
function s.efilter(e,te) function s.efilter(e,te)
return te:GetOwner():IsLevel(0) local tc=te:GetOwner()
return tc:IsType(TYPE_MONSTER) and tc:IsLevel(0)
end end
function s.qcon(e,tp,eg,ep,ev,re,r,rp) function s.qcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
local s,id,o=GetID() local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetCategory(CATEGORY_TOGRAVE)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCondition(s.condition) e1:SetCondition(s.condition)
......
...@@ -41,10 +41,11 @@ function s.initial_effect(c) ...@@ -41,10 +41,11 @@ function s.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function s.atlimit(e,c) function s.atlimit(e,c)
return c:IsLevelBelow(8) and not c:IsImmuneToEffect(e) return c:IsType(TYPE_MONSTER) and c:IsLevelBelow(8) and not c:IsImmuneToEffect(e)
end end
function s.efilter(e,te) function s.efilter(e,te)
return te:GetOwner():IsLevelBelow(8) local tc=te:GetOwner()
return tc:IsType(TYPE_MONSTER) and tc:IsLevelBelow(8)
end end
function s.qcon(e,tp,eg,ep,ev,re,r,rp) function s.qcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
......
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