Commit bf3bd7db authored by wind2009's avatar wind2009

Fix

parent 22b23b31
Pipeline #38555 passed with stages
in 5 minutes and 53 seconds
No preview for this file type
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
101302017 101302017
101302020 101302020
101302021 101302021
101302030
101302033 101302033
101302034 101302034
101302204 101302204
...@@ -21,6 +22,7 @@ ...@@ -21,6 +22,7 @@
101302206 101302206
101302207 101302207
101302050 101302050
101302053
101302208 101302208
101302056 101302056
101302061 101302061
......
...@@ -69,4 +69,4 @@ function s.tdop(e,tp,eg,ep,ev,re,r,rp) ...@@ -69,4 +69,4 @@ function s.tdop(e,tp,eg,ep,ev,re,r,rp)
Duel.HintSelection(g) Duel.HintSelection(g)
Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT) Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
end end
end end
\ No newline at end of file
...@@ -47,7 +47,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -47,7 +47,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function s.spop(e,tp,eg,ep,ev,re,r,rp) function s.spop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsRelateToChain() and c:IsLocation(LOCATION_HAND)then if c:IsRelateToChain() and c:IsLocation(LOCATION_HAND) then
Duel.Summon(tp,c,true,nil) Duel.Summon(tp,c,true,nil)
end end
end end
...@@ -65,4 +65,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -65,4 +65,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
end end
end end
\ No newline at end of file
...@@ -11,6 +11,7 @@ function s.initial_effect(c) ...@@ -11,6 +11,7 @@ function s.initial_effect(c)
e1:SetType(EFFECT_TYPE_QUICK_O) e1:SetType(EFFECT_TYPE_QUICK_O)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET) e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_MAIN_END)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCountLimit(1,id) e1:SetCountLimit(1,id)
e1:SetCondition(s.spcon) e1:SetCondition(s.spcon)
...@@ -30,7 +31,7 @@ function s.initial_effect(c) ...@@ -30,7 +31,7 @@ function s.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function s.spcon(e,tp,eg,ep,ev,re,r,rp) function s.spcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2 return Duel.IsMainPhase()
end end
function s.costfilter(c,e,tp) function s.costfilter(c,e,tp)
return c:IsAttribute(ATTRIBUTE_FIRE) and c:GetOriginalLevel()>2 and Duel.GetMZoneCount(tp,c)>0 return c:IsAttribute(ATTRIBUTE_FIRE) and c:GetOriginalLevel()>2 and Duel.GetMZoneCount(tp,c)>0
...@@ -38,12 +39,13 @@ function s.costfilter(c,e,tp) ...@@ -38,12 +39,13 @@ function s.costfilter(c,e,tp)
end end
function s.spfilter(c,e,tp,lv,race) function s.spfilter(c,e,tp,lv,race)
return c:IsAttribute(ATTRIBUTE_FIRE) and c:IsLevelBelow(lv-1) return c:IsAttribute(ATTRIBUTE_FIRE) and c:IsLevelBelow(lv-1)
and c:IsRace(race) and (c:GetOriginalRace()&race)~=0
and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
end end
function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk) function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.CheckReleaseGroup(tp,s.costfilter,1,nil,e,tp) end local c=e:GetHandler()
local g=Duel.SelectReleaseGroup(tp,s.costfilter,1,1,nil,e,tp) if chk==0 then return Duel.CheckReleaseGroup(tp,s.costfilter,1,c,e,tp) end
local g=Duel.SelectReleaseGroup(tp,s.costfilter,1,1,c,e,tp)
e:SetLabel(g:GetFirst():GetOriginalLevel(),g:GetFirst():GetOriginalRace()) e:SetLabel(g:GetFirst():GetOriginalLevel(),g:GetFirst():GetOriginalRace())
Duel.Release(g,REASON_COST) Duel.Release(g,REASON_COST)
end end
...@@ -57,7 +59,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -57,7 +59,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
end end
function s.spop(e,tp,eg,ep,ev,re,r,rp) function s.spop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToChain() then if tc:IsRelateToChain() and aux.NecroValleyFilter()(tc) then
Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP_DEFENSE) Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP_DEFENSE)
end end
end end
...@@ -78,4 +80,4 @@ end ...@@ -78,4 +80,4 @@ end
function s.desrepop(e,tp,eg,ep,ev,re,r,rp) function s.desrepop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_CARD,0,id) Duel.Hint(HINT_CARD,0,id)
Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_EFFECT+REASON_REPLACE) Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_EFFECT+REASON_REPLACE)
end end
\ No newline at end of file
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