Merge remote-tracking branch 'origin/dev'

Author: Openarl

CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.4.77 - 2018/02/24
+ * Added Might of the Meek
+ * Improved the handling of radius jewels; this mainly addresses issues with overlapping jewels
+    * Notably, threshold jewels will now correctly handle nearby nodes that have converted attributes
+
 ### 1.4.76 - 2018/02/23
  * Added Atziri's Reflection
  * Unique items can now be made Elder/Shaper

Classes/CalcBreakdownControl.lua

@@ -351,8 +351,6 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
 				local node = build.spec.nodes[tonumber(nodeId)]
 				row.sourceName = node.dn
 				row.sourceNameNode = node
-			elseif row.mod.source == "Tree:Jewel" then
-				row.sourceName = "Jewel conversion"
 			end
 		elseif sourceType == "Skill" then
 			-- Extract skill name
@@ -389,14 +387,16 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
 					else
 						desc = baseVal.." per "..self:FormatModName(tag.var)
 					end
+				elseif tag.type == "MultiplierThreshold" then
+					desc = "If "..self:FormatModName(tag.var)..(tag.upper and " <= " or " >= ")..(tag.threshold or self:FormatModName(tag.thresholdVar))
 				elseif tag.type == "PerStat" then
 					if tag.base then
 						desc = (row.mod.type == "BASE" and string.format("%+g", tag.base) or tag.base.."%").." + "..math.abs(row.mod.value).." per "..(tag.div or 1).." "..self:FormatModName(tag.var)
 					else
 						desc = baseVal.." per "..(tag.div or 1).." "..self:FormatModName(tag.stat)
 					end
 				elseif tag.type == "StatThreshold" then
-					desc = "If "..self:FormatModName(tag.stat).." >= "..tag.threshold
+					desc = "If "..self:FormatModName(tag.stat)..(tag.upper and " <= " or " >= ")..(tag.threshold or self:FormatModName(tag.thresholdStat))
 				elseif tag.type == "SkillName" then
 					desc = "Skill: "..tag.skillName
 				elseif tag.type == "SkillId" then

Classes/CalcsTab.lua

@@ -391,6 +391,11 @@ function CalcsTabClass:BuildOutput()
 	ConPrintf("Calc time: %d msec", GetTime() - start)
 	--]]
 
+	for _, node in pairs(self.build.spec.nodes) do
+		-- Set default final mod list for all nodes; some may not be set during the main pass
+		node.finalModList = node.modList
+	end
+
 	self.mainEnv = self.calcs.buildOutput(self.build, "MAIN")
 	self.mainOutput = self.mainEnv.player.output
 	self.calcsEnv = self.calcs.buildOutput(self.build, "CALCS")

Classes/ItemsTab.lua

