Skip to content

Y
ygopro-scripts-888
Commit 32b736fa authored by mercury233's avatar mercury233
Browse files
Options

fix ナチュル・サンフラワー and ナチュル・ナーブ

parent 431ae648
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
c16940215.lua
View file @ 32b736fa
...@@ -16,6 +16,7 @@ function c16940215.initial_effect(c) ...@@ -16,6 +16,7 @@ function c16940215.initial_effect(c)
end end
function c16940215.discon(e,tp,eg,ep,ev,re,r,rp) function c16940215.discon(e,tp,eg,ep,ev,re,r,rp)
return ep~=tp and re:IsHasType(EFFECT_TYPE_ACTIVATE) and Duel.IsChainNegatable(ev) return ep~=tp and re:IsHasType(EFFECT_TYPE_ACTIVATE) and Duel.IsChainNegatable(ev)
and not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED)
end end
function c16940215.cfilter(c) function c16940215.cfilter(c)
return c:IsSetCard(0x2a) and not c:IsStatus(STATUS_BATTLE_DESTROYED) return c:IsSetCard(0x2a) and not c:IsStatus(STATUS_BATTLE_DESTROYED)
...@@ -24,7 +25,7 @@ function c16940215.discost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -24,7 +25,7 @@ function c16940215.discost(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
local fe=Duel.IsPlayerAffectedByEffect(tp,29942771) local fe=Duel.IsPlayerAffectedByEffect(tp,29942771)
local b1=fe and Duel.IsPlayerCanDiscardDeckAsCost(tp,2) local b1=fe and Duel.IsPlayerCanDiscardDeckAsCost(tp,2)
local b2=c:IsReleasable() and not c:IsStatus(STATUS_BATTLE_DESTROYED) and Duel.CheckReleaseGroup(tp,c16940215.cfilter,1,c) local b2=c:IsReleasable() and Duel.CheckReleaseGroup(tp,c16940215.cfilter,1,c)
if chk==0 then return b1 or b2 end if chk==0 then return b1 or b2 end
if b1 and (not b2 or Duel.SelectYesNo(tp,fe:GetDescription())) then if b1 and (not b2 or Duel.SelectYesNo(tp,fe:GetDescription())) then
Duel.Hint(HINT_CARD,0,29942771) Duel.Hint(HINT_CARD,0,29942771)
......
c7478431.lua
View file @ 32b736fa
...@@ -15,7 +15,7 @@ function c7478431.initial_effect(c) ...@@ -15,7 +15,7 @@ function c7478431.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c7478431.discon(e,tp,eg,ep,ev,re,r,rp) function c7478431.discon(e,tp,eg,ep,ev,re,r,rp)
return ep~=tp and re:IsActiveType(TYPE_MONSTER) return ep~=tp and re:IsActiveType(TYPE_MONSTER) and not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED)
and Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION)~=LOCATION_DECK and Duel.IsChainNegatable(ev) and Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION)~=LOCATION_DECK and Duel.IsChainNegatable(ev)
end end
function c7478431.cfilter(c) function c7478431.cfilter(c)
...@@ -25,7 +25,7 @@ function c7478431.discost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -25,7 +25,7 @@ function c7478431.discost(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
local fe=Duel.IsPlayerAffectedByEffect(tp,29942771) local fe=Duel.IsPlayerAffectedByEffect(tp,29942771)
local b1=fe and Duel.IsPlayerCanDiscardDeckAsCost(tp,2) local b1=fe and Duel.IsPlayerCanDiscardDeckAsCost(tp,2)
local b2=c:IsReleasable() and not c:IsStatus(STATUS_BATTLE_DESTROYED) and Duel.CheckReleaseGroup(tp,c7478431.cfilter,1,c) local b2=c:IsReleasable() and Duel.CheckReleaseGroup(tp,c7478431.cfilter,1,c)
if chk==0 then return b1 or b2 end if chk==0 then return b1 or b2 end
if b1 and (not b2 or Duel.SelectYesNo(tp,fe:GetDescription())) then if b1 and (not b2 or Duel.SelectYesNo(tp,fe:GetDescription())) then
Duel.Hint(HINT_CARD,0,29942771) Duel.Hint(HINT_CARD,0,29942771)
......
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