Commit b06d965b authored by wind2009's avatar wind2009

Merge branch 'patch-1' into 'master'

fix--リンカーネイト・アンヴェイル・メイル

See merge request mycard/pre-release-database-cdb!87
parents 33a86d01 d0877a40
Pipeline #28822 passed with stages
in 1 minute and 11 seconds
...@@ -27,6 +27,13 @@ function s.initial_effect(c) ...@@ -27,6 +27,13 @@ function s.initial_effect(c)
e3:SetTarget(s.eftg) e3:SetTarget(s.eftg)
e3:SetLabelObject(e2) e3:SetLabelObject(e2)
c:RegisterEffect(e3) c:RegisterEffect(e3)
--add type
local e6=Effect.CreateEffect(c)
e6:SetType(EFFECT_TYPE_EQUIP)
e6:SetCode(EFFECT_ADD_TYPE)
e6:SetCondition(s.addcon)
e6:SetValue(TYPE_EFFECT)
c:RegisterEffect(e6)
--equip from grave --equip from grave
local e4=Effect.CreateEffect(c) local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
...@@ -49,6 +56,9 @@ function s.ibcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -49,6 +56,9 @@ function s.ibcon(e,tp,eg,ep,ev,re,r,rp)
local ec=e:GetHandler():GetEquipTarget() local ec=e:GetHandler():GetEquipTarget()
return ec:IsType(TYPE_XYZ) and not ec:IsDisabled() return ec:IsType(TYPE_XYZ) and not ec:IsDisabled()
end end
function s.addcon(e)
return not e:GetHandler():IsType(TYPE_EFFECT)
end
function s.xyzcon(e,tp,eg,ep,ev,re,r,rp) function s.xyzcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetBattledGroupCount()>0 return e:GetHandler():GetBattledGroupCount()>0
end end
......
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