Release 1.0.14

- Stop the melee/ranged weapon flag overrides from messing with skills that don't require it - Fixed ES on Sin Trek (and possibly other similar cases) - Enabled Dual Wielding mods
2016-09-02 00:29:47 +10:00
parent e168ec86fd
commit 4e49df32fc
5 changed files with 24 additions and 21 deletions
--- a/Classes/ItemsTab.lua
+++ b/Classes/ItemsTab.lua
@@ -407,7 +407,7 @@ function ItemsTabClass:AddItemTooltip(item, slot, dbMode)
 		end
 		for _, def in ipairs({{var="armour",label="Armour"},{var="evasion",label="Evasion Rating"},{var="energyShield",label="Energy Shield"}}) do
 			local itemVal = modList["slot:"..base.type.."_"..def.var.."Base"]
-			if itemVal then
+			if itemVal and itemVal > 0 then
 				main:AddTooltipLine(16, s_format("^x7F7F7F%s: %s%d", def.label, itemVal ~= base.armour[def.var.."Base"] and data.colorCodes.MAGIC or "^7", itemVal))
 			end
 		end
--- a/Modules/Calcs.lua
+++ b/Modules/Calcs.lua
@@ -515,6 +515,9 @@ local function initEnv(build, input, mode)
 	mod_dbMerge(modDB, "", "activeTrapLimit", 3)
 	mod_dbMerge(modDB, "", "activeMineLimit", 5)
 	mod_dbMerge(modDB, "", "projectileCount", 1)
+	mod_dbMerge(modDB, "CondMod", "DualWielding_attackSpeedMore", 1.1)
+	mod_dbMerge(modDB, "CondMod", "DualWielding_attack_physicalMore", 1.2)
+	mod_dbMerge(modDB, "CondMod", "DualWielding_blockChance", 15)

 	-- Add bandit mods
 	if build.banditNormal == "Alira" then
@@ -650,10 +653,10 @@ local function finaliseMods(env, output)
 			end
 			if skillFlags.attack then
 				skillFlags.weapon1Attack = true
-				if weapon1Info.melee then
+				if weapon1Info.melee and skillFlags.melee then
 					skillFlags.bow = nil
 					skillFlags.projectile = nil
-				else
+				elseif not weapon1Info.melee and skillFlags.bow then
 					skillFlags.melee = nil
 				end
 			end
@@ -850,10 +853,11 @@ local function finaliseMods(env, output)
 	if weapon1Type == "Staff" then
 		condList["UsingStaff"] = true
 	end
-	if env.skillFlags.mainIs1H then
-		if weapon2Type == "Shield" then
-			condList["UsingShield"] = true
-		end
+	if env.skillFlags.mainIs1H and weapon2Type == "Shield" then
+		condList["UsingShield"] = true
+	end
+	if data.weaponTypeInfo[weapon1Type] and data.weaponTypeInfo[weapon2Type] then
+		condList["DualWielding"] = true
 	end
 	if getMiscVal(modDB, "gear", "NormalCount", 0) > 0 then
 		condList["UsingNormalItem"] = true
@@ -1846,7 +1850,7 @@ function calcs.buildOutput(build, input, output, mode)
 		-- Configure view mode
 		setViewMode(env, build.skillsTab.list)

-		--infoDump(env, output)
+		infoDump(env, output)
 	end
 end

--- a/Modules/ItemTools.lua
+++ b/Modules/ItemTools.lua
@@ -273,15 +273,9 @@ function itemLib.buildItemModListForSlotNum(item, baseList, slotNum)
 			modList.weapon2_type = "Shield"
 		end
 		local basePrefix = "slot:"..item.base.type.."_"
-		if item.base.armour.armourBase then
-			modList[basePrefix.."armourBase"] = m_floor((item.base.armour.armourBase + (modList.armourBase or 0)) * (1 + ((modList.armourInc or 0) + (modList.armourAndEvasionInc or 0) + (modList.armourAndEnergyShieldInc or 0) + (modList.defencesInc or 0) + item.quality) / 100) + 0.5)
-		end
-		if item.base.armour.evasionBase then
-			modList[basePrefix.."evasionBase"] = m_floor((item.base.armour.evasionBase + (modList.evasionBase or 0)) * (1 + ((modList.evasionInc or 0) + (modList.armourAndEvasionInc or 0) + (modList.evasionAndEnergyShieldInc or 0) + (modList.defencesInc or 0) + item.quality) / 100) + 0.5)
-		end
-		if item.base.armour.energyShieldBase then
-			modList[basePrefix.."energyShieldBase"] = m_floor((item.base.armour.energyShieldBase + (modList.energyShieldBase or 0)) * (1 + ((modList.energyShieldInc or 0) + (modList.armourAndEnergyShieldInc or 0) + (modList.evasionAndEnergyShieldInc or 0) + (modList.defencesInc or 0) + item.quality) / 100) + 0.5)
-		end
+		modList[basePrefix.."armourBase"] = m_floor(((item.base.armour.armourBase or 0) + (modList.armourBase or 0)) * (1 + ((modList.armourInc or 0) + (modList.armourAndEvasionInc or 0) + (modList.armourAndEnergyShieldInc or 0) + (modList.defencesInc or 0) + item.quality) / 100) + 0.5)
+		modList[basePrefix.."evasionBase"] = m_floor(((item.base.armour.evasionBase or 0) + (modList.evasionBase or 0)) * (1 + ((modList.evasionInc or 0) + (modList.armourAndEvasionInc or 0) + (modList.evasionAndEnergyShieldInc or 0) + (modList.defencesInc or 0) + item.quality) / 100) + 0.5)
+		modList[basePrefix.."energyShieldBase"] = m_floor(((item.base.armour.energyShieldBase or 0) + (modList.energyShieldBase or 0)) * (1 + ((modList.energyShieldInc or 0) + (modList.armourAndEnergyShieldInc or 0) + (modList.evasionAndEnergyShieldInc or 0) + (modList.defencesInc or 0) + item.quality) / 100) + 0.5)
 		if item.base.armour.blockChance then
 			if modList.shieldLocal_noBlock then
 				modList.blockChance = 0
