Commit 7d26398b authored by Amiya's avatar Amiya

Merge branch 'master' of git.moenext.com:mycard/pre-release-database-cdb

parents e76962fe c94f83f8
Pipeline #40009 passed with stages
in 3 minutes and 30 seconds
...@@ -61,9 +61,15 @@ end ...@@ -61,9 +61,15 @@ end
function s.damcon(e,tp,eg,ep,ev,re,r,rp) function s.damcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if not eg:IsContains(c) then return false end if not eg:IsContains(c) then return false end
if not re or not re:IsActivated() then return true end if not re or not re:IsActivated() then
e:SetLabel(0)
return true
end
local rc=re:GetHandler() local rc=re:GetHandler()
if not rc then return true end if not rc then
e:SetLabel(0)
return true
end
if c:IsReason(REASON_EFFECT) if c:IsReason(REASON_EFFECT)
and (eg:IsContains(re:GetHandler()) and rc:GetPreviousCodeOnField()==73580471 and (eg:IsContains(re:GetHandler()) and rc:GetPreviousCodeOnField()==73580471
or not eg:IsContains(re:GetHandler()) and rc:IsCode(73580471)) then or not eg:IsContains(re:GetHandler()) and rc:IsCode(73580471)) then
......
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