Skip to content

Commit 4951f54

Browse files
author
LocalIdentity
committed
Merge branch 'dev'
2 parents 2d96cc1 + f2b103d commit 4951f54

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+29577
-20751
lines changed

‎.github/workflows/backport.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Port changes to PoB1
2+
3+
on:
4+
pull_request:
5+
types: [closed]
6+
7+
env:
8+
LABEL_STRING: ${{ join(github.event.pull_request.labels.*.name, ',') }}
9+
10+
jobs:
11+
backport:
12+
if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'pob1')
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Notify PathOfBuilding repo
16+
uses: peter-evans/repository-dispatch@v3
17+
with:
18+
token: ${{ secrets.WIRES77_PAT }}
19+
repository: ${{ github.repository_owner }}/PathOfBuilding
20+
event-type: port-changes
21+
client-payload: '{"patch_url": "${{ github.event.pull_request.patch_url }}", "msg": "Apply changes from ${{ github.event.pull_request.html_url }}", "id": ${{ github.event.pull_request.number }}, "title": "${{ github.event.pull_request.title }}", "labels": "${{ env.LABEL_STRING }}", "name": "${{ github.event.pull_request.user.name }}", "user": "${{ github.event.pull_request.user.login }}"}'
22+

‎.github/workflows/backport_receive.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Update code with code from PoB1
2+
3+
on:
4+
repository_dispatch:
5+
types:
6+
- port-changes
7+
8+
jobs:
9+
apply-patch:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v3
14+
with:
15+
ref: 'dev'
16+
- name: Apply patch
17+
run: |
18+
curl -L ${{ github.event.client_payload.patch_url }} | git apply -v --index
19+
- name: Create Pull Request
20+
uses: peter-evans/create-pull-request@v5
21+
with:
22+
title: "[pob1-port] ${{ github.event.client_payload.title }}"
23+
branch: pob1-pr-${{ github.event.client_payload.id }}
24+
body: |
25+
${{ github.event.client_payload.msg }}
26+
author: ${{ github.event.client_payload.name || github.event.client_payload.user }} <${{ github.event.client_payload.user }}@users.noreply.github.com>
27+
commit-message: ${{ github.event.client_payload.msg }}
28+
labels: ${{ github.event.client_payload.labels }}

‎.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
sed -i 's/\[Voronoff/\[Tom Clancy Is Dead/' temp_change.md;
4141
sed -i 's/\[PJacek/\[TPlant/' temp_change.md;
4242
sed -i 's/\[justjuangui/\[trompetin17/' temp_change.md;
43+
sed -i 's/\r//g' temp_change.md;
4344
cp temp_change.md changelog_temp.txt;
4445
cat CHANGELOG.md | tr \\r \\n | sed '1d' >> temp_change.md;
4546
printf "# Changelog\n\n## [v${{ github.event.inputs.releaseVersion }}](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v${{ github.event.inputs.releaseVersion }}) ($(date +'%Y/%m/%d'))\n\n" | cat - temp_change.md > CHANGELOG.md;

‎CHANGELOG.md

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

