Merge branch 'master' into dev

2020-09-17 01:06:49 +10:00
parent 90a5dce330 4eb275a429
commit 797c44d8f9
12 changed files with 3349 additions and 3298 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+### 1.4.170.9 - 2020/09/17
+ * Add better breakdown for duration mods on gems
+ * Fix crash related to new Keystones and old trees
+ * Fix support for Iron Grip Notable
+ * Fix support for new ailment scaling nodes
+ * Fix support for new cooldown recovery wording on nodes
+### 1.4.170.8 - 2020/09/16
+ * Add support for 3.12 Tree
+ * Add proper support for Carrion Golem
+ * Add support for Ancient Waystone unique
+ * Add support for +1 gems on Awakened Blasphemy
+ * Add configurable charges for Minions
+ * Add support to generate mods for Skin of the Lords
+ * Add Redemption Knight spectre
+ * Add Baranite Preacher spectre
+ * Add Templar Tactician spectre
+ * Add Scinteel Synthete spectre
+ * Add support for Non-Channelling Mana cost
+ * Fix crash when trying to add support gems to any spell while having "Gain no inherent bonuses from Attributes"
+ * Fix crash related to Minion Critical Strike Chance
+ * Fix mods on several uniques
+ * Fix current Shock note not showing in Shock effect breakdown for attack builds
+ * Fix Second Wind CDR numbers
+ * Fix stats on Enhanced Vaal Fallen, Baranite Thaumaturge, Baranite Sister
+ * Fix Life regen not showing in the sidebar
+ * Fix top node power calculations
 ### 1.4.170.7 - 2020/07/22
 * Fix crash related to the Siegebreaker belt
 * Fix crash related to Dancing Dervish/Duo
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,7 +44,7 @@ The easiest way to make and test changes is by setting up a development install,

       git clone -b dev https://github.com/PathOfBuildingCommunity/PathOfBuilding.git
 2. Create a shortcut to the 'Path of Building.exe' in your main installation of the program.
-3. Add the path to `./Launch.lua` as an argument to the shortcut. You should end up with something like: `"C:\Program Files (x86)\Path of Building Community\Path of Building.exe" "C:\Path of Building\Launch.lua"`.
+3. Add the path to `./Launch.lua` as an argument to the shortcut. You should end up with something like: `"C:\%APPDATA%\Path of Building Community\Path of Building.exe" "C:\PathOfBuilding\Launch.lua"`.

 You can now use the shortcut to run the program from the repository. Running the program in this manner automatically enables 'Dev Mode', which has some handy debugging feature:
 * `F5` restarts the program in-place (this is what usually happens when an update is applied).
@@ -71,7 +71,7 @@ Note: If you've configured a remote already, you can skip ahead to step 6.
       git remote -v
 2. Add a new remote repository and name it `upstream`.

-       git remote add upstream https://github.com/Path of Building Community/PathOfBuilding.git
+       git remote add upstream https://github.com/PathOfBuildingCommunity/PathOfBuilding.git
 3. Verify that adding the remote worked by running the last command again.

       git remote -v
@@ -114,7 +114,7 @@ dbg.tcpListen('localhost', 9966)
 5. Start Path of Building Community
 6. Attach the debugger

-##### IntelliJ Idea Community
+##### PyCharm Community / IntelliJ Idea Community

 1. Create a new 'Debug Configuration' of type 'Emmy Debugger(NEW)'.
 2. Select 'x86' version.
@@ -131,7 +131,7 @@ The repository also contains the system used to export data from the game's Cont

 How to export data from a GGPK file:

-1. Create a shortcut to `Path of Building.exe` with the path to `./Export/Launch.lua` as first argument. You should end up with something like: `"C:\Program Files (x86)\Path of Building Community\Path of Building.exe" "C:\Path of Building\Export\Launch.lua"`.
+1. Create a shortcut to `Path of Building.exe` with the path to `./Export/Launch.lua` as first argument. You should end up with something like: `"C:\%APPDATA%\Path of Building Community\Path of Building.exe" "C:\PathOfBuilding\Export\Launch.lua"`.
 2. Run the shortcut, and the GGPK data viewer UI will appear. If you get an error, be sure you're using the latest release of Path of Building Community.
 3. Paste the path to `Content.ggpk` into the text box in the top left, and hit `Enter` to read the GGPK. If successful, you will see a list of the data tables in the GGPK file. Note: This will not work on the GGPK from the torrent file released before league launches, as it contains no `./Data` section.
 4. Click `Scripts >>` to show the list of available export scripts. Double-clicking a script will run it, and the box to the right will show any output from the script.
--- a/Data/3_0/ModCache.lua
+++ b/Data/3_0/ModCache.lua
--- a/Modules/CalcBreakdown.lua
+++ b/Modules/CalcBreakdown.lua
@@ -67,9 +67,9 @@ function breakdown.simple(extraBase, cfg, total, ...)
 	end
 end

