Commit 4a47186c authored by Nemo Ma's avatar Nemo Ma

fix

parent b23f3ae5
...@@ -265,5 +265,5 @@ function cm.retop(e,tp,eg,ep,ev,re,r,rp) ...@@ -265,5 +265,5 @@ function cm.retop(e,tp,eg,ep,ev,re,r,rp)
if not g then return end if not g then return end
local sg=g:Filter(cm.filter6,nil) local sg=g:Filter(cm.filter6,nil)
g:DeleteGroup() g:DeleteGroup()
Duel.SendtoHand(sg,tp,REASON_EFFECT) Duel.SendtoHand(sg,tp,REASON_EFFECT+REASON_REPLACE)
end end
\ No newline at end of file
...@@ -167,7 +167,7 @@ function cm.limop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -167,7 +167,7 @@ function cm.limop2(e,tp,eg,ep,ev,re,r,rp)
e:Reset() e:Reset()
end end
function cm.ngop(e,tp,eg,ep,ev,re,r,rp) function cm.ngop(e,tp,eg,ep,ev,re,r,rp)
if ep~=tp then Duel.NegateEffect(ev) end if ep~=tp and ev==e:GetLabel() then Duel.NegateEffect(ev) end
end end
function cm.imfilter(e,re) function cm.imfilter(e,re)
local i=1 local i=1
...@@ -220,6 +220,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -220,6 +220,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
if tc then if tc then
th=Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) th=Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
local te=tc:GetActivateEffect() local te=tc:GetActivateEffect()
te:UseCountLimit(tp,1,true)
local tep=tc:GetControler() local tep=tc:GetControler()
local cost=te:GetCost() local cost=te:GetCost()
if cost then cost(te,tep,eg,ep,ev,re,r,rp,1) end if cost then cost(te,tep,eg,ep,ev,re,r,rp,1) end
......
...@@ -172,7 +172,7 @@ function cm.limop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -172,7 +172,7 @@ function cm.limop2(e,tp,eg,ep,ev,re,r,rp)
e:Reset() e:Reset()
end end
function cm.ngop(e,tp,eg,ep,ev,re,r,rp) function cm.ngop(e,tp,eg,ep,ev,re,r,rp)
if ep~=tp then Duel.NegateEffect(ev) end if ep~=tp and ev==e:GetLabel() then Duel.NegateEffect(ev) end
end end
function cm.imfilter(e,re) function cm.imfilter(e,re)
local i=1 local i=1
...@@ -225,7 +225,8 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -225,7 +225,8 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
local tc=Duel.SelectMatchingCard(tp,cm.filter2,tp,LOCATION_DECK,0,1,1,nil,tp):GetFirst() local tc=Duel.SelectMatchingCard(tp,cm.filter2,tp,LOCATION_DECK,0,1,1,nil,tp):GetFirst()
if tc then if tc then
th=Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
te:UseCountLimit(tp,1,true)
local te=tc:GetActivateEffect() local te=tc:GetActivateEffect()
local tep=tc:GetControler() local tep=tc:GetControler()
local cost=te:GetCost() local cost=te:GetCost()
......
...@@ -172,7 +172,7 @@ function cm.limop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -172,7 +172,7 @@ function cm.limop2(e,tp,eg,ep,ev,re,r,rp)
e:Reset() e:Reset()
end end
function cm.ngop(e,tp,eg,ep,ev,re,r,rp) function cm.ngop(e,tp,eg,ep,ev,re,r,rp)
if ep~=tp then Duel.NegateEffect(ev) end if ep~=tp and ev==e:GetLabel() then Duel.NegateEffect(ev) end
end end
function cm.imfilter(e,re) function cm.imfilter(e,re)
local i=1 local i=1
...@@ -228,8 +228,9 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -228,8 +228,9 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
local tc=Duel.SelectMatchingCard(tp,cm.filter2,tp,LOCATION_DECK,0,1,1,nil,tp):GetFirst() local tc=Duel.SelectMatchingCard(tp,cm.filter2,tp,LOCATION_DECK,0,1,1,nil,tp):GetFirst()
if tc then if tc then
th=Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
local te=tc:GetActivateEffect() local te=tc:GetActivateEffect()
te:UseCountLimit(tp,1,true)
local tep=tc:GetControler() local tep=tc:GetControler()
local cost=te:GetCost() local cost=te:GetCost()
if cost then cost(te,tep,eg,ep,ev,re,r,rp,1) end if cost then cost(te,tep,eg,ep,ev,re,r,rp,1) end
......
...@@ -216,7 +216,7 @@ function cm.limop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -216,7 +216,7 @@ function cm.limop2(e,tp,eg,ep,ev,re,r,rp)
e:Reset() e:Reset()
end end
function cm.ngop(e,tp,eg,ep,ev,re,r,rp) function cm.ngop(e,tp,eg,ep,ev,re,r,rp)
if ep~=tp then Duel.NegateEffect(ev) end if ep~=tp and ev==e:GetLabel() then Duel.NegateEffect(ev) end
end end
function cm.imfilter(e,re) function cm.imfilter(e,re)
local i=1 local i=1
......
...@@ -43,7 +43,6 @@ function s.mixtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -43,7 +43,6 @@ function s.mixtg(e,tp,eg,ep,ev,re,r,rp,chk)
e:SetCategory(ctgy) e:SetCategory(ctgy)
Duel.ChangeChainOperation(0,s.op2) Duel.ChangeChainOperation(0,s.op2)
end end
e:SetLabel(op)
end end
function s.op1(e,tp) function s.op1(e,tp)
local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
......
...@@ -69,7 +69,7 @@ function s.thfilter(c,e,tp) ...@@ -69,7 +69,7 @@ function s.thfilter(c,e,tp)
return c:IsAbleToHand() and Scl.IsSeries(c, "LordOfChain") return c:IsAbleToHand() and Scl.IsSeries(c, "LordOfChain")
end end
function s.drcon(e,tp,eg,ep,ev,re) function s.drcon(e,tp,eg,ep,ev,re)
return Scl.IsSeries(re:GetHandler(), "LordOfChain") and Duel.IsPlayerCanDraw(tp,1) return Scl.IsSeries(re:GetHandler(), "LordOfChain")
end end
function s.drop(e,tp) function s.drop(e,tp)
Scl.HintCard(id) Scl.HintCard(id)
......
...@@ -7,7 +7,7 @@ function s.initial_effect(c) ...@@ -7,7 +7,7 @@ function s.initial_effect(c)
{ "~Target", "SpecialSummon", s.spfilter, "Deck" }, s.act) { "~Target", "SpecialSummon", s.spfilter, "Deck" }, s.act)
local e3 = Scl.CreateQuickOptionalEffect(c, "FreeChain", "XyzSummon", nil, "XyzSummon", nil, "GY", nil, local e3 = Scl.CreateQuickOptionalEffect(c, "FreeChain", "XyzSummon", nil, "XyzSummon", nil, "GY", nil,
{ "Cost", "ShuffleIn2Deck", {s.cfilter, s.gcheck}, "Hand,GY", 0, 2 }, { "Cost", "ShuffleIn2Deck", {s.cfilter, s.gcheck}, "Hand,GY", 0, 2 },
{ "~Tareget", "XyzSummon", s.xfilter, "Extra" }, s.spop) { "~Target", "XyzSummon", s.xfilter, "Extra" }, s.spop)
end end
function s.acon(e) function s.acon(e)
return Duel.GetCurrentChain() >= 2 return Duel.GetCurrentChain() >= 2
...@@ -26,7 +26,7 @@ function s.cfilter(c) ...@@ -26,7 +26,7 @@ function s.cfilter(c)
return c:IsAbleToDeckAsCost() and (not c:IsLocation(LOCATION_HAND) or c:IsPublic()) return c:IsAbleToDeckAsCost() and (not c:IsLocation(LOCATION_HAND) or c:IsPublic())
end end
function s.gcheck(g,e,tp) function s.gcheck(g,e,tp)
return g:IsContains(e:GetHandler()) return g:IsContains(e:GetHandler()) and g:FilterCount(Card.IsLocation,nil,LOCATION_GRAVE) < 2
end end
function s.xfilter(c,e,tp) function s.xfilter(c,e,tp)
return c:IsType(TYPE_XYZ) and c:IsXyzSummonable(nil) return c:IsType(TYPE_XYZ) and c:IsXyzSummonable(nil)
......
...@@ -232,7 +232,7 @@ end ...@@ -232,7 +232,7 @@ end
function s.val(c,syncard,c1) function s.val(c,syncard,c1)
if c==c1 and c:IsSetCard(0x119) then if c==c1 and c:IsSetCard(0x119) then
local lv=c:GetSynchroLevel(syncard) local lv=c:GetSynchroLevel(syncard)
if lv~=0 then if lv~=0 and c:IsType(TYPE_TUNER) then
return (3<<16)+lv return (3<<16)+lv
else else
return 3 return 3
......
...@@ -235,7 +235,7 @@ end ...@@ -235,7 +235,7 @@ end
function s.val(c,syncard,c1) function s.val(c,syncard,c1)
if c==c1 and c:IsSetCard(0x101b) then if c==c1 and c:IsSetCard(0x101b) then
local lv=c:GetSynchroLevel(syncard) local lv=c:GetSynchroLevel(syncard)
if lv~=0 then if lv~=0 and c:IsType(TYPE_TUNER) then
return (2<<16)+lv return (2<<16)+lv
else else
return 2 return 2
......
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