Commit 4daf1d81 authored by mercury233's avatar mercury233 Committed by GitHub

add Auxiliary.DimensionalFissureTarget (#2675)

parent 9594151b
...@@ -12,12 +12,9 @@ function c31849106.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -12,12 +12,9 @@ function c31849106.activate(e,tp,eg,ep,ev,re,r,rp)
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE) e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
e1:SetCode(EFFECT_TO_GRAVE_REDIRECT) e1:SetCode(EFFECT_TO_GRAVE_REDIRECT)
e1:SetTarget(c31849106.rmtarget) e1:SetTarget(aux.DimensionalFissureTarget)
e1:SetTargetRange(LOCATION_DECK,LOCATION_DECK) e1:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
e1:SetValue(LOCATION_REMOVED) e1:SetValue(LOCATION_REMOVED)
e1:SetReset(RESET_PHASE+PHASE_END) e1:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
function c31849106.rmtarget(e,c)
return not c:IsLocation(0x80) and not c:IsType(TYPE_SPELL+TYPE_TRAP)
end
...@@ -136,8 +136,7 @@ function c53701259.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -136,8 +136,7 @@ function c53701259.disop(e,tp,eg,ep,ev,re,r,rp)
Duel.NegateEffect(ev) Duel.NegateEffect(ev)
end end
function c53701259.rmtg(e,c) function c53701259.rmtg(e,c)
return c:GetOwner()~=e:GetHandlerPlayer() and not c:IsLocation(LOCATION_OVERLAY) return c:GetOwner()~=e:GetHandlerPlayer() and aux.DimensionalFissureTarget(e,c)
and not c:IsType(TYPE_SPELL+TYPE_TRAP)
end end
function c53701259.rmcon(e) function c53701259.rmcon(e)
local tp=e:GetHandlerPlayer() local tp=e:GetHandlerPlayer()
......
...@@ -11,7 +11,7 @@ function c81674782.initial_effect(c) ...@@ -11,7 +11,7 @@ function c81674782.initial_effect(c)
e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE) e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
e2:SetCode(EFFECT_TO_GRAVE_REDIRECT) e2:SetCode(EFFECT_TO_GRAVE_REDIRECT)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetTarget(c81674782.rmtarget) e2:SetTarget(aux.DimensionalFissureTarget)
e2:SetTargetRange(LOCATION_DECK,LOCATION_DECK) e2:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
e2:SetValue(LOCATION_REMOVED) e2:SetValue(LOCATION_REMOVED)
c:RegisterEffect(e2) c:RegisterEffect(e2)
...@@ -25,9 +25,6 @@ function c81674782.initial_effect(c) ...@@ -25,9 +25,6 @@ function c81674782.initial_effect(c)
e3:SetTarget(c81674782.checktg) e3:SetTarget(c81674782.checktg)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c81674782.rmtarget(e,c)
return c:GetOriginalType()&TYPE_MONSTER>0 and not c:IsLocation(0x80) and not c:IsType(TYPE_SPELL+TYPE_TRAP)
end
function c81674782.checktg(e,c) function c81674782.checktg(e,c)
return not c:IsPublic() return not c:IsPublic()
end end
...@@ -1768,3 +1768,7 @@ function Auxiliary.IsCanBeQuickEffect(c,tp,code) ...@@ -1768,3 +1768,7 @@ function Auxiliary.IsCanBeQuickEffect(c,tp,code)
local filter=Auxiliary.quick_effect_filter[code] local filter=Auxiliary.quick_effect_filter[code]
return Duel.IsPlayerAffectedByEffect(tp,code)~=nil and filter~=nil and filter(c) return Duel.IsPlayerAffectedByEffect(tp,code)~=nil and filter~=nil and filter(c)
end end
--
function Auxiliary.DimensionalFissureTarget(e,c)
return c:GetOriginalType()&TYPE_MONSTER>0 and not c:IsLocation(LOCATION_OVERLAY) and not c:IsType(TYPE_SPELL+TYPE_TRAP)
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