Commit ffc3dd50 authored by Amiya's avatar Amiya

修复

parent d8007eb9
No preview for this file type
...@@ -40,10 +40,11 @@ function s.spcon(e,c) ...@@ -40,10 +40,11 @@ function s.spcon(e,c)
and Duel.IsExistingMatchingCard(s.filter,c:GetControler(),LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(s.filter,c:GetControler(),LOCATION_MZONE,0,1,nil)
end end
function s.thfilter(c) function s.thfilter(c)
return c:IsSetCard(0x2c8) and not c:IsCode(id) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() return c:IsSetCard(0x2c8) and not c:IsCode(id) 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)
or e:GetHandler():GetFlagEffect(id)>0 and Duel.IsPlayerCanDraw(tp,1) end
if e:GetHandler():GetFlagEffect(id)>0 then if e:GetHandler():GetFlagEffect(id)>0 then
e:SetLabel(1) e:SetLabel(1)
else else
...@@ -54,14 +55,14 @@ end ...@@ -54,14 +55,14 @@ end
function s.thop(e,tp,eg,ep,ev,re,r,rp) function s.thop(e,tp,eg,ep,ev,re,r,rp)
local b1=Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) local b1=Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil)
local b2=e:GetLabel()==1 and Duel.IsPlayerCanDraw(tp,1) local b2=e:GetLabel()==1 and Duel.IsPlayerCanDraw(tp,1)
if b1 and (not b2 or Duel.SelectYesNo(tp,aux.Stringid(id,2))) then if b1 and (not b2 or not Duel.SelectYesNo(tp,aux.Stringid(id,2))) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil)
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)
end end
elseif b2 then elseif e:GetLabel()==1 then
Duel.Draw(tp,1,REASON_EFFECT) Duel.Draw(tp,1,REASON_EFFECT)
end end
end end
......
...@@ -55,7 +55,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -55,7 +55,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp)
if not (tc:IsRelateToEffect(e) and tc:IsType(TYPE_MONSTER)) then end if not (tc:IsRelateToEffect(e) and tc:IsType(TYPE_MONSTER)) then end
local b1=tc:IsFaceup() local b1=tc:IsFaceup()
local b2=e:GetLabel()==1 local b2=e:GetLabel()==1
if b1 and (not b2 or Duel.SelectYesNo(tp,aux.Stringid(id,2))) then if b1 and (not b2 or not Duel.SelectYesNo(tp,aux.Stringid(id,2))) then
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT)
......
...@@ -56,7 +56,7 @@ function s.tdop(e,tp,eg,ep,ev,re,r,rp) ...@@ -56,7 +56,7 @@ function s.tdop(e,tp,eg,ep,ev,re,r,rp)
if not tc:IsRelateToEffect(e) then end if not tc:IsRelateToEffect(e) then end
local b1=tc:IsAbleToDeck() local b1=tc:IsAbleToDeck()
local b2=e:GetLabel()==1 and tc:IsAbleToRemove() local b2=e:GetLabel()==1 and tc:IsAbleToRemove()
if b1 and (not b2 or Duel.SelectYesNo(tp,aux.Stringid(id,2))) then if b1 and (not b2 or not Duel.SelectYesNo(tp,aux.Stringid(id,2))) then
Duel.SendtoDeck(tc,nil,SEQ_DECKSHUFFLE,REASON_EFFECT) Duel.SendtoDeck(tc,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
else else
Duel.Remove(tc,POS_FACEUP,REASON_EFFECT) Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)
......
--甜杯猫妖★味奇喵运输 --カプシー☆ヤミーウェイ
local s,id,o=GetID() local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
--synchro summon --synchro summon
...@@ -17,7 +17,7 @@ function s.initial_effect(c) ...@@ -17,7 +17,7 @@ function s.initial_effect(c)
--search --search
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_TOHAND+CATEGORY_SEARCH) e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_HANDES)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_DELAY)
e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCode(EVENT_SPSUMMON_SUCCESS)
...@@ -37,7 +37,7 @@ function s.initial_effect(c) ...@@ -37,7 +37,7 @@ function s.initial_effect(c)
e2:SetCondition(s.spcon) e2:SetCondition(s.spcon)
e2:SetCost(s.spcost) e2:SetCost(s.spcost)
e2:SetTarget(s.sptg) e2:SetTarget(s.sptg)
e2:SetOperation(s.spop) e2:SetOperation(s.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function s.CheckGroup(g,f,cg,min,max,...) function s.CheckGroup(g,f,cg,min,max,...)
...@@ -172,7 +172,7 @@ end ...@@ -172,7 +172,7 @@ end
function s.thop(e,tp,eg,ep,ev,re,r,rp) function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,2,2,nil) local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,2,2,nil)
if g:GetCount()>0 and Duel.SendtoHand(g,nil,REASON_EFFECT)>0 then if g:GetCount()>0 and Duel.SendtoHand(g,nil,REASON_EFFECT)>0 then
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
Duel.ShuffleHand(tp) Duel.ShuffleHand(tp)
Duel.BreakEffect() Duel.BreakEffect()
......
--曲奇猫妖★味奇喵运输 --クッキィ☆ヤミーウェイ
local s,id,o=GetID() local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
--synchro summon --synchro summon
......
--棒棒猫妖★味奇喵运输 --ロリポー☆ヤミーウェイ
local s,id,o=GetID() local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
--synchro summon --synchro summon
...@@ -14,7 +14,7 @@ function s.initial_effect(c) ...@@ -14,7 +14,7 @@ function s.initial_effect(c)
e0:SetValue(SUMMON_TYPE_SYNCHRO) e0:SetValue(SUMMON_TYPE_SYNCHRO)
c:RegisterEffect(e0) c:RegisterEffect(e0)
c:EnableReviveLimit() c:EnableReviveLimit()
--position change --special summon
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_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
...@@ -37,7 +37,7 @@ function s.initial_effect(c) ...@@ -37,7 +37,7 @@ function s.initial_effect(c)
e2:SetCondition(s.spcon) e2:SetCondition(s.spcon)
e2:SetCost(s.spcost) e2:SetCost(s.spcost)
e2:SetTarget(s.sptg) e2:SetTarget(s.sptg)
e2:SetOperation(s.spop) e2:SetOperation(s.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function s.CheckGroup(g,f,cg,min,max,...) function s.CheckGroup(g,f,cg,min,max,...)
......
...@@ -34,11 +34,11 @@ function s.stfilter(c,tp) ...@@ -34,11 +34,11 @@ function s.stfilter(c,tp)
return c:IsSetCard(0x2c8) and c:IsType(TYPE_FIELD) and not c:IsForbidden() and c:CheckUniqueOnField(tp) return c:IsSetCard(0x2c8) and c:IsType(TYPE_FIELD) and not c:IsForbidden() and c:CheckUniqueOnField(tp)
end end
function s.actg(e,tp,eg,ep,ev,re,r,rp,chk) function s.actg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(s.stfilter,tp,LOCATION_DECK,0,1,nil,tp) end if chk==0 then return Duel.IsExistingMatchingCard(s.stfilter,tp,LOCATION_DECK+LOCATION_HAND,0,1,nil,tp) end
end end
function s.acop(e,tp,eg,ep,ev,re,r,rp) function s.acop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
local tc=Duel.SelectMatchingCard(tp,s.stfilter,tp,LOCATION_DECK,0,1,1,nil,tp):GetFirst() local tc=Duel.SelectMatchingCard(tp,s.stfilter,tp,LOCATION_DECK+LOCATION_HAND,0,1,1,nil,tp):GetFirst()
if tc then if tc then
local fc=Duel.GetFieldCard(tp,LOCATION_SZONE,5) local fc=Duel.GetFieldCard(tp,LOCATION_SZONE,5)
if fc then if fc then
...@@ -47,6 +47,17 @@ function s.acop(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,6 +47,17 @@ function s.acop(e,tp,eg,ep,ev,re,r,rp)
end end
Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true) Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
end end
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetTargetRange(1,0)
e1:SetTarget(s.splimit)
e1:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp)
end
function s.splimit(e,c,tp,sumtp,sumpos)
return c:IsLinkAbove(3) and bit.band(sumtp,SUMMON_TYPE_LINK)==SUMMON_TYPE_LINK
end end
function s.sccon(e,tp,eg,ep,ev,re,r,rp) function s.sccon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2 or Duel.GetTurnPlayer()~=tp and Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE return Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2 or Duel.GetTurnPlayer()~=tp and Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE
......
...@@ -85,7 +85,8 @@ end ...@@ -85,7 +85,8 @@ end
function s.tdop(e,tp,eg,ep,ev,re,r,rp) function s.tdop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local sg=Duel.GetTargetsRelateToChain() local sg=Duel.GetTargetsRelateToChain()
if c:IsRelateToEffect(e) then g:AddCard(c) end if not c:IsRelateToEffect(e) then return end
sg:AddCard(c)
if #sg==0 then return end if #sg==0 then return end
aux.PlaceCardsOnDeckBottom(tp,sg) aux.PlaceCardsOnDeckBottom(tp,sg)
end end
\ No newline at end of file
...@@ -64,11 +64,11 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -64,11 +64,11 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
Duel.Destroy(tc,REASON_EFFECT) Duel.Destroy(tc,REASON_EFFECT)
end end
end end
function s.cfilter(c,tp,rp) function s.cfilter2(c,tp,rp)
return c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_MZONE) and rp==1-tp and c:IsReason(REASON_EFFECT) return c:IsPreviousPosition(POS_FACEUP) and c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_MZONE) and rp==1-tp and c:IsReason(REASON_EFFECT)
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 eg:IsExists(s.cfilter,1,nil,tp,rp) and not eg:IsContains(e:GetHandler()) return eg:IsExists(s.cfilter2,1,nil,tp,rp) and not eg:IsContains(e:GetHandler())
end end
function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
return c:IsSetCard(0x2c8) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsSetCard(0x2c8) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
...@@ -102,7 +102,8 @@ end ...@@ -102,7 +102,8 @@ end
function s.tdop(e,tp,eg,ep,ev,re,r,rp) function s.tdop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local sg=Duel.GetTargetsRelateToChain() local sg=Duel.GetTargetsRelateToChain()
if c:IsRelateToEffect(e) then g:AddCard(c) end if not c:IsRelateToEffect(e) then return end
sg:AddCard(c)
if #sg==0 then return end if #sg==0 then return end
aux.PlaceCardsOnDeckBottom(tp,sg) aux.PlaceCardsOnDeckBottom(tp,sg)
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