Merge branch 'dev'

.editorconfig

@@ -0,0 +1,4 @@
+[*.lua]
+trim_trailing_whitespace = false
+indent_style = tab
+max_line_length = 120

.github/ISSUE_TEMPLATE/accuracy_bug_report.yaml

@@ -21,6 +21,18 @@ body:
       options:
         - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue)
           required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you running Path of Building on?
+      options: 
+        - Windows
+        - Linux - Wine
+        - Linux - PoB Frontend
+        - MacOS
+      default: 0
+    validations:
+      required: true
   - type: textarea
     id: expected
     attributes:

.github/ISSUE_TEMPLATE/application_bug_report.yaml

@@ -21,6 +21,18 @@ body:
       options:
         - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue)
           required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you running Path of Building on?
+      options: 
+        - Windows
+        - Linux - Wine
+        - Linux - PoB Frontend
+        - MacOS
+      default: 0
+    validations:
+      required: true
   - type: textarea
     id: expected
     attributes:

.github/ISSUE_TEMPLATE/behaviour_bug_report.yaml

@@ -28,6 +28,18 @@ body:
       options: 
         - label: I've checked that the behaviour is supposed to be supported. If it isn't please open a feature request instead (Red text is a feature request).
           required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you running Path of Building on?
+      options: 
+        - Windows
+        - Linux - Wine
+        - Linux - PoB Frontend
+        - MacOS
+      default: 0
+    validations:
+      required: true
   - type: textarea
     id: expected
     attributes:

.github/ISSUE_TEMPLATE/calculation_bug_report.yaml

@@ -28,6 +28,18 @@ body:
       options:
         - label: I've checked that the calculation is supposed to be supported. If it isn't please open a feature request instead (Red text is a feature request).
           required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you running Path of Building on?
+      options: 
+        - Windows
+        - Linux - Wine
+        - Linux - PoB Frontend
+        - MacOS
+      default: 0
+    validations:
+      required: true
   - type: textarea
     id: expected
     attributes:

.github/ISSUE_TEMPLATE/crash_report.yaml

@@ -21,6 +21,18 @@ body:
       options:
         - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue)
           required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you running Path of Building on?
+      options: 
+        - Windows
+        - Linux - Wine
+        - Linux - PoB Frontend
+        - MacOS
+      default: 0
+    validations:
+      required: true
   - type: textarea
     id: context
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -14,6 +14,18 @@ body:
       options:
         - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue)
           required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you running Path of Building on?
+      options: 
+        - Windows
+        - Linux - Wine
+        - Linux - PoB Frontend
+        - MacOS
+      default: 0
+    validations:
+      required: true
   - type: textarea
     id: problem
     attributes:

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install busted
         run: luarocks install busted
       - name: Install cluacov
-        run: luarocks install cluacov
+        run: luarocks install cluacov 0.1.2-1
       - name: Install coveralls integration
         run: luarocks install luacov-coveralls
       - name: Run tests

RELEASE.md

@@ -54,7 +54,7 @@ Steps:
    according to the file's format. This is important, otherwise the JSON data converter
    won't trigger.
 7. Restart Path of Building Community. This should result in a new file `tree.lua`.
-8. Remove `data.json` from the new directory. Do not commit this file.
+8. Remove `data.json` and `sprites.json` from the new directory. Do not commit these files.
 
 ## Installer creation
 

changelog.txt

