Merge branch 'dev'

Author: LocalIdentity

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [v2.33.3](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.33.3) (2023/08/26)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.33.2...v2.33.3)
+
+<!-- Release notes generated using configuration in .github/release.yml at dev -->
+
+## What's Changed
+### Fixed Bugs
+- Fix Replica Dragonfang's Flight not providing levels to Vaal versions of a skill [\#6512](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6512) ([Paliak](https://github.com/Paliak))
+- Fix Full DPS not working for skills granted by items e.g. Arakaali's Fang  [\#6511](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6511) ([Paliak](https://github.com/Paliak))
+- Fix Militant Faith jewel not overriding small attribute tattoos [\#6514](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6514) ([LocalIdentity](https://github.com/LocalIdentity))
+
+
+
 ## [v2.33.2](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.33.2) (2023/08/25)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.33.1...v2.33.2)

changelog.txt

@@ -1,3 +1,11 @@
+VERSION[2.33.3][2023/08/26]
+
+--- Fixed Bugs ---
+* Fix Replica Dragonfang's Flight not providing levels to Vaal versions of a skill (Paliak)
+* Fix Full DPS not working for skills granted by items e.g. Arakaali's Fang  (Paliak)
+* Fix Militant Faith jewel not overriding small attribute tattoos (LocalIdentity)
+
+
 VERSION[2.33.2][2023/08/26]
 
 --- Fixed Crashes ---

src/Classes/PassiveSpec.lua

@@ -928,7 +928,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 					local dex = (isValueInArray(attributes, node.dn) or node.isTattoo) and "2" or "4"
 					self:NodeAdditionOrReplacementFromString(node, " \n+" .. dex .. " to Dexterity")
 				elseif conqueredBy.conqueror.type == "templar" then
-					if isValueInArray(attributes, node.dn) then
+					if (isValueInArray(attributes, node.dn) or node.isTattoo) then
 						local legionNode = legionNodes[91] -- templar_devotion_node
 						self:ReplaceNode(node, legionNode)
 					else

src/Data/ModCache.lua

@@ -109,6 +109,7 @@ function calcLib.gemIsType(gem, type)
 			((type == "active skill" or type == "grants_active_skill") and gem.tags.grants_active_skill and not gem.tags.support) or
 			(type == "non-vaal" and not gem.tags.vaal) or
 			(type == gem.name:lower()) or
+			(type == gem.name:lower():gsub("^vaal ", "")) or
 			((type ~= "active skill" and type ~= "grants_active_skill") and gem.tags[type]))
 end
 

src/Modules/CalcTools.lua

@@ -1764,7 +1764,7 @@ local function grantedExtraSkill(name, level, noSupports)
 	name = name:gsub(" skill","")
 	if gemIdLookup[name] then
 		return {
-			mod("ExtraSkill", "LIST", { skillId = gemIdLookup[name], level = level, noSupports = noSupports })
+			mod("ExtraSkill", "LIST", { skillId = gemIdLookup[name], level = tonumber(level), noSupports = noSupports })
 		}
 	end
 end
@@ -1775,7 +1775,7 @@ local function triggerExtraSkill(name, level, noSupports, sourceSkill, triggerCh
 	end
 	if gemIdLookup[name] then
 		return {
-			mod("ExtraSkill", "LIST", { skillId = gemIdLookup[name], level = level, noSupports = noSupports, triggered = true, source = sourceSkill, triggerChance = triggerChance })
+			mod("ExtraSkill", "LIST", { skillId = gemIdLookup[name], level = tonumber(level), noSupports = noSupports, triggered = true, source = sourceSkill, triggerChance = tonumber(triggerChance) })
 		}
 	end
 end