Commit 970d77ca authored by Amiya's avatar Amiya

修复

parent bf8ebeae
Pipeline #42559 passed with stages
in 2 minutes and 30 seconds
...@@ -56,7 +56,7 @@ function s.spcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -56,7 +56,7 @@ function s.spcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(s.cfilter,1,nil,tp) and not eg:IsContains(e:GetHandler()) return eg:IsExists(s.cfilter,1,nil,tp) and not eg:IsContains(e:GetHandler())
end end
function s.tgfilter(c,e) function s.tgfilter(c,e)
return c:IsLocation(LOCATION_GRAVE) and c:IsCanBeEffectTarget(e) and not c:IsAttack(0) return c:IsLocation(LOCATION_GRAVE) and c:IsCanBeEffectTarget(e)
end end
function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local c=e:GetHandler() local c=e:GetHandler()
...@@ -84,7 +84,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -84,7 +84,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetCode(EFFECT_SET_ATTACK_FINAL)
e1:SetValue(tc:GetAttack()) e1:SetValue(tc:GetAttack())
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
......
...@@ -68,7 +68,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -68,7 +68,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
local tg=sg:Select(tp,1,1,nil) local tg=sg:Select(tp,1,1,nil)
local tc=tg:GetFirst() local tc=tg:GetFirst()
if sg1:IsContains(tc) and (sg2==nil or not sg2:IsContains(tc) or not Duel.SelectYesNo(tp,ce:GetDescription())) then if sg1:IsContains(tc) and (sg2==nil or not sg2:IsContains(tc) or not Duel.SelectYesNo(tp,ce:GetDescription())) then
aux.FCheckAdditional=tc.branded_fusion_check or s.fcheck aux.FCheckAdditional=s.fcheck
local mat1=Duel.SelectFusionMaterial(tp,tc,mg1,nil,chkf) local mat1=Duel.SelectFusionMaterial(tp,tc,mg1,nil,chkf)
aux.FCheckAdditional=nil aux.FCheckAdditional=nil
tc:SetMaterial(mat1) tc:SetMaterial(mat1)
......
...@@ -52,7 +52,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -52,7 +52,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local ct,atk=e:GetLabel() local ct,atk=e:GetLabel()
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS) local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
local tg=g:Filter(Card.IsRelateToChain,nil) local tg=g:Filter(Card.IsRelateToChain,nil):Filter(Card.IsType,nil,TYPE_MONSTER)
local fid=c:GetFieldID() local fid=c:GetFieldID()
if tg:GetCount()>0 then if tg:GetCount()>0 then
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(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