Commit e82ecd79 authored by POLYMER's avatar POLYMER

fix

parent 4a21f2b4
...@@ -44,13 +44,11 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -44,13 +44,11 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
end end
end end
function cm.activate(e,tp,eg,ep,ev,re,r,rp) function cm.activate(e,tp,eg,ep,ev,re,r,rp)
if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) and Duel.Destroy(eg,REASON_EFFECT)~=0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,aux.ExceptThisCard(e)) then
Duel.Destroy(eg,REASON_EFFECT)
end
Duel.BreakEffect() Duel.BreakEffect()
if Duel.SelectYesNo(tp,aux.Stringid(m,0)) then local dg=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,1,aux.ExceptThisCard(e))
local tc=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_ONFIELD,0,1,1,nil) Duel.HintSelection(dg)
Duel.Destroy(tc,REASON_EFFECT) Duel.Destroy(dg,REASON_EFFECT)
end end
end end
......
...@@ -26,7 +26,7 @@ function this.initial_effect(c) ...@@ -26,7 +26,7 @@ function this.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function this.spcon(e,tp,eg,ep,ev,re,r,rp) function this.spcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(Card.IsPreviousLocation,1,nil,LOCATION_ONFIELD) return eg:IsExists(Card.IsPreviousLocation,1,nil,LOCATION_ONFIELD) and not eg:IsContains(e:GetHandler())
end end
function this.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function this.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
...@@ -68,9 +68,9 @@ end ...@@ -68,9 +68,9 @@ end
function this.dtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function this.dtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return false end if chkc then return false end
if chk==0 then return Duel.IsExistingTarget(this.dfilter1,tp,LOCATION_MZONE,0,1,nil,tp) end if chk==0 then return Duel.IsExistingTarget(this.dfilter1,tp,LOCATION_MZONE,0,1,nil,tp) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local g=Duel.SelectTarget(tp,this.dfilter1,tp,LOCATION_MZONE,0,1,1,nil,tp) local g=Duel.SelectTarget(tp,this.dfilter1,tp,LOCATION_MZONE,0,1,1,nil,tp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local g2=Duel.SelectTarget(tp,this.dfilter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,g) local g2=Duel.SelectTarget(tp,this.dfilter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,g)
g:Merge(g2) g:Merge(g2)
Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,2,0,0) Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,2,0,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