Add support for Giant's Blood (#166)

* Add support for Giant's Blood

* Constantly check for items in weapon slots

Author: Wires77

src/Classes/ItemsTab.lua

@@ -1127,6 +1127,9 @@ function ItemsTabClass:Draw(viewPort, inputEvents)
 	end
 
 	self:UpdateSockets()
+	-- Update weapon slots in case we got Giant's Blood from somewhere
+	self.slots["Weapon 2"]:Populate()
+	self.slots["Weapon 2 Swap"]:Populate()
 
 	self:DrawControls(viewPort)
 	if self.controls.scrollBarH:IsShown() then
@@ -1814,10 +1817,17 @@ function ItemsTabClass:IsItemValidForSlot(item, slotName, itemSet)
 	elseif slotName == "Weapon 2" or slotName == "Weapon 2 Swap" then
 		local weapon1Sel = itemSet[slotName == "Weapon 2" and "Weapon 1" or "Weapon 1 Swap"].selItemId or 0
 		local weapon1Base = self.items[weapon1Sel] and self.items[weapon1Sel].base or "Unarmed"
+		-- Calcs tab isn't loaded yet when the items tab gets loaded, so assume we have Giant's Blood until proven wrong
+		local giantsBlood = true
+		if self.build.calcsTab and self.build.calcsTab.mainEnv then
+			giantsBlood = self.build.calcsTab.mainEnv.modDB:Flag(nil, "GiantsBlood")
+		end
 		if weapon1Base.type == "Bow" then
 			return item.type == "Quiver"
-		elseif weapon1Base == "Unarmed" or weapon1Base.tags.onehand then
-			return item.type == "Shield" or item.type == "Focus" or item.type == "Sceptre" or (item.base.tags.one_hand_weapon and weapon1Base.type ~= "Wand" and weapon1Base.type ~= "Sceptre")
+		elseif weapon1Base == "Unarmed" or weapon1Base.tags.onehand or (giantsBlood and (weapon1Base.tags.axe or weapon1Base.tags.mace or weapon1Base.tags.sword)) then
+			return item.type == "Shield" or item.type == "Focus" or item.type == "Sceptre"
+					or (item.base.tags.one_hand_weapon and weapon1Base.type ~= "Wand" and weapon1Base.type ~= "Sceptre")
+					or (giantsBlood and (item.base.tags.axe or item.base.tags.mace or item.base.tags.sword))
 		end
 	end
 end
@@ -2502,7 +2512,7 @@ function ItemsTabClass:AddItemSetTooltip(tooltip, itemSet)
 		if not slot.nodeId then
 			local item = self.items[itemSet[slot.slotName].selItemId]
 			if item then
-				tooltip:AddLine(16, s_format("^7%s: %s%s", slot.label, colorCodes[item.rarity], item.name))
+				tooltip:AddLine(16, s_format("^7%s: %s%s", slot.slotName, colorCodes[item.rarity], item.name))
 			end
 		end
 	end

src/Data/ModCache.lua