@@ -1,3 +1,122 @@
+VERSION[2.43.0][2024/07/23]
+
+--- New to Path of Building ---
+* Add 3.25 Passive Tree (Regisle)
+* Update gems with 3.25 balance changes (LocalIdentity)
+* Add new 3.25 uniques (Regisle, acoudray)
+* Add support for linking sets through Loadouts (Subtractem, Peechey, deathbeam)
+* Add support for multiple configurations (Peechey)
+* Add support for new Gladiator Ascendancy nodes (Regisle, dicsantana)
+* Add support for Tinctures (Regisle)
+* Add support for new Warden Ascendancy nodes (Nerotox, Regisle)
+* Add support for new double Exerts Berserker Ascendancy (Paliak)
+* Add support for Champion's new Fortify on allies Ascendancy (Regisle)
+* Add support for Banner mods and Valour on tree (Regisle, LocalIdentity)
+* Add support for new Bandit rewards (Paliak)
+* Add support for new Endurance Charges stats (Regisle)
+* Add support for new Perfect Agony keystone (Paliak)
+* Add support for new Vaal Pact keystone (Nostrademous)
+* Add support for new Rage Rework (Regisle, LocalIdentity)
+* Update Wand base Attack Speed and Crit chance values (HashBR)
+* Update base Ward recharge delay (Wires77)
+* Update Quality on gear to be multiplicative (NL908)
+* Add support for EHP lucky and unlucky (Regisle)
+
+* Add support for Shaper Beam and Cortex Ground Degen as boss skills (Regisle)
+* Add support for throwing multiple Mines/Traps (NL908)
+* Add support for blocking allocated nodes when searching Militant Faith jewels (Peechey)
+* Add support for removing all Tattoos from skill tree (Peechey)
+* Add Abyssal Sockets to Item Trader (Peechey)
+* Add support for Ambush gem (DieMango)
+* Add support for Call to Arms gem (Paliak)
+* Add support for Summon Wisps Support (Paliak)
+* Add basic flask templates to item list (n1tr0xs)
+* Add support for Spark maximum hits skill part (Nerotox)
+* Add support for Tornado Shot secondary projectiles skill part (Regisle)
+* Add support for Automation Support (Paliak)
+* Add support for new tree notables (Nostrademous, Nerotox, Regisle, Paliak)
+* Add support for Impale avoidance in Calcs tab (Nerotox)
+* Add support for new Mastery nodes (Nerotox)
+* Add support for Additional Strike targets mod (Nerotox)
+* Add support for Bisco's Quantity/Rarity mods (Nerotox)
+* Add support for flat dmg reduction to Projectile Attacks (Nerotox)
+* Add support for Maim, Hinder, Impale, CB, Silence, Blind, and Knockback Immunity (Nerotox)
+* Add support for the "%d more recovery if used while on low life" Life flask mod (Nerotox)
+* Add support for Cold Snap more chill effect quality (0xjc)
+
+--- Fixed Crashes ---
+* Fix breakdown crash when using Crit Chance and Perandus Pact (n1tr0xs)
+* Fix error when toggling 'Include Enchants' checkbox in the item trader (teroshan)
+* Fix crash caused by Call to Arms Tattoo conversion (Paliak)
+* Fix faulty uuid calculation causing cache miss (Paliak)
+* Fix crash caused by invalid Impossible Escape keystone (trimbe)
+
+--- User Interface ---
+* Enhance passive tree search to show at the edges (JustinStitt)
+* Redesigned the Import Character menu to improve readability (ryuukk)
+* Add search to the Calcs tab (cooperaustinj)
+* Show total tattoo count when adding tattoos (Peechey)
+* Make Custom Modifiers input resizable (Yoshiitsune)
+* Add option to sort builds by level (NCHitsman)
+* Add a tooltip stat-diff toggle (Ctrl + D) to Items tab (Nightblade)
+* Add support to change Skill Tree with Up and Down arrow keys (n1tr0xs)
+* Split Player and Minion Info lines if they are too long (pHiney)
+* Move "Insane" config to skills section (LocalIdentity)
+* Correct subsection layout for Calcs tab (trimbe)
+* Fix scrolling when using the Trader UI (trimbe)
+* Fix manage trees in tree compare dropdown (zwglau)
+* Adjust gem filtering buttons (ryuukk)
+* Always show max Ignite stacks in Calcs tab (n1tr0xs)
+* Add more Elemental Damage Reduction mods to Calcs tab (Regisle)
+
+--- Fixed Calculations ---
+* Fix Impale calculation not using pre-Armour value (bdemolder)
+* Fix Elemancer overriding golem resistances (Paliak)
+* Fix Manaforged trigger rate calculations (Paliak)
+* Fix Spellslinger trigger rate not being capped by Spellslinger cooldown (Paliak)
+* Fix Tawhoa not showing trigger rate on Calcs page (Paliak)
+* Improve handling of trigger chance (Paliak)
+* Fix incorrect calculation of effective crit/hit chance for triggers when using skills that hit with both weapons at the same time (Paliak)
+* Use duration as pseudo cooldown for Shattershard (Paliak)
+* Fix The Adorned multiplying implicit and explicit mods individually (KaoXinRei)
+* Fix Stance Cooldown mastery affecting Attack Speed (NL908)
+* Fix Trap Cooldown for Trap Supported Spell in Black Zenith (NL908)
+* Fix support gems supporting pseudo active parts from gems granted by the same item (rexfox147)
+* Fix Widowhail multiplier not applying to clones (FWidm)
+* Fix maximum sustainable stages calculations ignoring certain buffs/mods (Paliak)
+* Improve power calculation speed (Regisle)
+
+--- Fixed Behaviours ---
+* Fix "damage with melee skills" mods not working for DoT damage (DieMango)
+* Fix "Deal 10% more Chaos Damage to enemies which have Energy Shield" mastery not being limited to hits and ailments (n1tr0xs)
+* Fix Ngamahu, Flame's Advance not working correctly with Timeless jewels (NL908)
+* Fix Abyss jewels not working in weapon swap (Paliak)
+* Fix Kalandra's Touch implicits and interactions with other uniques that count mods (Paliak)
+* Fix Forbidden Flesh & Flame (Duelist) Impact not updating the required class (n1tr0xs)
+* Fix Timeless Jewel trade league URL (tbiering)
+* Fix enemy level not updating in sync with player level when in auto mode (Paliak)
+* Fix Utula's Hunger not working when an Anoint grants Life (Paliak)
+* Fix The Apostate not working with Life Mastery (LocalIdentity)
+* Fix Dagger mastery not working with Varunastra (Paliak)
+* Fix various issues around Intuitive Leap-like jewels (trimbe)
+
+--- Accuracy Improvements ---
+* Update Mutewind Pennant Shield (ryuukk)
+* Update map mods (Regisle)
+* Fix Curtain Call description not matching in-game description (n1tr0xs)
+* Fix The Dark Seer unique stats (Nerotox)
+* Fix Blood Price unique stats (Nerotox)
+* Fix Seething Fury incorrectly having a radius (Tandrial)
+* Add missing overcapped mod to Replica Perfect Form (Paliak)
+* Add missing strength roll to Kaom's Binding (deathbeam)
+* Generate keystone items from tree data instead of all keystones (trimbe)
+
+--- Other changes ---
+* Fix incorrect shortcut key mapping on some keyboards (Wires77)
+* Fix slow startup on certain computers (zao)
+* Fix error when deleting empty folders (Wires77)
+* Fix incorrectly needing to redownload Timeless Jewel files (zao)
+
 VERSION[2.42.0][2024/03/30]
 
 --- New to Path of Building ---
