Commit 9950fde9 authored by wind2009's avatar wind2009

Fix

parent fb722b11
Pipeline #41865 passed with stages
in 3 minutes and 28 seconds
No preview for this file type
No preview for this file type
...@@ -17,4 +17,7 @@ ...@@ -17,4 +17,7 @@
100255015 100255015
100255016 100255016
100255116 100255116
100255017 100255017
\ No newline at end of file 100255018
100255019
100255020
\ No newline at end of file
...@@ -4,4 +4,5 @@ ...@@ -4,4 +4,5 @@
100200281 100200281
100254201 100254201
100254202 100254202
100228003 100228003
\ No newline at end of file 100200282
\ No newline at end of file
pics/100228003.jpg

87 KB | W: | H:

pics/100228003.jpg

95.5 KB | W: | H:

pics/100228003.jpg
pics/100228003.jpg
pics/100228003.jpg
pics/100228003.jpg
  • 2-up
  • Swipe
  • Onion skin
...@@ -59,7 +59,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -59,7 +59,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function s.thfilter(c) function s.thfilter(c)
return aux.IsCodeListed(c,id) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand() return aux.IsCodeListed(c,id) and c:IsType(TYPE_SPELL) and c:IsAbleToHand()
end end
function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end
...@@ -75,4 +75,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -75,4 +75,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.valcon(e,re,r,rp) function s.valcon(e,re,r,rp)
return bit.band(r,REASON_BATTLE)~=0 return bit.band(r,REASON_BATTLE)~=0
end end
\ No newline at end of file
...@@ -15,11 +15,12 @@ function s.initial_effect(c) ...@@ -15,11 +15,12 @@ function s.initial_effect(c)
--spsummon --spsummon
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(id,1)) e2:SetDescription(aux.Stringid(id,1))
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_REMOVE+CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_QUICK_O) e2:SetType(EFFECT_TYPE_QUICK_O)
e2:SetCode(EVENT_FREE_CHAIN) e2:SetCode(EVENT_FREE_CHAIN)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetProperty(EFFECT_FLAG_CARD_TARGET) e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_MAIN_END)
e2:SetCountLimit(1,id+o) e2:SetCountLimit(1,id+o)
e2:SetCondition(s.spcon2) e2:SetCondition(s.spcon2)
e2:SetTarget(s.sptg2) e2:SetTarget(s.sptg2)
...@@ -27,7 +28,7 @@ function s.initial_effect(c) ...@@ -27,7 +28,7 @@ function s.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function s.cfilter(c) function s.cfilter(c)
return c:IsFaceup() and c:IsRace(RACE_WARRIOR) return c:IsFaceup() and c:IsRace(RACE_SPELLCASTER)
end end
function s.spcon1(e,tp,eg,ep,ev,re,r,rp) function s.spcon1(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil) return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil)
...@@ -39,14 +40,15 @@ function s.sptg1(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -39,14 +40,15 @@ function s.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function s.spop1(e,tp,eg,ep,ev,re,r,rp) function s.spop1(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if not c:IsRelateToEffect(e) then return end if c:IsRelateToChain() then
Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
end
end end
function s.spcon2(e,tp,eg,ep,ev,re,r,rp) function s.spcon2(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.rmfilter(c,tp) function s.rmfilter(c,tp)
return c:IsRace(RACE_SPELLCASTER) and c:IsAbleToRemove() return c:IsFaceup() and c:IsRace(RACE_SPELLCASTER) and c:IsAbleToRemove()
and Duel.GetMZoneCount(tp,c)>0 and Duel.GetMZoneCount(tp,c)>0
end end
function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
...@@ -54,8 +56,7 @@ function s.spfilter(c,e,tp) ...@@ -54,8 +56,7 @@ function s.spfilter(c,e,tp)
end end
function s.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and s.rmfilter(chkc,tp) end if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and s.rmfilter(chkc,tp) end
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.IsExistingTarget(s.rmfilter,tp,LOCATION_MZONE,0,1,nil,tp)
and Duel.IsExistingTarget(s.rmfilter,tp,LOCATION_MZONE,0,1,nil,tp)
and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp) end and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g=Duel.SelectTarget(tp,s.rmfilter,tp,LOCATION_MZONE,0,1,1,nil,tp) local g=Duel.SelectTarget(tp,s.rmfilter,tp,LOCATION_MZONE,0,1,1,nil,tp)
...@@ -72,4 +73,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -72,4 +73,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
end end
end end
end end
\ No newline at end of file
...@@ -12,18 +12,18 @@ function s.initial_effect(c) ...@@ -12,18 +12,18 @@ function s.initial_effect(c)
e1:SetOperation(s.activate) e1:SetOperation(s.activate)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--destroy replace --destroy replace
local e1=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD) e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_DESTROY_REPLACE) e2:SetCode(EFFECT_DESTROY_REPLACE)
e1:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e1:SetCountLimit(1,id) e2:SetCountLimit(1,id)
e1:SetTarget(s.desreptg) e2:SetTarget(s.desreptg)
e1:SetValue(s.desrepval) e2:SetValue(s.desrepval)
e1:SetOperation(s.desrepop) e2:SetOperation(s.desrepop)
c:RegisterEffect(e1) c:RegisterEffect(e2)
end end
function s.thfilter(c) function s.thfilter(c)
return (c:IsCode(100200282) or aux.IsCodeListed(c,100200282)) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() return (c:IsCode(100200282) or aux.IsCodeListed(c,100200282) and c:IsType(TYPE_MONSTER)) and c:IsAbleToHand()
end end
function s.target(e,tp,eg,ep,ev,re,r,rp,chk) function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end
...@@ -38,7 +38,8 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -38,7 +38,8 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
if Duel.IsExistingMatchingCard(aux.TRUE,tp,0,LOCATION_MZONE,1,nil) if Duel.GetLocationCount(tp,LOCATION_MZONE)>0
and Duel.IsExistingMatchingCard(aux.TRUE,tp,0,LOCATION_MZONE,1,nil)
and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp)
and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
Duel.BreakEffect() Duel.BreakEffect()
......
...@@ -16,7 +16,7 @@ function s.initial_effect(c) ...@@ -16,7 +16,7 @@ function s.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--spsummon --spsummon
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(id,3)) e2:SetDescription(aux.Stringid(id,1))
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_GRAVE) e2:SetRange(LOCATION_GRAVE)
...@@ -41,23 +41,22 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -41,23 +41,22 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
local ch=Duel.GetCurrentChain() local ch=Duel.GetCurrentChain()
local b2=false local b2=false
local og=Group.CreateGroup() local og=Group.CreateGroup()
local tsp=-1
local tse=nil local tse=nil
if ch>0 then if ch>0 then
tsp,tse=Duel.GetChainInfo(ch,CHAININFO_TRIGGERING_PLAYER,CHAININFO_TRIGGERING_EFFECT) tse=Duel.GetChainInfo(ch,CHAININFO_TRIGGERING_EFFECT)
b2=tse:IsHasType(EFFECT_TYPE_ACTIVATE) b2=tse:IsHasType(EFFECT_TYPE_ACTIVATE)
and (tse:IsActiveType(TYPE_QUICKPLAY) or tse:GetHandler():GetType()==TYPE_SPELL) and Duel.IsChainDisablable(ev) and (tse:IsActiveType(TYPE_QUICKPLAY) or tse:GetHandler():GetType()==TYPE_SPELL) and Duel.IsChainDisablable(ev)
end end
if chk==0 then return b1 or b2 end if chk==0 then return b1 or b2 end
local op=aux.SelectFromOptions(tp, local op=aux.SelectFromOptions(tp,
{b1,aux.Stringid(id,1),1}, {b1,aux.Stringid(id,2),1},
{b2,aux.Stringid(id,2),2}) {b2,aux.Stringid(id,3),2})
e:SetLabel(op) e:SetLabel(op)
if op==1 then if op==1 then
e:SetCategory(CATEGORY_DESTROY) e:SetCategory(CATEGORY_DESTROY)
local g=Duel.GetMatchingGroup(s.desfilter,tp,0,LOCATION_MZONE,nil) local g=Duel.GetMatchingGroup(s.desfilter,tp,0,LOCATION_MZONE,nil)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
else elseif op==2 then
e:SetCategory(CATEGORY_DISABLE) e:SetCategory(CATEGORY_DISABLE)
Duel.SetOperationInfo(0,CATEGORY_DISABLE,og,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DISABLE,og,1,0,0)
end end
...@@ -70,13 +69,13 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -70,13 +69,13 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.HintSelection(g) Duel.HintSelection(g)
Duel.Destroy(g,REASON_EFFECT) Duel.Destroy(g,REASON_EFFECT)
end end
else elseif e:GetLabel()==2 then
local ch=Duel.GetCurrentChain() local ch=Duel.GetCurrentChain()
Duel.NegateEffect(ch-1) Duel.NegateEffect(ch-1)
end end
end end
function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
return (c:IsCode(100200282) or aux.IsCodeListed(c,100200282)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return aux.IsCodeOrListed(c,100200282) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and s.spfilter(chkc,e,tp) end if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and s.spfilter(chkc,e,tp) end
...@@ -88,7 +87,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -88,7 +87,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:IsRelateToEffect(e) then if tc:IsRelateToChain() and aux.NecroValleyFilter()(tc) then
Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
end end
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