From 629936772f36242d41ca28e2055668b31441af56 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Mon, 15 Dec 2025 13:49:29 +0000 Subject: [PATCH 1/2] Apply changes from https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9244 --- src/Classes/Item.lua.rej | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/Classes/Item.lua.rej diff --git a/src/Classes/Item.lua.rej b/src/Classes/Item.lua.rej new file mode 100644 index 000000000..b2c7589a6 --- /dev/null +++ b/src/Classes/Item.lua.rej @@ -0,0 +1,10 @@ +diff a/src/Classes/Item.lua b/src/Classes/Item.lua (rejected hunks) +@@ -1552,7 +1552,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum) + end + + if self.base.armour.BlockChance then +- armourData.BlockChance = m_floor((self.base.armour.BlockChance + calcLocal(modList, "BlockChance", "BASE", 0)) * (1 + calcLocal(modList, "BlockChance", "INC", 0) / 100)) ++ armourData.BlockChance = m_floor((self.base.armour.BlockChance * (1 + calcLocal(modList, "BlockChance", "INC", 0) / 100) + calcLocal(modList, "BlockChance", "BASE", 0))) + end + if self.base.armour.MovementPenalty then + modList:NewMod("MovementSpeed", "INC", -self.base.armour.MovementPenalty, self.modSource, { type = "Condition", var = "IgnoreMovementPenalties", neg = true }) From 7977a061df8014d4f17f7425938420dfa369ead8 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Tue, 16 Dec 2025 02:33:02 +1100 Subject: [PATCH 2/2] Fix merge conflict --- src/Classes/Item.lua | 2 +- src/Classes/Item.lua.rej | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 src/Classes/Item.lua.rej diff --git a/src/Classes/Item.lua b/src/Classes/Item.lua index 9f38a18f1..0ef3687e9 100644 --- a/src/Classes/Item.lua +++ b/src/Classes/Item.lua @@ -1612,7 +1612,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum) armourData.Ward = round((wardBase) * (1 + (wardInc + defencesInc) / 100) * (1 + (qualityScalar / 100))) if self.base.armour.BlockChance then - armourData.BlockChance = m_floor((self.base.armour.BlockChance + calcLocal(modList, "BlockChance", "BASE", 0)) * (1 + calcLocal(modList, "BlockChance", "INC", 0) / 100)) + armourData.BlockChance = m_floor((self.base.armour.BlockChance * (1 + calcLocal(modList, "BlockChance", "INC", 0) / 100) + calcLocal(modList, "BlockChance", "BASE", 0))) end if self.base.armour.MovementPenalty then modList:NewMod("MovementSpeed", "BASE", -self.base.armour.MovementPenalty, self.modSource, { type = "Condition", var = "IgnoreMovementPenalties", neg = true }) diff --git a/src/Classes/Item.lua.rej b/src/Classes/Item.lua.rej deleted file mode 100644 index b2c7589a6..000000000 --- a/src/Classes/Item.lua.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/src/Classes/Item.lua b/src/Classes/Item.lua (rejected hunks) -@@ -1552,7 +1552,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum) - end - - if self.base.armour.BlockChance then -- armourData.BlockChance = m_floor((self.base.armour.BlockChance + calcLocal(modList, "BlockChance", "BASE", 0)) * (1 + calcLocal(modList, "BlockChance", "INC", 0) / 100)) -+ armourData.BlockChance = m_floor((self.base.armour.BlockChance * (1 + calcLocal(modList, "BlockChance", "INC", 0) / 100) + calcLocal(modList, "BlockChance", "BASE", 0))) - end - if self.base.armour.MovementPenalty then - modList:NewMod("MovementSpeed", "INC", -self.base.armour.MovementPenalty, self.modSource, { type = "Condition", var = "IgnoreMovementPenalties", neg = true })