Release 1.0.19

- Fixed error caused by character level being 0 - Now supports unarmed conditionals - Added the Trap support nerf - Loosened up gem name search
2016-09-02 13:58:10 +10:00
parent 36f3d44342
commit b693457819
6 changed files with 51 additions and 39 deletions
--- a/Classes/SkillsTab.lua
+++ b/Classes/SkillsTab.lua
@@ -210,10 +210,11 @@ end
 function SkillsTabClass:FindSkillGem(nameSpec)
 	-- Search for gem name using increasingly broad search patterns
 	local patternList = {
-		"^ "..nameSpec.."$", -- Exact match
+		"^ "..nameSpec:gsub("%a", function(a) return "["..a:upper()..a:lower().."]" end).."$", -- Exact match (case-insensitive)
 		"^"..nameSpec:gsub("%a", " %0%%l+").."$", -- Simple abbreviation ("CtF" -> "Cold to Fire")
 		"^"..nameSpec:gsub(" ",""):gsub("%l", "%%l*%0").."%l+$", -- Abbreviated words ("CldFr" -> "Cold to Fire")
-		"^"..nameSpec:gsub(" ",""):gsub("%a", ".*%0") -- Global abbreviation ("CtoF" -> "Cold to Fire")
+		"^"..nameSpec:gsub(" ",""):gsub("%a", ".*%0"), -- Global abbreviation ("CtoF" -> "Cold to Fire")
+		"^"..nameSpec:gsub(" ",""):gsub("%a", function(a) return ".*".."["..a:upper()..a:lower().."]" end), -- Case insensitive global abbreviation ("ctof" -> "Cold to Fire")
 	}
 	local gemName, gemData
 	for i, pattern in ipairs(patternList) do
