From bc54dc66f08654d29e6e88a299e327f8b57bdfd6 Mon Sep 17 00:00:00 2001 From: "Carnegie L." Date: Sat, 18 Jan 2025 18:22:00 +0000 Subject: [PATCH 1/5] Added special logic: Issue #112 Added special logic for gamblesprint to make it through to the tooltip. Previous logic filtered any line that had 0% in. Special case added for gamblesprint. Issue #112 --- src/Modules/ItemTools.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/ItemTools.lua b/src/Modules/ItemTools.lua index 3f5e54685..67e0dafac 100644 --- a/src/Modules/ItemTools.lua +++ b/src/Modules/ItemTools.lua @@ -320,7 +320,7 @@ end function itemLib.formatModLine(modLine, dbMode) local line = (not dbMode and modLine.range and itemLib.applyRange(modLine.line, modLine.range, modLine.valueScalar, modLine.corruptedRange)) or modLine.line - if line:match("^%+?0%%? ") or (line:match(" %+?0%%? ") and not line:match("0 to [1-9]")) or line:match(" 0%-0 ") or line:match(" 0 to 0 ") then -- Hack to hide 0-value modifiers + if not line:match("^Gain %d+%% to %d+%%") and (line:match("^%+?0%%? ") or (line:match(" %+?0%%? ") and not line:match("0 to [1-9]")) or line:match(" 0%-0 ") or line:match(" 0 to 0 ")) then -- Hack to hide 0-value modifiers return end local colorCode From a6f81c8ad38ec9f6c1e65a8d28f01fe37af5dd9c Mon Sep 17 00:00:00 2001 From: "Carnegie L." Date: Sat, 18 Jan 2025 20:40:30 +0000 Subject: [PATCH 2/5] Adding in Renly's Training Block Logic Base Block Chance calculation change for shields when Renly's is allocated --- src/Modules/CalcDefence.lua | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Modules/CalcDefence.lua b/src/Modules/CalcDefence.lua index b71c11356..150878b08 100644 --- a/src/Modules/CalcDefence.lua +++ b/src/Modules/CalcDefence.lua @@ -725,15 +725,24 @@ function calcs.defence(env, actor) end output.BlockChanceOverCap = 0 output.SpellBlockChanceOverCap = 0 + local baseBlockChance = 0 if actor.itemList["Weapon 2"] and actor.itemList["Weapon 2"].armourData then - baseBlockChance = baseBlockChance + (actor.itemList["Weapon 2"].armourData.BlockChance or 0) + if env.allocNodes[23005] and actor.itemList["Weapon 2"].type == "Shield" then + baseBlockChance = baseBlockChance + 40 + else + baseBlockChance = baseBlockChance + (actor.itemList["Weapon 2"].armourData.BlockChance or 0) + end end + if actor.itemList["Weapon 3"] and actor.itemList["Weapon 3"].armourData then - baseBlockChance = baseBlockChance + (actor.itemList["Weapon 3"].armourData.BlockChance or 0) + if env.allocNodes[23005] and actor.itemList["Weapon 3"].type == "Shield" then + baseBlockChance = baseBlockChance + 40 + else + baseBlockChance = baseBlockChance + (actor.itemList["Weapon 3"].armourData.BlockChance or 0) + end end - output.ShieldBlockChance = baseBlockChance - baseBlockChance = modDB:Override(nil, "ReplaceShieldBlock") or baseBlockChance + if modDB:Flag(nil, "BlockAttackChanceIsEqualToParent") then output.BlockChance = m_min(actor.parent.output.BlockChance, output.BlockChanceMax) elseif modDB:Flag(nil, "BlockAttackChanceIsEqualToPartyMember") then From 1ab161481f46818ac36d219a5012768ce730d6cd Mon Sep 17 00:00:00 2001 From: "Carnegie L." Date: Sat, 18 Jan 2025 20:42:23 +0000 Subject: [PATCH 3/5] Revert "Adding in Renly's Training Block Logic" This reverts commit a6f81c8ad38ec9f6c1e65a8d28f01fe37af5dd9c. --- src/Modules/CalcDefence.lua | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/Modules/CalcDefence.lua b/src/Modules/CalcDefence.lua index 150878b08..b71c11356 100644 --- a/src/Modules/CalcDefence.lua +++ b/src/Modules/CalcDefence.lua @@ -725,24 +725,15 @@ function calcs.defence(env, actor) end output.BlockChanceOverCap = 0 output.SpellBlockChanceOverCap = 0 - local baseBlockChance = 0 if actor.itemList["Weapon 2"] and actor.itemList["Weapon 2"].armourData then - if env.allocNodes[23005] and actor.itemList["Weapon 2"].type == "Shield" then - baseBlockChance = baseBlockChance + 40 - else - baseBlockChance = baseBlockChance + (actor.itemList["Weapon 2"].armourData.BlockChance or 0) - end + baseBlockChance = baseBlockChance + (actor.itemList["Weapon 2"].armourData.BlockChance or 0) end - if actor.itemList["Weapon 3"] and actor.itemList["Weapon 3"].armourData then - if env.allocNodes[23005] and actor.itemList["Weapon 3"].type == "Shield" then - baseBlockChance = baseBlockChance + 40 - else - baseBlockChance = baseBlockChance + (actor.itemList["Weapon 3"].armourData.BlockChance or 0) - end + baseBlockChance = baseBlockChance + (actor.itemList["Weapon 3"].armourData.BlockChance or 0) end - + output.ShieldBlockChance = baseBlockChance + baseBlockChance = modDB:Override(nil, "ReplaceShieldBlock") or baseBlockChance if modDB:Flag(nil, "BlockAttackChanceIsEqualToParent") then output.BlockChance = m_min(actor.parent.output.BlockChance, output.BlockChanceMax) elseif modDB:Flag(nil, "BlockAttackChanceIsEqualToPartyMember") then From e3aad7d9bc5e1c9e998e18760b392fe0a71cf1dc Mon Sep 17 00:00:00 2001 From: "Carnegie L." Date: Sat, 18 Jan 2025 20:56:13 +0000 Subject: [PATCH 4/5] Update boots.lua Forgot to remove experimentation lines! Rectified --- src/Data/Uniques/boots.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Data/Uniques/boots.lua b/src/Data/Uniques/boots.lua index e4c07b0ee..bab152fec 100644 --- a/src/Data/Uniques/boots.lua +++ b/src/Data/Uniques/boots.lua @@ -82,9 +82,7 @@ Variant: Current (100-140)% increased Evasion Rating {variant:2}(10-15)% increased Rarity of Items found +(10-15) to Dexterity -{variant:1}+(5-15)% to Lightning Resistance -{variant:2}+(15-25)% to Lightning Resistance -+(15-25)% to Lightning Resistance ++(5-15)% to Lightning Resistance Gain 0% to 40% increased Movement Speed at random when Hit, until Hit again ]],[[ Thunderstep From fe2d6513ecf5e99a87b058817094c0f5e3816b11 Mon Sep 17 00:00:00 2001 From: "Carnegie L." Date: Sat, 18 Jan 2025 21:01:51 +0000 Subject: [PATCH 5/5] Update boots.lua Misunderstood the variant system. Updated again --- src/Data/Uniques/boots.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Data/Uniques/boots.lua b/src/Data/Uniques/boots.lua index bab152fec..9e52d235a 100644 --- a/src/Data/Uniques/boots.lua +++ b/src/Data/Uniques/boots.lua @@ -82,7 +82,8 @@ Variant: Current (100-140)% increased Evasion Rating {variant:2}(10-15)% increased Rarity of Items found +(10-15) to Dexterity -+(5-15)% to Lightning Resistance +{variant:1}+(5-15)% to Lightning Resistance +{variant:2}+(15-25)% to Lightning Resistance Gain 0% to 40% increased Movement Speed at random when Hit, until Hit again ]],[[ Thunderstep