Commit 8d123458 authored by Amiya's avatar Amiya

修复

parent 76c90247
Pipeline #40183 failed with stages
in 3 minutes and 58 seconds
...@@ -83,7 +83,11 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -83,7 +83,11 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp)
e4:SetCode(EFFECT_DISABLE_TRAPMONSTER) e4:SetCode(EFFECT_DISABLE_TRAPMONSTER)
sc:RegisterEffect(e4) sc:RegisterEffect(e4)
end end
if tc:IsRelateToChain() then Duel.Destroy(tc,REASON_EFFECT) end Duel.AdjustInstantly(sc)
if sc:IsDisabled() and tc:IsRelateToChain() then
Duel.BreakEffect()
Duel.Destroy(tc,REASON_EFFECT)
end
end end
end end
function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
...@@ -100,5 +104,5 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -100,5 +104,5 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp) local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)
local tc=g:GetFirst() local tc=g:GetFirst()
if not tc then return end if not tc then return end
Duel.SpecialSummon(tc,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
end end
\ No newline at end of file
...@@ -71,7 +71,8 @@ end ...@@ -71,7 +71,8 @@ end
function s.thop2(e,tp,eg,ep,ev,re,r,rp) function s.thop2(e,tp,eg,ep,ev,re,r,rp)
local tc1,tc2=Duel.GetFirstTarget() local tc1,tc2=Duel.GetFirstTarget()
if tc1~=e:GetLabelObject() then tc1,tc2=tc2,tc1 end if tc1~=e:GetLabelObject() then tc1,tc2=tc2,tc1 end
if tc1:IsRelateToChain() and Duel.Destroy(tc1,REASON_EFFECT)>0 and tc2:IsRelateToChain() then if tc1:IsRelateToChain() and Duel.Destroy(tc1,REASON_EFFECT)>0 and tc2:IsRelateToChain() and aux.NecroValleyFilter()(tc2) then
Duel.SendtoHand(tc2,nil,REASON_EFFECT) Duel.SendtoHand(tc2,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc2)
end end
end end
\ No newline at end of file
...@@ -67,7 +67,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -67,7 +67,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
if op==2 then if op==2 then
if e:IsCostChecked() then if e:IsCostChecked() then
e:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_REMOVE) e:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_REMOVE)
Duel.RegisterFlagEffect(tp,id,RESET_PHASE+PHASE_END,0,1) Duel.RegisterFlagEffect(tp,id+o,RESET_PHASE+PHASE_END,0,1)
end end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_GRAVE) Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_GRAVE)
...@@ -76,7 +76,7 @@ end ...@@ -76,7 +76,7 @@ end
function s.activate(e,tp,eg,ep,ev,re,r,rp) function s.activate(e,tp,eg,ep,ev,re,r,rp)
if e:GetLabel()==1 then if e:GetLabel()==1 then
local chkf=tp local chkf=tp
local mg1=Duel.GetMatchingGroup(s.filter1,tp,LOCATION_GRAVE,0,nil,tp) local mg1=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.filter1),tp,LOCATION_GRAVE,0,nil,tp)
aux.FCheckAdditional=s.fcheck aux.FCheckAdditional=s.fcheck
local sg1=Duel.GetMatchingGroup(s.fspfilter,tp,LOCATION_EXTRA,0,nil,e,tp,mg1,nil,chkf) local sg1=Duel.GetMatchingGroup(s.fspfilter,tp,LOCATION_EXTRA,0,nil,e,tp,mg1,nil,chkf)
local mg2=nil local mg2=nil
...@@ -110,7 +110,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -110,7 +110,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
aux.FCheckAdditional=nil aux.FCheckAdditional=nil
elseif e:GetLabel()==2 then elseif e:GetLabel()==2 then
::rcancel:: ::rcancel::
local mg=Duel.GetMatchingGroup(s.filter2,tp,LOCATION_GRAVE,0,nil,tp) local mg=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.filter2),tp,LOCATION_GRAVE,0,nil,tp)
aux.RCheckAdditional=s.rcheck aux.RCheckAdditional=s.rcheck
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local tg=Duel.SelectMatchingCard(tp,aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,1,nil,aux.TRUE,e,tp,Group.CreateGroup(),mg,Card.GetLevel,"Greater") local tg=Duel.SelectMatchingCard(tp,aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,1,nil,aux.TRUE,e,tp,Group.CreateGroup(),mg,Card.GetLevel,"Greater")
......
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