--- a/Data/Gems/sup_dex.lua
+++ b/Data/Gems/sup_dex.lua
@@ -1085,36 +1085,36 @@ gems["Trap"] = {
 		trapThrowingSpeedInc = 0.5,
 	},
 	levels = {
-		[1] = { trap_damageMore = 1.2, },
-		[2] = { trap_damageMore = 1.21, },
-		[3] = { trap_damageMore = 1.22, },
-		[4] = { trap_damageMore = 1.23, },
-		[5] = { trap_damageMore = 1.24, },
-		[6] = { trap_damageMore = 1.25, },
-		[7] = { trap_damageMore = 1.26, },
-		[8] = { trap_damageMore = 1.27, },
-		[9] = { trap_damageMore = 1.28, },
-		[10] = { trap_damageMore = 1.29, },
-		[11] = { trap_damageMore = 1.3, },
-		[12] = { trap_damageMore = 1.31, },
-		[13] = { trap_damageMore = 1.32, },
-		[14] = { trap_damageMore = 1.33, },
-		[15] = { trap_damageMore = 1.34, },
-		[16] = { trap_damageMore = 1.35, },
-		[17] = { trap_damageMore = 1.36, },
-		[18] = { trap_damageMore = 1.37, },
-		[19] = { trap_damageMore = 1.38, },
-		[20] = { trap_damageMore = 1.39, },
-		[21] = { trap_damageMore = 1.4, },
-		[22] = { trap_damageMore = 1.41, },
-		[23] = { trap_damageMore = 1.42, },
-		[24] = { trap_damageMore = 1.43, },
-		[25] = { trap_damageMore = 1.44, },
-		[26] = { trap_damageMore = 1.45, },
-		[27] = { trap_damageMore = 1.46, },
-		[28] = { trap_damageMore = 1.47, },
-		[29] = { trap_damageMore = 1.48, },
-		[30] = { trap_damageMore = 1.49, },
+		[1] = { trapHit_damageMore = 1.2, },
+		[2] = { trapHit_damageMore = 1.21, },
+		[3] = { trapHit_damageMore = 1.22, },
+		[4] = { trapHit_damageMore = 1.23, },
+		[5] = { trapHit_damageMore = 1.24, },
+		[6] = { trapHit_damageMore = 1.25, },
+		[7] = { trapHit_damageMore = 1.26, },
+		[8] = { trapHit_damageMore = 1.27, },
+		[9] = { trapHit_damageMore = 1.28, },
+		[10] = { trapHit_damageMore = 1.29, },
+		[11] = { trapHit_damageMore = 1.3, },
+		[12] = { trapHit_damageMore = 1.31, },
+		[13] = { trapHit_damageMore = 1.32, },
+		[14] = { trapHit_damageMore = 1.33, },
+		[15] = { trapHit_damageMore = 1.34, },
+		[16] = { trapHit_damageMore = 1.35, },
+		[17] = { trapHit_damageMore = 1.36, },
+		[18] = { trapHit_damageMore = 1.37, },
+		[19] = { trapHit_damageMore = 1.38, },
+		[20] = { trapHit_damageMore = 1.39, },
+		[21] = { trapHit_damageMore = 1.4, },
+		[22] = { trapHit_damageMore = 1.41, },
+		[23] = { trapHit_damageMore = 1.42, },
+		[24] = { trapHit_damageMore = 1.43, },
+		[25] = { trapHit_damageMore = 1.44, },
+		[26] = { trapHit_damageMore = 1.45, },
+		[27] = { trapHit_damageMore = 1.46, },
+		[28] = { trapHit_damageMore = 1.47, },
+		[29] = { trapHit_damageMore = 1.48, },
+		[30] = { trapHit_damageMore = 1.49, },
 	}
 }
 gems["Trap Cooldown"] = {
--- a/Modules/Calcs.lua
+++ b/Modules/Calcs.lua
@@ -855,6 +855,9 @@ local function finaliseMods(env, output)
 	if data.weaponTypeInfo[weapon1Type] and data.weaponTypeInfo[weapon2Type] then
 		condList["DualWielding"] = true
 	end
+	if weapon1Type == "None" and not data.weaponTypeInfo[weapon2Type] then
+		condList["Unarmed"] = true
+	end
 	if getMiscVal(modDB, "gear", "NormalCount", 0) > 0 then
 		condList["UsingNormalItem"] = true
 	end
@@ -1124,7 +1127,7 @@ local function performCalcs(env, output)
 		if getMiscVal(modDB, nil, "cannotEvade", false) then
 			output.total_evadeChance = 0
 		else
-			local attackerLevel = getMiscVal(modDB, "misc", "evadeMonsterLevel", false) and m_min(getMiscVal(modDB, "monster", "level", 1), #data.enemyAccuracyTable) or m_min(env.build.characterLevel, 80)
+			local attackerLevel = getMiscVal(modDB, "misc", "evadeMonsterLevel", false) and m_min(getMiscVal(modDB, "monster", "level", 1), #data.enemyAccuracyTable) or m_max(m_min(env.build.characterLevel, 80), 1)
 			output.total_evadeChance = 1 - calcHitChance(output.total_evasion, data.enemyAccuracyTable[attackerLevel])
 		end
 		buildSpaceTable(modDB)
@@ -1379,7 +1382,7 @@ local function performCalcs(env, output)
 			output.total_hitChance = 1
 		else
 			output.total_accuracy = calcVal(modDB, "accuracy")
-			local targetLevel = getMiscVal(modDB, "misc", "hitMonsterLevel", false) and m_min(getMiscVal(modDB, "monster", "level", 1), #data.enemyEvasionTable) or m_min(env.build.characterLevel, 79)
+			local targetLevel = getMiscVal(modDB, "misc", "hitMonsterLevel", false) and m_min(getMiscVal(modDB, "monster", "level", 1), #data.enemyEvasionTable) or m_max(m_min(env.build.characterLevel, 79), 1)
 			local targetEvasion = data.enemyEvasionTable[targetLevel]
 			if env.mode_effective then
 				targetEvasion = targetEvasion * getMiscVal(modDB, "effective", "evasionMore", 1)
--- a/Modules/ModParser.lua
+++ b/Modules/ModParser.lua
@@ -154,6 +154,7 @@ local modNameList = {
 	-- Other skill modifiers
 	["radius"] = "aoeRadius{suf}",
 	["radius of area skills"] = "aoeRadius{suf}",
+	["area of effect"] = "aoeRadius{suf}",
 	["duration"] = "duration{suf}",
 	["skill effect duration"] = "duration{suf}",
 	["chaos skill effect duration"] = "chaos_duration{suf}",
@@ -293,6 +294,7 @@ local specialSpaceList = {
 	["with shields"] = "CondMod_UsingShield_",
 	["while dual wielding"] = "CondMod_DualWielding_",
 	["while wielding a staff"] = "CondMod_UsingStaff_",
+	["while unarmed"] = "CondMod_Unarmed_",
 	["with a normal item equipped"] = "CondMod_UsingNormalItem_",
 	["with a magic item equipped"] = "CondMod_UsingMagicItem_",
 	["with a rare item equipped"] = "CondMod_UsingRareItem_",
--- a/README.md
+++ b/README.md
@@ -48,6 +48,12 @@ 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.19 - 2016/09/02
+ * Fixed error that would occur if you set your character level to 0
+ * Added support for "while Unarmed" modifiers
+ * Added latest patch changes
+ * Gem name input is a bit more lenient (it's somewhat case-insensitive now)
+
 ### 1.0.18 - 2016/09/02
 * Items now automatically equip when added to the build if there is an empty slot which the item can go in
 * Automatically focus the edit control in the tree import/export popups
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.0.18"/>
+	<Version number="1.0.19"/>
 	<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"/>
@@ -29,20 +29,20 @@
 	<File sha1="f2f2bda4a5a26e54cce51614e3ad48b6f7182671" name="Classes/ScrollBarControl.lua" part="program"/>
 	<File sha1="261dcf54a4542e6160fd7024d8edf4fc095d9c71" name="Classes/SectionControl.lua" part="program"/>
 	<File sha1="6131965219f17fd2e6dafc225e08699cf921d15c" name="Classes/SkillListControl.lua" part="program"/>
-	<File sha1="6937ea11f0b5812b2a8edd232d63d5df3158018e" name="Classes/SkillsTab.lua" part="program"/>
+	<File sha1="ff86e798a2fd2c5f883f6fd983ff8c0014953db9" name="Classes/SkillsTab.lua" part="program"/>
 	<File sha1="6317bd9ba391832dccafcb62409a5ce2988d1928" name="Classes/SliderControl.lua" part="program"/>
 	<File sha1="80527e0e05c986355ce7af2ba026538aec99a63a" name="Classes/SlotSelectControl.lua" part="program"/>
 	<File sha1="787ac0d738443206c15ec36544089465eec87048" name="Classes/TreeTab.lua" part="program"/>
 	<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
 	<File sha1="26526eb610e68fa710c3fc7ed2658808b1fad9a1" name="Modules/Build.lua" part="program"/>
 	<File sha1="c03a7796aea3e9aa832fbb92c1f674ef5af690ca" name="Modules/BuildList.lua" part="program"/>
-	<File sha1="2e0c73ba1560db5ef20bb548b8122be265860097" name="Modules/Calcs.lua" part="program"/>
+	<File sha1="e89ce0e2e347e2a75f7b9646ef0b4bab5056170f" name="Modules/Calcs.lua" part="program"/>
 	<File sha1="d4439a94dda4c3d3aa23ac123ba378a35174e425" 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="73e1c9410aba9b218cd9d0ff6b13062e9b8de915" name="Modules/ItemTools.lua" part="program"/>
 	<File sha1="51b4fca862b219d1e953a73a362cd48147aafdff" name="Modules/Main.lua" part="program"/>
-	<File sha1="929737ca821edb42974dcb39b4490d8a55cd3ac9" name="Modules/ModParser.lua" part="program"/>
+	<File sha1="137ea04eb1e5236ebbd046ea315626cad09407a4" 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="056de4fc6178320cc019ad1bacba09d689a87a56" name="Data/New.lua" part="program"/>
@@ -51,7 +51,7 @@
 	<File sha1="2f6080ca40b03e01eac184021b51a1ab5cab1ca1" name="Data/Gems/act_int.lua" part="program"/>
 	<File sha1="8a5ff23a64947650b4837368dea2ac9a78be83dc" name="Data/Gems/act_str.lua" part="program"/>
 	<File sha1="997177289512d8d107f45b440cddcd8ccea890fd" name="Data/Gems/other.lua" part="program"/>
-	<File sha1="e8dd082a5267da9c616ae7a2cdd129595c063bd4" name="Data/Gems/sup_dex.lua" part="program"/>
+	<File sha1="00bc6c49f33707e5a02bec0b463da2e632d2d478" name="Data/Gems/sup_dex.lua" part="program"/>
 	<File sha1="a7684a043d5b448a50d87fcbc4339cc290777515" name="Data/Gems/sup_int.lua" part="program"/>
 	<File sha1="1b8b4655e1fb258170eb4091589f24bfb70fb8da" name="Data/Gems/sup_str.lua" part="program"/>
 	<File sha1="e2bfaf8d42553867fff91aa7267dbae4e3ca460e" name="Data/Bases/amulet.lua" part="program"/>