Merge remote-tracking branch 'origin/dev'

Modules/Calcs.lua

@@ -791,6 +791,13 @@ local function finaliseMods(env, output)
 	
 	-- Reset namespaces
 	buildSpaceTable(modDB)
+
+	-- Add boss modifiers
+	if getMiscVal(modDB, "effective", "enemyIsBoss", false) then
+		mod_dbMerge(modDB, "", "curseEffectMore", 0.4) -- FIXME: Need to confirm actual value
+		mod_dbMerge(modDB, "effective", "elementalResist", 30)
+		mod_dbMerge(modDB, "effective", "chaosResist", 15)
+	end
 	
 	-- Merge skill modifiers and calculate life and mana reservations
 	for _, skill in pairs(env.skills) do
@@ -942,14 +949,6 @@ local function finaliseMods(env, output)
 	end
 	mod_dbMergeList(modDB, env.condModList)
 
-	-- Add boss modifiers
-	if getMiscVal(modDB, "effective", "enemyIsBoss", false) then
-		--mod_dbMerge(modDB, "", "curseEffectInc", -60)
-		mod_dbMerge(modDB, "", "curseEffectMore", 0.4) -- FIXME: Need to confirm actual value
-		mod_dbMerge(modDB, "effective", "elementalResist", 30)
-		mod_dbMerge(modDB, "effective", "chaosResist", 15)
-	end
-
 	-- Add per-item-type mods
 	for spaceName, countName in pairs({["PerNormal"]="NormalCount",["PerMagic"]="MagicCount",["PerRare"]="RareCount",["PerUnique"]="UniqueCount",["PerGrandSpectrum"]="GrandSpectrumCount"}) do
 		local space = modDB[spaceName]
@@ -1904,7 +1903,7 @@ function calcs.buildOutput(build, input, output, mode)
 		-- Configure view mode
 		setViewMode(env, build.skillsTab.list)
 
-		--infoDump(env, output)
+		infoDump(env, output)
 	end
 end
 

Modules/ModParser.lua

@@ -416,7 +416,7 @@ local specialModList = {
 	["socketed gems fire an additional projectile"] = { ["SocketedIn:X_projectileCount"] = 1 },
 	["socketed gems fire (%d+) additional projectiles"] = function(num) return { ["SocketedIn:X_projectileCount"] = num } end,
 	["socketed gems reserve no mana"] = { ["SocketedIn:X_manaReservedMore"] = 0 },
-	["socketed gems have blood magic"]  = { ["SocketedIn:X_bloodMagic"] = true },
+	["socketed gems have blood magic"]  = { ["SocketedIn:X_skill_bloodMagic"] = true },
 	-- Unique item modifiers
 	["your cold damage can ignite"] = { coldCanIgnite = true },
 	["your fire damage can shock but not ignite"] = { fireCanShock = true, fireCannotIgnite = true },

README.md

@@ -48,6 +48,10 @@ Head over to the [Releases](https://github.com/Openarl/PathOfBuilding/releases)
 ![ss3](https://cloud.githubusercontent.com/assets/19189971/18089780/f0ff234a-6f04-11e6-8c88-6193fe59a5c4.png)
 
 ## Changelog
+### 1.0.28 - 2016/09/13
+ * Fixed boss curse effectiveness modifier not applying
+ * Fixed issue relating to Prism Guardian's Blood Magic mod
+
 ### 1.0.27 - 2016/09/13
  * More updates to 2.4.0 uniques; most of them should have the correct roll ranges now
  * Added dropdown list and autocomplete to the skill gem name field

changelog.txt

@@ -1,4 +1,7 @@
-VERSION[1.0.27][2016/09/12]
+VERSION[1.0.28][2016/09/13]
+ * Fixed boss curse effectiveness modifier not applying
+ * Fixed issue relating to Prism Guardian's Blood Magic mod
+VERSION[1.0.27][2016/09/13]
  * More updates to 2.4.0 uniques; most of them should have the correct roll ranges now
  * Added dropdown list and autocomplete to the skill gem name field
  * Skill gems can now be individually disabled

manifest.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.0.27"/>
+	<Version number="1.0.28"/>
 	<Source part="program" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/"/>
 	<Source part="tree" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/tree.zip"/>
 	<Source url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/runtime-win32.zip" part="runtime" platform="win32"/>
 	<File sha1="7ebf2b5d0d580e334023fa2ae23cc36b8d4c6f9c" name="Launch.lua" part="program"/>
 	<File sha1="cb07c8d4819eb81df9e98ab9039e0c9adf74c150" name="UpdateCheck.lua" part="program"/>
 	<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
-	<File sha1="4c1084a12bac777ce8415cecf94af6441dbf6d31" name="changelog.txt" part="program"/>
+	<File sha1="53701632e65ccd672e89230780a1cb88b8b75e76" name="changelog.txt" part="program"/>
 	<File sha1="aef7145f378d0a1d5dc6f5f2d3c08d2a1b6ef264" name="Classes/BuildListControl.lua" part="program"/>
 	<File sha1="34fdf53db3b3231ce446749227e178847b982771" name="Classes/ButtonControl.lua" part="program"/>
 	<File sha1="ffe8c54a8006cb7acc34ba5c6e50772081a0a694" name="Classes/CalcsTab.lua" part="program"/>
@@ -39,13 +39,13 @@
 	<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
 	<File sha1="c729604180c1bf3753afee7bc39055c1c2f08a0d" name="Modules/Build.lua" part="program"/>
 	<File sha1="c03a7796aea3e9aa832fbb92c1f674ef5af690ca" name="Modules/BuildList.lua" part="program"/>
-	<File sha1="9e61c49047bc09716ec981a53d0d911586c181b0" name="Modules/Calcs.lua" part="program"/>
+	<File sha1="bf5d7043984c0c877a19e123aea20d264b9ee10e" name="Modules/Calcs.lua" part="program"/>
 	<File sha1="d4439a94dda4c3d3aa23ac123ba378a35174e425" name="Modules/CalcsView.lua" part="program"/>
 	<File sha1="3260bd50f67b7a51973c66157d3af20446bf291e" name="Modules/Common.lua" part="program"/>
 	<File sha1="cb25bd581587ba5b35f77ca7b245334be1e5186a" name="Modules/Data.lua" part="program"/>
 	<File sha1="6de97695b61787194e6241af8cc4da5943476a70" name="Modules/ItemTools.lua" part="program"/>
 	<File sha1="2559a1318044beb53eb232f04c130149dfe8562e" name="Modules/Main.lua" part="program"/>
-	<File sha1="b0fb995f3136ad81ae4bfeda38dd2b4ff8aaae5a" name="Modules/ModParser.lua" part="program"/>
+	<File sha1="4d098f047a50d63ef1e618887065bb14a2902959" name="Modules/ModParser.lua" part="program"/>
 	<File sha1="bc49ce1b5e15da40476a9c99c4c690b323c0e7ad" name="Modules/ModTools.lua" part="program"/>
 	<File sha1="e7ee7e5b6388facb7bf568517ecc401590757df7" name="Assets/ring.png" part="program"/>
 	<File sha1="698c46ec242133014f6904d276b27106580ea392" name="Data/New.lua" part="program"/>