Fix support for Serle's Masterwork

Author: Regisle

src/Classes/Item.lua

@@ -750,13 +750,17 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 					self.canHaveTwoEnchants = true
 				elseif lineLower == "can have 1 additional enchantment modifiers" then
 					self.canHaveTwoEnchants = true
-				elseif lineLower == "can have 2 additional enchantment modifiers" then
+				elseif lineLower == "can have 2 additional enchantment modifiers" or lineLower == "can have 2 additional runesmithing enchantments" then
 					self.canHaveTwoEnchants = true
 					self.canHaveThreeEnchants = true
 				elseif lineLower == "can have 3 additional enchantment modifiers" then
 					self.canHaveTwoEnchants = true
 					self.canHaveThreeEnchants = true
 					self.canHaveFourEnchants = true
+				elseif lineLower == "can be enchanted by a kalguuran runesmith" then
+					self.canHaveRunesmithEnchant = true
+				elseif lineLower == "can be runesmithed as though it were all one handed melee weapon types" then
+					self.canHaveAllOneHandedMeleeRunesmithEnchant = true
 				elseif lineLower == "has a crucible passive skill tree with only support passive skills" then
 					self.canHaveOnlySupportSkillsCrucibleTree = true
 				elseif lineLower == "has a crucible passive skill tree" then

src/Classes/ItemsTab.lua

@@ -2095,6 +2095,9 @@ function ItemsTabClass:EnchantDisplayItem(enchantSlot)
 
 	local controls = { } 
 	local enchantments = self.displayItem.enchantments
+	if self.displayItem.canHaveAllOneHandedMeleeRunesmithEnchant then
+		enchantments = data.enchantments["AllOneHandMelee"]
+	end
 	local haveSkills = true
 	for _, source in ipairs(self.build.data.enchantmentSource) do
 		if self.displayItem.enchantments[source.name] then
@@ -2131,7 +2134,7 @@ function ItemsTabClass:EnchantDisplayItem(enchantSlot)
 		wipeTable(enchantmentSourceList)
 		local list = haveSkills and enchantments[skillList[controls.skill and controls.skill.selIndex or 1]] or enchantments
 		for _, source in ipairs(self.build.data.enchantmentSource) do
-			if list[source.name] then
+			if list[source.name] and (source.name ~= "RUNESMITH" or (self.displayItem.rarity ~= "UNIQUE" and self.displayItem.rarity ~= "RELIC") or self.displayItem.canHaveRunesmithEnchant) then
 				t_insert(enchantmentSourceList, source)
 			end
 		end

src/Data/ModCache.lua

@@ -7329,13 +7329,13 @@ c["Can Allocate Passives from the Templar's starting point"]={{},nil}
 c["Can Allocate Passives from the Witch's starting point"]={{},nil}
 c["Can Consume 4 Support Gems"]={nil,"Can Consume 4 Support Gems "}
 c["Can Consume 4 Support Gems Has not Consumed any Gems"]={nil,"Can Consume 4 Support Gems Has not Consumed any Gems "}
-c["Can be Enchanted by a Kalguuran Runesmith"]={nil,"Can be Enchanted by a Kalguuran Runesmith "}
+c["Can be Enchanted by a Kalguuran Runesmith"]={{},nil}
+c["Can be Runesmithed as though it were all One Handed Melee Weapon Types"]={{},nil}
 c["Can be modified while Corrupted"]={nil,"Can be modified while Corrupted "}
 c["Can be modified while Corrupted 40% increased maximum Life and reduced Fire Resistance"]={nil,"Can be modified while Corrupted 40% increased maximum Life and reduced Fire Resistance "}
 c["Can be modified while Corrupted Can have up to 5 Implicit Modifiers while Item has this Modifier"]={nil,"Can be modified while Corrupted Can have up to 5 Implicit Modifiers while Item has this Modifier "}
 c["Can have 1 additional Siege Ballista Totem per 200 Dexterity"]={{[1]={[1]={includeTransfigured=true,skillName="Siege Ballista",type="SkillName"},[2]={div=200,stat="Dex",type="PerStat"},flags=0,keywordFlags=0,name="ActiveBallistaLimit",type="BASE",value=1}},nil}
-c["Can have 2 additional Runesmithing Enchantments"]={nil,"Can have 2 additional Runesmithing Enchantments "}
-c["Can have 2 additional Runesmithing Enchantments Can be Enchanted by a Kalguuran Runesmith"]={nil,"Can have 2 additional Runesmithing Enchantments Can be Enchanted by a Kalguuran Runesmith "}
+c["Can have 2 additional Runesmithing Enchantments"]={{},nil}
 c["Can have 3 additional Enchantment Modifiers"]={{},nil}
 c["Can have 5 fewer Traps placed at a time"]={{[1]={flags=0,keywordFlags=0,name="ActiveTrapLimit",type="BASE",value=-5}},nil}
 c["Can have a second Enchantment Modifier"]={{},nil}

src/Data/Uniques/Special/New.lua

@@ -96,8 +96,9 @@ Implicits: 1
 +(30-40) to Dexterity
 (150-250)% increased Physical Damage
 +(400-500) to Accuracy Rating
-Can have 2 additional Runesmithing Enchantments
 Can be Enchanted by a Kalguuran Runesmith
+Can have 2 additional Runesmithing Enchantments
+Can be Runesmithed as though it were all One Handed Melee Weapon Types
 ]],[[
 Kaom's Command
 Siege Helmet

src/Modules/Data.lua

@@ -574,7 +574,23 @@ do
 				end
 			end
 		end
-	end					
+	end
+	data.enchantments["AllOneHandMelee"] = { }
+	for enchantmentType, enchantmentList in pairs(data.enchantments["Weapon"]) do
+		if type(enchantmentList[1]) == "string" then
+			data.enchantments["AllOneHandMelee"][enchantmentType] = enchantmentList
+		elseif type(enchantmentList[1]) == "table" then
+			data.enchantments["AllOneHandMelee"][enchantmentType] = {}
+			for _, enchantment in ipairs(enchantmentList) do
+				for baseType, baseData in pairs(data.weaponTypeInfo) do 
+					if baseData.melee and baseData.oneHand and enchantment.types[baseType] then
+						t_insert(data.enchantments["AllOneHandMelee"][enchantmentType], table.concat(enchantment, "/"))
+						break
+					end
+				end
+			end
+		end
+	end
 end
 data.essences = LoadModule("Data/Essence")
 data.veiledMods = LoadModule("Data/ModVeiled")

src/Modules/ModParser.lua

@@ -5114,6 +5114,9 @@ local specialModList = {
 	["[%+%-](%d+) suffix modifiers? allowed"] = { },
 	["can have a second enchantment modifier"] = { },
 	["can have (%d+) additional enchantment modifiers"] = { },
+	["can have (%d+) additional runesmithing enchantments"] = { },
+	["can be enchanted by a kalguuran runesmith"] = { },
+	["can be runesmithed as though it were all one handed melee weapon types"] = { },
 	["this item can be anointed by cassia"] = { },
 	["implicit modifiers cannot be changed"] = { },
 	["has a crucible passive skill tree"] = { },