3+
## [v0.8.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v0.8.0) (2025/04/16)
4+
5+
[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/compare/v0.7.1...v0.8.0)
6+
7+
## What's Changed
8+
### New to Path of Building
9+
- Add support for Megalomaniac in PoB Trader [\#977](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/977) ([Edvinas-Smita](https://github.com/Edvinas-Smita))
10+
- Add proper support for pasting items with Lesser and Greater Runes [\#1010](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1010) ([QuickStick123](https://github.com/QuickStick123))
11+
### Tree
12+
- Add support for Eternal Life ascendancy notable [\#1011](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1011) ([Edvinas-Smita](https://github.com/Edvinas-Smita))
13+
- Add support for Smith of Kitava's Body Armour mods [\#967](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/967) ([Peechey](https://github.com/Peechey), [LocalIdentity](https://github.com/LocalIdentity))
14+
- Add support for "Crimson Assault" Keystone [\#979](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/979) ([majochem](https://github.com/majochem))
15+
### Skills
16+
- Add support for Dread Banner Ailment and Stun threshold [\#960](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/960) ([Blitz54](https://github.com/Blitz54))
17+
- Add support for Burgeon, Pinpoint Critical, Warm Blooded, and other partial gems [\#973](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/973) ([Blitz54](https://github.com/Blitz54))
18+
- Add support for Retreat, Pursuit, and Blindside [\#971](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/971) ([Blitz54](https://github.com/Blitz54))
19+
- Add support for Unerring Power [\#1002](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1002) ([Blitz54](https://github.com/Blitz54))
20+
### Items
21+
- Add support for Sire of Shards +4 projectiles [\#989](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/989) ([Blitz54](https://github.com/Blitz54))
22+
- Add support for Nightscale "cannot regen mana" mod [\#988](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/988) ([Blitz54](https://github.com/Blitz54))
23+
- Add support for Gloamgown base ES Recharge Delay [\#987](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/987) ([Blitz54](https://github.com/Blitz54))
24+
- Add support for Daevata's Wind "past 8 seconds" mod [\#1005](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1005) ([Blitz54](https://github.com/Blitz54))
25+
### Fixed Crashes
26+
- Fix a crash when importing a character with tree version 0_1 selected [\#970](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/970) ([trompetin17](https://github.com/justjuangui))
27+
### User Interface
28+
- Add Weapon requirements to gem tooltip [\#1017](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1017) ([LocalIdentity](https://github.com/LocalIdentity))
29+
- Improve Accuracy Breakdown for Excess Hit Chance [\#969](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/969) ([majochem](https://github.com/majochem))
30+
- Fix Ascendancy node positions on tree [\#1016](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1016) ([trompetin17](https://github.com/justjuangui))
31+
### Fixed Calculations
32+
- Fix Concoction skill Crit Chance and base damage [\#1019](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1019) ([LocalIdentity](https://github.com/LocalIdentity))
33+
- Fix Gem attack speed multiplier affecting Crossbow reload speed [\#1020](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1020) ([LocalIdentity](https://github.com/LocalIdentity))
34+
- Fix Recovery rate mods multiplying Life / Mana regeneration rate [\#1001](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1001) ([LocalIdentity](https://github.com/LocalIdentity))
35+
- Fix Support Gem reservation multipliers [\#1000](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1000) ([LocalIdentity](https://github.com/LocalIdentity))
36+
- Fix Arc skill on Storm Mages not working [\#1004](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1004) ([LocalIdentity](https://github.com/LocalIdentity))
37+
- Fix Dauntless max damage stacking [\#1014](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1014) ([Blitz54](https://github.com/Blitz54))
38+
### Fixed Behaviours
39+
- Fix trader sometimes not finding any mods for weapon slots [\#980](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/980) ([Edvinas-Smita](https://github.com/Edvinas-Smita))
40+
### Accuracy Improvements
41+
- Fix Giant's Blood Keystone [\#965](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/965) ([majochem](https://github.com/majochem))
42+
- Fix Cursecarver variants [\#1008](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1008) ([Blitz54](https://github.com/Blitz54))
43+
44+
45+
346
## [v0.7.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v0.7.1) (2025/04/09)
447

548
[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/compare/v0.7.0...v0.7.1)

‎changelog.txt

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,50 @@
1+
VERSION[0.8.0][2025/04/16]
2+
3+
--- New to Path of Building ---
4+
* Add support for Megalomaniac in PoB Trader (Edvinas-Smita)
5+
* Add proper support for pasting items with Lesser and Greater Runes (QuickStick123)
6+
7+
--- Tree ---
8+
* Add support for Eternal Life ascendancy notable (Edvinas-Smita)
9+
* Add support for Smith of Kitava's Body Armour mods (Peechey, LocalIdentity)
10+
* Add support for "Crimson Assault" Keystone (majochem)
11+
12+
--- Skills ---
13+
* Add support for Dread Banner Ailment and Stun threshold (Blitz54)
14+
* Add support for Burgeon, Pinpoint Critical, Warm Blooded, and other partial gems (Blitz54)
15+
* Add support for Retreat, Pursuit, and Blindside (Blitz54)
16+
* Add support for Unerring Power (Blitz54)
17+
18+
--- Items ---
19+
* Add support for Sire of Shards +4 projectiles (Blitz54)
20+
* Add support for Nightscale "cannot regen mana" mod (Blitz54)
21+
* Add support for Gloamgown base ES Recharge Delay (Blitz54)
22+
* Add support for Daevata's Wind "past 8 seconds" mod (Blitz54)
23+
24+
--- Fixed Crashes ---
25+
* Fix a crash when importing a character with tree version 0_1 selected (trompetin17)
26+
27+
--- User Interface ---
28+
* Add Weapon requirements to gem tooltip (LocalIdentity)
29+
* Improve Accuracy Breakdown for Excess Hit Chance (majochem)
30+
* Fix Ascendancy node positions on tree (trompetin17)
31+
32+
--- Fixed Calculations ---
33+
* Fix Concoction skill Crit Chance and base damage (LocalIdentity)
34+
* Fix Gem attack speed multiplier affecting Crossbow reload speed (LocalIdentity)
35+
* Fix Recovery rate mods multiplying Life / Mana regeneration rate (LocalIdentity)
36+
* Fix Support Gem reservation multipliers (LocalIdentity)
37+
* Fix Arc skill on Storm Mages not working (LocalIdentity)
38+
* Fix Dauntless max damage stacking (Blitz54)
39+
40+
--- Fixed Behaviours ---
41+
* Fix trader sometimes not finding any mods for weapon slots (Edvinas-Smita)
42+
43+
--- Accuracy Improvements ---
44+
* Fix Giant's Blood Keystone (majochem)
45+
* Fix Cursecarver variants (Blitz54)
46+
47+
148
VERSION[0.7.1][2025/04/09]
249

350
--- Fixed Behaviours ---

‎manifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<PoBVersion>
3-
<Version number="0.7.1" />
3+
<Version number="0.8.0" />
44
<Source part="default" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/{branch}/" />
55
<Source part="runtime" platform="win32" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/{branch}/runtime/" />
66
<Source part="program" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/{branch}/src/" />

‎src/Classes/ConfigTab.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -867,9 +867,9 @@ function ConfigTabClass:BuildModList()
867867
varData.apply(true, modList, enemyModList, self.build)
868868
end
869869
elseif varData.type == "count" or varData.type == "integer" or varData.type == "countAllowZero" or varData.type == "float" then
870-
if input[varData.var] and (input[varData.var] ~= 0 or varData.type == "countAllowZero") then
870+
if input[varData.var] and (input[varData.var] ~= 0 or varData.type ~= "count") then
871871
varData.apply(input[varData.var], modList, enemyModList, self.build)
872-
elseif placeholder[varData.var] and (placeholder[varData.var] ~= 0 or varData.type == "countAllowZero") then
872+
elseif placeholder[varData.var] and (placeholder[varData.var] ~= 0 or varData.type ~= "count") then
873873
varData.apply(placeholder[varData.var], modList, enemyModList, self.build)
874874
end
875875
elseif varData.type == "list" then

‎src/Classes/GemSelectControl.lua

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,11 +570,19 @@ function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
570570
))
571571
end
572572
if grantedEffect.support then
573-
if grantedEffectLevel.manaMultiplier then
573+
if grantedEffectLevel.manaMultiplier and grantedEffectLevel.reservationMultiplier and grantedEffectLevel.manaMultiplier == grantedEffectLevel.reservationMultiplier then
574+
self.tooltip:AddLine(16, string.format("^x7F7F7FCost & Reservation Multiplier: ^7%d%%", grantedEffectLevel.manaMultiplier + 100))
575+
elseif grantedEffectLevel.reservationMultiplier then
576+
self.tooltip:AddLine(16, string.format("^x7F7F7FReservation Multiplier: ^7%d%%", grantedEffectLevel.reservationMultiplier + 100))
577+
elseif grantedEffectLevel.manaMultiplier then
574578
self.tooltip:AddLine(16, string.format("^x7F7F7FCost Multiplier: ^7%d%%", grantedEffectLevel.manaMultiplier + 100))
575579
end
576580
if grantedEffectLevel.spiritReservationFlat then
577-
self.tooltip:AddLine(16, string.format("^x7F7F7FReservation: ^7%d Spirit", grantedEffectLevel.spiritReservationFlat))
581+
if grantedEffect.support then
582+
self.tooltip:AddLine(16, string.format("^x7F7F7FAdditional Reservation: ^7%d Spirit", grantedEffectLevel.spiritReservationFlat))
583+
else
584+
self.tooltip:AddLine(16, string.format("^x7F7F7FReservation: ^7%d Spirit", grantedEffectLevel.spiritReservationFlat))
585+
end
578586
end
579587
if grantedEffectLevel.cooldown then
580588
local string = string.format("^x7F7F7FCooldown Time: ^7%.2f sec", grantedEffectLevel.cooldown)
@@ -629,6 +637,9 @@ function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
629637
if grantedEffectLevel.critChance then
630638
self.tooltip:AddLine(16, string.format("^x7F7F7FCritical Hit Chance: ^7%.2f%%", grantedEffectLevel.critChance))
631639
end
640+
if gemInstance.gemData.weaponRequirements then
641+
self.tooltip:AddLine(16, "^x7F7F7F Requires: ^7" .. gemInstance.gemData.weaponRequirements)
642+
end
632643
end
633644
if addReq and displayInstance.quality > 0 then
634645
self.tooltip:AddLine(16, string.format("^x7F7F7FQuality: "..colorCodes.MAGIC.."+%d%%^7%s",

‎src/Classes/ImportTab.lua

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -598,8 +598,11 @@ function ImportTabClass:ImportPassiveTreeAndJewels(charData)
598598
end
599599
end
600600

601+
self.build.spec:ImportFromNodeList(charData.class, nil, nil, charPassiveData.alternate_ascendancy or 0, hashes, weaponSets, {}, charPassiveData.mastery_effects or {}, latestTreeVersion .. (charData.league:match("Ruthless") and "_ruthless" or ""))
602+
603+
-- workaround to update the ui to last option
604+
self.build.treeTab.controls.versionSelect.selIndex = #self.build.treeTab.treeVersions
601605
-- attributes nodes
602-
self.build.spec.hashOverrides = {}
603606
for skillId, nodeInfo in pairs(charPassiveData.skill_overrides) do
604607
local changeAttributeId = 0
605608
if nodeInfo.name == "Intelligence" then
@@ -611,13 +614,16 @@ function ImportTabClass:ImportPassiveTreeAndJewels(charData)
611614
end
612615

613616
if changeAttributeId > 0 then
614-
self.build.spec:SwitchAttributeNode(tonumber(skillId), changeAttributeId)
617+
local id = tonumber(skillId)
618+
self.build.spec:SwitchAttributeNode(id, changeAttributeId)
619+
local node = self.build.spec.nodes[id]
620+
621+
if node then
622+
self.build.spec:ReplaceNode(node, self.build.spec.hashOverrides[id])
623+
end
615624
end
616625
end
617626

618-
local attributesOverrides = copyTable(self.build.spec.hashOverrides, true)
619-
620-
self.build.spec:ImportFromNodeList(charData.class, nil, nil, charPassiveData.alternate_ascendancy or 0, hashes, weaponSets, attributesOverrides, charPassiveData.mastery_effects or {}, latestTreeVersion .. (charData.league:match("Ruthless") and "_ruthless" or ""))
621627
self.build.spec:AddUndoState()
622628
self.build.characterLevel = charData.level
623629
self.build.characterLevelAutoMode = false

0 commit comments

Comments
 (0)