Merge branch 'dev' into FixQuiverBonuses

Nostrademous · Nostrademous · commit ec05bd26b768 · 2025-01-18T16:14:31.000-05:00
diff --git a/src/Classes/CalcBreakdownControl.lua b/src/Classes/CalcBreakdownControl.lua
@@ -405,7 +405,7 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
 			local nodeId = row.mod.source:match("Tree:(%d+)")
 			if nodeId then
 				local nodeIdNumber = tonumber(nodeId)
-				local node = build.spec.nodes[nodeIdNumber] or build.spec.tree.nodes[nodeIdNumber]
+				local node = build.spec.nodes[nodeIdNumber] or build.spec.switchableNodes[nodeIdNumber] or build.spec.tree.nodes[nodeIdNumber]
 				row.sourceName = node.dn
 				row.sourceNameNode = node
 			end
diff --git a/src/Classes/Item.lua b/src/Classes/Item.lua
@@ -885,6 +885,9 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 	if deferJewelRadiusIndexAssignment then
 		self.jewelRadiusIndex = self.jewelData.radiusIndex
 	end
+	if self.jewelData and self.jewelData.timeLostJewelRadiusOverride then
+		self.jewelRadiusIndex = self.jewelData.timeLostJewelRadiusOverride
+	end
 end
 
 function ItemClass:NormaliseQuality()
diff --git a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua
@@ -1908,6 +1908,9 @@ function ItemsTabClass:CraftItem()
 				implicitIndex = implicitIndex + 1
 			end
 		end
+		if base.base.type == "Jewel" and base.base.subType == "Radius" then
+			item.jewelRadiusLabel = "Small"
+		end
 		item:NormaliseQuality()
 		item:BuildAndParseRaw()
 		return item
diff --git a/src/Classes/ModStore.lua b/src/Classes/ModStore.lua
@@ -486,22 +486,6 @@ function ModStoreClass:EvalMod(mod, cfg)
 					end
 				end
 			end
-		-- Syntax: { type = "MeleeProximity", ramp = {MaxBonusPct,MinBonusPct} }
-		-- 			Both MaxBonusPct and MinBonusPct are percent in decimal form (1.0 = 100%)
-		-- Example: { type = "MeleeProximity", ramp = {1,0} }   ## Duelist-Slayer: Impact
-		elseif tag.type == "MeleeProximity" then
-			if not cfg or not cfg.skillDist then
-				return
-			end
-			-- Max potency is 0-15 units of distance
-			if cfg.skillDist <= 15 then
-				value = value * tag.ramp[1]
-			-- Reduced potency (linear) until 40 units
-			elseif cfg.skillDist >= 16 and cfg.skillDist <= 39 then
-				value = value * (tag.ramp[1] - ((tag.ramp[1] / 25) * (cfg.skillDist - 15)))
-			elseif cfg.skillDist >= 40 then
-				value = 0
-			end
 		elseif tag.type == "Limit" then
 			value = m_min(value, tag.limit or self:GetMultiplier(tag.limitVar, cfg))
 		elseif tag.type == "Condition" then
@@ -809,4 +793,4 @@ function ModStoreClass:EvalMod(mod, cfg)
 		end
 	end	
 	return value
-end
+end
diff --git a/src/Classes/PassiveSpec.lua b/src/Classes/PassiveSpec.lua
@@ -958,6 +958,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 	local visited = { }
 	local attributes = { "Dexterity", "Intelligence", "Strength" }
 	-- Check all nodes for other nodes which depend on them (i.e. are only connected to the tree through that node)
+	self.switchableNodes = { }
 	for id, node in pairs(self.nodes) do
 		node.depends = wipeTable(node.depends)
 		node.intuitiveLeapLikesAffecting = { }
@@ -968,6 +969,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 			local nodeToReplace = self.tree.nodes[id]
 			if self.tree.nodes[id].isSwitchable and self.tree.nodes[id].options[self.curClassName] then
 				nodeToReplace = self.tree.nodes[id].options[self.curClassName]
+				self.switchableNodes[nodeToReplace.id] = node
 			end
 			self:ReplaceNode(node, nodeToReplace)
 		end
diff --git a/src/Classes/PassiveTreeView.lua b/src/Classes/PassiveTreeView.lua
@@ -247,7 +247,7 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 		end
 	end
 	
-	-- switchAttribute true -> allocating an attribute node, possibly with attribute in path -or- hotswap allocated attribute
+	-- switchAttribute true -> allocating an attribute node, possibly with attribute in path -or- hot-swap allocated attribute
 	-- switchAttribute false -> allocating a non-attribute node, possibly with attribute in path
 	-- we always want to keep track of last used attribute
 	local function processAttributeHotkeys(switchAttribute)
