Commit 652def7d authored by HidarimeYume's avatar HidarimeYume Committed by GitHub

fixes (#1650)

parent 852bc377
...@@ -36,9 +36,10 @@ function c49407319.damtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -36,9 +36,10 @@ function c49407319.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,PLAYER_ALL,2000) Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,PLAYER_ALL,2000)
end end
function c49407319.damop(e,tp,eg,ep,ev,re,r,rp) function c49407319.damop(e,tp,eg,ep,ev,re,r,rp)
Duel.Damage(tp,2000,REASON_EFFECT) if Duel.Damage(tp,2000,REASON_EFFECT)>0 then
Duel.BreakEffect() Duel.BreakEffect()
Duel.Damage(1-tp,2000,REASON_EFFECT) Duel.Damage(1-tp,2000,REASON_EFFECT)
end
end end
function c49407319.filter(c,tp,rp,seq) function c49407319.filter(c,tp,rp,seq)
return c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE) return c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE)
...@@ -56,8 +57,7 @@ function c49407319.destg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -56,8 +57,7 @@ function c49407319.destg(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,PLAYER_ALL,2000) Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,PLAYER_ALL,2000)
end end
function c49407319.desop(e,tp,eg,ep,ev,re,r,rp) function c49407319.desop(e,tp,eg,ep,ev,re,r,rp)
if e:GetHandler():IsRelateToEffect(e) and Duel.Destroy(e:GetHandler(),REASON_EFFECT)>0 then if e:GetHandler():IsRelateToEffect(e) and Duel.Destroy(e:GetHandler(),REASON_EFFECT)>0 and Duel.Damage(tp,2000,REASON_EFFECT)>0 then
Duel.Damage(tp,2000,REASON_EFFECT)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Damage(1-tp,2000,REASON_EFFECT) Duel.Damage(1-tp,2000,REASON_EFFECT)
end end
......
...@@ -39,6 +39,7 @@ function c70628672.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -39,6 +39,7 @@ function c70628672.activate(e,tp,eg,ep,ev,re,r,rp)
local cd=re:GetHandler():GetCode() local cd=re:GetHandler():GetCode()
local g=Duel.GetMatchingGroup(Card.IsCode,rp,LOCATION_DECK+LOCATION_EXTRA,0,nil,cd) local g=Duel.GetMatchingGroup(Card.IsCode,rp,LOCATION_DECK+LOCATION_EXTRA,0,nil,cd)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.BreakEffect()
Duel.SendtoGrave(g,REASON_EFFECT) Duel.SendtoGrave(g,REASON_EFFECT)
end end
end end
......
...@@ -44,9 +44,13 @@ end ...@@ -44,9 +44,13 @@ end
function c79766336.operation(e,tp,eg,ep,ev,re,r,rp) function c79766336.operation(e,tp,eg,ep,ev,re,r,rp)
local te=e:GetLabelObject() local te=e:GetLabelObject()
if not te then return end if not te then return end
if not te:GetHandler():IsRelateToEffect(e) then return end local tc=te:GetHandler()
if not (tc:IsRelateToEffect(e) and c:GetType()==TYPE_TRAP) then return end
e:SetLabelObject(te:GetLabelObject()) e:SetLabelObject(te:GetLabelObject())
local op=te:GetOperation() local op=te:GetOperation()
if op then op(e,tp,eg,ep,ev,re,r,rp) end if op then op(e,tp,eg,ep,ev,re,r,rp) end
Duel.Remove(te:GetHandler(),POS_FACEUP,REASON_EFFECT) if tc:IsRelateToEffect(e) and c:GetType()==TYPE_TRAP then
Duel.BreakEffect()
Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)
end
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