-function breakdown.mod(cfg, ...)
-	local inc = modDB:Sum("INC", cfg, ...)
-	local more = modDB:More(cfg, ...)
+function breakdown.mod(modList, cfg, ...)
+	local inc = modList:Sum("INC", cfg, ...)
+	local more = modList:More(cfg, ...)
 	if inc ~= 0 and more ~= 1 then
 		return { 
 			s_format("%.2f ^8(increased/reduced)", 1 + inc/100),
--- a/Modules/CalcDefence-3_0.lua
+++ b/Modules/CalcDefence-3_0.lua
@@ -571,7 +571,7 @@ function calcs.defence(env, actor)
 	output.CritExtraDamageReduction = m_min(modDB:Sum("BASE", nil, "ReduceCritExtraDamage"), 100)
 	output.LightRadiusMod = calcLib.mod(modDB, nil, "LightRadius")
 	if breakdown then
-		breakdown.LightRadiusMod = breakdown.mod(nil, "LightRadius")
+		breakdown.LightRadiusMod = breakdown.mod(modDB, nil, "LightRadius")
 	end

 	-- Energy Shield bypass
--- a/Modules/CalcOffence-3_0.lua
+++ b/Modules/CalcOffence-3_0.lua
@@ -523,7 +523,7 @@ function calcs.offence(env, actor, activeSkill)
 		end
 		output.ProjectileSpeedMod = calcLib.mod(skillModList, skillCfg, "ProjectileSpeed")
 		if breakdown then
-			breakdown.ProjectileSpeedMod = breakdown.mod(skillCfg, "ProjectileSpeed")
+			breakdown.ProjectileSpeedMod = breakdown.mod(skillModList, skillCfg, "ProjectileSpeed")
 		end
 	end
 	if skillFlags.melee then
@@ -555,13 +555,13 @@ function calcs.offence(env, actor, activeSkill)
 	if activeSkill.skillTypes[SkillType.Aura] then
 		output.AuraEffectMod = calcLib.mod(skillModList, skillCfg, "AuraEffect")
 		if breakdown then
-			breakdown.AuraEffectMod = breakdown.mod(skillCfg, "AuraEffect")
+			breakdown.AuraEffectMod = breakdown.mod(skillModList, skillCfg, "AuraEffect")
 		end
 	end
 	if activeSkill.skillTypes[SkillType.Curse] then
 		output.CurseEffectMod = calcLib.mod(skillModList, skillCfg, "CurseEffect")
 		if breakdown then
-			breakdown.CurseEffectMod = breakdown.mod(skillCfg, "CurseEffect")
+			breakdown.CurseEffectMod = breakdown.mod(skillModList, skillCfg, "CurseEffect")
 		end
 	end
 	if skillFlags.trap then
@@ -698,7 +698,7 @@ function calcs.offence(env, actor, activeSkill)
 		output.TotemLifeMod = calcLib.mod(skillModList, skillCfg, "TotemLife")
 		output.TotemLife = round(m_floor(env.data.monsterAllyLifeTable[skillData.totemLevel] * env.data.totemLifeMult[activeSkill.skillTotemId]) * output.TotemLifeMod)
 		if breakdown then
-			breakdown.TotemLifeMod = breakdown.mod(skillCfg, "TotemLife")
+			breakdown.TotemLifeMod = breakdown.mod(skillModList, skillCfg, "TotemLife")
 			breakdown.TotemLife = {
 				"Totem level: "..skillData.totemLevel,
 				env.data.monsterAllyLifeTable[skillData.totemLevel].." ^8(base life for a level "..skillData.totemLevel.." monster)",
@@ -725,7 +725,10 @@ function calcs.offence(env, actor, activeSkill)
 	do
 		output.DurationMod = calcLib.mod(skillModList, skillCfg, "Duration", "PrimaryDuration", "SkillAndDamagingAilmentDuration", skillData.mineDurationAppliesToSkill and "MineDuration" or nil)
 		if breakdown then
-			breakdown.DurationMod = breakdown.mod(skillCfg, "Duration", "PrimaryDuration", "SkillAndDamagingAilmentDuration", skillData.mineDurationAppliesToSkill and "MineDuration" or nil)
+			breakdown.DurationMod = breakdown.mod(skillModList, skillCfg, "Duration", "PrimaryDuration", "SkillAndDamagingAilmentDuration", skillData.mineDurationAppliesToSkill and "MineDuration" or nil)
+			if breakdown.DurationMod and skillData.durationSecondary then
+				t_insert(breakdown.DurationMod, 1, "Primary duration:")
+			end
 		end
 		local durationBase = (skillData.duration or 0) + skillModList:Sum("BASE", skillCfg, "Duration", "PrimaryDuration")
 		if durationBase > 0 then
@@ -754,6 +757,10 @@ function calcs.offence(env, actor, activeSkill)
 				output.DurationSecondary = output.DurationSecondary * debuffDurationMult
 			end
 			if breakdown and output.DurationSecondary ~= durationBase then
+				breakdown.SecondaryDurationMod = breakdown.mod(skillModList, skillCfg, "Duration", "SecondaryDuration", "SkillAndDamagingAilmentDuration", skillData.mineDurationAppliesToSkill and "MineDuration" or nil)
+				if breakdown.SecondaryDurationMod then
+					t_insert(breakdown.SecondaryDurationMod, 1, "Secondary duration:")
+				end
 				breakdown.DurationSecondary = {
 					s_format("%.2fs ^8(base)", durationBase),
 				}
--- a/Modules/CalcPerform.lua
+++ b/Modules/CalcPerform.lua
@@ -47,7 +47,7 @@ local function mergeKeystones(env)
 	local modDB = env.modDB

 	for _, name in ipairs(modDB:List(nil, "Keystone")) do
-		if not env.keystonesAdded[name] then
+		if not env.keystonesAdded[name] and env.spec.tree.keystoneMap[name] then
 			env.keystonesAdded[name] = true
 			modDB:AddList(env.spec.tree.keystoneMap[name].modList)
 		end
--- a/Modules/CalcSections-3_0.lua
+++ b/Modules/CalcSections-3_0.lua
@@ -542,8 +542,9 @@ return {
 		{ modName = "CooldownRecovery", cfg = "skill" },
 	}, },
 	{ label = "Duration Mod", flag = "duration", { format = "x {2:output:DurationMod}", 
-		{ breakdown = "DurationMod"}, 
-		{ modName = { "Duration", "SkillAndDamagingAilmentDuration" }, cfg = "skill" }, 
+		{ breakdown = "DurationMod" }, 
+		{ breakdown = "SecondaryDurationMod" }, 
+		{ modName = { "Duration", "PrimaryDuration", "SecondaryDuration", "SkillAndDamagingAilmentDuration" }, cfg = "skill" }, 
 	}, },
 	{ label = "Skill Duration", flag = "duration", haveOutput = "Duration", { format = "{2:output:Duration}s", { breakdown = "Duration" }, }, },
 	{ label = "Secondary Duration", flag = "duration", haveOutput = "DurationSecondary", { format = "{2:output:DurationSecondary}s", { breakdown = "DurationSecondary" }, }, },
--- a/Modules/ModParser-3_0.lua
+++ b/Modules/ModParser-3_0.lua
@@ -345,6 +345,7 @@ local modNameList = {
 	["trap trigger area of effect"] = "TrapTriggerAreaOfEffect",
 	["trap duration"] = "TrapDuration",
 	["cooldown recovery speed for throwing traps"] = { "CooldownRecovery", keywordFlags = KeywordFlag.Trap },
+	["cooldown recovery rate for throwing traps"] = { "CooldownRecovery", keywordFlags = KeywordFlag.Trap },
 	["mine laying speed"] = "MineLayingSpeed",
 	["mine throwing speed"] = "MineLayingSpeed",
 	["mine detonation area of effect"] = "MineDetonationAreaOfEffect",
@@ -381,6 +382,7 @@ local modNameList = {
 	["fire trap burning ground duration"] = { "Duration", tag = { type = "SkillName", skillName = "Fire Trap" } },
 	["cooldown recovery"] = "CooldownRecovery",
 	["cooldown recovery speed"] = "CooldownRecovery",
+	["cooldown recovery rate"] = "CooldownRecovery",
 	["weapon range"] = "WeaponRange",
 	["melee range"] = "MeleeWeaponRange",
 	["melee weapon range"] = "MeleeWeaponRange",
@@ -462,13 +464,17 @@ local modNameList = {
 	["to sap enemies"] = "SapChance",
 	["effect of shock"] = "EnemyShockEffect",
 	["effect of shock you inflict"] = "EnemyShockEffect",
+	["effect of lightning ailments"] = { "EnemyShockEffect" , "EnemySapEffect" },
 	["effect of chill"] = "EnemyChillEffect",
 	["effect of chill you inflict"] = "EnemyChillEffect",
+	["effect of cold ailments"] = { "EnemyChillEffect" , "EnemyBrittleEffect" },
 	["effect of chill on you"] = "SelfChillEffect",
 	["effect of non-damaging ailments"] = { "EnemyShockEffect", "EnemyChillEffect", "EnemyFreezeEffect", "EnemyScorchEffect", "EnemyBrittleEffect", "EnemySapEffect" },
 	["shock duration"] = "EnemyShockDuration",
+	["duration of lightning ailments"] = { "EnemyShockDuration" , "EnemySapDuration" },
 	["freeze duration"] = "EnemyFreezeDuration",
 	["chill duration"] = "EnemyChillDuration",
+	["duration of cold ailments"] = { "EnemyFreezeDuration" , "EnemyChillDuration", "EnemyBrittleDuration" },
 	["ignite duration"] = "EnemyIgniteDuration",
 	["duration of elemental ailments"] = { "EnemyShockDuration", "EnemyFreezeDuration", "EnemyChillDuration", "EnemyIgniteDuration", "EnemyScorchDuration", "EnemyBrittleDuration", "EnemySapDuration" },
 	["duration of elemental status ailments"] = { "EnemyShockDuration", "EnemyFreezeDuration", "EnemyChillDuration", "EnemyIgniteDuration", "EnemyScorchDuration", "EnemyBrittleDuration", "EnemySapDuration" },
@@ -1219,6 +1225,7 @@ local specialModList = {
 	["no critical strike multiplier"] = { flag("NoCritMultiplier") },
 	["ailments never count as being from critical strikes"] = { flag("AilmentsAreNeverFromCrit") },
 	["the increase to physical damage from strength applies to projectile attacks as well as melee attacks"] = { flag("IronGrip") },
+	["strength%'s damage bonus applies to projectile damage as well as melee damage"] = { flag("IronGrip") },
 	["converts all evasion rating to armour%. dexterity provides no bonus to evasion rating"] = { flag("IronReflexes") },
 	["30%% chance to dodge attack hits%. 50%% less armour, 30%% less energy shield, 30%% less chance to block spell and attack damage"] = {
 		mod("AttackDodgeChance", "BASE", 30),
--- a/TreeData/3_12/tree.lua
+++ b/TreeData/3_12/tree.lua
@@ -28035,7 +28035,7 @@ return {
            ["icon"]= "Art/2DArt/SkillIcons/passives/KeystoneIronGrip.png",
            ["isKeystone"]= true,
            ["stats"]= {
-                "Strength's damage bonus applies to Projectile Damage as well as Melee Damgae"
+                "Strength's damage bonus applies to Projectile Damage as well as Melee Damage"
            },
            ["flavourText"]= {
                "Legend tells of bows so powerful that only giants could draw them back."
@@ -32443,7 +32443,7 @@ return {
            ["icon"]= "Art/2DArt/SkillIcons/passives/lightningint.png",
            ["stats"]= {
                "10% increased Lightning Damage",
-                "{[0]=DNT} 30% increased Duration of Lightning Ailments"
+                "30% increased Duration of Lightning Ailments"
            },
            ["reminderText"]= {
                "(Lightning Ailments are Shocked and Sapped)"
@@ -32470,7 +32470,7 @@ return {
            ["stats"]= {
                "20% increased Lightning Damage",
                "15% chance to Shock",
-                "{[0]=DNT} 20% increased Duration of Lightning Ailments",
+                "20% increased Duration of Lightning Ailments",
                "20% increased Effect of Lightning Ailments"
            },
            ["reminderText"]= {
@@ -34462,7 +34462,7 @@ return {
            ["icon"]= "Art/2DArt/SkillIcons/passives/colddamage.png",
            ["stats"]= {
                "10% increased Cold Damage",
-                "{[0]=DNT} 30% increased Duration of Cold Ailments"
+                "30% increased Duration of Cold Ailments"
            },
            ["reminderText"]= {
                "(Cold Ailments are Chilled, Frozen and Brittle)"
@@ -36378,7 +36378,7 @@ return {
            ["icon"]= "Art/2DArt/SkillIcons/passives/lightningint.png",
            ["stats"]= {
                "5% chance to Shock",
-                "{[0]=DNT} 30% increased Duration of Lightning Ailments",
+                "30% increased Duration of Lightning Ailments",
                "10% increased Effect of Lightning Ailments"
            },
            ["reminderText"]= {
@@ -50402,7 +50402,7 @@ return {
            ["icon"]= "Art/2DArt/SkillIcons/passives/colddamage.png",
            ["stats"]= {
                "10% increased Cold Damage",
-                "{[0]=DNT} 20% increased Duration of Cold Ailments",
+                "20% increased Duration of Cold Ailments",
                "10% increased Effect of Cold Ailments"
            },
            ["reminderText"]= {
@@ -55075,7 +55075,7 @@ return {
            ["isNotable"]= true,
            ["stats"]= {
                "+20% to Damage over Time Multiplier for Ignite from Critical Strikes",
-                "{[0]=DNT} 20% increased Effect of non-Damaging Ailments you inflict with Critical Strikes",
+                "20% increased Effect of non-Damaging Ailments you inflict with Critical Strikes",
                "40% increased Critical Strike Chance"
            },
            ["reminderText"]= {
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,29 @@
+[1.4.170.9][2020/09/17]
+ * Add better breakdown for duration mods on gems
+ * Fix crash related to new Keystones and old trees
+ * Fix support for Iron Grip Notable
+ * Fix support for new ailment scaling nodes
+ * Fix support for new cooldown recovery wording on nodes
+[1.4.170.8][2020/09/16]
+ * Add support for 3.12 Tree
+ * Add proper support for Carrion Golem
+ * Add support for Ancient Waystone unique
+ * Add support for +1 gems on Awakened Blasphemy
+ * Add configurable charges for Minions
+ * Add support to generate mods for Skin of the Lords
+ * Add Redemption Knight spectre
+ * Add Baranite Preacher spectre
+ * Add Templar Tactician spectre
+ * Add Scinteel Synthete spectre
+ * Add support for Non-Channelling Mana cost
+ * Fix crash when trying to add support gems to any spell while having "Gain no inherent bonuses from Attributes"
+ * Fix crash related to Minion Critical Strike Chance
+ * Fix mods on several uniques
+ * Fix current Shock note not showing in Shock effect breakdown for attack builds
+ * Fix Second Wind CDR numbers
+ * Fix stats on Enhanced Vaal Fallen, Baranite Thaumaturge, Baranite Sister
+ * Fix Life regen not showing in the sidebar
+ * Fix top node power calculations
 [1.4.170.7][2020/07/22]
 * Fix crash related to the Siegebreaker belt
 * Fix crash related to Dancing Dervish/Duo
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.4.170.7" />
+	<Version number="1.4.170.9" />
 	<Source part="program" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/" />
 	<Source part="tree" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/" />
 	<Source part="tree-2_6" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/tree-2_6.zip" />
@@ -10,12 +10,13 @@
 	<Source part="tree-3_9" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/tree-3_9.zip" />
 	<Source part="tree-3_10" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/tree-3_10.zip" />
 	<Source part="tree-3_11" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/tree-3_11.zip" />
+	<Source part="tree-3_12" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/tree-3_12.zip" />
 	<Source part="runtime" platform="win32" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/runtime-win32.zip" />
 	<File name="Launch.lua" part="program" sha1="fdb15d26267d7c2769ce7b3249308e3327b765b9" />
 	<File name="UpdateCheck.lua" part="program" sha1="72b9bea1871e94a643e4471fd84bbedbc7810336" />
 	<File name="UpdateApply.lua" part="program" sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" />
-	<File name="GameVersions.lua" part="program" sha1="2f55b44f8bae18e7969dcb3a16c1d5cacc135b87" />
-	<File name="changelog.txt" part="program" sha1="5b3fcee49f6f4d599f6e60cd6f86d98a5cd62dcd" />
+	<File name="GameVersions.lua" part="program" sha1="8fd275fa0483311ba2ea844cb28baf4c7c1b1b6d" />
+	<File name="changelog.txt" part="program" sha1="080b8ffe470e1bcb658013020227ac79d7cd51f0" />
 	<File name="Path of Building.exe" part="runtime" platform="win32" sha1="abedf9c43a64c4a9270de5aacc3f02a105fecd1d" />
 	<File name="lua51.dll" part="runtime" platform="win32" sha1="7a973d3c0b5121e6aad0dcb9323be5b432fc63e7" />
 	<File name="SimpleGraphic.dll" part="runtime" platform="win32" sha1="d852ae6eafc9be62aa41d3cb74fb986d0e5b40e5" />
@@ -38,7 +39,7 @@
 	<File name="Classes/ButtonControl.lua" part="program" sha1="16fc5eaa04cc14b2022f6705a12717935454dab0" />
 	<File name="Classes/CalcBreakdownControl.lua" part="program" sha1="cecddb2e0b28e24773dfd65227052f5191813187" />
 	<File name="Classes/CalcSectionControl.lua" part="program" sha1="8ed97e9fdb4ae362eee1eec01984004d42bc433e" />
-	<File name="Classes/CalcsTab.lua" part="program" sha1="71a684356fec52034133f0c0bb2bdb95d6aa8299" />
+	<File name="Classes/CalcsTab.lua" part="program" sha1="1fb6195683cb0880227d0361c20786bc29fc0a6d" />
 	<File name="Classes/CheckBoxControl.lua" part="program" sha1="d2e5a1d2717da6853a9c5e788bc45c309d925e77" />
 	<File name="Classes/ConfigTab.lua" part="program" sha1="c6eefc6bb7daa1294dfbbe7884c09b713840af4b" />
 	<File name="Classes/Control.lua" part="program" sha1="64fc5fd8e3d4ade976f51c4a28d782b9b2ad31ac" />
@@ -81,27 +82,27 @@
 	<File name="Classes/TooltipHost.lua" part="program" sha1="23274906162877c09d2119237414b6747a0e6cea" />
 	<File name="Classes/TreeTab.lua" part="program" sha1="06da74dd960bd10344fc178d5d7d2c2e482e57af" />
 	<File name="Classes/UndoHandler.lua" part="program" sha1="ce4835c384c834da0de47b0302b1e774c8300c6b" />
-	<File name="Data/Generated.lua" part="program" sha1="b8e6eed7b5317356dd6d4855b7b31b38d1467b2b" />
+	<File name="Data/Generated.lua" part="program" sha1="a496a3dcb20456c225a44513bd5ba16c8a789973" />
 	<File name="Data/Global.lua" part="program" sha1="dea927ef86dadca3d8fd269b60ca69c7c8070b2d" />
 	<File name="Data/New.lua" part="program" sha1="9a2b7e19c805b2fca91c06620b6ad467f887014a" />
-	<File name="Data/Uniques/amulet.lua" part="program" sha1="bbfbf51566f88b61f54d91aba99bf9df890f7874" />
-	<File name="Data/Uniques/axe.lua" part="program" sha1="483963feead17926504ba1fc3055f3d5c1bf634e" />
+	<File name="Data/Uniques/amulet.lua" part="program" sha1="a0ba6db31b304a36852736c231168c0c658713ff" />
+	<File name="Data/Uniques/axe.lua" part="program" sha1="646cf7bdd8f32d7350c7178e579e38367377c4fe" />
 	<File name="Data/Uniques/belt.lua" part="program" sha1="09b347693985dc61755db12298d28948245fbb8b" />
-	<File name="Data/Uniques/body.lua" part="program" sha1="b6ef87a838d001a73994eaa9d477c660484db687" />
+	<File name="Data/Uniques/body.lua" part="program" sha1="eafce44134a224f6956e3b1f79f889f04feae226" />
 	<File name="Data/Uniques/boots.lua" part="program" sha1="53d7278edbddc2d3f82f90d232999a53d47e1af2" />
 	<File name="Data/Uniques/bow.lua" part="program" sha1="23cf9dea64288524a80f6616e690f71bb842a73d" />
 	<File name="Data/Uniques/claw.lua" part="program" sha1="4ef1e389f72641e29a5f5743290ff63a6fd36e04" />
 	<File name="Data/Uniques/dagger.lua" part="program" sha1="a4df6072c0166deda008d4266926676c1d6c9e88" />
 	<File name="Data/Uniques/flask.lua" part="program" sha1="abe57f70c2c211aeddccd4cd331438ff0a5532c3" />
-	<File name="Data/Uniques/gloves.lua" part="program" sha1="a86726080c8e70d29de49b2be6604766b08c895b" />
-	<File name="Data/Uniques/helmet.lua" part="program" sha1="a8b08f8a55ff37c558f04674a0f0c42f708bf7fb" />
+	<File name="Data/Uniques/gloves.lua" part="program" sha1="461f8a365938dae1c6e29ce4337b8396cd5bc0c8" />
+	<File name="Data/Uniques/helmet.lua" part="program" sha1="0bfa3f9c21dd8d16ed6914f51e08a2d7355f4fda" />
 	<File name="Data/Uniques/jewel.lua" part="program" sha1="3d136bbb9513074221702b489f2dae754c3a78ea" />
 	<File name="Data/Uniques/mace.lua" part="program" sha1="c1353949a050a5ca2a52e34ffcfb10d52a0867dd" />
 	<File name="Data/Uniques/quiver.lua" part="program" sha1="0860d5a4a07dafb0bc0a08fc3a85baa30a0e9dbb" />
 	<File name="Data/Uniques/ring.lua" part="program" sha1="2f71154bbfe23fb60d698d9cadf23719b8931e10" />
 	<File name="Data/Uniques/shield.lua" part="program" sha1="40b656fec12de847f59464ce852c5c6a0b90b676" />
-	<File name="Data/Uniques/staff.lua" part="program" sha1="d9ec558ce54a7af9b577c381ee8dd1ed9e53bbd3" />
-	<File name="Data/Uniques/sword.lua" part="program" sha1="9c34ea28198909a01c35c75ea7d2edc08a4eb3d4" />
+	<File name="Data/Uniques/staff.lua" part="program" sha1="a2b01e1d49ca06efc084ecaf1a543117c97e3582" />
+	<File name="Data/Uniques/sword.lua" part="program" sha1="ea3b54519bff8b85a12a4326c8d34459571df164" />
 	<File name="Data/Uniques/wand.lua" part="program" sha1="d489c2215be0a747c4b9c93bed9066b1a964ac61" />
 	<File name="Data/2_6/EnchantmentBoots.lua" part="program" sha1="4a2651bfcb3beb6fe8b9acab18a6792072f7e9b4" />
 	<File name="Data/2_6/EnchantmentGloves.lua" part="program" sha1="cc36a59b04a69c76ef76f5b6bc6899fd0ee1666e" />
@@ -155,16 +156,16 @@
 	<File name="Data/3_0/Gems.lua" part="program" sha1="2c85a6f50186ee18c117e22b9b10c2d0e4b77f7f" />
 	<File name="Data/3_0/Minions.lua" part="program" sha1="23b478033953ad37c8f3dc45454e08bc5533a329" />
 	<File name="Data/3_0/Misc.lua" part="program" sha1="15a1acdcf6ca2980bd5d7424048c7db1d31295c6" />
-	<File name="Data/3_0/ModCache.lua" part="program" sha1="714bb72b180aee822421e96a3fef228e947d9625" />
+	<File name="Data/3_0/ModCache.lua" part="program" sha1="bbd75d6fbbc09991f979cbff34b7204760e56e9c" />
 	<File name="Data/3_0/ModFlask.lua" part="program" sha1="f6febb9f6d121b2d83a975af56d615b1edb9a6a1" />
-	<File name="Data/3_0/ModItem.lua" part="program" sha1="f7bb386b45b05fff2c3bdd8cfbc08300974df22d" />
+	<File name="Data/3_0/ModItem.lua" part="program" sha1="510995f9ab2971fcaaaa5fd2aeb349199c35c81f" />
 	<File name="Data/3_0/ModJewel.lua" part="program" sha1="7010c8956361777306998b468a911e3c1dd90913" />
 	<File name="Data/3_0/ModJewelAbyss.lua" part="program" sha1="151c472888b9de069b76262ab47ad0c6cf6d1412" />
 	<File name="Data/3_0/ModJewelCluster.lua" part="program" sha1="52e7718baf3605d75f32f41e7d78bbcd32ae6ff4" />
 	<File name="Data/3_0/ModMaster.lua" part="program" sha1="3e1a579f2519b49ade733949ec98194b0d144815" />
 	<File name="Data/3_0/Rares.lua" part="program" sha1="713971a5629761d20b6eafddd58cf43498151890" />
-	<File name="Data/3_0/SkillStatMap.lua" part="program" sha1="5665984b2c287bd8bf021387a5ae42bd005757cc" />
-	<File name="Data/3_0/Spectres.lua" part="program" sha1="879031a95fe1430f2738d20015aa7d26b8568465" />
+	<File name="Data/3_0/SkillStatMap.lua" part="program" sha1="f82ab1a613ccc645b31e4777705698f621894867" />
+	<File name="Data/3_0/Spectres.lua" part="program" sha1="ea74ba088f4c21fed70ef79a798334f4caf16466" />
 	<File name="Data/3_0/Bases/amulet.lua" part="program" sha1="478275452ad2ab9c8602b9f8b9ff3f74cba758ba" />
 	<File name="Data/3_0/Bases/axe.lua" part="program" sha1="6355c7144fd2dace802a48560854b01604dba802" />
 	<File name="Data/3_0/Bases/belt.lua" part="program" sha1="10757212e277d6a062e11e18e4118678dc08f8df" />
@@ -186,14 +187,14 @@
 	<File name="Data/3_0/Bases/wand.lua" part="program" sha1="4fa8949053749cc4d0edb932caea4df5684af51e" />
 	<File name="Data/3_0/Pantheons.lua" part="program" sha1="51e60d2eee9bcd93ccb53df323c6c264213c1acf" />
 	<File name="Data/3_0/Skills/act_dex.lua" part="program" sha1="aa8680d7960470c8e02c5e55255039a84c528452" />
-	<File name="Data/3_0/Skills/act_int.lua" part="program" sha1="3c76973cecabe0c79ae92152252d66fc0a2d0ec3" />
+	<File name="Data/3_0/Skills/act_int.lua" part="program" sha1="e6745219c6edd9f505a07f3b6085780a3d920293" />
 	<File name="Data/3_0/Skills/act_str.lua" part="program" sha1="2df2c50bf49de73af3df39893d520d9009d1740e" />
 	<File name="Data/3_0/Skills/glove.lua" part="program" sha1="326e47c9608f5f74b7801534f23dd7f81a702247" />
-	<File name="Data/3_0/Skills/minion.lua" part="program" sha1="77d40c85edece44a4fcea9df47c67533b3bb5940" />
+	<File name="Data/3_0/Skills/minion.lua" part="program" sha1="0344a3189aaac6af3fa862e5cb26dd75dbb8bd1f" />
 	<File name="Data/3_0/Skills/other.lua" part="program" sha1="ddcedd93f7a3780e3ddf15c98b7c2f5647ccc090" />
-	<File name="Data/3_0/Skills/spectre.lua" part="program" sha1="ba002c3b030ab0a3525f97e12ca3d1dc7373fb0a" />
+	<File name="Data/3_0/Skills/spectre.lua" part="program" sha1="a34f13063247471e91bcfdec4bf2056ae554f96f" />
 	<File name="Data/3_0/Skills/sup_dex.lua" part="program" sha1="4de0f12e69208f924b1e2d6f4da3b61b5cc802db" />
-	<File name="Data/3_0/Skills/sup_int.lua" part="program" sha1="c674da2ac1c10e4d415b33b5725424614db0c2e1" />
+	<File name="Data/3_0/Skills/sup_int.lua" part="program" sha1="54516cdc8ef823002dcb3094667fdb87d3662fca" />
 	<File name="Data/3_0/Skills/sup_str.lua" part="program" sha1="47af5fcc88a746d4d7f98f7e99b76238fe3d399c" />
 	<File name="Data/3_0/StatDescriptions/active_skill_gem_stat_descriptions.lua" part="program" sha1="a53b0483eb7000f7899e57a54a811d64dd02d99b" />
 	<File name="Data/3_0/StatDescriptions/aura_skill_stat_descriptions.lua" part="program" sha1="97726c929660a9a8a87c2f5e9799a3160c2a294d" />
@@ -212,27 +213,27 @@
 	<File name="Data/3_0/StatDescriptions/skill_stat_descriptions.lua" part="program" sha1="f0840d23cacb35fc590bfdbea76a0eeeb3b13a43" />
 	<File name="Data/3_0/StatDescriptions/stat_descriptions.lua" part="program" sha1="6f3902edd96ce83d6af4042b3187c1ccf9d146b3" />
 	<File name="Data/3_0/StatDescriptions/variable_duration_skill_stat_descriptions.lua" part="program" sha1="c10e87b9b02f65dac7ea0e533115e1ada7c198d8" />
-	<File name="Modules/Build.lua" part="program" sha1="7d7b98331e95a08deb676d2d8479b6e0b539b359" />
+	<File name="Modules/Build.lua" part="program" sha1="6426d42122b3b975c4e280597ba25bee0dc8637f" />
 	<File name="Modules/BuildList.lua" part="program" sha1="bcda0c5148b9e40274acd13702896cc430c89eba" />
 	<File name="Modules/CalcActiveSkill.lua" part="program" sha1="5804638ab8c3956fd49d4f224941f6b98ee3a268" />
-	<File name="Modules/CalcBreakdown.lua" part="program" sha1="0d9b1f4ab8490d29bae642ba84f607a44e95f227" />
+	<File name="Modules/CalcBreakdown.lua" part="program" sha1="58e3615aa9617aaa928ed7743744cd237e26c91b" />
 	<File name="Modules/CalcDefence-2_6.lua" part="program" sha1="c574b0f07966af8d42e534118c075fb164134849" />
-	<File name="Modules/CalcDefence-3_0.lua" part="program" sha1="923da4712538d67c6e6c5f0d4d81a10ec7f65c5f" />
+	<File name="Modules/CalcDefence-3_0.lua" part="program" sha1="df0b3fcd3d7780d13830f24cc43acc86e9dbd1d6" />
 	<File name="Modules/CalcOffence-2_6.lua" part="program" sha1="a503b35efe905e67d70f8d56b5f14dcc24cf5666" />
-	<File name="Modules/CalcOffence-3_0.lua" part="program" sha1="8d5eff5090a77906a62bcfc6be911bb3b79447d5" />
-	<File name="Modules/CalcPerform.lua" part="program" sha1="c80b0f4698d2a5584df0a796bd969e058200b2c7" />
+	<File name="Modules/CalcOffence-3_0.lua" part="program" sha1="2e9beb947646ad4902a749a466afce1121f23ae7" />
+	<File name="Modules/CalcPerform.lua" part="program" sha1="7b29c2a375276e777f220b131ae106c456c8adba" />
 	<File name="Modules/Calcs.lua" part="program" sha1="af5aa10f9574870e8de222d9fe829e768ad8ed8b" />
 	<File name="Modules/CalcSections-2_6.lua" part="program" sha1="32da2a949a5fe0ab10d54078a96caff0dccb5f3f" />
-	<File name="Modules/CalcSections-3_0.lua" part="program" sha1="9470742ca85483c16cd5c36d48034699de5ac512" />
+	<File name="Modules/CalcSections-3_0.lua" part="program" sha1="a92cfd27a74ab5177add48ac88737489450ed49c" />
 	<File name="Modules/CalcSetup.lua" part="program" sha1="d63371dd7c9eb288945440fabd84631ee553ede2" />
 	<File name="Modules/CalcTools.lua" part="program" sha1="f4961868814126584d4ada4a886150718bb96071" />
 	<File name="Modules/Common.lua" part="program" sha1="c8a6612199263da0665ce45e588c123fb3e8361e" />
-	<File name="Modules/ConfigOptions.lua" part="program" sha1="2b5a035e6ac444fa10b96b1c1dbbac0e3dad6ed5" />
-	<File name="Modules/Data.lua" part="program" sha1="140cfe51a74c65341c4ae83af69cd3f52a6507ef" />
+	<File name="Modules/ConfigOptions.lua" part="program" sha1="9b59d7d4da52fe84a24777d8fa06b715ba401397" />
+	<File name="Modules/Data.lua" part="program" sha1="fecca9a8b771e09824f5ef16b78132138143b68a" />
 	<File name="Modules/ItemTools.lua" part="program" sha1="08d24df856a31835234fa2d569ebf4c1295d63e3" />
 	<File name="Modules/Main.lua" part="program" sha1="180eb8c8fdda9215ccc8fc80d20e6c3d1159790e" />
 	<File name="Modules/ModParser-2_6.lua" part="program" sha1="40816503edfc2023a070491d4d69ae02032e2312" />
-	<File name="Modules/ModParser-3_0.lua" part="program" sha1="9699d3669df46fd9d20062fd1c92605f49e95514" />
+	<File name="Modules/ModParser-3_0.lua" part="program" sha1="6458ad7c83949da854b9934fd93be2284e327f7c" />
 	<File name="Modules/ModTools.lua" part="program" sha1="2ce4f3b83db992a286bd92f3849d037d6dcc8db2" />
 	<File name="Modules/StatDescriber.lua" part="program" sha1="cb77b8c6931a5c4c4695fc66f222422365d19a73" />
 	<File name="Modules/PantheonTools.lua" part="program" sha1="ebe91a7d8f8444a6061acf4758da0e775cc8c314" />
@@ -447,4 +448,8 @@
 	<File name="TreeData/3_11/groups-3.png" part="tree-3_11" sha1="351b940efd39cf3210babd01f8843b930a3c6165" />
 	<File name="TreeData/3_11/skills-3.jpg" part="tree-3_11" sha1="e24100ec6bc1a20486424f95f878f0ff75753f97" />
 	<File name="TreeData/3_11/skills-disabled-3.jpg" part="tree-3_11" sha1="b7a63aecf727ccc8e826d1cefd8d6ee7029714e0" />
+	<File name="TreeData/3_12/tree.lua" part="program" sha1="8d4e072ae1bca974f14e93b2d2755036d0ef5c19" />
+	<File name="TreeData/3_12/groups-3.png" part="tree-3_12" sha1="b3011c26e4d11c683d1737301d904c5277fd0bf2" />
+	<File name="TreeData/3_12/skills-3.jpg" part="tree-3_12" sha1="d75037ab31799cbcd74a883852bad9970c677e19" />
+	<File name="TreeData/3_12/skills-disabled-3.jpg" part="tree-3_12" sha1="a33048a22c27d5776f9f2ef4e96302a7c29c8dac" />
 </PoBVersion>