Commit 86b75089 authored by Nemo Ma's avatar Nemo Ma

fix

parent 312d07df
...@@ -11,7 +11,7 @@ function cm.initial_effect(c) ...@@ -11,7 +11,7 @@ function cm.initial_effect(c)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e1:SetCode(EVENT_PHASE+PHASE_END) e1:SetCode(EVENT_PHASE+PHASE_END)
e1:SetCountLimit(1) e1:SetCountLimit(1)
e1:SetRange(LOCATION_FZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCondition(cm.tgcon) e1:SetCondition(cm.tgcon)
e1:SetTarget(cm.tgtg) e1:SetTarget(cm.tgtg)
e1:SetOperation(cm.tgop) e1:SetOperation(cm.tgop)
...@@ -22,6 +22,7 @@ function cm.initial_effect(c) ...@@ -22,6 +22,7 @@ function cm.initial_effect(c)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
e2:SetCondition(cm.rmcon)
e2:SetCost(cm.rmcost) e2:SetCost(cm.rmcost)
e2:SetTarget(cm.rmtg) e2:SetTarget(cm.rmtg)
e2:SetOperation(cm.rmop) e2:SetOperation(cm.rmop)
...@@ -136,6 +137,9 @@ end ...@@ -136,6 +137,9 @@ end
function cm.efilter2(e,te) function cm.efilter2(e,te)
return te:IsActiveType(TYPE_TRAP) return te:IsActiveType(TYPE_TRAP)
end end
function cm.rmcon(e,tp,eg,ep,ev,re,r,rp)
return bit.band(e:GetHandler():GetFlagEffectLabel(m),TYPE_MONSTER+TYPE_SPELL+TYPE_TRAP)==TYPE_MONSTER+TYPE_SPELL+TYPE_TRAP
end
function cm.rmcost(e,tp,eg,ep,ev,re,r,rp,chk) function cm.rmcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsReleasable() end if chk==0 then return e:GetHandler():IsReleasable() end
Duel.Release(e:GetHandler(),REASON_COST) Duel.Release(e:GetHandler(),REASON_COST)
......
...@@ -41,6 +41,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -41,6 +41,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST) Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)
end end
function cm.operation(e,tp,eg,ep,ev,re,r,rp) function cm.operation(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
......
...@@ -12,7 +12,7 @@ function cm.initial_effect(c) ...@@ -12,7 +12,7 @@ function cm.initial_effect(c)
e2:SetCode(EVENT_PHASE_START+PHASE_END) e2:SetCode(EVENT_PHASE_START+PHASE_END)
e2:SetRange(LOCATION_FZONE) e2:SetRange(LOCATION_FZONE)
e2:SetCountLimit(1) e2:SetCountLimit(1)
e2:SetOperation(cm.condition) e2:SetCondition(cm.condition)
e2:SetOperation(cm.operation) e2:SetOperation(cm.operation)
c:RegisterEffect(e2) c:RegisterEffect(e2)
local e3=Effect.CreateEffect(e:GetHandler()) local e3=Effect.CreateEffect(e:GetHandler())
...@@ -34,7 +34,6 @@ function cm.initial_effect(c) ...@@ -34,7 +34,6 @@ function cm.initial_effect(c)
Duel.AddCustomActivityCounter(m,ACTIVITY_CHAIN,cm.chainfilter) Duel.AddCustomActivityCounter(m,ACTIVITY_CHAIN,cm.chainfilter)
end end
function cm.chainfilter(re,tp,cid) function cm.chainfilter(re,tp,cid)
local attr=Duel.GetChainInfo(cid,CHAININFO_TRIGGERING_ATTRIBUTE)
return not (re:GetHandler():IsSetCard(0x144e)) return not (re:GetHandler():IsSetCard(0x144e))
end end
function cm.condition(e,tp,eg,ep,ev,re,r,rp) function cm.condition(e,tp,eg,ep,ev,re,r,rp)
......
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