Skip to content

Fix a couple of cases where Rage did not work correctly #1081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 25, 2020
Merged

Fix a couple of cases where Rage did not work correctly #1081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d96b355
Fix a couple of cases where Rage did not work correctly
Quotae Jun 22, 2020
2fe7f25
Add parsing for War Bringer
Quotae Jun 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Data/3_0/Skills/sup_str.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2636,7 +2636,7 @@ skills["SupportRage"] = {
statDescriptionScope = "gem_stat_descriptions",
statMap = {
["support_rage_gain_rage_on_melee_hit_cooldown_ms"] = {
flag("Condition:CanGainRage"),
flag("Condition:CanGainRage", { type = "GlobalEffect", effectType = "Buff" }),
mod("Dummy", "DUMMY", 1, 0, 0, { type = "Condition", var = "CanGainRage" }),
},
["attack_minimum_added_physical_damage_with_at_least_10_rage"] = {
Expand All @@ -2646,10 +2646,10 @@ skills["SupportRage"] = {
mod("PhysicalMax", "BASE", nil, bit.bor(ModFlag.Attack, ModFlag.Weapon), 0, { type = "MultiplierThreshold", var = "Rage", threshold = 10 })
},
["attack_minimum_added_physical_damage_per_10_rage"] = {
mod("PhysicalMin", "BASE", nil, bit.bor(ModFlag.Attack, ModFlag.Weapon), 0, { type = "Multiplier", var = "Rage", div = 10, limit = 5 })
mod("PhysicalMin", "BASE", nil, bit.bor(ModFlag.Attack, ModFlag.Weapon), 0, { type = "Multiplier", var = "Rage", div = 10 })
},
["attack_maximum_added_physical_damage_per_10_rage"] = {
mod("PhysicalMax", "BASE", nil, bit.bor(ModFlag.Attack, ModFlag.Weapon), 0, { type = "Multiplier", var = "Rage", div = 10, limit = 5 })
mod("PhysicalMax", "BASE", nil, bit.bor(ModFlag.Attack, ModFlag.Weapon), 0, { type = "Multiplier", var = "Rage", div = 10 })
},
},
baseMods = {
Expand Down
6 changes: 3 additions & 3 deletions Export/Skills/sup_str.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ local skills, mod, flag, skill = ...
#skill SupportRage
statMap = {
["support_rage_gain_rage_on_melee_hit_cooldown_ms"] = {
flag("Condition:CanGainRage"),
flag("Condition:CanGainRage", { type = "GlobalEffect", effectType = "Buff" } ),
mod("Dummy", "DUMMY", 1, 0, 0, { type = "Condition", var = "CanGainRage" }),
},
["attack_minimum_added_physical_damage_with_at_least_10_rage"] = {
Expand All @@ -328,10 +328,10 @@ local skills, mod, flag, skill = ...
mod("PhysicalMax", "BASE", nil, bit.bor(ModFlag.Attack, ModFlag.Weapon), 0, { type = "MultiplierThreshold", var = "Rage", threshold = 10 })
},
["attack_minimum_added_physical_damage_per_10_rage"] = {
mod("PhysicalMin", "BASE", nil, bit.bor(ModFlag.Attack, ModFlag.Weapon), 0, { type = "Multiplier", var = "Rage", div = 10, limit = 5 })
mod("PhysicalMin", "BASE", nil, bit.bor(ModFlag.Attack, ModFlag.Weapon), 0, { type = "Multiplier", var = "Rage", div = 10 })
},
["attack_maximum_added_physical_damage_per_10_rage"] = {
mod("PhysicalMax", "BASE", nil, bit.bor(ModFlag.Attack, ModFlag.Weapon), 0, { type = "Multiplier", var = "Rage", div = 10, limit = 5 })
mod("PhysicalMax", "BASE", nil, bit.bor(ModFlag.Attack, ModFlag.Weapon), 0, { type = "Multiplier", var = "Rage", div = 10 })
},
},
#mods
Expand Down
2 changes: 2 additions & 0 deletions Modules/CalcDefence-3_0.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,8 @@ function calcs.defence(env, actor)
end
end
if modDB:Sum("BASE", nil, "RageRegen") > 0 then
modDB:NewMod("Condition:CanGainRage", "FLAG", true, "RageRegen")
modDB:NewMod("Dummy", "DUMMY", 1, "RageRegen", 0, { type = "Condition", var = "CanGainRage" }) -- Make the Configuration option appear
local base = modDB:Sum("BASE", nil, "RageRegen")
if modDB:Flag(nil, "ManaRegenToRageRegen") then
local mana = modDB:Sum("INC", nil, "ManaRegen")
Expand Down
2 changes: 1 addition & 1 deletion Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ local function doActorMisc(env, actor)
modDB:NewMod("ChaosDamage", "MORE", 10 * effect, "Infusion")
end
end
if modDB:Flag(nil, "Condition:CanGainRage") then
if modDB:Flag(nil, "Condition:CanGainRage") or modDB:Sum("BASE", nil, "RageRegen") > 0 then
output.MaximumRage = modDB:Sum("BASE", skillCfg, "MaximumRage")
modDB:NewMod("Multiplier:Rage", "BASE", 1, "Base", { type = "Multiplier", var = "RageStack", limit = output.MaximumRage })
end
Expand Down
4 changes: 4 additions & 0 deletions Modules/ModParser-3_0.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,10 @@ local specialModList = {
["cannot be stunned while you have at least (%d+) rage"] = function(num) return { mod("AvoidStun", "BASE", 100, { type = "MultiplierThreshold", var = "Rage", threshold = 25 }) } end,
["lose ([%d%.]+)%% of life per second per rage while you are not losing rage"] = function(num) return { mod("LifeDegen", "BASE", 1, { type = "PercentStat", stat = "Life", percent = num }, { type = "Multiplier", var = "Rage", limit = 50 }) } end,
["if you've warcried recently, you and nearby allies have (%d+)%% increased attack speed"] = function(num) return { mod("ExtraAura", "LIST", { mod = mod("Speed", "INC", num, nil, ModFlag.Attack) }, { type = "Condition", var = "UsedWarcryRecently" }) } end,
["warcries grant (%d+) rage per (%d+) power if you have less than (%d+) rage"] = {
flag("Condition:CanGainRage"),
mod("Dummy", "DUMMY", 1, { type = "Condition", var = "CanGainRage" }), -- Make the Configuration option appear
},
-- Champion
["you have fortify"] = { flag("Condition:Fortify") },
["cannot be stunned while you have fortify"] = { mod("AvoidStun", "BASE", 100, { type = "Condition", var = "Fortify" }) },
Expand Down