Commit ea7a4220 authored by wind2009's avatar wind2009

Fix 原質の臨界超過

parent 37521eae
Pipeline #30228 passed with stages
in 2 minutes and 10 seconds
...@@ -52,10 +52,10 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -52,10 +52,10 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
if hc and Duel.SendtoHand(hc,nil,REASON_EFFECT)~=0 and hc:IsLocation(LOCATION_HAND) then if hc and Duel.SendtoHand(hc,nil,REASON_EFFECT)~=0 and hc:IsLocation(LOCATION_HAND) then
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsRelateToEffect(e) if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsRelateToEffect(e)
and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENCE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then
Duel.BreakEffect() Duel.BreakEffect()
Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP_DEFENCE) Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP_DEFENSE)
end end
end end
end end
......
...@@ -19,7 +19,6 @@ function s.initial_effect(c) ...@@ -19,7 +19,6 @@ function s.initial_effect(c)
--add overlay --add overlay
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetDescription(aux.Stringid(id,1)) e3:SetDescription(aux.Stringid(id,1))
e3:SetCategory(CATEGORY_TOHAND)
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e3:SetProperty(EFFECT_FLAG_DELAY) e3:SetProperty(EFFECT_FLAG_DELAY)
e3:SetCode(EVENT_CHAINING) e3:SetCode(EVENT_CHAINING)
......
...@@ -32,7 +32,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -32,7 +32,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
rg:Merge(hg) rg:Merge(hg)
end end
end end
if chk==0 then return rg and rg:Filter(s.ovfilter,nil,tp) end if chk==0 then return rg and rg:Filter(s.ovfilter,nil,tp):GetCount()>0 end
Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0) Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
end end
function s.atkfilter(c,e) function s.atkfilter(c,e)
...@@ -50,7 +50,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -50,7 +50,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
rg:Merge(hg) rg:Merge(hg)
end end
end end
if rg and rg:Filter(s.ovfilter,nil,tp) then if rg and rg:Filter(s.ovfilter,nil,tp):GetCount()>0 then
Duel.BreakEffect() Duel.BreakEffect()
local tc=rg:FilterSelect(tp,s.ovfilter,1,1,nil,tp):GetFirst() local tc=rg:FilterSelect(tp,s.ovfilter,1,1,nil,tp):GetFirst()
if Duel.SendtoHand(tc,nil,REASON_EFFECT)~=0 and tc:IsLocation(LOCATION_HAND) then if Duel.SendtoHand(tc,nil,REASON_EFFECT)~=0 and tc:IsLocation(LOCATION_HAND) then
......
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