Skip to content

Added sources of gaining rage #1613

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

Open
MrHB212 wants to merge 10 commits into
base: dev
Choose a base branch
from
+23 −10
Open

Added sources of gaining rage #1613

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
14e5cc5
calc tab shows rage gain whent hit and on melee hit
MrHB212 Dec 15, 2025
c3a1392
deleted previously added line
MrHB212 Dec 15, 2025
46060ef
deleted another useless line
MrHB212 Dec 16, 2025
ced2e68
fixed maximum rage while shapeshifted
MrHB212 Dec 16, 2025
2326ae2
Revert "fixed maximum rage while shapeshifted"
MrHB212 Dec 17, 2025
4e2cfe7
review
MrHB212 Jan 13, 2026
1191ae5
review - calc breakdown fix
MrHB212 Jan 13, 2026
9e2833d
added rage support into calculation
MrHB212 Jan 13, 2026
f67d6fb
Fury of the Mountain, Maul
MrHB212 Jan 13, 2026
061a28b
Update CalcPerform.lua
MrHB212 Jan 15, 2026
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
8 changes: 4 additions & 4 deletions src/Data/ModCache.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4927,7 +4927,7 @@ c["Gain 1 Life Flask Charge per 4% Life spent"]={{[1]={flags=0,keywordFlags=0,na
c["Gain 1 Life Flask Charge per 4% Life spent On Hitting an Enemy while a Life Flask is at full Charges, 40% of its Charges are consumed"]={{[1]={flags=4,keywordFlags=0,name="Life",type="BASE",value=1}}," Flask Charge per 4% Life spent ting an Enemy while a Life Flask is at full Charges, 40% of its Charges are consumed "}
c["Gain 1 Life Flask Charge per 4% Life spent On Hitting an Enemy while a Life Flask is at full Charges, 40% of its Charges are consumed Gain 1% of damage as Physical damage for 3 seconds per Charge consumed this way"]={{[1]={flags=4,keywordFlags=0,name="LifeAsPhysical",type="BASE",value=1}}," Flask Charge per 4% Life spent ting an Enemy while a Life Flask is at full Charges, 40% of its Charges are consumed Gain 1% of damage per Charge consumed this way "}
c["Gain 1 Rage on Melee Axe Hit"]={{[1]={flags=0,keywordFlags=0,name="Condition:CanGainRage",type="FLAG",value=true}},nil}
c["Gain 1 Rage on Melee Hit"]={{[1]={flags=0,keywordFlags=0,name="Condition:CanGainRage",type="FLAG",value=true}},nil}
c["Gain 1 Rage on Melee Hit"]={{[1]={flags=0,keywordFlags=0,name="RageOnMeleeHit",type="BASE",value=1},[2]={flags=0,keywordFlags=0,name="Condition:CanGainRage",type="FLAG",value=true}},nil}
c["Gain 1 Rage when your Hit Ignites a target"]={{}," Rage when your Hit Ignites a target "}
c["Gain 1 Volatility on inflicting an Elemental Ailment"]={{}," Volatility on inflicting an Elemental Ailment "}
c["Gain 1 Volatility on inflicting an Elemental Ailment Take no Damage from Volatility"]={{[1]={flags=0,keywordFlags=0,name="Damage",type="BASE",value=1}}," Volatility on inflicting an Elemental Ailment Take no from Volatility "}
Expand Down Expand Up @@ -4971,7 +4971,7 @@ c["Gain 15% of maximum Life as Extra maximum Energy Shield"]={{[1]={flags=0,keyw
c["Gain 18 Mana per enemy killed"]={{[1]={flags=0,keywordFlags=0,name="ManaOnKill",type="BASE",value=18}},nil}
c["Gain 18% of Physical Damage as Extra Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageGainAsLightning",type="BASE",value=18}},nil}
c["Gain 2 Rage on Melee Axe Hit"]={{[1]={flags=0,keywordFlags=0,name="Condition:CanGainRage",type="FLAG",value=true}},nil}
c["Gain 2 Rage when Hit by an Enemy"]={{[1]={flags=0,keywordFlags=0,name="Condition:CanGainRage",type="FLAG",value=true}},nil}
c["Gain 2 Rage when Hit by an Enemy"]={{[1]={flags=0,keywordFlags=0,name="RageWhenHit",type="BASE",value=2},[2]={flags=0,keywordFlags=0,name="Condition:CanGainRage",type="FLAG",value=true}},nil}
c["Gain 2% of Damage as Extra Fire Damage per Endurance Charge consumed Recently"]={{[1]={[1]={type="Multiplier",var="EnduranceCharge"},flags=0,keywordFlags=0,name="DamageGainAsFire",type="BASE",value=2}}," consumed Recently "}
c["Gain 20 Energy Shield when you Block"]={{[1]={flags=0,keywordFlags=0,name="EnergyShieldOnBlock",type="BASE",value=20}},nil}
c["Gain 20 Life per enemy killed"]={{[1]={flags=0,keywordFlags=0,name="LifeOnKill",type="BASE",value=20}},nil}
Expand All @@ -4992,7 +4992,7 @@ c["Gain 26% of Damage as Extra Lightning Damage"]={{[1]={flags=0,keywordFlags=0,
c["Gain 27% of Damage as Extra Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="DamageGainAsChaos",type="BASE",value=27}},nil}
c["Gain 3 Life per Enemy Hit with Attacks"]={{[1]={flags=4,keywordFlags=65536,name="LifeOnHit",type="BASE",value=3}},nil}
c["Gain 3 Life per enemy killed"]={{[1]={flags=0,keywordFlags=0,name="LifeOnKill",type="BASE",value=3}},nil}
c["Gain 3 Rage when Hit by an Enemy"]={{[1]={flags=0,keywordFlags=0,name="Condition:CanGainRage",type="FLAG",value=true}},nil}
c["Gain 3 Rage when Hit by an Enemy"]={{[1]={flags=0,keywordFlags=0,name="RageWhenHit",type="BASE",value=3},[2]={flags=0,keywordFlags=0,name="Condition:CanGainRage",type="FLAG",value=true}},nil}
c["Gain 3 Volatility when an Allied Persistent Reviving Minion is Killed"]={{}," Volatility when an Allied Persistent Reviving is Killed "}
c["Gain 3% of Damage as Chaos Damage per Undead Minion"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="DamageAsChaos",type="BASE",value=3}}}}," per Undead "}
c["Gain 3% of Damage as Chaos Damage per Undead Minion Gain 5% of Damage as Chaos Damage per Undead Minion"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="DamageAsChaos",type="BASE",value=3}}}}," per Undead Gain 5% of Damage as Chaos Damage per Undead Minion "}
Expand All @@ -5017,7 +5017,7 @@ c["Gain 5 Life per Enemy Hit with Attacks"]={{[1]={flags=4,keywordFlags=65536,na
c["Gain 5 Life per enemy killed"]={{[1]={flags=0,keywordFlags=0,name="LifeOnKill",type="BASE",value=5}},nil}
c["Gain 5 Mana per enemy killed"]={{[1]={flags=0,keywordFlags=0,name="ManaOnKill",type="BASE",value=5}},nil}
c["Gain 5 Rage on Hit"]={{[1]={flags=0,keywordFlags=0,name="Condition:CanGainRage",type="FLAG",value=true}},nil}
c["Gain 5 Rage when Hit by an Enemy"]={{[1]={flags=0,keywordFlags=0,name="Condition:CanGainRage",type="FLAG",value=true}},nil}
c["Gain 5 Rage when Hit by an Enemy"]={{[1]={flags=0,keywordFlags=0,name="RageWhenHit",type="BASE",value=5},[2]={flags=0,keywordFlags=0,name="Condition:CanGainRage",type="FLAG",value=true}},nil}
c["Gain 5 Rage when Hit by an Enemy during effect"]={{}," Rage when Hit by an Enemy "}
c["Gain 5 Rage when Hit by an Enemy during effect No Inherent loss of Rage during effect"]={{}," Rage when Hit by an Enemy No Inherent loss of Rage "}
c["Gain 5% of Damage as Chaos Damage per Undead Minion"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="DamageAsChaos",type="BASE",value=5}}}}," per Undead "}
Expand Down
2 changes: 2 additions & 0 deletions src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,8 @@ local function doActorMisc(env, actor)
modDB:NewMod("Multiplier:RageEffect", "BASE", output.RageEffect, "Base")
output.Rage = stacks
output.MaximumRage = maxStacks
output.RageOnMeleeHit = modDB:Sum("BASE", nil, "RageOnMeleeHit")
output.RageWhenHit = modDB:Sum("BASE", nil, "RageWhenHit")
modDB:NewMod("Multiplier:Rage", "BASE", output.Rage, "Base")
if modDB:Flag(nil, "Condition:RageSpellDamage") then
modDB:NewMod("Damage", "MORE", output.RageEffect, "Rage", ModFlag.Spell)
Expand Down
2 changes: 2 additions & 0 deletions src/Modules/CalcSections.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1803,6 +1803,8 @@ return {
{ label = "Total", { format = "{0:output:Rage}", }, },
{ label = "Rage Effect", { format = "{1:output:RageEffect}", { modName = "RageEffect" }, }, },
{ label = "Maximum Rage", { format = "{0:output:MaximumRage}", { modName = "MaximumRage" }, }, },
{ label = "Gain on Melee hit", { format = "{0:output:RageOnMeleeHit}", { modName = "RageOnMeleeHit" }, }, },
Copy link
Copy Markdown
Contributor

@LocalIdentity LocalIdentity Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should change to be Gain on Hit so it can work for other sources

Copy link
Copy Markdown
Contributor Author

@MrHB212 MrHB212 Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

{ label = "Gain when hit", { format = "{0:output:RageWhenHit}", { modName = "RageWhenHit" }, }, },
{ label = "Recovery", { format = "{1:output:RageRegenRecovery} ({1:output:RageRegenPercent}%)",
{ breakdown = "RageRegenRecovery" },
{ label = "Sources", modName = { "RageRegen", "RageRegenPercent", "RageDegen", "RageDegenPercent", "RageRecovery" }, modType = "BASE" },
Expand Down
13 changes: 9 additions & 4 deletions src/Modules/ModParser.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2707,11 +2707,16 @@ local specialModList = {
["gain %d+ rage on hit with axes or swords"] = {
flag("Condition:CanGainRage"),
},
["gain %d+ rage on melee hit"] = {
flag("Condition:CanGainRage"),
},
["gain (%d+) rage on melee hit"] = function(num) return {
mod("RageOnMeleeHit", "BASE", num),
Copy link
Copy Markdown
Contributor

@LocalIdentity LocalIdentity Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should use ModFlag.Melee as a way to only have it work on Melee skills

Copy link
Copy Markdown
Contributor Author

@MrHB212 MrHB212 Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

flag("Condition:CanGainRage")
}end,
["gain (%d+) rage when hit by an enemy"] = function(num) return {
mod("RageWhenHit", "BASE", num),
flag("Condition:CanGainRage")
}end,
["gain %d+ rage on melee weapon hit"] = {
flag("Condition:CanGainRage"),
flag("Condition:CanGainRage")
Copy link
Copy Markdown
Contributor

@LocalIdentity LocalIdentity Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can use the weapon modflag for this similar to how we handle other weapon hit mods

Copy link
Copy Markdown
Contributor Author

@MrHB212 MrHB212 Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually deleted that parse since it seemed like a duplicate to me, the nodes still work fine without that.

},
["gain %d+ rage on ([%D]+)"] = {
flag("Condition:CanGainRage"),
Expand Down
Loading