Commit 9c4dc5b9 authored by POLYMER's avatar POLYMER

fix

parent f1342dcb
...@@ -41,7 +41,7 @@ function s.initial_effect(c) ...@@ -41,7 +41,7 @@ function s.initial_effect(c)
c:RegisterEffect(e32) c:RegisterEffect(e32)
--Column Wipe --Column Wipe
local e4=Effect.CreateEffect(c) local e4=Effect.CreateEffect(c)
e4:SetDescription(aux.Stringid(id,1)) e4:SetDescription(aux.Stringid(id,2))
e4:SetCategory(CATEGORY_TOGRAVE+CATEGORY_COUNTER) e4:SetCategory(CATEGORY_TOGRAVE+CATEGORY_COUNTER)
e4:SetType(EFFECT_TYPE_QUICK_O) e4:SetType(EFFECT_TYPE_QUICK_O)
e4:SetCode(EVENT_CHAINING) e4:SetCode(EVENT_CHAINING)
...@@ -54,7 +54,7 @@ function s.initial_effect(c) ...@@ -54,7 +54,7 @@ function s.initial_effect(c)
--Effect 2: Attack Boost & Multi Attack --Effect 2: Attack Boost & Multi Attack
local e5=Effect.CreateEffect(c) local e5=Effect.CreateEffect(c)
e5:SetDescription(aux.Stringid(id,2)) e5:SetDescription(aux.Stringid(id,3))
e5:SetCategory(CATEGORY_ATKCHANGE) e5:SetCategory(CATEGORY_ATKCHANGE)
e5:SetType(EFFECT_TYPE_QUICK_O) e5:SetType(EFFECT_TYPE_QUICK_O)
e5:SetCode(EVENT_FREE_CHAIN) e5:SetCode(EVENT_FREE_CHAIN)
......
...@@ -152,11 +152,12 @@ function s.cpop(e,tp,eg,ep,ev,re,r,rp) ...@@ -152,11 +152,12 @@ function s.cpop(e,tp,eg,ep,ev,re,r,rp)
if ac==code then if ac==code then
ht[code]=true ht[code]=true
local cdata=s.findeffect(te) local cdata=s.findeffect(te)
local id=cdata.id[1] local cid=cdata.id[1]
if not ht2[id] then if not cid then Debug.Message("!") end
ht2[id]=true if cid and not ht2[cid] then
ht2[cid]=true
table.insert(effects,cdata) table.insert(effects,cdata)
table.insert(numbers,id) table.insert(numbers,cid)
end end
end end
end end
......
...@@ -40,19 +40,19 @@ function s.costfilter(c,e,tp) ...@@ -40,19 +40,19 @@ function s.costfilter(c,e,tp)
end end
function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
if chk==0 then return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_HAND,0,1,c,e,tp) end if chk==0 then return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_HAND,0,1,c,e,tp) and not c:IsPublic() end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
local sc=Duel.SelectMatchingCard(tp,s.costfilter,tp,LOCATION_HAND,0,1,1,c,e,tp):GetFirst() local sc=Duel.SelectMatchingCard(tp,s.costfilter,tp,LOCATION_HAND,0,1,1,c,e,tp):GetFirst()
Duel.ConfirmCards(1-tp,sc) Duel.ConfirmCards(1-tp,sc)
local fid=c:GetFieldID() local fid=c:GetFieldID()
c:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN,EFFECT_FLAG_CLIENT_HINT,1,fid,66) c:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,fid,66)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_PUBLIC) e1:SetCode(EFFECT_PUBLIC)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
c:RegisterEffect(e1) c:RegisterEffect(e1)
local fid=sc:GetFieldID() local fid=sc:GetFieldID()
sc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN,EFFECT_FLAG_CLIENT_HINT,1,fid,66) sc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,fid,66)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE) e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetCode(EFFECT_PUBLIC) e2:SetCode(EFFECT_PUBLIC)
......
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