Skip to content

Commit e3ec936

Browse files
author
LocalIdentity
committed
Merge branch 'dev'
2 parents 2173928 + 14fc6ce commit e3ec936

File tree

12 files changed

+128
-68
lines changed

12 files changed

+128
-68
lines changed

‎.github/ISSUE_TEMPLATE/application_bug_report.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: Application Bug report
2-
description: Create a bug report to help us fix an issue in path of building
1+
name: Application bug report
2+
description: Create a bug report to help us fix an issue in Path of Building
33
labels: [bug]
44
body:
55
- type: markdown

‎.github/ISSUE_TEMPLATE/behaviour_bug_report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Behaviour bug report
2-
description: Create a bug report to help us fix incorrectly behaviour or logic
2+
description: Create a bug report to help us fix incorrect behaviour or logic
33
labels: ["bug:behaviour"]
44
body:
55
- type: markdown

‎CHANGELOG.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# Changelog
22

3+
## [v2.25.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.25.1) (2023/01/06)
4+
5+
[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.25.0...v2.25.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 caused by item stuck on cursor when dragging [\#5550](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5550) ([Paliak](https://github.com/Paliak))
12+
- Fix crash when using Whispering Ice with trigger support [\#5547](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5547) ([Paliak](https://github.com/Paliak))
13+
- Fix crash caused by loading shared items too early [\#5543](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5543) ([QuickStick123](https://github.com/QuickStick123))
14+
### Fixed Bugs
15+
- Fixing Timeless jewels not working correctly when added via the "Find Timeless Jewel" UI [\#5522](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5522) ([QuickStick123](https://github.com/QuickStick123))
16+
- Fix Atziri's Mirror's drop source [\#5524](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5524) ([pHiney](https://github.com/pHiney))
17+
- Fix Blood Sacrament incorrect scaling when setting to stages more than 1 [\#5551](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5551) ([dreais](https://github.com/dreais))
18+
- Fix Spell Suppression mastery not working with Acrobatics Keystone [\#5528](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5528) ([Paliak](https://github.com/Paliak))
19+
- Fix magic utility flask effect not scaling Onslaught from Silver Flasks [\#5519](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5519) ([deathbeam](https://github.com/deathbeam))
20+
21+
322
## [v2.25.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.25.0) (2023/01/03)
423

524
[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.24.0...v2.25.0)
@@ -62,7 +81,7 @@
6281
- Seismic Trap and Lightning Spire Trap not rounding to server ticks for wave count calculation [\#5395](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5395) ([Edvinas-Smita](https://github.com/Edvinas-Smita))
6382
- Missing Physical tag to Heartbound Loop [\#5416](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5416) ([ProphetLamb](https://github.com/ProphetLamb))
6483
- Wording on Sandstorm Visage mods [\#5425](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5425) ([QuickStick123](https://github.com/QuickStick123))
65-
- Remove Legacy Crystalised Omniscience from the unique list as it no longer exists [\#5447](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5447) ([QuickStick123](https://github.com/QuickStick123))
84+
- Remove Legacy Crystallised Omniscience from the unique list as it no longer exists [\#5447](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5447) ([QuickStick123](https://github.com/QuickStick123))
6685
- Damage multipliers to exerts also applying to triggered skills [\#5446](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5446) ([Paliak](https://github.com/Paliak))
6786
- More than 100% reduced resistances causing negative res to turn positive [\#5458](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5458) ([QuickStick123](https://github.com/QuickStick123))
6887
- Militant Faith mod using "Skill Cost" instead of "Mana Cost" [\#5460](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/5460) ([Regisle](https://github.com/Regisle))

‎changelog.txt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
VERSION[2.25.1][2023/01/06]
2+
3+
--- Fixed Crashes ---
4+
* Fix crash caused by item stuck on cursor when dragging (Paliak)
5+
* Fix crash when using Whispering Ice with trigger support (Paliak)
6+
* Fix crash caused by loading shared items too early (QuickStick123)
7+
8+
--- Fixed Bugs ---
9+
* Fixing Timeless jewels not working correctly when added via the "Find Timeless Jewel" UI (QuickStick123)
10+
* Fix Atziri's Mirror's drop source (pHiney)
11+
* Fix Blood Sacrament incorrect scaling when setting to stages more than 1 (dreais)
12+
* Fix Spell Suppression mastery not working with Acrobatics Keystone (Paliak)
13+
* Fix magic utility flask effect not scaling Onslaught from Silver Flasks (deathbeam)
14+
115
VERSION[2.25.0][2023/01/03]
216

317
--- Implemented Enhancements ---
@@ -58,7 +72,7 @@ VERSION[2.25.0][2023/01/03]
5872
* Seismic Trap and Lightning Spire Trap not rounding to server ticks for wave count calculation (Edvinas-Smita)
5973
* Missing Physical tag to Heartbound Loop (ProphetLamb)
6074
* Wording on Sandstorm Visage mods (QuickStick123)
61-
* Remove Legacy Crystalised Omniscience from the unique list as it no longer exists (QuickStick123)
75+
* Remove Legacy Crystallised Omniscience from the unique list as it no longer exists (QuickStick123)
6276
* Damage multipliers to exerts also applying to triggered skills (Paliak)
6377
* More than 100% reduced resistances causing negative res to turn positive (QuickStick123)
6478
* Militant Faith mod using "Skill Cost" instead of "Mana Cost" (Regisle)

‎src/Classes/ControlHost.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ function ControlHostClass:SelectControl(newSelControl)
1313
return
1414
end
1515
if self.selControl then
16+
if self.selControl.selDragActive and self.selControl.dragTargetList then
17+
return
18+
end
1619
self.selControl:SetFocus(false)
1720
end
1821
self.selControl = newSelControl

‎src/Classes/TimelessJewelListControl.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Limited to: 1
102102
Variant: Cadiro (Supreme Decadence)
103103
Variant: Victario (Supreme Grandstanding)
104104
Variant: Caspiro (Supreme Ostentation)
105-
Selected Variant: ]] .. variant .. [[
105+
Selected Variant: ]] .. variant .. "\n" .. [[
106106
Radius: Large
107107
Implicits: 0
108108
{variant:1}Commissioned ]] .. data.seed .. [[ coins to commemorate Cadiro
@@ -121,7 +121,7 @@ Limited to: 1
121121
Variant: Doryani (Corrupted Soul)
122122
Variant: Xibaqua (Divine Flesh)
123123
Variant: Ahuana (Immortal Ambition)
124-
Selected Variant: ]] .. variant .. [[
124+
Selected Variant: ]] .. variant .. "\n" ..[[
125125
Radius: Large
126126
Implicits: 0
127127
{variant:1}Bathed in the blood of ]] .. data.seed .. [[ sacrificed in the name of Doryani
@@ -140,7 +140,7 @@ Limited to: 1
140140
Variant: Kaom (Strength of Blood)
141141
Variant: Rakiata (Tempered by War)
142142
Variant: Akoya (Chainbreaker)
143-
Selected Variant: ]] .. variant .. [[
143+
Selected Variant: ]] .. variant .. "\n" .. [[
144144
Radius: Large
145145
Implicits: 0
146146
{variant:1}Commanded leadership over ]] .. data.seed .. [[ warriors under Kaom
@@ -159,7 +159,7 @@ Limited to: 1
159159
Variant: Asenath (Dance with Death)
160160
Variant: Nasima (Second Sight)
161161
Variant: Balbala (The Traitor)
162-
Selected Variant: ]] .. variant .. [[
162+
Selected Variant: ]] .. variant .. "\n" .. [[
163163
Radius: Large
164164
Implicits: 0
165165
{variant:1}Denoted service of ]] .. data.seed .. [[ dekhara in the akhara of Asenath
@@ -200,7 +200,7 @@ Variant: Mana Regen
200200
Variant: Skill Cost
201201
Variant: Non-Curse Aura Effect
202202
Variant: Defences from Shield
203-
Selected Variant: ]] .. variant .. [[
203+
Selected Variant: ]] .. variant .. "\n" .. [[
204204
Selected Alt Variant: ]] .. altVariant .. "\n" .. [[
205205
Selected Alt Variant Two: ]] .. altVariant2 .. "\n" .. [[
206206
Radius: Large

‎src/Data/Skills/other.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -363,14 +363,14 @@ skills["BloodSacramentUnique"] = {
363363
end,
364364
statMap = {
365365
["flameblast_hundred_times_radius_+_per_1%_life_reserved"] = {
366-
skill("radiusExtra", nil, { type = "Multiplier", var = "ChannelledLifeReservedPercentPerStage" }, { type = "Multiplier", var = "BloodSacramentStage" }),
366+
skill("radiusExtra", nil, { type = "Multiplier", var = "ChannelledLifeReservedPercentPerStage" }),
367367
div = 100,
368368
},
369369
["flameblast_damage_+%_final_per_10_life_reserved"] = {
370-
mod("Damage", "MORE", nil, ModFlag.Hit, 0, { type = "Multiplier", var = "ChannelledLifeReservedPerStage", div = 10 }, { type = "Multiplier", var = "BloodSacramentStage" }),
370+
mod("Damage", "MORE", nil, ModFlag.Hit, 0, { type = "Multiplier", var = "ChannelledLifeReservedPerStage", div = 10 }),
371371
},
372372
["flameblast_ailment_damage_+%_final_per_10_life_reserved"] = {
373-
mod("Damage", "MORE", nil, ModFlag.Ailment, 0, { type = "Multiplier", var = "ChannelledLifeReservedPerStage", div = 10 }, { type = "Multiplier", var = "BloodSacramentStage" }),
373+
mod("Damage", "MORE", nil, ModFlag.Ailment, 0, { type = "Multiplier", var = "ChannelledLifeReservedPerStage", div = 10 }),
374374
},
375375
},
376376
baseFlags = {
@@ -3409,4 +3409,4 @@ skills["VoidShot"] = {
34093409
levels = {
34103410
[20] = { damageEffectiveness = 0.65, baseMultiplier = 0.65, levelRequirement = 70, },
34113411
},
3412-
}
3412+
}

‎src/Data/Uniques/shield.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Blood Magic
201201
[[
202202
Atziri's Mirror
203203
Golden Buckler
204-
Upgrade: No longer obtainable
204+
Source: No longer obtainable
205205
Variant: Pre 2.0.0
206206
Variant: Pre 3.0.0
207207
Variant: Pre 3.17.0

‎src/Export/Skills/other.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,14 @@ local skills, mod, flag, skill = ...
154154
end,
155155
statMap = {
156156
["flameblast_hundred_times_radius_+_per_1%_life_reserved"] = {
157-
skill("radiusExtra", nil, { type = "Multiplier", var = "ChannelledLifeReservedPercentPerStage" }, { type = "Multiplier", var = "BloodSacramentStage" }),
157+
skill("radiusExtra", nil, { type = "Multiplier", var = "ChannelledLifeReservedPercentPerStage" }),
158158
div = 100,
159159
},
160160
["flameblast_damage_+%_final_per_10_life_reserved"] = {
161-
mod("Damage", "MORE", nil, ModFlag.Hit, 0, { type = "Multiplier", var = "ChannelledLifeReservedPerStage", div = 10 }, { type = "Multiplier", var = "BloodSacramentStage" }),
161+
mod("Damage", "MORE", nil, ModFlag.Hit, 0, { type = "Multiplier", var = "ChannelledLifeReservedPerStage", div = 10 }),
162162
},
163163
["flameblast_ailment_damage_+%_final_per_10_life_reserved"] = {
164-
mod("Damage", "MORE", nil, ModFlag.Ailment, 0, { type = "Multiplier", var = "ChannelledLifeReservedPerStage", div = 10 }, { type = "Multiplier", var = "BloodSacramentStage" }),
164+
mod("Damage", "MORE", nil, ModFlag.Ailment, 0, { type = "Multiplier", var = "ChannelledLifeReservedPerStage", div = 10 }),
165165
},
166166
},
167167
#mods
@@ -907,4 +907,4 @@ local skills, mod, flag, skill = ...
907907
#skill VoidShot
908908
#flags attack projectile area
909909
fromItem = true,
910-
#mods
910+
#mods

‎src/Modules/CalcDefence.lua

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -492,25 +492,24 @@ function calcs.defence(env, actor)
492492
end
493493
end
494494

495+
local weaponsCfg = {
496+
flags = bit.bor(env.player.weaponData1 and env.player.weaponData1.type and ModFlag[env.player.weaponData1.type] or 0, env.player.weaponData2 and env.player.weaponData2.type and ModFlag[env.player.weaponData2.type] or 0)
497+
}
498+
local spellSuppressionChance = modDB:Sum("BASE", weaponsCfg, "SpellSuppressionChance")
499+
local totalSpellSuppressionChance = modDB:Override(weaponsCfg, "SpellSuppressionChance") or spellSuppressionChance
500+
495501
-- Dodge
496502
-- Acrobatics Spell Suppression to Spell Dodge Chance conversion.
497503
if modDB:Flag(nil, "ConvertSpellSuppressionToSpellDodge") then
498-
local SpellSuppressionChance = modDB:Sum("BASE", nil, "SpellSuppressionChance")
499-
modDB:NewMod("SpellDodgeChance", "BASE", SpellSuppressionChance / 2, "Acrobatics")
504+
modDB:NewMod("SpellDodgeChance", "BASE", spellSuppressionChance / 2, "Acrobatics")
500505
end
501506

502-
503-
local weaponsCfg = {
504-
flags = bit.bor(env.player.weaponData1 and env.player.weaponData1.type and ModFlag[env.player.weaponData1.type] or 0, env.player.weaponData2 and env.player.weaponData2.type and ModFlag[env.player.weaponData2.type] or 0)
505-
}
506-
local totalSpellSuppressionChance = modDB:Override(weaponsCfg, "SpellSuppressionChance") or modDB:Sum("BASE", weaponsCfg, "SpellSuppressionChance")
507-
508507
output.SpellSuppressionChance = m_min(totalSpellSuppressionChance, data.misc.SuppressionChanceCap)
509-
output.SpellSuppressionEffect = data.misc.SuppressionEffect + modDB:Sum("BASE", nil, "SpellSuppressionEffect")
508+
output.SpellSuppressionEffect = data.misc.SuppressionEffect + modDB:Sum("BASE", weaponsCfg, "SpellSuppressionEffect")
510509

511-
if env.mode_effective and modDB:Flag(nil, "SpellSuppressionChanceIsUnlucky") then
510+
if env.mode_effective and modDB:Flag(weaponsCfg, "SpellSuppressionChanceIsUnlucky") then
512511
output.SpellSuppressionChance = output.SpellSuppressionChance / 100 * output.SpellSuppressionChance
513-
elseif env.mode_effective and modDB:Flag(nil, "SpellSuppressionChanceIsLucky") then
512+
elseif env.mode_effective and modDB:Flag(weaponsCfg, "SpellSuppressionChanceIsLucky") then
514513
output.SpellSuppressionChance = (1 - (1 - output.SpellSuppressionChance / 100) ^ 2) * 100
515514
end
516515

0 commit comments

Comments
 (0)