Commit c5e5cfd6 authored by salix5's avatar salix5

Merge pull request #1464 from DailyShana/patch-2

fix
parents a28b348b 817b48b9
...@@ -12,7 +12,7 @@ function c13945283.initial_effect(c) ...@@ -12,7 +12,7 @@ function c13945283.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c13945283.condition(e,tp,eg,ep,ev,re,r,rp) function c13945283.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetAttackTarget()==e:GetHandler() return Duel.GetAttackTarget()==e:GetHandler() and not Duel.GetAttacker():IsStatus(STATUS_BATTLE_DESTROYED)
end end
function c13945283.target(e,tp,eg,ep,ev,re,r,rp,chk) function c13945283.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
......
...@@ -44,6 +44,7 @@ function c32542011.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -44,6 +44,7 @@ function c32542011.target(e,tp,eg,ep,ev,re,r,rp,chk)
if Duel.IsExistingMatchingCard(c32542011.cfilter2,tp,LOCATION_MZONE,0,1,nil,ATTRIBUTE_WATER) then if Duel.IsExistingMatchingCard(c32542011.cfilter2,tp,LOCATION_MZONE,0,1,nil,ATTRIBUTE_WATER) then
local g=Duel.GetMatchingGroup(c32542011.spfilter,tp,LOCATION_GRAVE,0,nil,Duel.GetTurnCount(),e,tp) local g=Duel.GetMatchingGroup(c32542011.spfilter,tp,LOCATION_GRAVE,0,nil,Duel.GetTurnCount(),e,tp)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,Duel.GetLocationCount(tp,LOCATION_MZONE),0,0) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,Duel.GetLocationCount(tp,LOCATION_MZONE),0,0)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,1,0,LOCATION_MZONE)
end end
end end
function c32542011.activate(e,tp,eg,ep,ev,re,r,rp) function c32542011.activate(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -32,12 +32,13 @@ end ...@@ -32,12 +32,13 @@ end
function c73872164.activate(e,tp,eg,ep,ev,re,r,rp) function c73872164.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) and tc:IsFaceup() and Duel.Destroy(tc,REASON_EFFECT)~=0 then if tc:IsRelateToEffect(e) and tc:IsFaceup() and Duel.Destroy(tc,REASON_EFFECT)~=0 then
Duel.BreakEffect()
local code=tc:GetCode() local code=tc:GetCode()
local g=Duel.GetMatchingGroup(Card.IsCode,tp,0,LOCATION_HAND,nil,code) local g=Duel.GetMatchingGroup(Card.IsCode,tp,0,LOCATION_HAND,nil,code)
local hg=Duel.GetFieldGroup(tp,0,LOCATION_HAND) local hg=Duel.GetFieldGroup(tp,0,LOCATION_HAND)
Duel.ConfirmCards(tp,hg) Duel.ConfirmCards(tp,hg)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoGrave(g,REASON_EFFECT+REASON_DISCARD) Duel.SendtoGrave(g,REASON_EFFECT)
end end
Duel.ShuffleHand(1-tp) Duel.ShuffleHand(1-tp)
end end
......
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