Commit 77465098 authored by Nemo Ma's avatar Nemo Ma

Merge card fix

parent 21ab91f4
...@@ -85,7 +85,7 @@ function c33700066.operation1(e,tp,eg,ep,ev,re,r,rp) ...@@ -85,7 +85,7 @@ function c33700066.operation1(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_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
e1:SetValue(500) e1:SetValue(1000)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END) e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
local e2=e1:Clone() local e2=e1:Clone()
......
...@@ -112,18 +112,18 @@ function cm.SelfSpsummonOperation(e,tp,eg,ep,ev,re,r,rp) ...@@ -112,18 +112,18 @@ function cm.SelfSpsummonOperation(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tc=eg:GetFirst() local tc=eg:GetFirst()
if tc and e:GetHandler():IsRelateToEffect(e) and Duel.SpecialSummonStep(c,0,tp,tp,false,false,POS_FACEUP) then if tc and e:GetHandler():IsRelateToEffect(e) and Duel.SpecialSummonStep(c,0,tp,tp,false,false,POS_FACEUP) then
cm.Copy(c,code) cm.Copy(c,tc)
Duel.SpecialSummonComplete() Duel.SpecialSummonComplete()
end end
end end
function cm.copyfilter(c) function cm.copyfilter(c)
return c:IsFaceup() and c:IsSummonType(SUMMON_TYPE_SPECIAL) return c:IsFaceup() and c:IsSummonType(SUMMON_TYPE_SPECIAL) and not c:IsCode(m)
end end
function cm.copytg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function cm.copytg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and cm.copyfilter(chkc) end if chkc then return chkc:IsLocation(LOCATION_MZONE) and cm.copyfilter(chkc) and c~=e:GetHandler() end
if chk==0 then return Duel.IsExistingTarget(cm.copyfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) and e:GetHandler():GetFlagEffect(m-700000)==0 end if chk==0 then return Duel.IsExistingTarget(cm.copyfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,e:GetHandler()) and e:GetHandler():GetFlagEffect(m-700000)==0 end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
Duel.SelectTarget(tp,cm.copyfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil) Duel.SelectTarget(tp,cm.copyfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,e:GetHandler())
end end
function cm.copyop(e,tp,eg,ep,ev,re,r,rp) function cm.copyop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
......
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