Commit e9a03bb8 authored by POLYMER's avatar POLYMER

fix

parent 97a542af
...@@ -78,7 +78,7 @@ end ...@@ -78,7 +78,7 @@ end
function cm.setop(e,tp,eg,ep,ev,re,r,rp) function cm.setop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
local g=Duel.SelectMatchingCard(tp,cm.penfilter,tp,LOCATION_EXTRA+LOCATION_GRAVE,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,cm.penfilter,tp,LOCATION_EXTRA+LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil)
local tc=g:GetFirst() local tc=g:GetFirst()
if tc:IsType(TYPE_PENDULUM) and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) then if tc:IsType(TYPE_PENDULUM) and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) then
Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true) Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
......
...@@ -127,6 +127,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -127,6 +127,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.SelectMatchingCard(tp,cm.thfilter1,tp,LOCATION_DECK,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,cm.thfilter1,tp,LOCATION_DECK,0,1,1,nil)
if #g>0 then if #g>0 then
Duel.SendtoHand(g,tp,REASON_EFFECT) Duel.SendtoHand(g,tp,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g)
end end
end end
function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se) function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se)
...@@ -158,6 +159,7 @@ function cm.stop(e,tp,eg,ep,ev,re,r,rp) ...@@ -158,6 +159,7 @@ function cm.stop(e,tp,eg,ep,ev,re,r,rp)
local op=Duel.SelectOption(tp,table.unpack(ops)) local op=Duel.SelectOption(tp,table.unpack(ops))
if opval[op]==1 then if opval[op]==1 then
Duel.SendtoHand(g,tp,REASON_EFFECT) Duel.SendtoHand(g,tp,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g)
elseif opval[op]==2 then elseif opval[op]==2 then
Duel.SSet(tp,g) Duel.SSet(tp,g)
end end
......
...@@ -100,7 +100,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -100,7 +100,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
end end
--set rule --set rule
function cm.costfilter(c) function cm.costfilter(c)
return c:IsFaceup() and c:IsReleasable() return c:IsReleasable()
end end
function cm.cfilter1(c,g) function cm.cfilter1(c,g)
return c:IsSetCard(0xe08) and g:IsExists(Card.IsType,1,c,TYPE_SPELL) return c:IsSetCard(0xe08) and g:IsExists(Card.IsType,1,c,TYPE_SPELL)
......
...@@ -34,8 +34,8 @@ function c22348332.regop(e,tp,eg,ep,ev,re,r,rp) ...@@ -34,8 +34,8 @@ function c22348332.regop(e,tp,eg,ep,ev,re,r,rp)
local e2=e1:Clone() local e2=e1:Clone()
e2:SetCode(EFFECT_NO_EFFECT_DAMAGE) e2:SetCode(EFFECT_NO_EFFECT_DAMAGE)
e2:SetReset(RESET_PHASE+PHASE_END) e2:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e2,tp)0 Duel.RegisterEffect(e2,tp)
end0 end
function c22348332.drcon(e,tp,eg,ep,ev,re,r,rp) function c22348332.drcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
return c:IsPreviousLocation(LOCATION_ONFIELD) return c:IsPreviousLocation(LOCATION_ONFIELD)
......
...@@ -61,7 +61,7 @@ function cm.drop(e,tp,eg,ep,ev,re,r,rp) ...@@ -61,7 +61,7 @@ function cm.drop(e,tp,eg,ep,ev,re,r,rp)
local b1=false local b1=false
local b2=false local b2=false
if Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_DECK,0,1,nil,68468459) then b1=true end if Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_DECK,0,1,nil,68468459) then b1=true end
if Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,68468459)) then b2=true end if Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,68468459) then b2=true end
local op=aux.SelectFromOptions(tp, local op=aux.SelectFromOptions(tp,
{b1,aux.Stringid(m,0)}, {b1,aux.Stringid(m,0)},
{b2,aux.Stringid(m,1)}) {b2,aux.Stringid(m,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