Commit 8cb2cff2 authored by POLYMER's avatar POLYMER

fix

parent 237b6dd3
...@@ -91,7 +91,7 @@ function cm.chop(e,tp,eg,ep,ev,re,r,rp) ...@@ -91,7 +91,7 @@ function cm.chop(e,tp,eg,ep,ev,re,r,rp)
Duel.ChangeChainOperation(ev,cm.repop) Duel.ChangeChainOperation(ev,cm.repop)
end end
function cm.repop(e,tp,eg,ep,ev,re,r,rp) function cm.repop(e,tp,eg,ep,ev,re,r,rp)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(e:GetHandler())
e2:SetType(EFFECT_TYPE_FIELD) e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_DISABLE) e2:SetCode(EFFECT_DISABLE)
e2:SetTargetRange(0,LOCATION_ONFIELD) e2:SetTargetRange(0,LOCATION_ONFIELD)
......
...@@ -53,7 +53,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -53,7 +53,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then if chk==0 then
if e:GetLabel()~=100 then return false end if e:GetLabel()~=100 then return false end
e:SetLabel(0) e:SetLabel(0)
return Duel.GetLocationCount(tp,LOCATION_MZONE)>-1 return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
and Duel.IsExistingMatchingCard(s.spfilter1,tp,LOCATION_DECK,0,1,nil,e,tp) and Duel.IsExistingMatchingCard(s.spfilter1,tp,LOCATION_DECK,0,1,nil,e,tp)
end end
e:SetLabel(0) e:SetLabel(0)
......
...@@ -77,7 +77,8 @@ function s.adjustop(e,tp,eg,ep,ev,re,r,rp) ...@@ -77,7 +77,8 @@ function s.adjustop(e,tp,eg,ep,ev,re,r,rp)
end end
BlackLotus_ElementSaber_Effect={} BlackLotus_ElementSaber_Effect={}
Card.RegisterEffect=function(card,effect,flag) Card.RegisterEffect=function(card,effect,flag)
if effect and s.GetRange(effect)==LOCATION_MZONE and (effect:IsHasType(EFFECT_TYPE_QUICK_O) or effect:IsHasType(EFFECT_TYPE_IGNITION)) then if effect and s.GetRange(effect)==LOCATION_MZONE and ((effect:IsHasType(EFFECT_TYPE_QUICK_O) and bit.band(effect:GetCode(),EVENT_FREE_CHAIN)==EVENT_FREE_CHAIN) or effect:IsHasType(EFFECT_TYPE_IGNITION)) then
--Duel.Hint(HINT_CARD,0,card:GetCode())
local eff=effect:Clone() local eff=effect:Clone()
BlackLotus_ElementSaber_Effect[card:GetCode()]=eff BlackLotus_ElementSaber_Effect[card:GetCode()]=eff
end end
...@@ -215,11 +216,12 @@ end ...@@ -215,11 +216,12 @@ end
function s.cptg(e,tp,eg,ep,ev,re,r,rp,chk) function s.cptg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
local ce=BlackLotus_ElementSaber_Effect[c:GetOriginalCode()] local ce=BlackLotus_ElementSaber_Effect[c:GetOriginalCode()]
local tg=ce:GetTarget() local tg=nil
if ce then tg=ce:GetTarget() end
if chk==0 then if chk==0 then
return ce and (not tg or tg(e,tp,eg,ep,ev,re,r,rp,0)) return ce and (not tg or tg(e,tp,eg,ep,ev,re,r,rp,0))
end end
local ce=BlackLotus_ElementSaber_Effect[c:GetOriginalCode()] --local ce=BlackLotus_ElementSaber_Effect[c:GetOriginalCode()]
e:SetProperty(ce:GetProperty()) e:SetProperty(ce:GetProperty())
if tg then tg(e,tp,ceg,cep,cev,cre,cr,crp,1) end if tg then tg(e,tp,ceg,cep,cev,cre,cr,crp,1) end
ce:SetLabelObject(e:GetLabelObject()) ce:SetLabelObject(e:GetLabelObject())
......
...@@ -637,6 +637,7 @@ ...@@ -637,6 +637,7 @@
!setname 0x47fb 亚克 !setname 0x47fb 亚克
#水镜 #水镜
!setname 0xff0 契灵
!setname 0xff7 式神 !setname 0xff7 式神
#紫宵 (PurpleNightfall) 114 0x970-0x97f #紫宵 (PurpleNightfall) 114 0x970-0x97f
...@@ -810,6 +811,7 @@ ...@@ -810,6 +811,7 @@
!setname 0x662e 圣兽装骑·蜂 !setname 0x662e 圣兽装骑·蜂
!setname 0x962e 圣兽装骑·骸 !setname 0x962e 圣兽装骑·骸
!setname 0x642 伊兹尼亚 !setname 0x642 伊兹尼亚
!setname 0x6a2 大世环
!counter 0x62b 万世铭指示物 !counter 0x62b 万世铭指示物
#MEKK #MEKK
......
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