Apply changes from PathOfBuildingCommunity/PathOfBuilding-PoE2#1761

Author: ibabde

src/Classes/CalcBreakdownControl.lua.rej

@@ -0,0 +1,10 @@
+diff a/src/Classes/CalcBreakdownControl.lua b/src/Classes/CalcBreakdownControl.lua	(rejected hunks)
+@@ -183,7 +183,7 @@ function CalcBreakdownClass:AddBreakdownSection(sectionData)
+ 				{ label = "More/less", key = "more" },
+ 				{ label = "Inc/red", key = "inc" },
+ 				{ label = "Efficiency", key = "efficiency" },
+-				{ label = "Efficiency More", key = "efficiencyMore" },
++				{ label = "Efficiency More/less", key = "efficiencyMore" },
+ 				{ label = "Count", key = "count" },
+ 				{ label = "Reservation", key = "total" },
+ 			}

src/Data/ModCache.lua.rej

@@ -0,0 +1,10 @@
+diff a/src/Data/ModCache.lua b/src/Data/ModCache.lua	(rejected hunks)
+@@ -5664,7 +5664,7 @@ c["Non-Channelling Spells deal 6% increased Damage per 100 maximum Life"]={{[1]=
+ c["Non-Channelling Spells have 3% increased Critical Hit Chance per 100 maximum Life"]={{[1]={[1]={neg=true,skillType=48,type="SkillType"},[2]={div=100,stat="Life",type="PerStat"},flags=2,keywordFlags=0,name="CritChance",type="INC",value=3}},nil}
+ c["Non-Channelling Spells have 5% increased Critical Hit Chance per 100 maximum Life"]={{[1]={[1]={neg=true,skillType=48,type="SkillType"},[2]={div=100,stat="Life",type="PerStat"},flags=2,keywordFlags=0,name="CritChance",type="INC",value=5}},nil}
+ c["Non-Keystone Passive Skills in Medium Radius of allocated Keystone Passive Skills can be allocated without being connected to your tree"]={{[1]={flags=0,keywordFlags=0,name="AllocateFromNodeRadius",type="LIST",value={from="Keystone",radiusIndex=2,to={[1]="Notable",[2]="Normal"}}}},nil}
+-c["Non-Minion Skills have 50% less Reservation Efficiency"]={nil,"Non-Minion Skills have 50% less Reservation Efficiency "}
++c["Non-Minion Skills have 50% less Reservation Efficiency"]={{[1]={[1]={neg=true,skillType=6,type="SkillType"},flags=0,keywordFlags=0,name="ReservationEfficiency",type="MORE",value=-50}},nil}
+ c["Non-Unique Time-Lost Jewels have 40% increased radius"]={nil,"Non-Unique Time-Lost Jewels have 40% increased radius "}
+ c["Offering Skills have 15% increased Buff effect"]={{[1]={[1]={skillType=154,type="SkillType"},flags=0,keywordFlags=0,name="BuffEffect",type="INC",value=15}},nil}
+ c["Offering Skills have 20% increased Area of Effect"]={{[1]={[1]={skillType=154,type="SkillType"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=20}},nil}

src/Modules/CalcDefence.lua.rej

@@ -0,0 +1,28 @@
+diff a/src/Modules/CalcDefence.lua b/src/Modules/CalcDefence.lua	(rejected hunks)
+@@ -242,7 +242,7 @@ function calcs.doActorLifeManaSpiritReservation(actor)
+ 					local baseFlatVal = values.baseFlat * mult
+ 					values.reservedFlat = 0
+ 					if values.more > 0 and values.inc > -100 and baseFlatVal ~= 0 then
+-						values.reservedFlat = m_max(round(baseFlatVal * (100 + values.inc) / 100 * values.more / (1 + values.efficiency / 100) / (values.efficiencyMore), 0), 0)
++						values.reservedFlat = m_max(round(baseFlatVal * (100 + values.inc) / 100 * values.more / (1 + values.efficiency / 100) / values.efficiencyMore, 0), 0)
+ 					end
+ 				end
+ 				if activeSkill.skillData[name.."ReservationPercentForced"] then
+@@ -251,7 +251,7 @@ function calcs.doActorLifeManaSpiritReservation(actor)
+ 					local basePercentVal = values.basePercent * mult
+ 					values.reservedPercent = 0
+ 					if values.more > 0 and values.inc > -100 and basePercentVal ~= 0 then
+-						values.reservedPercent = m_max(round(basePercentVal * (100 + values.inc) / 100 * values.more / (1 + values.efficiency / 100) / (values.efficiencyMore), 2), 0)
++						values.reservedPercent = m_max(round(basePercentVal * (100 + values.inc) / 100 * values.more / (1 + values.efficiency / 100) / values.efficiencyMore, 2), 0)
+ 					end
+ 				end
+ 				if activeSkill.activeMineCount then
+@@ -273,7 +273,7 @@ function calcs.doActorLifeManaSpiritReservation(actor)
+ 
+ 					-- Extra reservation of blasphemy needs to be separated from the reservation caused by curses
+ 					local blasphemyFlat = activeSkill.skillData["blasphemyReservationFlat" .. name]
+-					local blasphemyEffectiveFlat = m_max(m_ceil(blasphemyFlat * mult * (100 + values.inc) / 100 * values.more / (1 + values.efficiency / 100), 0), 0)
++					local blasphemyEffectiveFlat = m_max(m_ceil(blasphemyFlat * mult * (100 + values.inc) / 100 * values.more / (1 + values.efficiency / 100) / values.efficiencyMore, 0), 0)
+ 					values.reservedFlat = values.reservedFlat + blasphemyEffectiveFlat * instances
+ 				end
+ 					-- Blood Sacrament increases reservation per stage channelled

src/Modules/ModParser.lua

@@ -1074,6 +1074,7 @@ local preFlagList = {
 	["^golems [hd][ae][va][el] "] = { addToMinion = true, addToMinionTag = { type = "SkillType", skillType = SkillType.Golem } },
 	["^summoned golems [hd][ae][va][el] "] = { addToMinion = true, addToMinionTag = { type = "SkillType", skillType = SkillType.Golem } },
 	["^golem skills have "] = { tag = { type = "SkillType", skillType = SkillType.Golem } },
+	["^non%-minion skills have "] = { tag = { type = "SkillType", skillType = SkillType.Minion, neg = true } },
 	["^zombies [hd][ae][va][el] "] = { addToMinion = true, addToMinionTag = { type = "SkillName", skillName = "Raise Zombie", includeTransfigured = true } },
 	["^raised zombies [hd][ae][va][el] "] = { addToMinion = true, addToMinionTag = { type = "SkillName", skillName = "Raise Zombie", includeTransfigured = true } },
 	["^skeletons [hd][ae][va][el] "] = { addToMinion = true, addToMinionTag = { type = "SkillName", skillName = "Summon Skeletons", includeTransfigured = true } },