Merge branch 'dev'

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,68 @@
+name: Bug report
+description: Create a bug report to help us improve
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for reporting an issue.
+        Please try to fill in as much of the form below as you're able to. Some of the fields marked with an asterisk (*) are required.
+  - type: checkboxes
+    id: version
+    attributes:
+      label: Check version
+      options:
+        - label: I'm running the latest version of Path of Building and I've verified this by checking the [changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/blob/master/CHANGELOG.md)
+          required: true
+  - type: checkboxes
+    id: duplicates
+    attributes:
+      label: Check for duplicates
+      options:
+        - label: I've checked for duplicate issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues)
+          required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: What is the expected behaviour/value?
+      description: Please write a clear and concise description of what should happen.
+      placeholder: E.g. When I'm clicking on [...], I expect [...].
+    validations:
+      required: true
+  - type: textarea
+    id: actual
+    attributes:
+      label: What is the actual behaviour/value?
+      description: Please write a a clear and concise description of what actually happens.
+      placeholder: E.g. When I'm hovering over [...], PoB displays [...].
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: How to reproduce the issue
+      description: Please provide step-by-step instructions.
+      placeholder: |
+        E.g.
+        1. Select [...] as main skill.
+        2. Switch to the items tab.
+        3. Remove the main skill group.
+        4. [...].
+    validations:
+      required: false
+  - type: textarea
+    id: build_code
+    attributes:
+      label: Build code
+      description: Always provide a build code that exhibits the bug you want to report, even if it is not specific to a particular build. This helps us greatly to reproduce bugs faster.
+      placeholder: Build codes can be either Base64 encoded text, or pastebin.com links to this text.
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Screenshots
+      description: If you receive an error or experience graphical bugs, include one or multiple screenshots. GIFs or short videos are also okay, if the bug cannot be displayed in a still image.
+      placeholder: In this text area, you can attach files directly, or link to them if they're hosted elsewhere instead.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,48 @@
+name: Feature request
+description: Suggest an idea for this project
+labels: [feature]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for suggesting a feature.
+        Please try to fill in as much of the form below as you're able to. Some of the fields marked with an asterisk (*) are required.
+  - type: checkboxes
+    id: duplicates
+    attributes:
+      label: Check for duplicates
+      options:
+        - label: I've checked for duplicate issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues)
+          required: true
+  - type: textarea
+    id: problem
+    attributes:
+      label: Is your feature request related to a problem?
+      description: Please write a clear and concise description of what the problem is.
+      placeholder: E.g. I'd like to be able to do [...], but there currently is no support for [...].
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe the solution you'd like
+      description: Please write a a clear and concise description of what you want to happen.
+      placeholder: E.g. When I'm creating a new item, there should be an option to [...].
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives you've considered
+      description: Please write a clear and concise description of any alternative solutions or features you've considered.
+      placeholder: Currently, the same functionality can be achieved be combining [...] with [...].
+    validations:
+      required: false
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+      placeholder: In this text area, you can attach files directly, or link to them if they're hosted elsewhere instead.
+    validations:
+      required: false

CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## [2.5.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/2.5.0) (2021/07/26)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.4.0...2.5.0)
+
+**Implemented enhancements:**
+
+- Add full support for new 3.15 Skill Gems [\#2999](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2999) ([LocalIdentity](https://github.com/LocalIdentity)) ([ifnjeff](https://github.com/ifnjeff)) ([tcid](https://github.com/Voronoff)) 
+	- Absolution
+	- Behead Support
+	- Boneshatter
+	- Defiance Banner
+	- Explosive Concoction
+	- Eye of Winter
+	- Forbidden Rite
+	- Manabond
+	- Rage Vortex
+	- Shield Crush
+	- Spectral Helix
+	- Storm Rain
+	- Summon Reaper
+	- Voltaxic Burst
+- Add partial support for new 3.15 Skill Gems
+	- Ambush
+	- Battlemage's Cry
+	- Blade Trap
+	- Earthbreaker Support
+	- Focused Ballista Support
+- Update enchantments with 3.15 changes [\#2999](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2999) ([LocalIdentity](https://github.com/LocalIdentity)) ([Nostrademous](https://github.com/Nostrademous))
+- Update item mods to 3.15 stats [\#2999](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2999) ([LocalIdentity](https://github.com/LocalIdentity))
+- Update minions with 3.15 changes [\#2999](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2999) ([LocalIdentity](https://github.com/LocalIdentity))
+- Update Pantheons with 3.15 changes [\#2985](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2985) ([Nostrademous](https://github.com/Nostrademous))
+- Add new item bases [\#2986](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2986) ([Wires77](https://github.com/Wires77))
+- Add support for Timeless jewel edits to persist when updating to a new tree version [\#2957](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2957) ([Wires77](https://github.com/Wires77))
+- Add documentation for colour codes to the Notes tab [\#2965](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2965) ([Wires77](https://github.com/Wires77))
+- Update poison damage tooltip from 20% to 30% [\#2947](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2947) ([pundm](https://github.com/pundm))
+
+**Fixed bugs:**
+
+- Fix Mana Reservation Rounding [\#2989](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2989) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix skills turned into mines not having reservation [\#2983](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2983) ([PJacek](https://github.com/PJacek))
+- Fix for downloading tree data if missing [\#2981](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2981) ([Wires77](https://github.com/Wires77))
+- Fix triggered skills not showing the right mana cost [\#2955](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2955) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Hexproof to be unaffected by curses, not immune [\#2933](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2933) ([Wires77](https://github.com/Wires77))
+- Fix level progress calculations [\#2932](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2932) ([ifnjeff](https://github.com/ifnjeff))
+- Fix Anomalous Pride quality didn't increase "chance to bleed" [\#3008](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/3008) ([Typepluto](https://github.com/Typepluto))
+- Fix Bladestorm to always bleeds in Blood Stance [\#2971](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2971) ([Wires77](https://github.com/Wires77))
+- Fix Hollow Palm Technique parsing [\#2960](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2960) ([Helyos96](https://github.com/Helyos96))
+
 ## [2.4.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/2.4.0) (2021/07/21)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.3.0...2.4.0)
@@ -22,7 +70,7 @@
 - Add support for many Alternate Quality gems [\#2898](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2898) ([PJacek](https://github.com/PJacek))
 - Add support for "Perfect Crime" and "Bomb Specialist" ascendancy nodes [\#2905](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2905) ([Nostrademous](https://github.com/Nostrademous))
 - Add support for Chip Away brand cluster notable [\#2777](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2777) ([LocalIdentity](https://github.com/LocalIdentity))
-- Add functionality for Blood Artist notable [\#2767](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2767) ([pundm](https://github.com/pundm))
+- Add functionality for Blood Artist notable [\#2767](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2767) ([pundm](https://github.com/pundm)) ([Wires77](https://github.com/Wires77))
 - Add skill parts for Smite [\#2918](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2918) ([Wires77](https://github.com/Wires77))
 - Add support for Gore Shockwave skill [\#2775](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2775) ([LocalIdentity](https://github.com/LocalIdentity))
 - Add support for Divergent Close Combat [\#2788](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/2788) ([Wires77](https://github.com/Wires77))

changelog.txt

@@ -1,3 +1,44 @@
+VERSION[2.5.0][2021/07/26]
+
+* Add full support for new 3.15 Skill Gems (LocalIdentity) (ifnjeff) (tcid)
+    * Absolution
+    * Behead Support
+    * Boneshatter
+    * Defiance Banner
+    * Explosive Concoction
+    * Eye of Winter
+    * Forbidden Rite
+    * Manabond
+    * Rage Vortex
+    * Shield Crush
+    * Spectral Helix
+    * Storm Rain
+    * Summon Reaper
+    * Voltaxic Burst
+* Add partial support for new 3.15 Skill Gems
+    * Ambush
+    * Battlemage's Cry
+    * Blade Trap
+    * Earthbreaker Support
+    * Focused Ballista Support
+* Update enchantments with 3.15 changes (Nostrademous) (LocalIdentity)
+* Update item mods to 3.15 stats (LocalIdentity)
+* Update minions with 3.15 changes (LocalIdentity)
+* Update Pantheons with 3.15 changes (Nostrademous)
+* Add new item bases (Wires77)
+* Add support for Timeless jewel edits to persist when updating to a new tree version (Wires77)
+* Add documentation for color codes to the Notes tab (Wires77)
+* Update poison damage tooltip from 20% to 30% (pundm)
+* Fix Mana Reservation Rounding (LocalIdentity)
+* Fix skills turned into mines not having reservation (PJacek)
+* Fix for downloading tree data if missing (Wires77)
+* Fix triggered skills not showing the right mana cost (LocalIdentity)
+* Fix Hexproof to be unaffected by curses, not immune (Wires77)
+* Fix level progress calculations (ifnjeff)
+* Fix Anomalous Pride quality didn't increase "chance to bleed" (Typepluto)
+* Fix Bladestorm to always bleeds in Blood Stance (Wires77)
+* Fix Hollow Palm Technique parsing (Helyos96)
+
 VERSION[2.4.0][2021/07/22]
 
 * Add 3.15 passive skill tree (ppoelzl)
@@ -17,7 +58,7 @@ VERSION[2.4.0][2021/07/22]
 * Add support for many Alternate Quality gems (PJacek)
 * Add support for "Perfect Crime" and "Bomb Specialist" ascendancy nodes (Nostrademous)
 * Add support for Chip Away brand cluster notable (LocalIdentity)
-* Add functionality for Blood Artist notable (pundm)
+* Add functionality for Blood Artist notable (pundm) (Wires77)
 * Add skill parts for Smite (Wires77)
 * Add support for Gore Shockwave skill (LocalIdentity)
 * Add support for Divergent Close Combat (Wires77)

src/Classes/GemSelectControl.lua

@@ -519,10 +519,16 @@ function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mer
 		if grantedEffectLevel.cooldown then
 			self.tooltip:AddLine(16, string.format("^x7F7F7FCooldown Time: ^7%.2f sec", grantedEffectLevel.cooldown))
 		end
+		if grantedEffectLevel.critChance then
+			self.tooltip:AddLine(16, string.format("^x7F7F7FCritical Strike Chance: ^7%.2f%%", grantedEffectLevel.critChance))
+		end
 		if gemInstance.gemData.tags.attack then
 			if grantedEffectLevel.attackSpeedMultiplier then
 				self.tooltip:AddLine(16, string.format("^x7F7F7FAttack Speed: ^7%d%% of base", grantedEffectLevel.attackSpeedMultiplier + 100))
 			end
+			if grantedEffectLevel.attackTime then
+				self.tooltip:AddLine(16, string.format("^x7F7F7FAttack Time: ^7%.2f sec", grantedEffectLevel.attackTime / 1000))
+			end
 			if grantedEffectLevel.baseMultiplier then
 				self.tooltip:AddLine(16, string.format("^x7F7F7FAttack Damage: ^7%g%% of base", grantedEffectLevel.baseMultiplier * 100))
 			end
@@ -532,9 +538,6 @@ function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mer
 			else
 				self.tooltip:AddLine(16, "^x7F7F7FCast Time: ^7Instant")
 			end
-			if grantedEffectLevel.critChance then
-				self.tooltip:AddLine(16, string.format("^x7F7F7FCritical Strike Chance: ^7%.2f%%", grantedEffectLevel.critChance))
-			end
 		end
 		if grantedEffectLevel.damageEffectiveness then
 			self.tooltip:AddLine(16, string.format("^x7F7F7FEffectiveness of Added Damage: ^7%d%%", grantedEffectLevel.damageEffectiveness * 100))

src/Classes/Item.lua

@@ -967,11 +967,13 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
 		local evasionEnergyShieldBase = sumLocal(modList, "EvasionAndEnergyShield", "BASE", 0)
 		local energyShieldBase = sumLocal(modList, "EnergyShield", "BASE", 0) + (self.base.armour.EnergyShieldBase or 0)
 		local armourEnergyShieldBase = sumLocal(modList, "ArmourAndEnergyShield", "BASE", 0)
+		local wardBase = sumLocal(modList, "Ward", "BASE", 0) + (self.base.armour.WardBase or 0)
 		local armourInc = sumLocal(modList, "Armour", "INC", 0)
 		local armourEvasionInc = sumLocal(modList, "ArmourAndEvasion", "INC", 0)
 		local evasionInc = sumLocal(modList, "Evasion", "INC", 0)
 		local evasionEnergyShieldInc = sumLocal(modList, "EvasionAndEnergyShield", "INC", 0)
 		local energyShieldInc = sumLocal(modList, "EnergyShield", "INC", 0)
+		local wardInc = sumLocal(modList, "Ward", "INC", 0)
 		local armourEnergyShieldInc = sumLocal(modList, "ArmourAndEnergyShield", "INC", 0)
 		local defencesInc = sumLocal(modList, "Defences", "INC", 0)
 		local qualityScalar = self.quality
@@ -981,6 +983,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
 		armourData.Armour = round((armourBase + armourEvasionBase + armourEnergyShieldBase) * (1 + (armourInc + armourEvasionInc + armourEnergyShieldInc + defencesInc + qualityScalar) / 100))
 		armourData.Evasion = round((evasionBase + armourEvasionBase + evasionEnergyShieldBase) * (1 + (evasionInc + armourEvasionInc + evasionEnergyShieldInc + defencesInc + qualityScalar) / 100))
 		armourData.EnergyShield = round((energyShieldBase + evasionEnergyShieldBase + armourEnergyShieldBase) * (1 + (energyShieldInc + armourEnergyShieldInc + evasionEnergyShieldInc + defencesInc + qualityScalar) / 100))
+		armourData.Ward = round(wardBase * (1 + (wardInc + defencesInc + qualityScalar) / 100))
 		if self.base.armour.BlockChance then
 			armourData.BlockChance = self.base.armour.BlockChance + sumLocal(modList, "BlockChance", "BASE", 0)
 		end

src/Classes/ItemsTab.lua

@@ -2332,6 +2332,9 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
 		if armourData.EnergyShield > 0 then
 			tooltip:AddLine(16, s_format("^x7F7F7FEnergy Shield: %s%d", main:StatColor(armourData.EnergyShield, base.armour.EnergyShieldBase), armourData.EnergyShield))
 		end
+		if armourData.Ward > 0 then
+			tooltip:AddLine(16, s_format("^x7F7F7FWard: %s%d", main:StatColor(armourData.Ward, base.armour.WardBase), armourData.Ward))
+		end
 	elseif base.flask then
 		-- Flask-specific info
 		local flaskData = item.flaskData

src/Classes/ModStore.lua

@@ -494,6 +494,9 @@ function ModStoreClass:EvalMod(mod, cfg)
 			else
 				match = (tag.skillName == matchName)
 			end
+			if tag.neg then
+				match = not match
+			end
 			if not match then
 				return
 			end