@@ -16,7 +135,7 @@ VERSION[2.42.0][2024/03/30]
 * Fix Tree export to PoE Planner (pHiney)
 
 --- Other changes ---
-* Save resources when window is minimized (ryuuk)
+* Save resources when window is minimized (ryuukk)
 
 VERSION[2.41.1][2024/03/27]
 
@@ -73,11 +192,11 @@ VERSION[2.40.0][2024/03/24]
 * Overhaul graphics engine to v2.0 (Zao)
   * Should have a noticeable increase in performance and fix many obscure crashes
 * 3.24 Changes:
-  * Add 3.24 Trees by (Regisle)
-  * Add support for new 3.24 Uniques by (Lexy, LocalIdentity)
-  * Update existing uniques from 3.24 patch notes by (Lexy, LocalIdentity)
-  * Update existing skill gems from 3.24 patch notes by (Wires77, LocalIdentity)
-  * Update Tattoos, Flasks and item mods with 3.24 changes by (LocalIdentity)
+  * Add 3.24 Trees (Regisle)
+  * Add support for new 3.24 Uniques (Lexy, LocalIdentity)
+  * Update existing uniques from 3.24 patch notes (Lexy, LocalIdentity)
+  * Update existing skill gems from 3.24 patch notes (Wires77, LocalIdentity)
+  * Update Tattoos, Flasks and item mods with 3.24 changes (LocalIdentity)
 * Add a config option for disabling Champion Intimidate effect (Paliak)
 * Add support for Everlasting Sacrifice Keystone (sida-wang)
 * Fix import of Taiwan realm to use Hotcool (Chuanhsing)
@@ -108,7 +227,7 @@ VERSION[2.40.0][2024/03/24]
 * Implement explosive trap +-30% base tertiary radius, fix overlap chance for transfigured version (Edvinas-Smita)
 * Fix Life Leech and Block missing from current version of Essentia Sanguis (Paliak)
 * Fix current variant of Lioneye's Glare missing Far Shot (Paliak)
-* Fix Nightgrip missing "taken" keyword in description (MattiaCiccone)
+* Fix Nightgrip missing "taken" keyword in description (Ciccooz)
 
 
 VERSION[2.39.3][2024/01/26]
@@ -176,9 +295,9 @@ VERSION[2.39.0][2024/01/23]
 --- Fixed Bugs ---
 * Fix Law of the Wilds using the wrong minion data (LocalIdentity)
 * Fix Blink/Mirror Arrow of Bombarding/Prismatic using wrong Minion Skills (LocalIdentity)
