Release 1.2.12

- Reimplemented exp penalty calcs - Fixed NotKilledRecently condition
2016-11-22 02:39:29 +10:00
parent ce0389cd4e
commit 7ba2bb07e1
6 changed files with 49 additions and 18 deletions
--- a/Modules/Build.lua
+++ b/Modules/Build.lua
@@ -10,6 +10,8 @@ local ipairs = ipairs
 local t_insert = table.insert
 local m_min = math.min
 local m_max = math.max
+local m_floor = math.floor
+local m_abs = math.abs

 local buildMode = common.New("ControlHost")

@@ -124,9 +126,36 @@ function buildMode:Init(dbFileName, buildName)
 		end
 	end
 	self.controls.characterLevel = common.New("EditControl", {"LEFT",self.anchorTopBarRight,"RIGHT"}, 0, 0, 106, 20, "", "Level", "[%d]", 3, function(buf)
-		self.characterLevel = tonumber(buf) or 1
+		self.characterLevel = m_min(tonumber(buf) or 1, 100)
 		self.buildFlag = true
 	end)
+	self.controls.characterLevel.tooltip = function()
+		local ret = "Experience multiplier:"
+		local playerLevel = self.characterLevel
+		local safeZone = 3 + m_floor(playerLevel / 16)
+		for level, expLevel in ipairs(data.monsterExperienceLevelMap) do
+			local diff = m_abs(playerLevel - expLevel) - safeZone
+			local mult
+			if diff <= 0 then
+				mult = 1
+			else
+				mult = ((playerLevel + 5) / (playerLevel + 5 + diff ^ 2.5)) ^ 1.5
+			end
+			if playerLevel >= 95 then
+				mult = mult * (1 / (1 + 0.1 * (playerLevel - 94)))
+			end
+			if mult > 0.01 then
+				ret = ret .. "\n" .. level
+				if level >= 68 then 
+					ret = ret .. string.format(" (Tier %d)", level - 67)
+				else
+					
+				end
+				ret = ret .. string.format(": %.1f%%", mult * 100)
+			end
+		end
+		return ret
+	end
 	self.controls.classDrop = common.New("DropDownControl", {"LEFT",self.controls.characterLevel,"RIGHT"}, 8, 0, 100, 20, nil, function(index, val)
 		local classId = self.tree.classNameMap[val]
 		if classId ~= self.spec.curClassId then
@@ -496,7 +525,7 @@ function buildMode:OnFrame(inputEvents)
 	SetDrawColor(0.85, 0.85, 0.85)
 	DrawImage(nil, sideBarWidth - 4, 32, 4, main.screenH - 32)

-	self:DrawControls(viewPort)
+	self:DrawControls(main.viewPort)
 end

 function buildMode:RefreshStatList()
--- a/Modules/Calcs.lua
+++ b/Modules/Calcs.lua
@@ -1114,6 +1114,7 @@ local function performCalcs(env)
 	end

 	-- Process conditions that can depend on other conditions
+	condList["NotKilledRecently"] = not condList["KilledRecently"]
 	if env.mode_effective then
 		if condList["EnemyIgnited"] then
 			condList["EnemyBurning"] = true
@@ -2399,17 +2400,6 @@ function calcs.buildOutput(build, mode)
 			output["Spec:"..stat.."Inc"] = env.modDB:Sum("INC", specCfg, stat)
 		end
 	elseif mode == "CALCS" then
-		-- Calculate XP modifier 
-		--[[ FIXME?
-		if input.monster_level and input.monster_level > 0 then
-			local playerLevel = build.characterLevel
-			local diff = m_abs(playerLevel - input.monster_level) - 3 - m_floor(playerLevel / 16)
-			if diff <= 0 then
-				output.MonsterXP = 1
-			else
-				output.MonsterXP = m_max(0.01, ((playerLevel + 5) / (playerLevel + 5 + diff ^ 2.5)) ^ 1.5)
-			end
-		end]]
 		local buffList = { }
 		local combatList = { }
 		local curseList = { }
--- a/Modules/Data.lua
+++ b/Modules/Data.lua
@@ -201,6 +201,11 @@ data.monsterLifeTable = { 15, 17, 20, 23, 26, 30, 33, 37, 41, 46, 50, 55, 60, 66
 -- From MonsterVarieties.dat combined with SkillTotemVariations.dat
 data.totemLifeMult = { [1] = 2.94, [2] = 2.94, [3] = 2.94, [4] = 2.94, [5] = 2.94, [6] = 4.2, [7] = 2.94, [8] = 2.94, [9] = 2.94, [10] = 2.94, [11] = 2.94, [12] = 2.94, [13] = 4.5, }

+data.monsterExperienceLevelMap = { [71] = 70.94, [72] = 71.82, [73] = 72.64, [74] = 73.40, [75] = 74.10, [76] = 74.74, [77] = 75.32, [78] = 75.84, [79] = 76.30, [80] = 76.70, [81] = 77.04, [82] = 77.32, [83] = 77.54, [84] = 77.70, }
+for i = 1, 70 do
+	data.monsterExperienceLevelMap[i] = i
+end
+
 data.weaponTypeInfo = {
 	["None"] = { oneHand = true, melee = true, flag = ModFlag.Unarmed },
 	["Bow"] = { oneHand = false, melee = false, flag = ModFlag.Bow },
--- a/README.md
+++ b/README.md
@@ -49,6 +49,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.2.12 - 2016/11/22
+ * Hovering over the character level input will now show the experience penalties for relevant area levels
+ * Fixed the "not Killed Recently" condition on "Rite of Ruin"
+
 ### 1.2.11 - 2016/11/22
 * Added support for the Minion Damage-related modifiers on The Scourge
 * Fixed error when hovering over Kongming's Stratagem
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+VERSION[1.2.12][2016/11/22]
+ * Hovering over the character level input will now show the experience penalties for relevant area levels
+ * Fixed the "not Killed Recently" condition on "Rite of Ruin"
 VERSION[1.2.11][2016/11/22]
 * Added support for the Minion Damage-related modifiers on The Scourge
 * Fixed error when hovering over Kongming's Stratagem
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.2.11"/>
+	<Version number="1.2.12"/>
 	<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="6bb074e0d3a4043f0e5dcbd25c33f8e5e1f5cfe0" name="Launch.lua" part="program"/>
 	<File sha1="93e19c2a160eb49993d50d9e2b47ea79962373d9" name="UpdateCheck.lua" part="program"/>
 	<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
-	<File sha1="8e8a4b6f9cd5a435ab05d71f5940644aa561ba2a" name="changelog.txt" part="program"/>
+	<File sha1="b62b25c6debf66c86f512c66b66cb1a3cafca48d" name="changelog.txt" part="program"/>
 	<File sha1="8f552be8544dbfb32882cb9dbba1907ce9a67522" name="Classes/BuildListControl.lua" part="program"/>
 	<File sha1="331c2ab54695ed4f0b48dd00b516857678766719" name="Classes/ButtonControl.lua" part="program"/>
 	<File sha1="8df790619a3284b8ed78075f59dd34d5b00d28a3" name="Classes/CalcBreakdownControl.lua" part="program"/>
@@ -41,12 +41,12 @@
 	<File sha1="a4f9cc96ba474d0a75c768a0eabec92837e027cf" name="Classes/TextListControl.lua" part="program"/>
 	<File sha1="c1fe2beba55e93d284ed1b418af3a2c0adf57e5f" name="Classes/TreeTab.lua" part="program"/>
 	<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
-	<File sha1="fa05e8848ea14a8608fd831551d25495eef1ec2a" name="Modules/Build.lua" part="program"/>
+	<File sha1="46ef0a6131752cbe6c2192be766885914d889c3e" name="Modules/Build.lua" part="program"/>
 	<File sha1="c03a7796aea3e9aa832fbb92c1f674ef5af690ca" name="Modules/BuildList.lua" part="program"/>
-	<File sha1="805ebbd1ac5da2e1802ecdc0793741b9f9fa4615" name="Modules/Calcs.lua" part="program"/>
+	<File sha1="5c6159092e0b743db78e80a0f39241cb816c237d" name="Modules/Calcs.lua" part="program"/>
 	<File sha1="99148774ffc1c326f3a50e7d8b3f7a68fe1ede57" name="Modules/CalcSections.lua" part="program"/>
 	<File sha1="f207df4010cb3c7bc6cce98be2529a3b8a708b8f" name="Modules/Common.lua" part="program"/>
-	<File sha1="0deb086a2fcf8aa8637d59ef6f2b825354b9b2c3" name="Modules/Data.lua" part="program"/>
+	<File sha1="bad785f71247b99ff76d9a359f725968aa71da5f" name="Modules/Data.lua" part="program"/>
 	<File sha1="5ddfa4a5904cefbf2755c231797175c8ae24ac49" name="Modules/ItemTools.lua" part="program"/>
 	<File sha1="e881a33fb01053d69d58af5a112e5fb03bc29188" name="Modules/Main.lua" part="program"/>
 	<File sha1="a535c1032e56636e84d8e8df7912679b92d7dd09" name="Modules/ModParser.lua" part="program"/>