Commit 87fa54ee authored by VanillaSalt's avatar VanillaSalt

fix

parent 7e465bd8
...@@ -11,7 +11,7 @@ function c18486927.initial_effect(c) ...@@ -11,7 +11,7 @@ function c18486927.initial_effect(c)
local e2=e1:Clone() local e2=e1:Clone()
e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCode(EVENT_SPSUMMON_SUCCESS)
c:RegisterEffect(e2) c:RegisterEffect(e2)
--name change (temp) --name change
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetDescription(aux.Stringid(18486927,0)) e3:SetDescription(aux.Stringid(18486927,0))
e3:SetType(EFFECT_TYPE_IGNITION) e3:SetType(EFFECT_TYPE_IGNITION)
...@@ -61,9 +61,12 @@ function c18486927.actcon(e) ...@@ -61,9 +61,12 @@ function c18486927.actcon(e)
end end
function c18486927.nametg(e,tp,eg,ep,ev,re,r,rp,chk) function c18486927.nametg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
local ac=Duel.AnnounceCardFilter(tp,0x51,OPCODE_ISSETCARD,18486927,OPCODE_ISCODE,OPCODE_NOT,OPCODE_AND) local code=e:GetHandler():GetCode()
--c:IsSetCard(0x51) and not c:IsCode(code)
c18486927.announce_filter={0x51,OPCODE_ISSETCARD,code,OPCODE_ISCODE,OPCODE_NOT,OPCODE_AND}
local ac=Duel.AnnounceCardFilter(tp,table.unpack(c18486927.announce_filter))
Duel.SetTargetParam(ac) Duel.SetTargetParam(ac)
Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD) Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD_FILTER)
end end
function c18486927.nameop(e,tp,eg,ep,ev,re,r,rp) function c18486927.nameop(e,tp,eg,ep,ev,re,r,rp)
local ac=Duel.GetChainInfo(0,CHAININFO_TARGET_PARAM) local ac=Duel.GetChainInfo(0,CHAININFO_TARGET_PARAM)
......
...@@ -24,7 +24,7 @@ function c50078320.initial_effect(c) ...@@ -24,7 +24,7 @@ function c50078320.initial_effect(c)
end end
function c50078320.condition(e,tp,eg,ep,ev,re,r,rp) function c50078320.condition(e,tp,eg,ep,ev,re,r,rp)
local ex,cg,ct,cp,cv=Duel.GetOperationInfo(ev,CATEGORY_ANNOUNCE) local ex,cg,ct,cp,cv=Duel.GetOperationInfo(ev,CATEGORY_ANNOUNCE)
return rp~=tp and ex and bit.band(cv,ANNOUNCE_CARD)~=0 return rp~=tp and ex and bit.band(cv,ANNOUNCE_CARD+ANNOUNCE_CARD_FILTER)~=0
end end
function c50078320.cost(e,tp,eg,ep,ev,re,r,rp,chk) function c50078320.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end
...@@ -32,8 +32,13 @@ function c50078320.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -32,8 +32,13 @@ function c50078320.cost(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function c50078320.operation(e,tp,eg,ep,ev,re,r,rp) function c50078320.operation(e,tp,eg,ep,ev,re,r,rp)
local ex,cg,ct,cp,cv=Duel.GetOperationInfo(ev,CATEGORY_ANNOUNCE) local ex,cg,ct,cp,cv=Duel.GetOperationInfo(ev,CATEGORY_ANNOUNCE)
local ac=0
Duel.Hint(HINT_SELECTMSG,tp,564) Duel.Hint(HINT_SELECTMSG,tp,564)
local ac=Duel.AnnounceCard(tp,cv) if bit.band(cv,ANNOUNCE_CARD)~=0 then
ac=Duel.AnnounceCard(tp,cv)
else
ac=Duel.AnnounceCardFilter(tp,table.unpack(re:GetHandler().announce_filter))
end
Duel.ChangeTargetParam(ev,ac) Duel.ChangeTargetParam(ev,ac)
end end
function c50078320.desfilter(c) function c50078320.desfilter(c)
......
...@@ -728,6 +728,7 @@ ACTIVITY_BATTLE_PHASE =6 -- not available in custom counter ...@@ -728,6 +728,7 @@ ACTIVITY_BATTLE_PHASE =6 -- not available in custom counter
ACTIVITY_CHAIN =7 -- only available in custom counter ACTIVITY_CHAIN =7 -- only available in custom counter
--announce type(宣言类型,CATEGORY_ANNOUNCE的OperationInfo的target_param) --announce type(宣言类型,CATEGORY_ANNOUNCE的OperationInfo的target_param)
ANNOUNCE_CARD =0x7 --宣言卡片 ANNOUNCE_CARD =0x7 --宣言卡片
ANNOUNCE_CARD_FILTER =0x8 --
--cards with double names --cards with double names
CARD_MARINE_DOLPHIN =78734254 --海洋海豚 CARD_MARINE_DOLPHIN =78734254 --海洋海豚
CARD_TWINKLE_MOSS =13857930 --光輝苔蘚 CARD_TWINKLE_MOSS =13857930 --光輝苔蘚
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