Commit f0e3b600 authored by wind2009's avatar wind2009

Merge remote-tracking branch 'upstream/24PP' into master

parents 02505d16 e001f856
...@@ -23,7 +23,7 @@ function s.initial_effect(c) ...@@ -23,7 +23,7 @@ function s.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
--destroy monster --destroy monster
local e4=Effect.CreateEffect(c) local e4=Effect.CreateEffect(c)
e4:SetCategory(CATEGORY_SPECIAL_SUMMON) e4:SetCategory(CATEGORY_DESTROY)
e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e4:SetCode(EVENT_ATTACK_ANNOUNCE) e4:SetCode(EVENT_ATTACK_ANNOUNCE)
e4:SetCountLimit(1) e4:SetCountLimit(1)
......
...@@ -55,7 +55,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -55,7 +55,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function s.atkcon(e,tp,eg,ep,ev,re,r,rp) function s.atkcon(e,tp,eg,ep,ev,re,r,rp)
return re:GetHandler():IsType(TYPE_SPELL) return re:IsActiveType(TYPE_SPELL) and re:IsHasType(EFFECT_TYPE_ACTIVATE)
end end
function s.atkfilter(c) function s.atkfilter(c)
return c:IsAttribute(ATTRIBUTE_FIRE) and c:IsFaceup() return c:IsAttribute(ATTRIBUTE_FIRE) and c:IsFaceup()
......
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