-* Fix Cluster Jewel import not allocating nodes correctly by (sida-wang, Peechey)
+* Fix Cluster Jewel import not allocating nodes correctly (sida-wang, Peechey)
 * Fix importing of Vaal Impurity Skills and Transfigured Vaal Summon Skeletons (sida-wang)
-* Fix mods that apply to skill gems, not applying to their Transfigured versions by (sida-wang, Paliak)
+* Fix mods that apply to skill gems, not applying to their Transfigured versions (sida-wang, Paliak)
 * Fix loading of Passive Tree dropdown in Items Tab (Peechey)
 * Cap Doom Blast expiration mode and use charge based calcs for skills that ignore tick rate (Paliak)
 * Fix bug where Precursor's Emblem's curse mod was not working (Drox346)
@@ -196,7 +315,7 @@ VERSION[2.39.0][2024/01/23]
 * Fix added Cooldown and added Cast Time not working correctly (Paliak)
 * Fix Kalandra's Touch not adding to influenced items multiplier (Paliak)
 * Fix resistance calculations when using Glimpse of Chaos and Chieftain Tasalio node (sida-wang)
-* Fix Oath of the Maji not stacking with Juggernaut's Unbreakable (wkingston1248)
+* Fix Oath of the Maji not stacking with Juggernaut's Unbreakable (Random-Panda)
 
 --- Accuracy Improvements ---
 * Fix mod parsing for Militant Faith Cloistered Notable (Peechey)
@@ -323,10 +442,10 @@ VERSION[2.36.1][2023/12/11]
 VERSION[2.36.0][2023/12/11]
 
 --- New to Path of Building ---
-* Update all base skill gems + minions with 3.23 changes by (Wires77, LocalIdentity)
-* Add support for new Ascendancy skills by (Wires77, LocalIdentity)
+* Update all base skill gems + minions with 3.23 changes (Wires77, LocalIdentity)
+* Add support for new Ascendancy skills (Wires77, LocalIdentity)
 * Add support for Charms (Regisle)
-* Add support for Tinctures by (Regisle, LocalIdentity, Wires77)
+* Add support for Tinctures (Regisle, LocalIdentity, Wires77)
 * Adding new 3.23 uniques (Wires77)
 * Add support for importing new Ascendancies (Wires77)
 * Save trade search weights to build file (Peechey)
@@ -846,10 +965,10 @@ VERSION[2.30.0][2023/05/06]
 VERSION[2.29.0][2023/04/28]
 
 --- Implemented Enhancements ---
-* Support for crafting Crucible mods on items by (LocalIdentity, Peechey)
+* Support for crafting Crucible mods on items (LocalIdentity, Peechey)
 * Add ability to simulate Aura bots or curse support with new Party tab (Regisle)
 * Add support for on-kill explosions (Edvinas-Smita)
-* Add support for Vaal Firestorm, Lightning Arrow, Arctic Armour, Animate Weapon and Reap by (Regisle, LocalIdentity)
+* Add support for Vaal Firestorm, Lightning Arrow, Arctic Armour, Animate Weapon and Reap (Regisle, LocalIdentity)
 * Add ability to search for Megalomaniac in Trader (Edvinas-Smita)
 * Add support for local, Essence and crafted mods in Trader (QuickStick123)
 * Add support for hits against you overwhelm pdr (QuickStick123)

fix_ascendancy_positions.py

@@ -120,6 +120,20 @@ def fix_ascendancy_positions(path: os.PathLike) -> None:
             if node["Node"]["name"] in EXTRA_NODES_STATS:
                 data["nodes"][node["Node"]["skill"]]["stats"] = EXTRA_NODES_STATS[node["Node"]["name"]]["stats"]
                 data["nodes"][node["Node"]["skill"]]["reminderText"] = EXTRA_NODES_STATS[node["Node"]["name"]]["reminderText"]
+
+    # Remove unused image zoom levels and data around them
+    for sprite in data["sprites"]:
+        if "1" in data["sprites"][sprite]:
+            data["sprites"][sprite] = data["sprites"][sprite]["1"]
+        elif "0.3835" in data["sprites"][sprite]:
+            data["sprites"][sprite] = data["sprites"][sprite]["0.3835"]
+    spritesPath = os.path.join(os.path.dirname(path), "sprites.json")
+    with open(spritesPath, "w", encoding="utf-8") as o:
+        json.dump({"extraImages": data["extraImages"],"sprites": data["sprites"]}, o, indent=4)
+    del data["extraImages"]
+    del data["sprites"]
+    del data["imageZoomLevels"]
+
     with open(path, "w", encoding="utf-8") as o:
         json.dump(data, o, indent=4)