Commit 7c92fb43 authored by salix5's avatar salix5

Merge pull request #1237 from DailyShana/patch-3

fix
parents d069b8bb d8cfe4e8
...@@ -35,9 +35,11 @@ function c15381252.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -35,9 +35,11 @@ function c15381252.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=g:GetFirst() local tc=g:GetFirst()
if tc:IsType(TYPE_MONSTER) then if tc:IsType(TYPE_MONSTER) then
Duel.DisableShuffleCheck() Duel.DisableShuffleCheck()
Duel.SendtoGrave(g,REASON_EFFECT+REASON_REVEAL) Duel.SendtoGrave(tc,REASON_EFFECT+REASON_REVEAL)
Duel.Damage(1-tp,500,REASON_EFFECT) if tc:IsLocation(LOCATION_GRAVE) then
count=count-1 Duel.Damage(1-tp,500,REASON_EFFECT)
count=count-1
else count=0 end
else else
count=0 count=0
end end
......
...@@ -33,7 +33,8 @@ function c22227683.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -33,7 +33,8 @@ function c22227683.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
local g=Duel.SelectMatchingCard(tp,c22227683.tgfilter,tp,LOCATION_DECK,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c22227683.tgfilter,tp,LOCATION_DECK,0,1,1,nil)
local tc=g:GetFirst() local tc=g:GetFirst()
if tc and Duel.SendtoGrave(tc,REASON_EFFECT)~=0 and c:IsRelateToBattle() and c:IsFaceup() then if tc and Duel.SendtoGrave(tc,REASON_EFFECT)~=0 and tc:IsLocation(LOCATION_GRAVE)
and c:IsRelateToBattle() and c:IsFaceup() then
local lv=tc:GetLevel() local lv=tc:GetLevel()
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
...@@ -44,7 +44,7 @@ function c23626223.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -44,7 +44,7 @@ function c23626223.activate(e,tp,eg,ep,ev,re,r,rp)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function c23626223.tgfilter(c) function c23626223.tgfilter(c)
return c:IsFaceup() and c:IsType(TYPE_TRAP) and c:IsType(TYPE_MONSTER) return c:IsFaceup() and bit.band(c:GetOriginalType(),TYPE_TRAP)~=0 and c:IsType(TYPE_MONSTER)
end end
function c23626223.tgcon(e) function c23626223.tgcon(e)
return Duel.IsExistingMatchingCard(c23626223.tgfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,e:GetHandler()) return Duel.IsExistingMatchingCard(c23626223.tgfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,e:GetHandler())
......
...@@ -46,7 +46,7 @@ function c43476205.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -46,7 +46,7 @@ function c43476205.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if Duel.GetTurnPlayer()~=tp then if Duel.GetTurnPlayer()~=tp then
if not tc:IsRelateToEffect(e) or not tc:IsFaceup() then return end if not tc:IsRelateToEffect(e) or not tc:IsFaceup() then return end
if not Duel.GetControl(tc,tp,PHASE_END,1) then if not Duel.GetControl(tc,tp) then
if not tc:IsImmuneToEffect(e) and tc:IsAbleToChangeControler() then if not tc:IsImmuneToEffect(e) and tc:IsAbleToChangeControler() then
Duel.Destroy(tc,REASON_EFFECT) Duel.Destroy(tc,REASON_EFFECT)
end end
......
...@@ -9,7 +9,7 @@ function c6859683.initial_effect(c) ...@@ -9,7 +9,7 @@ function c6859683.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c6859683.filter(c) function c6859683.filter(c)
not c:IsType(TYPE_PENDULUM) return c:IsFacedown() or not c:IsType(TYPE_PENDULUM)
end end
function c6859683.target(e,tp,eg,ep,ev,re,r,rp,chk) function c6859683.target(e,tp,eg,ep,ev,re,r,rp,chk)
local g=Duel.GetFieldGroup(tp,0,LOCATION_EXTRA) local g=Duel.GetFieldGroup(tp,0,LOCATION_EXTRA)
......
...@@ -14,7 +14,7 @@ function c76442616.cfilter(c) ...@@ -14,7 +14,7 @@ function c76442616.cfilter(c)
return c:IsFaceup() and c:IsSetCard(0x8) return c:IsFaceup() and c:IsSetCard(0x8)
end end
function c76442616.condition(e,tp,eg,ep,ev,re,r,rp) function c76442616.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(c76442616.cfilter,tp,LOCATION_MZONE,0,1,nil) return Duel.IsExistingMatchingCard(c76442616.cfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil)
end end
function c76442616.filter(c,e,tp) function c76442616.filter(c,e,tp)
return c:IsLevelBelow(4) and c:IsSetCard(0x3008) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsLevelBelow(4) and c:IsSetCard(0x3008) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
......
...@@ -74,4 +74,4 @@ function c86871614.descon(e,tp,eg,ep,ev,re,r,rp) ...@@ -74,4 +74,4 @@ function c86871614.descon(e,tp,eg,ep,ev,re,r,rp)
end end
function c86871614.desop(e,tp,eg,ep,ev,re,r,rp) function c86871614.desop(e,tp,eg,ep,ev,re,r,rp)
Duel.Destroy(e:GetHandler(),REASON_EFFECT) Duel.Destroy(e:GetHandler(),REASON_EFFECT)
end end
\ No newline at end of file
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