Commit 5f2b27ef authored by DailyShana's avatar DailyShana

fix

parent 4adf31a7
...@@ -26,8 +26,9 @@ function c59650656.initial_effect(c) ...@@ -26,8 +26,9 @@ function c59650656.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function c59650656.cfilter(c,tp) function c59650656.cfilter(c,tp)
return c:IsFaceup() and c:IsSetCard(0x7b) and c:IsType(TYPE_XYZ) return c:IsPreviousPosition(POS_FACEUP) and c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_MZONE)
and c:IsReason(REASON_DESTROY) and c:IsPreviousLocation(LOCATION_MZONE) and c:GetPreviousControler()==tp and c:IsReason(REASON_DESTROY) and (c:IsReason(REASON_EFFECT) or (c:IsReason(REASON_BATTLE) and Duel.GetAttacker():IsControler(1-tp)))
and c:IsSetCard(0x7b) and c:IsType(TYPE_XYZ)
end end
function c59650656.descon(e,tp,eg,ep,ev,re,r,rp) function c59650656.descon(e,tp,eg,ep,ev,re,r,rp)
return rp~=tp and eg:IsExists(c59650656.cfilter,1,nil,tp) return rp~=tp and eg:IsExists(c59650656.cfilter,1,nil,tp)
......
...@@ -12,14 +12,10 @@ function c5990062.cfilter(c) ...@@ -12,14 +12,10 @@ function c5990062.cfilter(c)
return not c:IsAbleToGraveAsCost() return not c:IsAbleToGraveAsCost()
end end
function c5990062.cost(e,tp,eg,ep,ev,re,r,rp,chk) function c5990062.cost(e,tp,eg,ep,ev,re,r,rp,chk)
local g1=Duel.GetFieldGroup(tp,LOCATION_ONFIELD,0) local g=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_ONFIELD,0)
local g2=Duel.GetFieldGroup(tp,LOCATION_HAND,0) g:RemoveCard(e:GetHandler())
g1:RemoveCard(e:GetHandler()) if chk==0 then return g:GetCount()>0 and not g:IsExists(c5990062.cfilter,1,nil) end
g2:RemoveCard(e:GetHandler()) Duel.SendtoGrave(g,REASON_COST)
if chk==0 then return g1:GetCount()>0 and not g1:IsExists(c5990062.cfilter,1,nil)
and g2:GetCount()>0 and not g2:IsExists(c5990062.cfilter,1,nil) end
g1:Merge(g2)
Duel.SendtoGrave(g1,REASON_COST)
end end
function c5990062.activate(e,tp,eg,ep,ev,re,r,rp) function c5990062.activate(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetDecktopGroup(tp,1) local g=Duel.GetDecktopGroup(tp,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