@@ -104,7 +104,7 @@ local ItemsTabClass = common.NewClass("ItemsTab", "UndoHandler", "ControlHost",
 	self.sockets = { }
 	local socketOrder = { }
 	for _, node in pairs(build.tree.nodes) do
-		if node.type == "socket" then
+		if node.type == "Socket" then
 			t_insert(socketOrder, node)
 		end
 	end
@@ -1773,7 +1773,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
 				end
 			end
 			if line then
-				tooltip:AddLine(16, "^x7F7F7FAllocated in Radius: "..line)
+				tooltip:AddLine(16, "^x7F7F7FAttributes in Radius: "..line)
 			end
 		end
 	end

Classes/ModDB.lua

@@ -141,7 +141,8 @@ function ModDBClass:EvalMod(mod, cfg)
 			else
 				mult = (self.multipliers[tag.var] or 0) + self:Sum("BASE", cfg, multiplierName[tag.var])
 			end
-			if mult < tag.threshold then
+			local threshold = tag.threshold or ((self.multipliers[tag.thresholdVar] or 0) + self:Sum("BASE", cfg, multiplierName[tag.thresholdVar]))
+			if (tag.upper and mult > tag.threshold) or (not tag.upper and mult < tag.threshold) then
 				return
 			end
 		elseif tag.type == "PerStat" then
@@ -162,7 +163,9 @@ function ModDBClass:EvalMod(mod, cfg)
 				value = value * mult + (tag.base or 0)
 			end
 		elseif tag.type == "StatThreshold" then
-			if (self.actor.output[tag.stat] or (cfg and cfg.skillStats and cfg.skillStats[tag.stat]) or 0) < tag.threshold then
+			local stat = self.actor.output[tag.stat] or (cfg and cfg.skillStats and cfg.skillStats[tag.stat]) or 0
+			local threshold = tag.threshold or (self.actor.output[tag.thresholdStat] or (cfg and cfg.skillStats and cfg.skillStats[tag.thresholdStat]) or 0)
+			if (tag.upper and stat > threshold) or (not tag.upper and stat < threshold) then
 				return
 			end
 		elseif tag.type == "DistanceRamp" then

Classes/ModList.lua

@@ -38,6 +38,19 @@ function ModListClass:AddMod(mod)
 	t_insert(self, mod)
 end
 
+function ModListClass:MergeMod(mod)
+	if mod.type == "BASE" or mod.type == "INC" then
+		for i = 1, #self do
+			if modLib.compareModParams(self[i], mod) then
+				self[i] = copyTable(self[i], true)
+				self[i].value = self[i].value + mod.value
+				return
+			end
+		end
+	end
+	self:AddMod(mod)
+end
+
 function ModListClass:ScaleAddMod(mod, scale)
 	if scale == 1 then
 		self:AddMod(mod)
@@ -82,6 +95,10 @@ function ModListClass:NewMod(...)
 	self:AddMod(mod_createMod(...))
 end
 
+function ModListClass:MergeNewMod(...)
+	self:MergeMod(mod_createMod(...))
+end
+
 function ModListClass:EvalMod(mod, cfg)
 	local value = mod.value
 	for _, tag in ipairs(mod) do
@@ -118,7 +135,8 @@ function ModListClass:EvalMod(mod, cfg)
 			else
 				mult = (self.multipliers[tag.var] or 0) + self:Sum("BASE", cfg, multiplierName[tag.var])
 			end
-			if mult < tag.threshold then
+			local threshold = tag.threshold or ((self.multipliers[tag.thresholdVar] or 0) + self:Sum("BASE", cfg, multiplierName[tag.thresholdVar]))
+			if (tag.upper and mult > tag.threshold) or (not tag.upper and mult < tag.threshold) then
 				return
 			end
 		elseif tag.type == "PerStat" then
@@ -139,7 +157,9 @@ function ModListClass:EvalMod(mod, cfg)
 				value = value * mult + (tag.base or 0)
 			end
 		elseif tag.type == "StatThreshold" then
-			if (self.actor.output[tag.stat] or (cfg and cfg.skillStats and cfg.skillStats[tag.stat]) or 0) < tag.threshold then
+			local stat = self.actor.output[tag.stat] or (cfg and cfg.skillStats and cfg.skillStats[tag.stat]) or 0
+			local threshold = tag.threshold or (self.actor.output[tag.thresholdStat] or (cfg and cfg.skillStats and cfg.skillStats[tag.thresholdStat]) or 0)
+			if (tag.upper and stat > threshold) or (not tag.upper and stat < threshold) then
 				return
 			end
 		elseif tag.type == "DistanceRamp" then

Classes/PassiveSpec.lua

@@ -178,7 +178,7 @@ end
 function PassiveSpecClass:EncodeURL(prefix)
 	local a = { 0, 0, 0, 4, self.curClassId, self.curAscendClassId, 0 }
 	for id, node in pairs(self.allocNodes) do
-		if node.type ~= "classStart" and node.type ~= "ascendClassStart" then
+		if node.type ~= "ClassStart" and node.type ~= "AscendClassStart" then
 			t_insert(a, m_floor(id / 256))
 			t_insert(a, id % 256)
 		end
@@ -263,7 +263,7 @@ end
 -- Clear the allocated status of all non-class-start nodes
 function PassiveSpecClass:ResetNodes()
 	for id, node in pairs(self.nodes) do
-		if node.type ~= "classStart" and node.type ~= "ascendClassStart" then
+		if node.type ~= "ClassStart" and node.type ~= "AscendClassStart" then
 			node.alloc = false
 			self.allocNodes[id] = nil
 		end
@@ -320,15 +320,15 @@ end
 function PassiveSpecClass:CountAllocNodes()
 	local used, ascUsed, sockets = 0, 0, 0
 	for _, node in pairs(self.allocNodes) do
-		if node.type ~= "classStart" and node.type ~= "ascendClassStart" then
+		if node.type ~= "ClassStart" and node.type ~= "AscendClassStart" then
 			if node.ascendancyName then
 				if not node.isMultipleChoiceOption then
 					ascUsed = ascUsed + 1
 				end
 			else
 				used = used + 1
 			end
-			if node.type == "socket" then
+			if node.type == "Socket" then
 				sockets = sockets + 1
 			end
 		end
@@ -348,8 +348,8 @@ function PassiveSpecClass:FindStartFromNode(node, visited, noAscend)
 		-- Either:
 		--  - the other node is a start node, or
 		--  - there is a path to a start node through the other node which didn't pass through any nodes which have already been visited
-		if other.alloc and (other.type == "classStart" or other.type == "ascendClassStart" or (not other.visited and self:FindStartFromNode(other, visited, noAscend))) then
-			if not noAscend or other.type ~= "ascendClassStart" then
+		if other.alloc and (other.type == "ClassStart" or other.type == "AscendClassStart" or (not other.visited and self:FindStartFromNode(other, visited, noAscend))) then
+			if not noAscend or other.type ~= "AscendClassStart" then
 				return true
 			end
 		end
@@ -375,7 +375,7 @@ function PassiveSpecClass:BuildPathFromNode(root)
 			-- 2. They cannot pass between different ascendancy classes or between an ascendancy class and the main tree
 			--    The one exception to that rule is that a path may start from an ascendancy node and pass into the main tree
 			--    This permits pathing from the Ascendant 'Path of the X' nodes into the respective class start areas
-			if other.type ~= "classStart" and other.type ~= "ascendClassStart" and other.pathDist > curDist and (node.ascendancyName == other.ascendancyName or (curDist == 1 and not other.ascendancyName)) then
+			if other.type ~= "ClassStart" and other.type ~= "AscendClassStart" and other.pathDist > curDist and (node.ascendancyName == other.ascendancyName or (curDist == 1 and not other.ascendancyName)) then
 				-- The shortest path to the other node is through the current node
 				other.pathDist = curDist
 				other.path = wipeTable(other.path)
@@ -400,7 +400,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 	for id, node in pairs(self.nodes) do
 		node.depends = wipeTable(node.depends)
 		node.dependsOnIntuitiveLeap = false
-		if node.type ~= "classStart" then
+		if node.type ~= "ClassStart" then
 			for nodeId, itemId in pairs(self.jewels) do
 				if self.allocNodes[nodeId] and self.nodes[nodeId].nodesInRadius[1][node.id] then
 					if itemId ~= 0 and self.build.itemsTab.items[itemId] and self.build.itemsTab.items[itemId].jewelData and self.build.itemsTab.items[itemId].jewelData.intuitiveLeap then
@@ -422,11 +422,11 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 	for id, node in pairs(self.allocNodes) do
 		node.visited = true
 
-		local anyStartFound = (node.type == "classStart" or node.type == "ascendClassStart")
+		local anyStartFound = (node.type == "ClassStart" or node.type == "AscendClassStart")
 		for _, other in ipairs(node.linked) do
 			if other.alloc and not isValueInArray(node.depends, other) then
 				-- The other node is allocated and isn't already dependant on this node, so try and find a path to a start node through it
-				if other.type == "classStart" or other.type == "ascendClassStart" then
+				if other.type == "ClassStart" or other.type == "AscendClassStart" then
 					-- Well that was easy!
 					anyStartFound = true
 				elseif self:FindStartFromNode(other, visited) then

Classes/PassiveTree.lua

@@ -125,7 +125,7 @@ local PassiveTreeClass = common.NewClass("PassiveTree", function(self, targetVer
 		[6] = "centershadow"
 	}
 	local nodeOverlay = {
-		normal = {
+		Normal = {
 			artWidth = 40,
 			alloc = "PSSkillFrameActive",
 			path = "PSSkillFrameHighlighted",
@@ -134,7 +134,7 @@ local PassiveTreeClass = common.NewClass("PassiveTree", function(self, targetVer
 			pathAscend = "PassiveSkillScreenAscendancyFrameSmallCanAllocate",
 			unallocAscend = "PassiveSkillScreenAscendancyFrameSmallNormal"
 		},
-		notable = {
+		Notable = {
 			artWidth = 58,
 			alloc = "NotableFrameAllocated",
 			path = "NotableFrameCanAllocate",
@@ -143,13 +143,13 @@ local PassiveTreeClass = common.NewClass("PassiveTree", function(self, targetVer
 			pathAscend = "PassiveSkillScreenAscendancyFrameLargeCanAllocate",
 			unallocAscend = "PassiveSkillScreenAscendancyFrameLargeNormal"
 		},
-		keystone = { 
+		Keystone = { 
 			artWidth = 84,
 			alloc = "KeystoneFrameAllocated",
 			path = "KeystoneFrameCanAllocate",
 			unalloc = "KeystoneFrameUnallocated"
 		},
-		socket = {
+		Socket = {
 			artWidth = 58, 
 			alloc = "JewelFrameAllocated",
 			path = "JewelFrameCanAllocate",
@@ -177,26 +177,26 @@ local PassiveTreeClass = common.NewClass("PassiveTree", function(self, targetVer
 
 		-- Determine node type
 		if node.spc[0] then
-			node.type = "classStart"
+			node.type = "ClassStart"
 			local class = self.classes[node.spc[0]]
 			class.startNodeId = node.id
 			node.startArt = classArt[node.spc[0]]
 		elseif node.isAscendancyStart then
-			node.type = "ascendClassStart"
+			node.type = "AscendClassStart"
 			local ascendClass = self.ascendNameMap[node.ascendancyName].ascendClass
 			ascendClass.startNodeId = node.id
 		elseif node.m then
-			node.type = "mastery"
+			node.type = "Mastery"
 		elseif node.isJewelSocket then
-			node.type = "socket"
+			node.type = "Socket"
 			sockets[node.id] = node
 		elseif node.ks then
-			node.type = "keystone"
+			node.type = "Keystone"
 			self.keystoneMap[node.dn] = node
 		elseif node["not"] then
-			node.type = "notable"
+			node.type = "Notable"
 		else
-			node.type = "normal"
+			node.type = "Normal"
 		end
 
 		-- Assign node artwork assets
@@ -299,7 +299,7 @@ local PassiveTreeClass = common.NewClass("PassiveTree", function(self, targetVer
 				end
 			end
 		end
-		if node.type == "keystone" then
+		if node.type == "Keystone" then
 			node.keystoneMod = modLib.createMod("Keystone", "LIST", node.dn, "Tree"..node.id)
 		end
 	end
@@ -317,9 +317,6 @@ local PassiveTreeClass = common.NewClass("PassiveTree", function(self, targetVer
 					local vX, vY = node.x - socket.x, node.y - socket.y
 					if vX * vX + vY * vY <= rSq then 
 						socket.nodesInRadius[radiusIndex][node.id] = node
-						for _, att in pairs({"Str","Dex","Int"}) do
-							socket.attributesInRadius[radiusIndex][att] = (socket.attributesInRadius[radiusIndex][att] or 0) + node.modList:Sum("BASE", nil, att)
-						end
 					end
 				end
 			end
@@ -333,7 +330,7 @@ local PassiveTreeClass = common.NewClass("PassiveTree", function(self, targetVer
 			local other = nodeMap[otherId]
 			t_insert(node.linkedId, otherId)
 			t_insert(other.linkedId, node.id)
-			if node.type ~= "classStart" and other.type ~= "classStart" and node.type ~= "mastery" and other.type ~= "mastery" and node.ascendancyName == other.ascendancyName then
+			if node.type ~= "ClassStart" and other.type ~= "ClassStart" and node.type ~= "Mastery" and other.type ~= "Mastery" and node.ascendancyName == other.ascendancyName then
 				t_insert(self.connectors, self:BuildConnector(node, other))
 			end
 		end
@@ -343,7 +340,7 @@ local PassiveTreeClass = common.NewClass("PassiveTree", function(self, targetVer
 		local startNode = nodeMap[class.startNodeId]
 		for _, nodeId in ipairs(startNode.linkedId) do
 			local node = nodeMap[nodeId]
-			if node.type == "normal" then
+			if node.type == "Normal" then
 				node.modList:NewMod("Condition:ConnectedTo"..class.name.."Start", "FLAG", true, "Tree:"..nodeId)
 			end
 		end