Skip to content

Y
ygopro-scripts
Commit 5927b9ff authored by DailyShana's avatar DailyShana
Browse files
Options

fix

parent 5c3c232b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
c4145852.lua
View file @ 5927b9ff
...@@ -47,7 +47,7 @@ function c4145852.discon(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,7 +47,7 @@ function c4145852.discon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
return c:GetOriginalRace()==RACE_BEASTWARRIOR return c:GetOriginalRace()==RACE_BEASTWARRIOR
and not c:IsStatus(STATUS_BATTLE_DESTROYED) and ep==1-tp and not c:IsStatus(STATUS_BATTLE_DESTROYED) and ep==1-tp
and re:IsActiveType(TYPE_TRAP) and Duel.IsChainDisablable(ev) and re:IsActiveType(TYPE_TRAP) and Duel.IsChainNegatable(ev)
and re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) and re:IsHasProperty(EFFECT_FLAG_CARD_TARGET)
and Duel.GetChainInfo(ev,CHAININFO_TARGET_CARDS):IsContains(c) and Duel.GetChainInfo(ev,CHAININFO_TARGET_CARDS):IsContains(c)
end end
...@@ -61,5 +61,7 @@ function c4145852.distg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -61,5 +61,7 @@ function c4145852.distg(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_DISABLE,eg,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DISABLE,eg,1,0,0)
end end
function c4145852.disop(e,tp,eg,ep,ev,re,r,rp) function c4145852.disop(e,tp,eg,ep,ev,re,r,rp)
Duel.NegateEffect(ev) if Duel.NegateActivation(ev) and re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:GetHandler():IsRelateToEffect(re) then
Duel.SendtoGrave(eg,REASON_EFFECT)
end
end end
c4367330.lua
View file @ 5927b9ff
...@@ -46,7 +46,7 @@ function c4367330.discon(e,tp,eg,ep,ev,re,r,rp) ...@@ -46,7 +46,7 @@ function c4367330.discon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
return c:GetOriginalRace()==RACE_BEASTWARRIOR return c:GetOriginalRace()==RACE_BEASTWARRIOR
and not c:IsStatus(STATUS_BATTLE_DESTROYED) and ep==1-tp and not c:IsStatus(STATUS_BATTLE_DESTROYED) and ep==1-tp
and re:IsActiveType(TYPE_SPELL) and Duel.IsChainDisablable(ev) and re:IsActiveType(TYPE_SPELL) and Duel.IsChainNegatable(ev)
and re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) and re:IsHasProperty(EFFECT_FLAG_CARD_TARGET)
and Duel.GetChainInfo(ev,CHAININFO_TARGET_CARDS):IsContains(c) and Duel.GetChainInfo(ev,CHAININFO_TARGET_CARDS):IsContains(c)
end end
...@@ -60,5 +60,7 @@ function c4367330.distg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -60,5 +60,7 @@ function c4367330.distg(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_DISABLE,eg,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DISABLE,eg,1,0,0)
end end
function c4367330.disop(e,tp,eg,ep,ev,re,r,rp) function c4367330.disop(e,tp,eg,ep,ev,re,r,rp)
Duel.NegateEffect(ev) if Duel.NegateActivation(ev) and re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:GetHandler():IsRelateToEffect(re) then
Duel.SendtoGrave(eg,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