Commit 534c3c65 authored by Huangnan's avatar Huangnan

fix

parent ea2bbe55
Pipeline #35848 passed with stages
in 21 minutes and 36 seconds
...@@ -17,7 +17,7 @@ function cm.initial_effect(c) ...@@ -17,7 +17,7 @@ function cm.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--imn --imn
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(id,1)) e2:SetDescription(aux.Stringid(m,1))
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e2:SetCode(EVENT_CHAIN_SOLVING) e2:SetCode(EVENT_CHAIN_SOLVING)
e2:SetRange(LOCATION_HAND) e2:SetRange(LOCATION_HAND)
......
...@@ -36,14 +36,12 @@ function s.costtg(e,te,tp) ...@@ -36,14 +36,12 @@ function s.costtg(e,te,tp)
e:SetLabelObject(te:GetHandler()) e:SetLabelObject(te:GetHandler())
return true return true
end end
function s.costchk(e,tp,eg,ep,ev,re,r,rp,chk) function s.costchk(e,te_or_c,tp)
if chk==0 then return true end
local tc=e:GetLabelObject() local tc=e:GetLabelObject()
local typ=tc:GetType()&0x7 local typ=tc:GetType()&0x7
return Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_HAND,0,1,tc,typ) return Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_HAND,0,1,tc,typ)
end end
function s.costop(e,tp,eg,ep,ev,re,r,rp) function s.costop(e,tp,eg,ep,ev,re,r,rp)
local ctype=0
local tc=e:GetLabelObject() local tc=e:GetLabelObject()
local typ=tc:GetType()&0x7 local typ=tc:GetType()&0x7
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
......
...@@ -94,7 +94,7 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -94,7 +94,7 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
return (ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE) return (ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE)
end end
function cm.rfilter(c) function cm.rfilter(c)
return c:IsSetCard(0x82b) and c:IsAbleToDeck() return c:IsSetCard(0x82b) and c:IsType(TYPE_MONSTER) and c:IsAbleToDeck()
end end
function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk) function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(cm.rfilter,tp,LOCATION_GRAVE,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(cm.rfilter,tp,LOCATION_GRAVE,0,1,nil) end
......
...@@ -6,7 +6,6 @@ function cm.initial_effect(c) ...@@ -6,7 +6,6 @@ function cm.initial_effect(c)
aux.AddLinkProcedure(c,cm.matfilter,2,99) aux.AddLinkProcedure(c,cm.matfilter,2,99)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(m,0))
e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE) e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE)
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetTargetRange(0,LOCATION_MZONE) e1:SetTargetRange(0,LOCATION_MZONE)
...@@ -16,7 +15,7 @@ function cm.initial_effect(c) ...@@ -16,7 +15,7 @@ function cm.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(m,1)) e2:SetDescription(aux.Stringid(m,0))
e2:SetCategory(CATEGORY_DESTROY+CATEGORY_ATKCHANGE) e2:SetCategory(CATEGORY_DESTROY+CATEGORY_ATKCHANGE)
e2:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_SINGLE) e2:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_SINGLE)
e2:SetCode(EVENT_BATTLE_START) e2:SetCode(EVENT_BATTLE_START)
...@@ -27,7 +26,7 @@ function cm.initial_effect(c) ...@@ -27,7 +26,7 @@ function cm.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetDescription(aux.Stringid(m,2)) e3:SetDescription(aux.Stringid(m,1))
e3:SetCategory(CATEGORY_RECOVER) e3:SetCategory(CATEGORY_RECOVER)
e3:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_FIELD) e3:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_FIELD)
e3:SetCode(EVENT_PHASE+PHASE_BATTLE) e3:SetCode(EVENT_PHASE+PHASE_BATTLE)
......
...@@ -4,6 +4,7 @@ function s.initial_effect(c) ...@@ -4,6 +4,7 @@ function s.initial_effect(c)
--①:从自己的卡组·墓地选1只「现界」怪兽或「被遗忘的余烬」 加入自己的手卡。 --①:从自己的卡组·墓地选1只「现界」怪兽或「被遗忘的余烬」 加入自己的手卡。
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(id,0)) e1:SetDescription(aux.Stringid(id,0))
e1:SetCountLimit(1,id)
e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
......
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