Skip to content

Commit

Permalink
Revert "Increases to maximum mana apply to shock effect (#3460)"
Browse files Browse the repository at this point in the history
This reverts commit 5f56b8e.
  • Loading branch information
SaloEater authored and LocalIdentity committed Oct 20, 2021
1 parent 5f56b8e commit 2d21ff8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
13 changes: 3 additions & 10 deletions src/Modules/CalcOffence.lua
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@ function calcs.offence(env, actor, activeSkill)
end
end
end

if skillModList:Flag(nil, "CastSpeedAppliesToAttacks") then
-- Get all increases for this; assumption is that multiple sources would not stack, so find the max
local multiplier = getConversionMultiplier("INC", "ImprovedCastSpeedAppliesToAttacks")
Expand All @@ -529,15 +530,7 @@ function calcs.offence(env, actor, activeSkill)
end
end
end
if skillModList:Flag(nil, "MaximumManaAppliesToShockEffect") then
-- Maximum Mana conversion from Lightning Mastery
local multiplier = getConversionMultiplier("INC", "ImprovedMaximumManaAppliesToShockEffect")
for i, value in ipairs(skillModList:Tabulate("INC", nil, "Mana")) do
local mod = value.mod
local modifiers = getConvertedModTags(mod, multiplier)
skillModList:NewMod("EnemyShockEffect", "INC", mod.value * multiplier, mod.source, mod.flags, mod.keywordFlags, unpack(modifiers))
end
end

if skillModList:Flag(nil, "ClawDamageAppliesToUnarmed") then
-- Claw Damage conversion from Rigwald's Curse
for i, value in ipairs(skillModList:Tabulate("INC", { flags = ModFlag.Claw, keywordFlags = KeywordFlag.Hit }, "Damage")) do
Expand Down Expand Up @@ -570,7 +563,7 @@ function calcs.offence(env, actor, activeSkill)
for i, value in ipairs(skillModList:Tabulate("INC", { flags = bor(ModFlag.Claw, ModFlag.Hit) }, "CritChance")) do
local mod = value.mod
if band(mod.flags, ModFlag.Claw) ~= 0 then
env.minion.modDB:NewMod("CritChance", mod.type, mod.value, mod.source)
env.minion.modDB:NewMod("CritChance", mod.type, mod.value, mod.source)
end
end
end
Expand Down
1 change: 0 additions & 1 deletion src/Modules/ModParser.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2077,7 +2077,6 @@ local specialModList = {
["increases and reductions to spell damage also apply to attacks"] = { flag("SpellDamageAppliesToAttacks"), mod("ImprovedSpellDamageAppliesToAttacks", "INC", 100) },
["increases and reductions to spell damage also apply to attacks at (%d+)%% of their value"] = function(num) return { flag("SpellDamageAppliesToAttacks"), mod("ImprovedSpellDamageAppliesToAttacks", "INC", num) } end,
["increases and reductions to spell damage also apply to attacks while wielding a wand"] = { flag("SpellDamageAppliesToAttacks", { type = "Condition", var = "UsingWand" }), mod("ImprovedSpellDamageAppliesToAttacks", "INC", 100, { type = "Condition", var = "UsingWand" }) },
["increases and reductions to maximum mana also apply to shock effect at (%d+)%% of their value"] = function(num) return { flag("MaximumManaAppliesToShockEffect"), mod("ImprovedMaximumManaAppliesToShockEffect", "INC", num) } end,
["modifiers to claw damage also apply to unarmed"] = { flag("ClawDamageAppliesToUnarmed") },
["modifiers to claw damage also apply to unarmed attack damage"] = { flag("ClawDamageAppliesToUnarmed") },
["modifiers to claw attack speed also apply to unarmed"] = { flag("ClawAttackSpeedAppliesToUnarmed") },
Expand Down

0 comments on commit 2d21ff8

Please sign in to comment.