Skip to content

Commit 95f938a

Browse files
author
LocalIdentity
committed
Merge branch 'dev'
2 parents 18f43d5 + ee4a857 commit 95f938a

File tree

16 files changed

+294
-35
lines changed

16 files changed

+294
-35
lines changed

‎CHANGELOG.md

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

3+
## [v2.38.3](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.38.3) (2023/12/19)
4+
5+
[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.38.2...v2.38.3)
6+
7+
<!-- Release notes generated using configuration in .github/release.yml at dev -->
8+
9+
## What's Changed
10+
11+
### Fixed Crashes
12+
- Fix crash when checking the breakdown for Transfigured Eye of Winter and Infernal Blow [\#7116](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7116) ([LocalIdentity](https://github.com/LocalIdentity))
13+
14+
### Fixed Bugs
15+
- Fix Oath of the Magi not working for Body Armour slot [\#7109](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7109) ([sida-wang](https://github.com/sida-wang))
16+
- Fix Lancing Steel less damage multiplier only applying to Hits [\#7114](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7114) ([deathbeam](https://github.com/deathbeam))
17+
18+
### Other change
19+
- Update The Adorned to work in Cluster Jewel sockets [\#7113](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7113) ([LocalIdentity](https://github.com/LocalIdentity))
20+
21+
22+
23+
324
## [v2.38.2](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.38.2) (2023/12/19)
425

526
[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.38.1...v2.38.2)

‎changelog.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
VERSION[2.38.3][2023/12/19]
2+
3+
--- Fixed Crashes ---
4+
* Fix crash when checking the breakdown for Transfigured Eye of Winter and Infernal Blow (LocalIdentity)
5+
6+
--- Fixed Bugs ---
7+
* Fix Oath of the Magi not working for Body Armour slot (sida-wang)
8+
* Fix Lancing Steel less damage multiplier only applying to Hits (deathbeam)
9+
10+
--- Other Changes ---
11+
* Update The Adorned to work in Cluster Jewel sockets (LocalIdentity)
12+
13+
114
VERSION[2.38.2][2023/12/19]
215

316
--- Fixed Bugs ---

‎src/Data/ModCache.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2358,7 +2358,7 @@ c["100% increased Duration of Lightning Ailments"]={{[1]={flags=0,keywordFlags=0
23582358
c["100% increased Effect of Buffs granted by your Golems"]={{[1]={[1]={skillType=61,type="SkillType"},flags=0,keywordFlags=0,name="BuffEffect",type="INC",value=100}},nil}
23592359
c["100% increased Effect of Buffs your Ancestor Totems grant while Active"]={{[1]={[1]={skillNameList={[1]="Ancestral Warchief",[2]="Ancestral Protector",[3]="Earthbreaker"},type="SkillName"},flags=0,keywordFlags=0,name="BuffEffect",type="INC",value=100}},nil}
23602360
c["100% increased Effect of Chill you inflict while Leeching Mana"]={{[1]={[1]={type="Condition",var="LeechingMana"},flags=0,keywordFlags=0,name="EnemyChillEffect",type="INC",value=100}},nil}
2361-
c["100% increased Effect of Jewel Socket Passive Skills containing Corrupted Magic Jewels, if not from Cluster Jewels"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="corruptedMagicJewelIncEffectFromNonClusterSocket",value=100}}},nil}
2361+
c["100% increased Effect of Jewel Socket Passive Skills containing Corrupted Magic Jewels"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="corruptedMagicJewelIncEffect",value=100}}},nil}
23622362
c["100% increased Effect of Lightning Ailments"]={{[1]={flags=0,keywordFlags=0,name="EnemyShockEffect",type="INC",value=100},[2]={flags=0,keywordFlags=0,name="EnemySapEffect",type="INC",value=100}},nil}
23632363
c["100% increased Effect of Onslaught on you"]={{[1]={flags=0,keywordFlags=0,name="OnslaughtEffect",type="INC",value=100}},nil}
23642364
c["100% increased Effect of Shocks you inflict while Leeching Energy Shield"]={{[1]={[1]={type="Condition",var="LeechingEnergyShield"},flags=0,keywordFlags=0,name="EnemyShockEffect",type="INC",value=100}},nil}
@@ -2986,7 +2986,7 @@ c["150% increased Critical Strike Chance against Enemies on Consecrated Ground d
29862986
c["150% increased Critical Strike Chance against Enemies on Full Life"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="FullLife"},flags=0,keywordFlags=0,name="CritChance",type="INC",value=150}},nil}
29872987
c["150% increased Critical Strike Chance for Spells"]={{[1]={flags=2,keywordFlags=0,name="CritChance",type="INC",value=150}},nil}
29882988
c["150% increased Effect of Auras from Mines"]={{[1]={flags=0,keywordFlags=8192,name="AuraEffect",type="INC",value=150}},nil}
2989-
c["150% increased Effect of Jewel Socket Passive Skills containing Corrupted Magic Jewels, if not from Cluster Jewels"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="corruptedMagicJewelIncEffectFromNonClusterSocket",value=150}}},nil}
2989+
c["150% increased Effect of Jewel Socket Passive Skills containing Corrupted Magic Jewels"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="corruptedMagicJewelIncEffect",value=150}}},nil}
29902990
c["150% increased Elemental Damage if you've dealt a Critical Strike Recently"]={{[1]={[1]={type="Condition",var="CritRecently"},flags=0,keywordFlags=0,name="ElementalDamage",type="INC",value=150}},nil}
29912991
c["150% increased Elemental Damage if you've used a Warcry Recently"]={{[1]={[1]={type="Condition",var="UsedWarcryRecently"},flags=0,keywordFlags=0,name="ElementalDamage",type="INC",value=150}},nil}
29922992
c["150% increased Endurance, Frenzy and Power Charge Duration"]={{[1]={flags=0,keywordFlags=0,name="PowerChargesDuration",type="INC",value=150},[2]={flags=0,keywordFlags=0,name="FrenzyChargesDuration",type="INC",value=150},[3]={flags=0,keywordFlags=0,name="EnduranceChargesDuration",type="INC",value=150}},nil}
@@ -7439,7 +7439,7 @@ c["Debuffs on you expire 20% faster"]={{[1]={flags=0,keywordFlags=0,name="SelfDe
74397439
c["Debuffs on you expire 20% faster while affected by Haste"]={nil,"Debuffs on you expire 20% faster while affected by Haste "}
74407440
c["Debuffs on you expire 20% faster while affected by Haste You gain Onslaught for 4 seconds on Kill while affected by Haste"]={nil,"Debuffs on you expire 20% faster while affected by Haste You gain Onslaught for 4 seconds on Kill while affected by Haste "}
74417441
c["Defences are Zero"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="MORE",value=-100},[2]={flags=0,keywordFlags=0,name="EnergyShield",type="MORE",value=-100},[3]={flags=0,keywordFlags=0,name="Evasion",type="MORE",value=-100},[4]={flags=0,keywordFlags=0,name="Ward",type="MORE",value=-100}},nil}
7442-
c["Defences from Equipped Body Armour are doubled if it has no Socketed Gems"]={{[1]={[1]={threshold=0,type="MultiplierThreshold",upper=true,var="SocketedGemsInBody Armour"},[2]={type="Condition",var="UsingBodyArmour"},flags=0,keywordFlags=0,name="DoubleBodyArmourDefence",type="FLAG",value=true}},nil}
7442+
c["Defences from Equipped Body Armour are doubled if it has no Socketed Gems"]={{[1]={[1]={threshold=0,type="MultiplierThreshold",upper=true,var="SocketedGemsInBody Armour"},[2]={type="Condition",var="UsingBody Armour"},flags=0,keywordFlags=0,name="DoubleBodyArmourDefence",type="FLAG",value=true}},nil}
74437443
c["Defend with 120% of Armour against Projectile Attacks"]={nil,"Defend with 120% of Armour against Projectile Attacks "}
74447444
c["Defend with 120% of Armour against Projectile Attacks 5% more chance to Evade Melee Attacks"]={nil,"Defend with 120% of Armour against Projectile Attacks 5% more chance to Evade Melee Attacks "}
74457445
c["Defiance Banner has 200% increased Taunt duration"]={{[1]={[1]={skillName="Defiance Banner",type="SkillName"},flags=0,keywordFlags=0,name="Duration",type="INC",value=200}}," Taunt "}

‎src/Data/Skills/act_dex.lua

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4189,7 +4189,7 @@ skills["CycloneAltX"] = {
41894189
else -- unarmed
41904190
range = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "UnarmedRange") + 10 * activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "UnarmedRangeMetre")
41914191
end
4192-
activeSkill.skillModList:NewMod("Multiplier:AdditionalMeleeRange", "BASE", range, "Skill:CycloneofTumult")
4192+
activeSkill.skillModList:NewMod("Multiplier:AdditionalMeleeRange", "BASE", range, "Skill:CycloneAltX")
41934193
end,
41944194
statMap = {
41954195
["cyclone_max_number_of_stages"] = {
@@ -6898,10 +6898,10 @@ skills["FlamethrowerTrap"] = {
68986898
{
68996899
name = "One trap (bad placement)",
69006900
},
6901-
{
6901+
{
69026902
name = "Average # traps (good placement)",
69036903
},
6904-
{
6904+
{
69056905
name = "Average # traps (bad placement)",
69066906
},
69076907
},
@@ -9174,7 +9174,7 @@ skills["LancingSteel"] = {
91749174
local percentReducedProjectiles = (output.ProjectileCount - 1) / output.ProjectileCount
91759175
local mult = (activeSkill.skillModList:More(activeSkill.skillCfg, "LancingSteelSubsequentDamage") - 1) * 100 * percentReducedProjectiles
91769176
activeSkill.skillData.dpsMultiplier = output.ProjectileCount
9177-
activeSkill.skillModList:NewMod("Damage", "MORE", mult, "Skill:LancingSteel", ModFlag.Hit)
9177+
activeSkill.skillModList:NewMod("Damage", "MORE", mult, "Skill:LancingSteel")
91789178
end
91799179
end,
91809180
parts = {
@@ -9281,7 +9281,7 @@ skills["LancingSteelAltX"] = {
92819281
local percentReducedProjectiles = (output.ProjectileCount - 1) / output.ProjectileCount
92829282
local mult = (activeSkill.skillModList:More(activeSkill.skillCfg, "LancingSteelSubsequentDamage") - 1) * 100 * percentReducedProjectiles
92839283
activeSkill.skillData.dpsMultiplier = output.ProjectileCount
9284-
activeSkill.skillModList:NewMod("Damage", "MORE", mult, "Skill:LancingSteelofSpraying", ModFlag.Hit)
9284+
activeSkill.skillModList:NewMod("Damage", "MORE", mult, "Skill:LancingSteelAltX")
92859285
end
92869286
end,
92879287
parts = {
@@ -11963,7 +11963,7 @@ skills["ScourgeArrow"] = {
1196311963
name = "Release",
1196411964
stages = true,
1196511965
},
11966-
{
11966+
{
1196711967
name = "Thorn Arrows",
1196811968
stages = true,
1196911969
},
@@ -16251,7 +16251,7 @@ skills["Tornado"] = {
1625116251
statMap = {
1625216252
["tornado_base_damage_interval_ms"] = {
1625316253
skill("damageInterval", nil ),
16254-
div = 1000,
16254+
div = 1000,
1625516255
},
1625616256
},
1625716257
baseFlags = {

‎src/Data/Skills/act_int.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5164,7 +5164,7 @@ skills["EyeOfWinterAltX"] = {
51645164
statDescriptionScope = "skill_stat_descriptions",
51655165
castTime = 0.8,
51665166
preDamageFunc = function(activeSkill, output)
5167-
activeSkill.skillModList:NewMod("Damage", "MORE", activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "EyeOfWinterRamp"), "Skill:EyeOfWinterofFinality", { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
5167+
activeSkill.skillModList:NewMod("Damage", "MORE", activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "EyeOfWinterRamp"), "Skill:EyeOfWinterAltX", { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
51685168
end,
51695169
statMap = {
51705170
["freezing_pulse_damage_+%_final_at_long_range"] = {
@@ -5254,7 +5254,7 @@ skills["EyeOfWinterAltY"] = {
52545254
statDescriptionScope = "skill_stat_descriptions",
52555255
castTime = 0.8,
52565256
preDamageFunc = function(activeSkill, output)
5257-
activeSkill.skillModList:NewMod("Damage", "MORE", activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "EyeOfWinterRamp"), "Skill:EyeOfWinterofTransience", { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
5257+
activeSkill.skillModList:NewMod("Damage", "MORE", activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "EyeOfWinterRamp"), "Skill:EyeOfWinterAltY", { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
52585258
end,
52595259
statMap = {
52605260
["freezing_pulse_damage_+%_final_at_long_range"] = {
@@ -7406,7 +7406,7 @@ skills["FrostBombAltY"] = {
74067406
castTime = 0.5,
74077407
preDamageFunc = function(activeSkill, output)
74087408
local duration = math.floor(activeSkill.skillData.duration * output.DurationMod * 10)
7409-
activeSkill.skillModList:NewMod("Multiplier:100msFrostBombDuration", "BASE", duration, "Skill:FrostBombofForthcoming")
7409+
activeSkill.skillModList:NewMod("Multiplier:100msFrostBombDuration", "BASE", duration, "Skill:FrostBombAltY")
74107410
end,
74117411
statMap = {
74127412
["active_skill_hit_damage_+%_final_per_100ms_duration"] = {

‎src/Data/Skills/act_str.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6358,7 +6358,7 @@ skills["InfernalBlowAltX"] = {
63586358
preDamageFunc = function(activeSkill, output)
63596359
local effect = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "DebuffEffect")
63606360
if activeSkill.skillPart == 2 or activeSkill.skillPart == 3 then
6361-
activeSkill.skillModList:NewMod("Damage", "MORE", effect, "Skill:InfernalBlowofImmolation", 0, { type = "Multiplier", var = "DebuffStack", base = -100 + effect })
6361+
activeSkill.skillModList:NewMod("Damage", "MORE", effect, "Skill:InfernalBlowAltX", 0, { type = "Multiplier", var = "DebuffStack", base = -100 + effect })
63626362
end
63636363
if activeSkill.skillPart == 3 then
63646364
activeSkill.skillData.dpsMultiplier = 1 / 6

‎src/Data/StatDescriptions/stat_descriptions.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181547,7 +181547,7 @@ return {
181547181547
[2]="#"
181548181548
}
181549181549
},
181550-
text="{0}% increased Effect of Jewel Socket Passive Skills containing\nCorrupted Magic Jewels, if not from Cluster Jewels"
181550+
text="{0}% increased Effect of Jewel Socket Passive Skills containing Corrupted Magic Jewels"
181551181551
},
181552181552
[2]={
181553181553
[1]={
@@ -181560,7 +181560,7 @@ return {
181560181560
[2]=-1
181561181561
}
181562181562
},
181563-
text="{0}% reduced Effect of Jewel Socket Passive Skills containing\nCorrupted Magic Jewels, if not from Cluster Jewels"
181563+
text="{0}% reduced Effect of Jewel Socket Passive Skills containing Corrupted Magic Jewels"
181564181564
}
181565181565
}
181566181566
},

‎src/Data/Uniques/Special/New.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ You take 100% of Elemental Damage from Blocked Hits
125125
The Adorned
126126
Crimson Jewel
127127
League: Affliction
128-
(50–150)% increased Effect of Jewel Socket Passive Skills containing Corrupted Magic Jewels, if not from Cluster Jewels
128+
(50–150)% increased Effect of Jewel Socket Passive Skills containing Corrupted Magic Jewels
129129
]],[[
130130
Replica Fragility
131131
Crimson Jewel

‎src/Export/Classes/GGPKData.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ function GGPKClass:GetNeededFiles()
220220
"Data/itemisedcorpse.dat",
221221
"Data/indexableskillgems.dat",
222222
"Data/indexablesupportgems.dat",
223+
"Data/itemclasscategories.dat",
223224
}
224225
local txtFiles = {
225226
"Metadata/StatDescriptions/passive_skill_aura_stat_descriptions.txt",

‎src/Export/Skills/act_dex.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ local skills, mod, flag, skill = ...
803803
else -- unarmed
804804
range = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "UnarmedRange") + 10 * activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "UnarmedRangeMetre")
805805
end
806-
activeSkill.skillModList:NewMod("Multiplier:AdditionalMeleeRange", "BASE", range, "Skill:CycloneofTumult")
806+
activeSkill.skillModList:NewMod("Multiplier:AdditionalMeleeRange", "BASE", range, "Skill:CycloneAltX")
807807
end,
808808
statMap = {
809809
["cyclone_max_number_of_stages"] = {
@@ -1482,10 +1482,10 @@ local skills, mod, flag, skill = ...
14821482
{
14831483
name = "One trap (bad placement)",
14841484
},
1485-
{
1485+
{
14861486
name = "Average # traps (good placement)",
14871487
},
1488-
{
1488+
{
14891489
name = "Average # traps (bad placement)",
14901490
},
14911491
},
@@ -1883,7 +1883,7 @@ local skills, mod, flag, skill = ...
18831883
local percentReducedProjectiles = (output.ProjectileCount - 1) / output.ProjectileCount
18841884
local mult = (activeSkill.skillModList:More(activeSkill.skillCfg, "LancingSteelSubsequentDamage") - 1) * 100 * percentReducedProjectiles
18851885
activeSkill.skillData.dpsMultiplier = output.ProjectileCount
1886-
activeSkill.skillModList:NewMod("Damage", "MORE", mult, "Skill:LancingSteel", ModFlag.Hit)
1886+
activeSkill.skillModList:NewMod("Damage", "MORE", mult, "Skill:LancingSteel")
18871887
end
18881888
end,
18891889
parts = {
@@ -1914,7 +1914,7 @@ local skills, mod, flag, skill = ...
19141914
local percentReducedProjectiles = (output.ProjectileCount - 1) / output.ProjectileCount
19151915
local mult = (activeSkill.skillModList:More(activeSkill.skillCfg, "LancingSteelSubsequentDamage") - 1) * 100 * percentReducedProjectiles
19161916
activeSkill.skillData.dpsMultiplier = output.ProjectileCount
1917-
activeSkill.skillModList:NewMod("Damage", "MORE", mult, "Skill:LancingSteelofSpraying", ModFlag.Hit)
1917+
activeSkill.skillModList:NewMod("Damage", "MORE", mult, "Skill:LancingSteelAltX")
19181918
end
19191919
end,
19201920
parts = {
@@ -2366,7 +2366,7 @@ local skills, mod, flag, skill = ...
23662366
name = "Release",
23672367
stages = true,
23682368
},
2369-
{
2369+
{
23702370
name = "Thorn Arrows",
23712371
stages = true,
23722372
},
@@ -3246,7 +3246,7 @@ local skills, mod, flag, skill = ...
32463246
statMap = {
32473247
["tornado_base_damage_interval_ms"] = {
32483248
skill("damageInterval", nil ),
3249-
div = 1000,
3249+
div = 1000,
32503250
},
32513251
},
32523252
#mods

0 commit comments

Comments
 (0)