Commit 1220326e authored by wind2009's avatar wind2009

Fix

parent aecc8e18
Pipeline #42613 canceled with stages
in 15 seconds
No preview for this file type
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
101304018 101304018
101304019 101304019
101304020 101304020
101304021
101304022 101304022
101304023 101304023
101304024 101304024
...@@ -38,6 +39,8 @@ ...@@ -38,6 +39,8 @@
101304038 101304038
101304039 101304039
101304040 101304040
101304041
101304042
101304043 101304043
101304044 101304044
101304045 101304045
......
...@@ -32,6 +32,7 @@ function s.initial_effect(c) ...@@ -32,6 +32,7 @@ function s.initial_effect(c)
e3:SetTarget(s.eftg) e3:SetTarget(s.eftg)
e3:SetOperation(s.efop) e3:SetOperation(s.efop)
c:RegisterEffect(e3) c:RegisterEffect(e3)
s.killer_tune_be_material_effect=e3
end end
function s.tfilter(e,c) function s.tfilter(e,c)
return c:IsSynchroType(TYPE_TUNER) return c:IsSynchroType(TYPE_TUNER)
...@@ -55,7 +56,7 @@ function s.sumfilter(c) ...@@ -55,7 +56,7 @@ function s.sumfilter(c)
return c:IsType(TYPE_TUNER) and c:IsSummonable(true,nil) return c:IsType(TYPE_TUNER) and c:IsSummonable(true,nil)
end end
function s.sumtg(e,tp,eg,ep,ev,re,r,rp,chk) function s.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(s.sumfilter,tp,LOCATION_HAND,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(s.sumfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,nil) end
Duel.SetOperationInfo(0,CATEGORY_SUMMON,nil,1,0,0) Duel.SetOperationInfo(0,CATEGORY_SUMMON,nil,1,0,0)
end end
function s.sumop(e,tp,eg,ep,ev,re,r,rp) function s.sumop(e,tp,eg,ep,ev,re,r,rp)
...@@ -83,7 +84,7 @@ function s.eftg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -83,7 +84,7 @@ function s.eftg(e,tp,eg,ep,ev,re,r,rp,chk)
if op==1 then if op==1 then
e:SetCategory(CATEGORY_TODECK) e:SetCategory(CATEGORY_TODECK)
Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,1-tp,LOCATION_GRAVE) Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,1-tp,LOCATION_GRAVE)
else elseif op==2 then
e:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) e:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
end end
end end
...@@ -91,11 +92,12 @@ function s.efop(e,tp,eg,ep,ev,re,r,rp) ...@@ -91,11 +92,12 @@ function s.efop(e,tp,eg,ep,ev,re,r,rp)
local op=e:GetLabel() local op=e:GetLabel()
if op==1 then if op==1 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
local g=Duel.SelectMatchingCard(tp,Card.IsAbleToDeck,tp,0,LOCATION_GRAVE,1,1,nil) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(Card.IsAbleToDeck),tp,0,LOCATION_GRAVE,1,1,nil)
if #g>0 then if #g>0 then
Duel.HintSelection(g)
Duel.SendtoDeck(g,nil,SEQ_DECKBOTTOM,REASON_EFFECT) Duel.SendtoDeck(g,nil,SEQ_DECKBOTTOM,REASON_EFFECT)
end end
else elseif op==2 then
local g=Duel.GetFieldGroup(tp,0,LOCATION_HAND) local g=Duel.GetFieldGroup(tp,0,LOCATION_HAND)
if #g>0 then if #g>0 then
Duel.ConfirmCards(tp,g) Duel.ConfirmCards(tp,g)
......
--キラーチューン・クラックル --キラーチューン・クラックル
local s,id,o=GetID() local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
aux.AddMaterialCodeList(c,101304021) aux.AddMaterialCodeList(c,43904702)
--synchro summon --synchro summon
aux.AddSynchroMixProcedure(c,aux.FilterBoolFunction(Card.IsCode,101304021),nil,nil,aux.Tuner(nil),1,99) aux.AddSynchroMixProcedure(c,aux.FilterBoolFunction(Card.IsCode,43904702),nil,nil,aux.Tuner(nil),1,99)
c:EnableReviveLimit() c:EnableReviveLimit()
--Effect 1 --remove extra
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(id,0)) e1:SetDescription(aux.Stringid(id,0))
e1:SetCategory(CATEGORY_REMOVE+CATEGORY_ATKCHANGE) e1:SetCategory(CATEGORY_REMOVE+CATEGORY_ATKCHANGE)
...@@ -16,7 +16,7 @@ function s.initial_effect(c) ...@@ -16,7 +16,7 @@ function s.initial_effect(c)
e1:SetTarget(s.atktg) e1:SetTarget(s.atktg)
e1:SetOperation(s.atkop) e1:SetOperation(s.atkop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--Effect 2 --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+CATEGORY_REMOVE) e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_REMOVE)
...@@ -37,18 +37,18 @@ function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -37,18 +37,18 @@ function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function s.atkop(e,tp,eg,ep,ev,re,r,rp) function s.atkop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local g=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,0,LOCATION_EXTRA,nil) local g=Duel.GetFieldGroup(tp,0,LOCATION_EXTRA)
if #g>0 then if #g>0 then
Duel.ConfirmCards(tp,Duel.GetFieldGroup(tp,0,LOCATION_EXTRA)) Duel.ConfirmCards(tp,g,true)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local sg=g:Select(tp,1,1,nil) local sg=g:FilterSelect(tp,Card.IsAbleToRemove,1,1,nil)
local tc=sg:GetFirst() local tc=sg:GetFirst()
if tc and Duel.Remove(tc,POS_FACEUP,REASON_EFFECT+REASON_TEMPORARY)~=0 then if tc and Duel.Remove(tc,POS_FACEUP,REASON_EFFECT+REASON_TEMPORARY)~=0 then
local fid=c:GetFieldID() local fid=c:GetFieldID()
local og=Duel.GetOperatedGroup() local og=Duel.GetOperatedGroup()
local oc=og:GetFirst() local oc=og:GetFirst()
if oc then if oc then
oc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1,fid) oc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,fid,aux.Stringid(id,4))
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e1:SetCode(EVENT_PHASE+PHASE_END) e1:SetCode(EVENT_PHASE+PHASE_END)
...@@ -91,19 +91,19 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -91,19 +91,19 @@ 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 Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)>0 then if c:IsRelateToChain() and aux.NecroValleyFilter()(c) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)>0 then
local g=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,0,LOCATION_EXTRA,nil) local g=Duel.GetMatchingGroup(nil,tp,0,LOCATION_EXTRA,nil)
if #g>=2 and Duel.SelectYesNo(tp,aux.Stringid(id,3)) then if #g>=2 and Duel.SelectYesNo(tp,aux.Stringid(id,3)) then
Duel.BreakEffect() Duel.BreakEffect()
Duel.ConfirmCards(tp,Duel.GetFieldGroup(tp,0,LOCATION_EXTRA)) Duel.ConfirmCards(tp,Duel.GetFieldGroup(tp,0,LOCATION_EXTRA),true)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local sg=g:Select(tp,2,2,nil) local sg=g:FilterSelect(tp,Card.IsAbleToRemove,2,2,nil)
if #sg>0 then if #sg==2 then
local fid=c:GetFieldID() local fid=c:GetFieldID()
if Duel.Remove(sg,POS_FACEUP,REASON_EFFECT+REASON_TEMPORARY)~=0 then if Duel.Remove(sg,POS_FACEUP,REASON_EFFECT+REASON_TEMPORARY)~=0 then
local og=Duel.GetOperatedGroup() local og=Duel.GetOperatedGroup()
for oc in aux.Next(og) do for oc in aux.Next(og) do
oc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1,fid) oc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,fid,aux.Stringid(id,4))
end end
og:KeepAlive() og:KeepAlive()
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
...@@ -128,4 +128,4 @@ function s.retop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -128,4 +128,4 @@ function s.retop2(e,tp,eg,ep,ev,re,r,rp)
local fid=e:GetLabel() local fid=e:GetLabel()
local tg=e:GetLabelObject():Filter(s.retfilter,nil,fid) local tg=e:GetLabelObject():Filter(s.retfilter,nil,fid)
Duel.SendtoDeck(tg,nil,SEQ_DECKSHUFFLE,REASON_EFFECT) Duel.SendtoDeck(tg,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
end end
\ No newline at end of file
--10星 --キラーチューンB2B
local s,id,o=GetID() local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
--Synchro Summon --Synchro Summon
...@@ -41,8 +41,9 @@ function s.thcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -41,8 +41,9 @@ function s.thcon(e,tp,eg,ep,ev,re,r,rp)
return rp==1-tp and re:IsActiveType(TYPE_MONSTER) return rp==1-tp and re:IsActiveType(TYPE_MONSTER)
end end
function s.filter(c,e,tp) function s.filter(c,e,tp)
local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
return c:IsType(TYPE_TUNER) and not c:IsLevel(10) and c:IsFaceupEx() return c:IsType(TYPE_TUNER) and not c:IsLevel(10) and c:IsFaceupEx()
and (c:IsAbleToHand() or c:IsCanBeSpecialSummoned(e,0,tp,false,false)) and (c:IsAbleToHand() or ft>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false))
end end
function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and chkc:IsControler(tp) and s.filter(chkc,e,tp) end if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and chkc:IsControler(tp) and s.filter(chkc,e,tp) end
...@@ -64,12 +65,13 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -64,12 +65,13 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
if op==1 then if op==1 then
res=Duel.SendtoHand(tc,nil,REASON_EFFECT)>0 res=Duel.SendtoHand(tc,nil,REASON_EFFECT)>0
Duel.ConfirmCards(1-tp,tc) Duel.ConfirmCards(1-tp,tc)
else elseif op==2 then
res=Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)>0 res=Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)>0
end end
if res then if res then
local g=Duel.GetMatchingGroup(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,nil,nil) local g=Duel.GetMatchingGroup(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,nil,nil)
if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then
Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local sg=g:Select(tp,1,1,nil) local sg=g:Select(tp,1,1,nil)
Duel.SynchroSummon(tp,sg:GetFirst(),nil) Duel.SynchroSummon(tp,sg:GetFirst(),nil)
......
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