@@ -313,7 +313,7 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 			else
 				-- a way for us to bypass the popup when allocating attribute nodes, last used hotkey + RMB
 				-- RMB + non attribute node logic
-				-- RMB hotswap logic
+				-- RMB hot-swap logic
 				if hotkeyPressed then
 					processAttributeHotkeys(hoverNode.isAttribute)
 				elseif hoverNode.isAttribute then
@@ -544,9 +544,9 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 				local dist = math.sqrt(dx * dx + dy * dy) * (connection.orbit > 0 and 1 or -1)
 
 				if dist < r * 2 then
-					local perp = math.sqrt(r * r - (dist * dist) / 4) * (r > 0 and 1 or -1)
-					local cx = node1.x + dx / 2 + perp * (dy / dist)
-					local cy = node1.y + dy / 2 - perp * (dx / dist)
+					local perpendicular = math.sqrt(r * r - (dist * dist) / 4) * (r > 0 and 1 or -1)
+					local cx = node1.x + dx / 2 + perpendicular * (dy / dist)
+					local cy = node1.y + dy / 2 - perpendicular * (dx / dist)
 					local scx, scy = treeToScreen(cx, cy)
 					
 					local innerSize = r * scale
@@ -1123,7 +1123,7 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build)
 		tooltip:AddLine(16, string.format("AllocMode: %d", node.allocMode or 0))
 		tooltip:AddSeparator(14)
 
-		-- add conection info for debugging
+		-- add connection info for debugging
 		for _, connection in ipairs(node.connections) do
 			tooltip:AddLine(16, string.format("^7Connection: %d, Orbit: %d", connection.id, connection.orbit))
 		end