--- a/README.md
+++ b/README.md
@@ -48,6 +48,11 @@ 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.14 - 2016/09/01
+ * Fixed tags on certain multipart skills not correctly applying
+ * Fixed energy shield not showing up on Sin Trek
+ * Dual Wielding modifiers will now apply
+   * Skills that can use both weapons still only use the main hand at the moment; that requires a bit more work to implement
 ### 1.0.13 - 2016/09/01
 * Added a scroll bar to the Items tab to fix the issue with low screen resolutions
   * The scroll bar will automatically jump to the right when you start editing an item, then jump back when you save it
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.0.13"/>
+	<Version number="1.0.14"/>
 	<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"/>
@@ -20,7 +20,7 @@
 	<File sha1="2a3001d92c8f788a7d487643fbfcc4fa93419f4a" name="Classes/ItemDBControl.lua" part="program"/>
 	<File sha1="0cb467a1a8643e5297d8e1cdc1a3808686ffc9ef" name="Classes/ItemListControl.lua" part="program"/>
 	<File sha1="b78b8fd05d201aff7e0da1b3a70acdedef9bf60d" name="Classes/ItemSlotControl.lua" part="program"/>
-	<File sha1="c54a8dd3f9bc379dd296c48442e36e9da98d8f66" name="Classes/ItemsTab.lua" part="program"/>
+	<File sha1="f57bc78b0b8fa9268191b65aa9788bacc9bc04b4" name="Classes/ItemsTab.lua" part="program"/>
 	<File sha1="e577edeea7685cb2b0cd0d00b901a458ae45add0" name="Classes/LabelControl.lua" part="program"/>
 	<File sha1="6f8f98d6ee505af53441c1fe9ad74fbff86d56ad" name="Classes/PassiveSpec.lua" part="program"/>
 	<File sha1="03dde914f7ad75d26f2ba0845b11986d198b6e94" name="Classes/PassiveTree.lua" part="program"/>
@@ -36,11 +36,11 @@
 	<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
 	<File sha1="329ba38548953be8101a83e4c410ebe6f0d0607c" name="Modules/Build.lua" part="program"/>
 	<File sha1="c03a7796aea3e9aa832fbb92c1f674ef5af690ca" name="Modules/BuildList.lua" part="program"/>
-	<File sha1="00197d6bdb1bd2f855233397e39948342eaadae1" name="Modules/Calcs.lua" part="program"/>
+	<File sha1="b9bf5febe19d2bca001f8afa5778b38e9c9cfcda" name="Modules/Calcs.lua" part="program"/>
 	<File sha1="7721650215b51d7c472da2e81389b81c91c6b498" name="Modules/CalcsView.lua" part="program"/>
 	<File sha1="3fd280d8abfa60264495daad42f8ccaa92cdcd46" name="Modules/Common.lua" part="program"/>
 	<File sha1="cb25bd581587ba5b35f77ca7b245334be1e5186a" name="Modules/Data.lua" part="program"/>
-	<File sha1="e04edbadc8eda47583b80f49a3c0a6b844d00dc5" name="Modules/ItemTools.lua" part="program"/>
+	<File sha1="73e1c9410aba9b218cd9d0ff6b13062e9b8de915" name="Modules/ItemTools.lua" part="program"/>
 	<File sha1="bb80b7fe33286e94ca0a52fcd4b1ac403a3d09b9" name="Modules/Main.lua" part="program"/>
 	<File sha1="d4dc00795c80a8a0831f9e126df2f586ef50978c" name="Modules/ModParser.lua" part="program"/>
 	<File sha1="bc49ce1b5e15da40476a9c99c4c690b323c0e7ad" name="Modules/ModTools.lua" part="program"/>