Commit 0cf9fdbf authored by Nemo Ma's avatar Nemo Ma

fix

parent 83026835
...@@ -79,10 +79,9 @@ end ...@@ -79,10 +79,9 @@ end
function cm.zones(e,tp,eg,ep,ev,re,r,rp) function cm.zones(e,tp,eg,ep,ev,re,r,rp)
local lg=Duel.GetMatchingGroup(cm.cfilter,tp,LOCATION_MZONE,LOCATION_MZONE,nil) local lg=Duel.GetMatchingGroup(cm.cfilter,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
local zone=0 local zone=0
for x=0,4 do for i=0,4 do
for lc in aux.Next(lg) do for lc in aux.Next(lg) do
local x,y=cm.xylabel(lc,tp) if cm.islinkdir(lc,i,0,tp) then zone=zone|(1<<i) end
if cm.islinkdir(lc,x,0,tp) then zone=zone|(1<<x) end
end end
end end
return zone return zone
......
...@@ -88,7 +88,7 @@ function cm.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -88,7 +88,7 @@ function cm.desop(e,tp,eg,ep,ev,re,r,rp)
e4:SetCode(EFFECT_DISABLE) e4:SetCode(EFFECT_DISABLE)
e4:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD) e4:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
e4:SetTarget(cm.distg) e4:SetTarget(cm.distg)
e4:SetLabel(tc:GetOriginalCode()) e4:SetLabelObject(tc)
e4:SetReset(RESET_PHASE+PHASE_END) e4:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e4,tp) Duel.RegisterEffect(e4,tp)
local e5=Effect.CreateEffect(c) local e5=Effect.CreateEffect(c)
...@@ -96,7 +96,7 @@ function cm.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -96,7 +96,7 @@ function cm.desop(e,tp,eg,ep,ev,re,r,rp)
e5:SetCode(EVENT_CHAIN_SOLVING) e5:SetCode(EVENT_CHAIN_SOLVING)
e5:SetCondition(cm.discon) e5:SetCondition(cm.discon)
e5:SetOperation(cm.disop) e5:SetOperation(cm.disop)
e5:SetLabel(tc:GetOriginalCode()) e5:SetLabelObject(tc)
e5:SetReset(RESET_PHASE+PHASE_END) e5:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e5,tp) Duel.RegisterEffect(e5,tp)
end end
...@@ -104,14 +104,13 @@ function cm.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -104,14 +104,13 @@ function cm.desop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function cm.distg(e,c) function cm.distg(e,c)
local code=e:GetLabel() local tc=e:GetLabelObject()
local code1,code2=c:GetOriginalCodeRule() return tc and c:IsOriginalCodeRule(tc:GetOriginalCodeRule())
return code1==code or code2==code
end end
function cm.discon(e,tp,eg,ep,ev,re,r,rp) function cm.discon(e,tp,eg,ep,ev,re,r,rp)
local code=e:GetLabel() local rc=re:GetHandler()
local code1,code2=re:GetHandler():GetOriginalCodeRule() local tc=e:GetLabelObject()
return code1==code or code2==code return rc:IsOriginalCodeRule(tc:GetOriginalCodeRule())
end end
function cm.disop(e,tp,eg,ep,ev,re,r,rp) function cm.disop(e,tp,eg,ep,ev,re,r,rp)
Duel.NegateEffect(ev) Duel.NegateEffect(ev)
......
...@@ -105,16 +105,26 @@ function cm.bombop(e,tp,eg,ep,ev,re,r,rp) ...@@ -105,16 +105,26 @@ function cm.bombop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_DISABLE) e1:SetCode(EFFECT_DISABLE)
e1:SetReset(RESET_EVENT+0x17a0000) e1:SetReset(RESET_EVENT+RESET_EVENT+RESETS_STANDARD-RESET_TOGRAVE-RESET_REMOVE)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
local e2=Effect.CreateEffect(e:GetHandler()) local e2=Effect.CreateEffect(e:GetHandler())
e2:SetType(EFFECT_TYPE_SINGLE) e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetCode(EFFECT_DISABLE_EFFECT)
e2:SetReset(RESET_EVENT+0x17a0000) e2:SetReset(RESET_EVENT+RESET_EVENT+RESETS_STANDARD-RESET_TOGRAVE-RESET_REMOVE)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
e3:SetCode(EVENT_CHAIN_SOLVING)
e3:SetOperation(cm.disop1)
e3:SetLabelObject(tc)
e3:SetReset(RESET_EVENT+RESET_EVENT+RESETS_STANDARD-RESET_TOGRAVE-RESET_REMOVE)
tc:RegisterEffect(e3)
end end
end end
end end
function cm.disop1(e,tp,eg,ep,ev,re,r,rp)
Duel.NegateEffect(ev)
end
function cm.efilter1(e,re) function cm.efilter1(e,re)
return e:GetHandler()~=re:GetHandler() return e:GetHandler()~=re:GetHandler()
end end
local m=31400056 local m=31400058
local cm=_G["c"..m] local cm=_G["c"..m]
cm.name="星兹剑术大师" cm.name="星兹剑术大师"
function cm.initial_effect(c) function cm.initial_effect(c)
......
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