Skip to content

Commit f077744

Browse files
author
LocalIdentity
committed
Merge branch 'dev'
2 parents 054d88e + c709267 commit f077744

17 files changed

+114
-56
lines changed

‎CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
# Changelog
22

3+
## [v2.34.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.34.1) (2023/09/16)
4+
5+
[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.34.0...v2.34.1)
6+
7+
<!-- Release notes generated using configuration in .github/release.yml at dev -->
8+
9+
## What's Changed
10+
### Fixed Crashes
11+
- Fix crash when using Saviour Mirages in Full DPS [\#6677](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6677) ([Paliak](https://github.com/Paliak))
12+
- Fix crash when using Cast when Channeling with Whispering Ice [\#6681](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6681) ([Paliak](https://github.com/Paliak))
13+
### User Interface
14+
- Update tooltip wording for Magmatic Strikes config [\#6689](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6689) ([Paliak](https://github.com/Paliak))
15+
- Show Warcry calculation mode when using Fist of War [\#6691](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6691) ([Paliak](https://github.com/Paliak))
16+
### Fixed Bugs
17+
- Fix curse mods from The Felbog Fang and Fated End applying to Mark skills [\#6687](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6687) ([Paliak](https://github.com/Paliak))
18+
- Fix Fist of War not applying to Projectile skill parts [\#6693](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6693) ([Paliak](https://github.com/Paliak))
19+
- Fix Divergent Arcane Cloak not scaling properly with buff effect [\#6695](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6695) ([LocalIdentity](https://github.com/LocalIdentity))
20+
### Accuracy Improvements
21+
- Increase accuracy of Doom Blast calculations [\#6676](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6676) ([Paliak](https://github.com/Paliak))
22+
- Fix parsing for some mods on the Pantheon [\#6686](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6686) ([Paliak](https://github.com/Paliak))
23+
- Assume 1 stage by default for Sigil of Power [\#6692](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6692) ([Paliak](https://github.com/Paliak))
24+
- Fix Scorching Ray max stages calculation [\#6697](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6697) ([LocalIdentity](https://github.com/LocalIdentity))
25+
26+
27+
328
## [v2.34.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.34.0) (2023/09/13)
429

530
[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.33.5...v2.34.0)

‎changelog.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
VERSION[2.34.1][2023/09/16]
2+
3+
--- Fixed Crashes ---
4+
* Fix crash when using Saviour Mirages in Full DPS (Paliak)
5+
* Fix crash when using Cast when Channeling with Whispering Ice (Paliak)
6+
7+
--- User Interface ---
8+
* Update tooltip wording for Magmatic Strikes config (Paliak)
9+
* Show Warcry calculation mode when using Fist of War (Paliak)
10+
11+
--- Fixed Bugs ---
12+
* Fix curse mods from The Felbog Fang and Fated End applying to Mark skills (Paliak)
13+
* Fix Fist of War not applying to Projectile skill parts (Paliak)
14+
* Fix Divergent Arcane Cloak not scaling properly with buff effect (LocalIdentity)
15+
16+
--- Accuracy Improvements ---
17+
* Increase accuracy of Doom Blast calculations (Paliak)
18+
* Fix parsing for some mods on the Pantheon (Paliak)
19+
* Assume 1 stage by default for Sigil of Power (Paliak)
20+
* Fix Scorching Ray max stages calculation (LocalIdentity)
21+
22+
123
VERSION[2.34.0][2023/09/13]
224

325
--- New to Path of Building ---

‎src/Classes/CalcBreakdownControl.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,9 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
429429
desc = base.."per "..(tag.div or 1).." "..(tag.actor and (tag.actor.." ") or "")..self:FormatVarNameOrList(tag.stat, tag.statList)
430430
baseVal = ""
431431
elseif tag.type == "PercentStat" then
432-
local finalPercent = (row.mod.value * (tag.percent / 100)) * 100
432+
local finalPercent = (row.mod.value * ((tag.percent or 1) / 100)) * 100
433433
local base = tag.base and (self:FormatModBase(row.mod, tag.base).." + "..math.abs(finalPercent).." ") or self:FormatModBase(row.mod, finalPercent)
434-
desc = base.."% of "..(tag.actor and (tag.actor.." ") or "")..self:FormatVarNameOrList(tag.stat, tag.statList)
434+
desc = base.."% of "..(tag.actor and (tag.actor.." ") or "")..self:FormatVarNameOrList(tag.percentVar or tag.stat, tag.statList)
435435
baseVal = ""
436436
elseif tag.type == "MultiplierThreshold" or tag.type == "StatThreshold" then
437437
desc = "If "..self:FormatVarNameOrList(tag.var or tag.stat, tag.varList or tag.statList)..(tag.upper and " <= " or " >= ")..(tag.threshold or self:FormatModName(tag.thresholdVar or tag.thresholdStat))

‎src/Classes/ModStore.lua

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ local pairs = pairs
88
local select = select
99
local t_insert = table.insert
1010
local m_floor = math.floor
11+
local m_ceil = math.ceil
1112
local m_min = math.min
1213
local m_max = math.max
1314
local m_modf = math.modf
@@ -416,7 +417,8 @@ function ModStoreClass:EvalMod(mod, cfg)
416417
else
417418
base = target:GetStat(tag.stat, cfg)
418419
end
419-
local mult = base * (tag.percent and tag.percent / 100 or 1)
420+
local percent = tag.percent or self:GetMultiplier(tag.percentVar, cfg)
421+
local mult = base * (percent and percent / 100 or 1)
420422
local limitTotal
421423
if tag.limit or tag.limitVar then
422424
local limit = tag.limit or self:GetMultiplier(tag.limitVar, cfg)
@@ -429,18 +431,18 @@ function ModStoreClass:EvalMod(mod, cfg)
429431
if type(value) == "table" then
430432
value = copyTable(value)
431433
if value.mod then
432-
value.mod.value = value.mod.value * mult + (tag.base or 0)
434+
value.mod.value = m_ceil(value.mod.value * mult + (tag.base or 0))
433435
if limitTotal then
434436
value.mod.value = m_min(value.mod.value, limitTotal)
435437
end
436438
else
437-
value.value = value.value * mult + (tag.base or 0)
439+
value.value = m_ceil(value.value * mult + (tag.base or 0))
438440
if limitTotal then
439441
value.value = m_min(value.value, limitTotal)
440442
end
441443
end
442444
else
443-
value = value * mult + (tag.base or 0)
445+
value = m_ceil(value * mult + (tag.base or 0))
444446
if limitTotal then
445447
value = m_min(value, limitTotal)
446448
end

‎src/Data/ModCache.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2033,7 +2033,7 @@ c["10% increased Area Damage"]={{[1]={flags=512,keywordFlags=0,name="Damage",typ
20332033
c["10% increased Area of Effect"]={{[1]={flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=10}},nil}
20342034
c["10% increased Area of Effect of Area Skills"]={{[1]={flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=10}},nil}
20352035
c["10% increased Area of Effect of Aura Skills"]={{[1]={[1]={skillType=43,type="SkillType"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=10}},nil}
2036-
c["10% increased Area of Effect per second you've been stationary, up to a maximum of 50%"]={{[1]={flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=10}}," per second you've been stationary, up to a maximum of 50% "}
2036+
c["10% increased Area of Effect per second you've been stationary, up to a maximum of 50%"]={{[1]={[1]={limit=50,limitTotal=true,type="Multiplier",var="StationarySeconds"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=10}},nil}
20372037
c["10% increased Armour"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="INC",value=10}},nil}
20382038
c["10% increased Armour per Red Socket on Main Hand Weapon"]={{[1]={[1]={type="Multiplier",var="RedSocketInWeapon 1"},flags=0,keywordFlags=0,name="Armour",type="INC",value=10}},nil}
20392039
c["10% increased Attack Damage"]={{[1]={flags=1,keywordFlags=0,name="Damage",type="INC",value=10}},nil}
@@ -8959,9 +8959,9 @@ c["No Chance to Block"]={{[1]={flags=0,keywordFlags=0,name="ArmourData",type="LI
89598959
c["No Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="WeaponData",type="LIST",value={key="PhysicalMin"}},[2]={flags=0,keywordFlags=0,name="WeaponData",type="LIST",value={key="PhysicalMax"}},[3]={flags=0,keywordFlags=0,name="WeaponData",type="LIST",value={key="PhysicalDPS"}}},nil}
89608960
c["Non-Aura Curses you inflict are not removed from Dying Enemies"]={nil,"Non-Aura Curses you inflict are not removed from Dying Enemies "}
89618961
c["Non-Aura Curses you inflict are not removed from Dying Enemies Enemies near Corpses affected by your Curses are Blinded"]={nil,"Non-Aura Curses you inflict are not removed from Dying Enemies Enemies near Corpses affected by your Curses are Blinded "}
8962-
c["Non-Aura Hexes expire upon reaching 200% of base Effect Non-Aura Hexes gain 20% increased Effect per second"]={{[1]={[1]={actor="enemy",limit=200,limitTotal=true,type="Multiplier",var="CurseDurationExpired"},[2]={neg=true,skillType=43,type="SkillType"},flags=0,keywordFlags=0,name="CurseEffect",type="INC",value=20}},nil}
8962+
c["Non-Aura Hexes expire upon reaching 200% of base Effect Non-Aura Hexes gain 20% increased Effect per second"]={{[1]={[1]={actor="enemy",limit=200,limitTotal=true,type="Multiplier",var="CurseDurationExpired"},[2]={neg=true,skillType=43,type="SkillType"},[3]={skillType=108,type="SkillType"},flags=0,keywordFlags=0,name="CurseEffect",type="INC",value=20}},nil}
89638963
c["Non-Aura Hexes expire upon reaching 220% of base Effect"]={nil,"Non-Aura Hexes expire upon reaching 220% of base Effect "}
8964-
c["Non-Aura Hexes expire upon reaching 220% of base Effect Non-Aura Hexes gain 20% increased Effect per second"]={{[1]={[1]={actor="enemy",limit=220,limitTotal=true,type="Multiplier",var="CurseDurationExpired"},[2]={neg=true,skillType=43,type="SkillType"},flags=0,keywordFlags=0,name="CurseEffect",type="INC",value=20}},nil}
8964+
c["Non-Aura Hexes expire upon reaching 220% of base Effect Non-Aura Hexes gain 20% increased Effect per second"]={{[1]={[1]={actor="enemy",limit=220,limitTotal=true,type="Multiplier",var="CurseDurationExpired"},[2]={neg=true,skillType=43,type="SkillType"},[3]={skillType=108,type="SkillType"},flags=0,keywordFlags=0,name="CurseEffect",type="INC",value=20}},nil}
89658965
c["Non-Aura Vaal Skills require 25% reduced Souls Per Use during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},[2]={neg=true,skillType=43,type="SkillType"},[3]={skillType=42,type="SkillType"},flags=0,keywordFlags=0,name="SoulCost",type="INC",value=-25}},nil}
89668966
c["Non-Channelling Skills have -5 to Total Mana Cost while affected by Clarity"]={{[1]={[1]={neg=true,skillType=57,type="SkillType"},[2]={type="Condition",var="AffectedByClarity"},flags=0,keywordFlags=0,name="ManaCost",type="BASE",value=-5}},nil}
89678967
c["Non-Channelling Skills have -9 to Total Mana Cost"]={{[1]={[1]={neg=true,skillType=57,type="SkillType"},flags=0,keywordFlags=0,name="ManaCost",type="BASE",value=-9}},nil}
@@ -11211,8 +11211,8 @@ c["Your Critical Strikes do not deal extra Damage during Effect"]={{[1]={[1]={ty
1121111211
c["Your Critical Strikes have Culling Strike"]={{[1]={flags=0,keywordFlags=0,name="CriticalCullPercent",type="MAX",value=10}},nil}
1121211212
c["Your Critical Strikes have a 5% chance to deal Double Damage"]={{[1]={flags=0,keywordFlags=0,name="DoubleDamageChanceOnCrit",type="BASE",value=5}},nil}
1121311213
c["Your Curse Limit is equal to your maximum Power Charges"]={{[1]={flags=0,keywordFlags=0,name="CurseLimitIsMaximumPowerCharges",type="FLAG",value=true}},nil}
11214-
c["Your Curses have 20% increased Effect if 50% of Curse Duration expired"]={{[1]={[1]={actor="enemy",threshold=50,type="MultiplierThreshold",var="CurseExpired"},flags=0,keywordFlags=0,name="CurseEffect",type="INC",value=20}},nil}
11215-
c["Your Curses have 25% increased Effect if 50% of Curse Duration expired"]={{[1]={[1]={actor="enemy",threshold=50,type="MultiplierThreshold",var="CurseExpired"},flags=0,keywordFlags=0,name="CurseEffect",type="INC",value=25}},nil}
11214+
c["Your Curses have 20% increased Effect if 50% of Curse Duration expired"]={{[1]={[1]={actor="enemy",threshold=50,type="MultiplierThreshold",var="CurseExpired"},[2]={skillType=108,type="SkillType"},flags=0,keywordFlags=0,name="CurseEffect",type="INC",value=20}},nil}
11215+
c["Your Curses have 25% increased Effect if 50% of Curse Duration expired"]={{[1]={[1]={actor="enemy",threshold=50,type="MultiplierThreshold",var="CurseExpired"},[2]={skillType=108,type="SkillType"},flags=0,keywordFlags=0,name="CurseEffect",type="INC",value=25}},nil}
1121611216
c["Your Damage with Critical Strikes is Lucky"]={{[1]={flags=0,keywordFlags=0,name="CritLucky",type="FLAG",value=true}},nil}
1121711217
c["Your Damage with Hits is Lucky"]={{[1]={flags=0,keywordFlags=0,name="LuckyHits",type="FLAG",value=true}},nil}
1121811218
c["Your Elemental Damage can Shock"]={{[1]={flags=0,keywordFlags=0,name="ColdCanShock",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="FireCanShock",type="FLAG",value=true}},nil}

‎src/Data/Skills/act_int.lua

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,12 @@ skills["ArcaneCloak"] = {
190190
mod("GuardAbsorbRate", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Guard", unscalable = true }),
191191
},
192192
["arcane_cloak_consume_%_of_mana"] = {
193-
mod("Multiplier:ArcaneCloakConsumedMana", "BASE", nil, 0, 0, { type = "PerStat", stat = "ManaUnreserved" }, { type = "GlobalEffect", effectType = "Guard", unscalable = true }),
193+
mod("Multiplier:ArcaneCloakConsumedMana", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Guard", unscalable = true }),
194194
div = 100,
195195
},
196196
["arcane_cloak_gain_%_of_consumed_mana_as_lightning_damage"] = {
197-
mod("LightningMin", "BASE", nil, 0, 0, { type = "Multiplier", var = "ArcaneCloakConsumedMana" }, { type = "GlobalEffect", effectType = "Guard" }),
198-
mod("LightningMax", "BASE", nil, 0, 0, { type = "Multiplier", var = "ArcaneCloakConsumedMana" }, { type = "GlobalEffect", effectType = "Guard" }),
199-
div = 100,
197+
mod("LightningMin", "BASE", nil, 0, 0, { type = "PercentStat", stat = "ManaUnreserved", percentVar = "ArcaneCloakConsumedMana" }, { type = "GlobalEffect", effectType = "Buff" }),
198+
mod("LightningMax", "BASE", nil, 0, 0, { type = "PercentStat", stat = "ManaUnreserved", percentVar = "ArcaneCloakConsumedMana" }, { type = "GlobalEffect", effectType = "Buff" }),
200199
},
201200
},
202201
baseFlags = {
@@ -8818,7 +8817,7 @@ skills["FireBeam"] = {
88188817
stages = true,
88198818
},
88208819
{
8821-
name = "Maximum Sustainable Stages",
8820+
name = "Maximum Stages",
88228821
},
88238822
},
88248823
statMap = {

‎src/Data/Skills/sup_str.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2143,10 +2143,10 @@ skills["AncestralSlamSupport"] = {
21432143
statDescriptionScope = "gem_stat_descriptions",
21442144
statMap = {
21452145
["support_ancestral_slam_big_hit_hit_damage_+%_final"] = {
2146-
mod("FistOfWarHitMultiplier", "BASE", nil, ModFlag.Melee),
2146+
mod("FistOfWarHitMultiplier", "BASE", nil),
21472147
},
21482148
["support_ancestral_slam_big_hit_ailment_damage_+%_final"] = {
2149-
mod("FistOfWarAilmentMultiplier", "BASE", nil, bit.band(ModFlag.Melee, ModFlag.Ailment)),
2149+
mod("FistOfWarAilmentMultiplier", "BASE", nil),
21502150
},
21512151
["ancestral_slam_interval_duration"] = {
21522152
mod("FistOfWarCooldown", "BASE", nil),

‎src/Export/Skills/act_int.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@ local skills, mod, flag, skill = ...
3131
mod("GuardAbsorbRate", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Guard", unscalable = true }),
3232
},
3333
["arcane_cloak_consume_%_of_mana"] = {
34-
mod("Multiplier:ArcaneCloakConsumedMana", "BASE", nil, 0, 0, { type = "PerStat", stat = "ManaUnreserved" }, { type = "GlobalEffect", effectType = "Guard", unscalable = true }),
34+
mod("Multiplier:ArcaneCloakConsumedMana", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Guard", unscalable = true }),
3535
div = 100,
3636
},
3737
["arcane_cloak_gain_%_of_consumed_mana_as_lightning_damage"] = {
38-
mod("LightningMin", "BASE", nil, 0, 0, { type = "Multiplier", var = "ArcaneCloakConsumedMana" }, { type = "GlobalEffect", effectType = "Guard" }),
39-
mod("LightningMax", "BASE", nil, 0, 0, { type = "Multiplier", var = "ArcaneCloakConsumedMana" }, { type = "GlobalEffect", effectType = "Guard" }),
40-
div = 100,
38+
mod("LightningMin", "BASE", nil, 0, 0, { type = "PercentStat", stat = "ManaUnreserved", percentVar = "ArcaneCloakConsumedMana" }, { type = "GlobalEffect", effectType = "Buff" }),
39+
mod("LightningMax", "BASE", nil, 0, 0, { type = "PercentStat", stat = "ManaUnreserved", percentVar = "ArcaneCloakConsumedMana" }, { type = "GlobalEffect", effectType = "Buff" }),
4140
},
4241
},
4342
#baseMod mod("GuardAbsorbLimit", "BASE", 1, 0, 0, { type = "Multiplier", var = "ArcaneCloakConsumedMana" }, { type = "GlobalEffect", effectType = "Guard", unscalable = true })
@@ -1993,7 +1992,7 @@ local skills, mod, flag, skill = ...
19931992
stages = true,
19941993
},
19951994
{
1996-
name = "Maximum Sustainable Stages",
1995+
name = "Maximum Stages",
19971996
},
19981997
},
19991998
statMap = {

‎src/Export/Skills/sup_str.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,10 @@ local skills, mod, flag, skill = ...
269269
#skill AncestralSlamSupport
270270
statMap = {
271271
["support_ancestral_slam_big_hit_hit_damage_+%_final"] = {
272-
mod("FistOfWarHitMultiplier", "BASE", nil, ModFlag.Melee),
272+
mod("FistOfWarHitMultiplier", "BASE", nil),
273273
},
274274
["support_ancestral_slam_big_hit_ailment_damage_+%_final"] = {
275-
mod("FistOfWarAilmentMultiplier", "BASE", nil, bit.band(ModFlag.Melee, ModFlag.Ailment)),
275+
mod("FistOfWarAilmentMultiplier", "BASE", nil),
276276
},
277277
["ancestral_slam_interval_duration"] = {
278278
mod("FistOfWarCooldown", "BASE", nil),

‎src/HeadlessWrapper.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ dofile("Launch.lua")
169169
-- Prevents loading of ModCache
170170
-- Allows running mod parsing related tests without pushing ModCache
171171
-- The CI env var will be true when run from github workflows but should be false for other tools using the headless wrapper
172-
mainObject.continuousIntegrationMode = os.getenv("CI")
172+
mainObject.continuousIntegrationMode = os.getenv("CI")
173173

174174
runCallback("OnInit")
175175
runCallback("OnFrame") -- Need at least one frame for everything to initialise

‎src/Modules/CalcMirages.lua

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ local function calculateMirage(env, config)
3535
newSkill.skillCfg.skillCond["usedByMirage"] = true
3636
newSkill.skillData.limitedProcessing = true
3737
newSkill.skillTypes[SkillType.OtherThingUsesSkill] = true
38-
env.player.mainSkill.mirage = { }
39-
env.player.mainSkill.mirage.name = newSkill.activeEffect.grantedEffect.name
38+
4039
_ = config.preCalcFunc and config.preCalcFunc(env, newSkill, newEnv)
4140

4241
newEnv.player.mainSkill = newSkill
@@ -63,7 +62,11 @@ function calcs.mirages(env)
6362
local moreDamage = newSkill.skillModList:Sum("BASE", newSkill.skillCfg, "MirageArcherLessDamage")
6463
local moreAttackSpeed = newSkill.skillModList:Sum("BASE", newSkill.skillCfg, "MirageArcherLessAttackSpeed")
6564
local mirageCount = newSkill.skillModList:Sum("BASE", env.player.mainSkill.skillCfg, "MirageArcherMaxCount")
65+
66+
env.player.mainSkill.mirage = { }
67+
env.player.mainSkill.mirage.name = newSkill.activeEffect.grantedEffect.name
6668
env.player.mainSkill.mirage.count = mirageCount
69+
6770
if not env.player.mainSkill.infoMessage then
6871
env.player.mainSkill.infoMessage = tostring(mirageCount) .. " Mirage Archers using " .. newSkill.activeEffect.grantedEffect.name
6972
end
@@ -81,9 +84,7 @@ function calcs.mirages(env)
8184
end
8285
end,
8386
postCalcFunc = function(env, newSkill, newEnv)
84-
-- Re-link over the output
8587
env.player.mainSkill.mirage.output = newEnv.player.output
86-
8788
if newSkill.minion then
8889
env.player.mainSkill.mirage.minion = {}
8990
env.player.mainSkill.mirage.minion.output = newEnv.minion.output

‎src/Modules/CalcOffence.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2505,8 +2505,8 @@ function calcs.offence(env, actor, activeSkill)
25052505
globalOutput.FistOfWarCooldown = skillModList:Sum("BASE", cfg, "FistOfWarCooldown") or 0
25062506
-- If Fist of War & Active Skill is a Slam Skill & NOT a Vaal Skill & NOT used by mirage or other
25072507
if globalOutput.FistOfWarCooldown ~= 0 and activeSkill.skillTypes[SkillType.Slam] and not activeSkill.skillTypes[SkillType.Vaal] and not activeSkill.skillTypes[SkillType.OtherThingUsesSkill] then
2508-
globalOutput.FistOfWarHitMultiplier = skillModList:Sum("BASE", cfg, "FistOfWarHitMultiplier") / 100
2509-
globalOutput.FistOfWarAilmentMultiplier = skillModList:Sum("BASE", cfg, "FistOfWarAilmentMultiplier") / 100
2508+
globalOutput.FistOfWarHitMultiplier = skillModList:Sum("BASE", nil, "FistOfWarHitMultiplier") / 100
2509+
globalOutput.FistOfWarAilmentMultiplier = skillModList:Sum("BASE", nil, "FistOfWarAilmentMultiplier") / 100
25102510
globalOutput.FistOfWarUptimeRatio = m_min( (1 / output.Speed) / globalOutput.FistOfWarCooldown, 1) * 100
25112511
if globalBreakdown then
25122512
globalBreakdown.FistOfWarUptimeRatio = {

0 commit comments

Comments
 (0)