diff --git a/src/Data/ModCache.lua b/src/Data/ModCache.lua
@@ -2501,7 +2501,7 @@ c["Gain 30% of Maximum Life as Extra Maximum Energy Shield"]={{[1]={flags=0,keyw
 c["Gain 30% of Maximum Mana as Extra Maximum Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="ManaGainAsEnergyShield",type="BASE",value=30}},nil}
 c["Gain 35 Mana per Enemy Killed"]={{[1]={flags=0,keywordFlags=0,name="ManaOnKill",type="BASE",value=35}},nil}
 c["Gain 35% of Damage as Extra Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="DamageGainAsChaos",type="BASE",value=35}},nil}
-c["Gain 40% Base Chance to Block from Equipped Shield instead of the Shield's value"]={{[1]={[1]={slotName="Weapon 2",type="SlotName"},flags=0,keywordFlags=0,name="BlockChance",type="BASE",value=40}},"% Base   instead of the Shield's value "}
+c["Gain 40% Base Chance to Block from Equipped Shield instead of the Shield's value"]={{[1]={[1]={type="Condition",var="UsingShield"},flags=0,keywordFlags=0,name="ReplaceShieldBlock",type="OVERRIDE",value=40}},nil}
 c["Gain 40% of Damage as Extra Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="DamageGainAsChaos",type="BASE",value=40}},nil}
 c["Gain 5 Life per Enemy Killed"]={{[1]={flags=0,keywordFlags=0,name="LifeOnKill",type="BASE",value=5}},nil}
 c["Gain 5 Mana per Enemy Killed"]={{[1]={flags=0,keywordFlags=0,name="ManaOnKill",type="BASE",value=5}},nil}
@@ -2935,8 +2935,7 @@ c["Share Charges with Allies in your Presence"]={nil,"Share Charges with Allies
 c["Shocking Hits have a 50% chance to also Shock enemies in a 1.5 metre radius"]={nil,"Shocking Hits have a 50% chance to also Shock enemies in a 1.5 metre radius "}
 c["Shocks you when you reach maximum Power Charges"]={nil,"Shocks you when you reach maximum Power Charges "}
 c["Skill Gems have 30% more Attribute Requirements"]={{[1]={flags=0,keywordFlags=0,name="GlobalGemAttributeRequirements",type="MORE",value=30}},nil}
-c["Skill Mana Costs Converted to Life Costs"]={nil,"Skill Mana Costs Converted to Life Costs "}
-c["Skill Mana Costs Converted to Life Costs Skills gain 1% of Damage as Chaos Damage per 3 Life Cost"]={nil,"Skill Mana Costs Converted to Life Costs Skills gain 1% of Damage as Chaos Damage per 3 Life Cost "}
+c["Skill Mana Costs Converted to Life Costs"]={{[1]={flags=0,keywordFlags=0,name="CostLifeInsteadOfMana",type="FLAG",value=true}},nil}
 c["Skills Supported by Unleash have 10% increased Seal gain frequency"]={{[1]={flags=0,keywordFlags=0,name="SealGainFrequency",type="INC",value=10}},nil}
 c["Skills Supported by Unleash have 25% increased Seal gain frequency"]={{[1]={flags=0,keywordFlags=0,name="SealGainFrequency",type="INC",value=25}},nil}
 c["Skills fire an additional Projectile"]={{[1]={flags=0,keywordFlags=0,name="ProjectileCount",type="BASE",value=1}},nil}
diff --git a/src/Data/SkillStatMap.lua b/src/Data/SkillStatMap.lua
@@ -599,7 +599,7 @@ return {
 	flag("NeverCrit"),
 },
 ["base_critical_strike_multiplier_+"] = {
-	mod("CritMultiplier", "BASE", nil),
+	mod("CritMultiplier", "INC", nil),
 },
 ["critical_strike_chance_+%_vs_shocked_enemies"] = {
 	mod("CritChance", "INC", nil, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Shocked" }),
diff --git a/src/Modules/CalcActiveSkill.lua b/src/Modules/CalcActiveSkill.lua
@@ -445,12 +445,8 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 		end
 	end
 
-	-- Calculate Distance for meleeDistance or projectileDistance (for melee proximity, e.g. Impact)
-	if skillFlags.melee then
-		effectiveRange = env.configInput.meleeDistance
-	else
-		effectiveRange = env.configInput.projectileDistance
-	end
+	-- Calculate distance from enemy
+	effectiveRange = env.configInput.enemyDistance
 
 	-- Build config structure for modifier searches
 	activeSkill.skillCfg = {
diff --git a/src/Modules/CalcSetup.lua b/src/Modules/CalcSetup.lua
@@ -730,6 +730,9 @@ function calcs.initEnv(build, mode, override, specEnv)
 		modDB:NewMod("Multiplier:AllocatedLifeMastery", "BASE", allocatedMasteryTypes["Life Mastery"])
 	end
 
+	-- add Conditional WeaponnSet# base on weapon set from item
+	modDB:NewMod("Condition:WeaponSet" .. (build.itemsTab.activeItemSet.useSecondWeaponSet and 2 or 1) , "FLAG", true, "Weapon Set")
+
 	-- Build and merge item modifiers, and create list of radius jewels
 	if not accelerate.requirementsItems then
 		local items = {}
diff --git a/src/Modules/ConfigOptions.lua b/src/Modules/ConfigOptions.lua
@@ -273,10 +273,6 @@ local configSettings = {
 	{ var = "stoneGolemEqualsCarrionGolem", type = "check", label = "# Stone Golem = # Carrion Golem:", ifCond = "StoneEqualCarrionGolem", ifSkill = "Summon Carrion Golem", includeTransfigured = true, apply = function(val, modList, enemyModList)
 		modList:NewMod("Condition:StoneEqualCarrionGolem", "FLAG", true, "Config")
 	end },
-	{ label = "Close Combat:", ifSkill = "Close Combat" },
-	{ var = "closeCombatCombatRush", type = "check", label = "Is Combat Rush active?", ifSkill = "Close Combat", tooltip = "Combat Rush grants 20% more Attack Speed to Travel Skills not Supported by Close Combat.",apply = function(val, modList, enemyModList)
-		modList:NewMod("Condition:CombatRushActive", "FLAG", true, "Config")
-	end },
 	{ label = "Cold Snap:", ifSkill = "Cold Snap", includeTransfigured = true },
 	{ var = "ColdSnapBypassCD", type = "check", label = "Bypass CD?", ifSkill = "Cold Snap", includeTransfigured = true, apply = function(val, modList, enemyModList)
 		modList:NewMod("CooldownRecovery", "OVERRIDE", 0, "Config", { type = "SkillName", skillName = "Cold Snap", includeTransfigured = true })
@@ -1415,8 +1411,7 @@ Huge sets the radius to 11.
 	{ var = "skillPierceCount", type = "count", label = "# of times Skill has Pierced:", ifStat = "PiercedCount", ifFlag = "piercing", apply = function(val, modList, enemyModList)
 		modList:NewMod("PiercedCount", "BASE", val, "Config", { type = "Condition", var = "Effective" })
 	end },
-	{ var = "meleeDistance", type = "count", label = "Melee distance to enemy:", ifTagType = "MeleeProximity", ifFlag = "melee" },
-	{ var = "projectileDistance", type = "count", label = "Projectile travel distance:", ifTagType = "DistanceRamp", ifFlag = "projectile" },
+	{ var = "enemyDistance", type = "count", label = "Distance to enemy:", ifTagType = "DistanceRamp" },
 	{ var = "conditionAtCloseRange", type = "check", label = "Is the enemy at Close Range?", ifCond = "AtCloseRange", apply = function(val, modList, enemyModList)
 		modList:NewMod("Condition:AtCloseRange", "FLAG", true, "Config", { type = "Condition", var = "Effective" })
 	end },
diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua
@@ -2082,6 +2082,7 @@ local specialModList = {
 	["removes all energy shield"] = { mod("EnergyShield", "MORE", -100) },
 	["converts all energy shield to mana"] = { mod("EnergyShieldConvertToMana", "BASE", 100) },
 	["skills cost life instead of mana"] = { flag("CostLifeInsteadOfMana") },
+	["skill mana costs converted to life costs"] = { flag("CostLifeInsteadOfMana") },
 	["skills reserve life instead of mana"] = { flag("BloodMagicReserved") },
 	["non%-aura skills cost no mana or life while focus?sed"] = {
 		mod("ManaCost", "MORE", -100, { type = "Condition", var = "Focused" }, { type = "SkillType", skillType = SkillType.Aura, neg = true }),
@@ -2587,6 +2588,9 @@ local specialModList = {
 	["gain (%d+)%% chance to block from equipped shield instead of the shield's value"] = function(num) return {
 		mod("ReplaceShieldBlock", "OVERRIDE", num, { type = "Condition", var = "UsingShield" } )
 	} end,
+	["gain (%d+)%% base chance to block from equipped shield instead of the shield's value"] = function(num) return {
+		mod("ReplaceShieldBlock", "OVERRIDE", num, { type = "Condition", var = "UsingShield" } )
+	} end,
 	["deal (%d+)%% more damage with hits and ailments to rare and unique enemies for each second they've ever been in your presence, up to a maximum of (%d+)%%"] = function(num, _, limit) return {
 		mod("Damage", "MORE", num, nil, 0, bor(KeywordFlag.Hit, KeywordFlag.Ailment), { type = "Multiplier", var = "EnemyPresenceSeconds", actor = "enemy", limit = tonumber(limit) }, { type = "ActorCondition", actor = "enemy", var = "RareOrUnique" }),
 	} end,
@@ -2736,7 +2740,6 @@ local specialModList = {
 	["you gain (%d+)%% increased area of effect for each mine"] = function(num) return { mod("AreaOfEffect", "INC", num, { type = "PerStat", stat = "ActiveMineLimit" }) } end,
 	["triggers level (%d+) summon triggerbots when allocated"] = { flag("HaveTriggerBots") },
 	-- Slayer
-	["deal up to (%d+)%% more melee damage to enemies, based on proximity"] = function(num) return { mod("Damage", "MORE", num, nil, bor(ModFlag.Attack, ModFlag.Melee), { type = "MeleeProximity", ramp = {1,0} }) } end,
 	["cannot be stunned while leeching"] = { flag("StunImmune", { type = "Condition", var = "Leeching" }), },
 	["you are immune to bleeding while leeching"] = { flag("BleedImmune", { type = "Condition", var = "Leeching" }), },
 	["life leech effects are not removed at full life"] = { flag("CanLeechLifeOnFullLife") },
@@ -4589,6 +4592,8 @@ local specialModList = {
 	["only affects passives in large ring"] = { mod("JewelData", "LIST", { key = "radiusIndex", value = 10 }) },
 	["only affects passives in very large ring"] = { mod("JewelData", "LIST", { key = "radiusIndex", value = 11 }) },
 	["only affects passives in massive ring"] = { mod("JewelData", "LIST", { key = "radiusIndex", value = 12 }) },
+	["upgrades radius to medium"] = { mod("JewelData", "LIST", { key = "timeLostJewelRadiusOverride", value = 2 })},
+	["upgrades radius to large"] = { mod("JewelData", "LIST", { key = "timeLostJewelRadiusOverride", value = 3 })},
 	["primordial"] = { mod("Multiplier:PrimordialItem", "BASE", 1) },
 	["spectres have a base duration of (%d+) seconds"] = { mod("SkillData", "LIST", { key = "duration", value = 6 }, { type = "SkillName", skillName = "Raise Spectre", includeTransfigured = true }) },
 	["flasks applied to you have (%d+)%% increased effect"] = function(num) return { mod("FlaskEffect", "INC", num, { type = "ActorCondition", actor = "player"}) } end,