@@ -2924,7 +2924,7 @@ c["Trigger skills refund half of Energy spent"]={nil,"Trigger skills refund half
 c["Triggered Spells deal 14% increased Spell Damage"]={{[1]={[1]={skillType=41,type="SkillType"},flags=2,keywordFlags=131072,name="Damage",type="INC",value=14}},nil}
 c["Triggered Spells deal 16% increased Spell Damage"]={{[1]={[1]={skillType=41,type="SkillType"},flags=2,keywordFlags=131072,name="Damage",type="INC",value=16}},nil}
 c["Triggered Spells deal 45% increased Spell Damage"]={{[1]={[1]={skillType=41,type="SkillType"},flags=2,keywordFlags=131072,name="Damage",type="INC",value=45}},nil}
-c["Triple Attribute requirements of weapons"]={nil,"Triple Attribute requirements of weapons "}
+c["Triple Attribute requirements of weapons"]={{[1]={flags=0,keywordFlags=0,name="GlobalWeaponAttributeRequirements",type="MORE",value=200}},nil}
 c["Unaffected by Chill during Dodge Roll"]={nil,"Unaffected by Chill during Dodge Roll "}
 c["Unaffected by Chill while Leeching Mana"]={{[1]={[1]={type="Condition",var="LeechingMana"},flags=0,keywordFlags=0,name="SelfChillEffect",type="MORE",value=-100}},nil}
 c["Undead Minions have 20% reduced Reservation"]={nil,"Undead Minions have 20% reduced Reservation "}
@@ -2954,8 +2954,7 @@ c["You can only Socket Ruby Jewels in this item"]={nil,"You can only Socket Ruby
 c["You can only Socket Ruby Jewels in this item You can only Socket Emerald Jewels in this item"]={nil,"You can only Socket Ruby Jewels in this item You can only Socket Emerald Jewels in this item "}
 c["You can only Socket Sapphire Jewels in this item"]={nil,"You can only Socket Sapphire Jewels in this item "}
 c["You can use two copies of the same Support Gem in different Skills"]={{[1]={flags=0,keywordFlags=0,name="MaxSupportGemCopies",type="OVERRIDE",value=2}},nil}
-c["You can wield Two-Handed Axes, Maces and Swords in one hand"]={nil,"You can wield Two-Handed Axes, Maces and Swords in one hand "}
-c["You can wield Two-Handed Axes, Maces and Swords in one hand Triple Attribute requirements of weapons"]={nil,"You can wield Two-Handed Axes, Maces and Swords in one hand Triple Attribute requirements of weapons "}
+c["You can wield Two-Handed Axes, Maces and Swords in one hand"]={{[1]={flags=0,keywordFlags=0,name="GiantsBlood",type="FLAG",value=true}},nil}
 c["You cannot Block"]={nil,"You cannot Block "}
 c["You cannot Block No Chance to Block"]={nil,"You cannot Block No Chance to Block "}
 c["You cannot Recharge Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="NoEnergyShieldRecharge",type="FLAG",value=true}},nil}

src/Modules/CalcPerform.lua

@@ -1382,8 +1382,10 @@ function calcs.perform(env, skipEHP)
 	do
 		local reqMultItem = calcLib.mod(modDB, nil, "GlobalAttributeRequirements", "GlobalItemAttributeRequirements")
 		local reqMultGem = calcLib.mod(modDB, nil, "GlobalAttributeRequirements", "GlobalGemAttributeRequirements")
+		local reqMultWeapon = calcLib.mod(modDB, nil, "GlobalAttributeRequirements", "GlobalItemAttributeRequirements", "GlobalWeaponAttributeRequirements")
 		output.GlobalItemAttributeRequirements = reqMultItem
 		output.GlobalGemAttributeRequirements = reqMultGem
+		output.GlobalWeaponAttributeRequirements = reqMultWeapon
 		local gemAttributeRequirementsSatisfiedByHighestAttribute = modDB:Flag(nil, "GemAttributeRequirementsSatisfiedByHighestAttribute")
 		local attrTable = {"Str","Dex","Int"}
 		local highestAttributeValue = 0
@@ -1414,7 +1416,11 @@ function calcs.perform(env, skipEHP)
 				if reqSource[attr] and reqSource[attr] > 0 then
 					local req = 0
 					if reqSource.source == "Item" then
-						req = m_floor(reqSource[attr] * reqMultItem)
+						if reqSource.sourceItem.base.weapon then
+							req = m_floor(reqSource[attr] * reqMultWeapon)
+						else
+							req = m_floor(reqSource[attr] * reqMultItem)
+						end
 					elseif reqSource.source == "Gem" then
 						req = m_floor(reqSource[attr] * reqMultGem)
 					end

src/Modules/CalcSections.lua

@@ -1383,6 +1383,7 @@ return {
 	{ label = "Intelligence", { format = "{0:output:Int}", { breakdown = "Int" }, { modName = "Int" }, }, },
 	{ label = "Gem Req Mod", { format = "{2:output:GlobalGemAttributeRequirements}", { modName = { "GlobalGemAttributeRequirements", "GlobalAttributeRequirements"} }, }, },
 	{ label = "Item Req Mod", { format = "{2:output:GlobalItemAttributeRequirements}", { modName = { "GlobalItemAttributeRequirements", "GlobalAttributeRequirements"} }, }, },
+	{ label = "Weapon Req Mod", { format = "{2:output:GlobalWeaponAttributeRequirements}", { modName = { "GlobalWeaponAttributeRequirements", "GlobalItemAttributeRequirements", "GlobalAttributeRequirements"} }, }, },
 	{ notFlag = "minionSkill", label = "Str. Required", { format = "{output:ReqStrString}", { breakdown = "ReqStr" }, }, },
 	{ notFlag = "minionSkill", label = "Dex. Required", { format = "{output:ReqDexString}", { breakdown = "ReqDex" }, }, },
 	{ notFlag = "minionSkill", label = "Int. Required", { format = "{output:ReqIntString}", { breakdown = "ReqInt" }, }, },

src/Modules/ModParser.lua

@@ -2225,6 +2225,7 @@ local specialModList = {
 		mod("ArmourDefense", "MAX", math.min(numChance / 100, 1.0) * 100, "Armour Mastery: Average Calc", { type = "Condition", var = "ArmourAvg" }, { type = "Multiplier", var = "BeenHitRecently", limit = cap / numChance }),
 		mod("ArmourDefense", "MAX", math.min(math.floor(numChance / 100), 1.0) * 100, "Armour Mastery: Min Calc", { type = "Condition", var = "ArmourMax", neg = true }, { type = "Condition", var = "ArmourAvg", neg = true }, { type = "Multiplier", var = "BeenHitRecently", limit = cap / numChance }),
 	} end,
+	["you can wield two%-handed axes, maces and swords in one hand"] = { flag("GiantsBlood") },
 	-- Legacy support
 	["(%d+)%% chance to defend with double armour"] = function(numChance) return {
 		mod("ArmourDefense", "MAX", 100, "Armour Mastery: Max Calc", { type = "Condition", var = "ArmourMax" }),
@@ -4701,6 +4702,7 @@ local specialModList = {
 	["equipment and skill gems have (%d+)%% reduced attribute requirements"] = function(num) return { mod("GlobalAttributeRequirements", "INC", -num) } end,
 	["equipment and skill gems have (%d+)%% increased attribute requirements"] = function(num) return { mod("GlobalAttributeRequirements", "INC", num) } end,
 	["skill gems have (%d+)%% more attribute requirements"] = function(num) return { mod("GlobalGemAttributeRequirements", "MORE", num) } end,
+	["triple attribute requirements of weapons"] = function() return { mod("GlobalWeaponAttributeRequirements", "MORE", 200) } end,
 	["mana reservation of herald skills is always (%d+)%%"] = function(num) return { mod("SkillData", "LIST", { key = "ManaReservationPercentForced", value = num }, { type = "SkillType", skillType = SkillType.Herald }) } end,
 	["([%a%s]+) reserves no mana"] = function(_, name) return {
 		mod("SkillData", "LIST", { key = "manaReservationFlat", value = 0 }, { type = "SkillId", skillId = gemIdLookup[name] }, { type = "SkillType", skillType = SkillType.Blessing, neg = true }),