Merge pull request #156 from QuickStick123/remove-enchantments

Remove enchantments

Author: Wires77

src/Classes/Item.lua

@@ -663,15 +663,6 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 						self.affixes = (self.base.subType and data.itemMods[self.base.type..self.base.subType])
 								or data.itemMods[self.base.type]
 								or data.itemMods.Item
-						if self.base.flask then
-							if self.base.utility_flask then
-								self.enchantments = data.enchantments["UtilityFlask"]
-							else
-								self.enchantments = data.enchantments["Flask"]
-							end
-						else
-							self.enchantments = data.enchantments[self.base.type]
-						end
 						self.corruptible = self.base.type ~= "Flask" and self.base.type ~= "Charm" and self.base.type ~= "Rune" and self.base.type ~= "SoulCore"
 						self.clusterJewel = data.clusterJewels and data.clusterJewels.jewels[self.baseName]
 						self.requirements.str = self.base.req.str or 0
@@ -729,17 +720,6 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 					self.suffixes.limit = (self.suffixes.limit or 0) + (tonumber(lineLower:match("%+(%d+) suffix modifiers? allowed")) or 0) - (tonumber(lineLower:match("%-(%d+) suffix modifiers? allowed")) or 0)
 				elseif lineLower == "this item can be anointed by cassia" then
 					self.canBeAnointed = true
-				elseif lineLower == "can have a second enchantment modifier" then
-					self.canHaveTwoEnchants = true
-				elseif lineLower == "can have 1 additional enchantment modifiers" then
-					self.canHaveTwoEnchants = true
-				elseif lineLower == "can have 2 additional enchantment modifiers" 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
 				end
 
 				local modLines

src/Classes/ItemsTab.lua

@@ -379,54 +379,15 @@ holding Shift will put it in the second.]])
 
 	-- Section: Enchant / Anoint / Corrupt
 	self.controls.displayItemSectionEnchant = new("Control", {"TOPLEFT",self.controls.displayItemSectionSockets,"BOTTOMLEFT"}, {0, 0, 0, function()
-		return (self.controls.displayItemEnchant:IsShown() or self.controls.displayItemEnchant2:IsShown() or self.controls.displayItemAnoint:IsShown() or self.controls.displayItemAnoint2:IsShown() or self.controls.displayItemCorrupt:IsShown() ) and 28 or 0
+		return (self.controls.displayItemAnoint:IsShown() or self.controls.displayItemAnoint2:IsShown() or self.controls.displayItemCorrupt:IsShown() ) and 28 or 0
 	end})
-	self.controls.displayItemEnchant = new("ButtonControl", {"TOPLEFT",self.controls.displayItemSectionEnchant,"TOPLEFT"}, {0, 0, 160, 20}, "Apply Enchantment...", function()
-		self:EnchantDisplayItem(1)
-	end)
-	self.controls.displayItemEnchant.shown = function()
-		return self.displayItem and self.displayItem.enchantments
-	end
-	self.controls.displayItemEnchant2 = new("ButtonControl", {"TOPLEFT",self.controls.displayItemEnchant,"TOPRIGHT",true}, {8, 0, 160, 20}, "Apply Enchantment 2...", function()
-		self:EnchantDisplayItem(2)
-	end)
-	self.controls.displayItemEnchant2.shown = function()
-		return self.displayItem and self.displayItem.enchantments and self.displayItem.canHaveTwoEnchants and #self.displayItem.enchantModLines > 0
-	end
-	self.controls.displayItemAnoint = new("ButtonControl", {"TOPLEFT",self.controls.displayItemEnchant2,"TOPRIGHT",true}, {8, 0, 100, 20}, "Anoint...", function()
+	self.controls.displayItemAnoint = new("ButtonControl", {"TOPLEFT",self.controls.displayItemSectionEnchant,"TOPLEFT"}, {0, 0, 100, 20}, "Anoint...", function()
 		self:AnointDisplayItem(1)
 	end)
 	self.controls.displayItemAnoint.shown = function()
 		return self.displayItem and (self.displayItem.base.type == "Amulet" or self.displayItem.canBeAnointed)
 	end
-	self.controls.displayItemAnoint2 = new("ButtonControl", {"TOPLEFT",self.controls.displayItemAnoint,"TOPRIGHT",true}, {8, 0, 100, 20}, "Anoint 2...", function()
-		self:AnointDisplayItem(2)
-	end)
-	self.controls.displayItemAnoint2.shown = function()
-		return self.displayItem and
-			(self.displayItem.base.type == "Amulet" or self.displayItem.canBeAnointed) and
-			self.displayItem.canHaveTwoEnchants and
-			#self.displayItem.enchantModLines > 0
-	end
-	self.controls.displayItemAnoint3 = new("ButtonControl", {"TOPLEFT",self.controls.displayItemAnoint2,"TOPRIGHT",true}, {8, 0, 100, 20}, "Anoint 3...", function()
-		self:AnointDisplayItem(3)
-	end)
-	self.controls.displayItemAnoint3.shown = function()
-		return self.displayItem and
-			(self.displayItem.base.type == "Amulet" or self.displayItem.canBeAnointed) and
-			self.displayItem.canHaveThreeEnchants and
-			#self.displayItem.enchantModLines > 1
-	end
-	self.controls.displayItemAnoint4 = new("ButtonControl", {"TOPLEFT",self.controls.displayItemAnoint3,"TOPRIGHT",true}, {8, 0, 100, 20}, "Anoint 4...", function()
-		self:AnointDisplayItem(4)
-	end)
-	self.controls.displayItemAnoint4.shown = function()
-		return self.displayItem and
-			(self.displayItem.base.type == "Amulet" or self.displayItem.canBeAnointed) and
-			self.displayItem.canHaveFourEnchants and
-			#self.displayItem.enchantModLines > 2
-	end
-	self.controls.displayItemCorrupt = new("ButtonControl", {"TOPLEFT",self.controls.displayItemAnoint4,"TOPRIGHT",true}, {8, 10, 100, 20}, "Corrupt...", function()
+	self.controls.displayItemCorrupt = new("ButtonControl", {"TOPLEFT",self.controls.displayItemAnoint,"TOPRIGHT",true}, {8, 0, 100, 20}, "Corrupt...", function()
 		self:CorruptDisplayItem()
 	end)
 	self.controls.displayItemCorrupt.shown = function()
@@ -2036,133 +1997,6 @@ function ItemsTabClass:EditDisplayItemText(alsoAddItem)
 	main:OpenPopup(500, 500, self.displayItem and "Edit Item Text" or "Create Custom Item from Text", controls, nil, "edit")
 end
 
--- Opens the item enchanting popup
-function ItemsTabClass:EnchantDisplayItem(enchantSlot)
-	self.enchantSlot = enchantSlot or 1
-
-	local controls = { } 
-	local enchantments = self.displayItem.enchantments
-	local haveSkills = true
-	for _, source in ipairs(self.build.data.enchantmentSource) do
-		if self.displayItem.enchantments[source.name] then
-			haveSkills = false
-			break
-		end
-	end
-	local skillList = { }
-	local skillsUsed = { }
-	if haveSkills then
-		for _, socketGroup in ipairs(self.build.skillsTab.socketGroupList) do
-			for _, gemInstance in ipairs(socketGroup.gemList) do
-				if gemInstance.gemData then 
-					for _, grantedEffect in ipairs(gemInstance.gemData.grantedEffectList) do
-						if not grantedEffect.support and enchantments[grantedEffect.name] then
-							skillsUsed[grantedEffect.name] = true
-						end
-					end
-				end
-			end
-		end
-	end
-	local function buildSkillList(onlyUsedSkills)
-		wipeTable(skillList)
-		for skillName in pairs(enchantments) do
-			if not onlyUsedSkills or not next(skillsUsed) or skillsUsed[skillName] then
-				t_insert(skillList, skillName)
-			end
-		end
-		table.sort(skillList)
-	end
-	local enchantmentSourceList = { }
-	local function buildEnchantmentSourceList()
-		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
-				t_insert(enchantmentSourceList, source)
-			end
-		end
-	end
-	local enchantmentList = { }
-	local function buildEnchantmentList()
-		wipeTable(enchantmentList)
-		local list = haveSkills and enchantments[skillList[controls.skill and controls.skill.selIndex or 1]] or enchantments
-		for _, enchantment in ipairs(list[enchantmentSourceList[controls.enchantmentSource and controls.enchantmentSource.selIndex or 1].name]) do
-			t_insert(enchantmentList, enchantment)
-		end
-	end
-	if haveSkills then
-		buildSkillList(true)
-	end
-	buildEnchantmentSourceList()
-	buildEnchantmentList()
-	local function enchantItem(idx, remove)
-		local item = new("Item", self.displayItem:BuildRaw())
-		local index = idx or controls.enchantment.selIndex
-		item.id = self.displayItem.id
-		local list = haveSkills and enchantments[controls.skill.list[controls.skill.selIndex]] or enchantments
-		local line = list[controls.enchantmentSource.list[controls.enchantmentSource.selIndex].name][index]
-		local first, second = line:match("([^/]+)/([^/]+)")
-		if remove then
-			t_remove(item.enchantModLines, self.enchantSlot)
-		elseif first then
-			item.enchantModLines = { { enchant = true, line = first }, { enchant = true, line = second } }
-		else
-			if not item.canHaveTwoEnchants and #item.enchantModLines > 1 then
-				item.enchantModLines = { item.enchantModLines[1] }
-			end
-			if #item.enchantModLines >= self.enchantSlot then
-				t_remove(item.enchantModLines, self.enchantSlot)
-			end
-			t_insert(item.enchantModLines, self.enchantSlot, { enchant = true, line = line})
-		end
-		item:BuildAndParseRaw()
-		return item
-	end
-	if haveSkills then
-		controls.skillLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {95, 20, 0, 16}, "^7Skill:")
-		controls.skill = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, {100, 20, 180, 18}, skillList, function(index, value)
-			buildEnchantmentSourceList()
-			buildEnchantmentList()
-			controls.enchantment:SetSel(1)
-		end)
-		controls.allSkills = new("CheckBoxControl", {"TOPLEFT",nil,"TOPLEFT"}, {350, 20, 18}, "All skills:", function(state)
-			buildSkillList(not state)
-			controls.skill:SetSel(1)
-			buildEnchantmentList()
-			controls.enchantment:SetSel(1)
-		end)
-		controls.allSkills.tooltipText = "Show all skills, not just those used by this build."
-		if not next(skillsUsed) then
-			controls.allSkills.state = true
-			controls.allSkills.enabled = false
-		end
-	end
-	controls.enchantmentSourceLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {95, 45, 0, 16}, "^7Source:")
-	controls.enchantmentSource = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, {100, 45, 180, 18}, enchantmentSourceList, function(index, value)
-		buildEnchantmentList()
-		controls.enchantment:SetSel(m_min(controls.enchantment.selIndex, #enchantmentList))
-	end)
-	controls.enchantmentLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {95, 70, 0, 16}, "^7Enchantment:")
-	controls.enchantment = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, {100, 70, 440, 18}, enchantmentList)
-	controls.enchantment.tooltipFunc = function(tooltip, mode, index)
-		tooltip:Clear()
-		self:AddItemTooltip(tooltip, enchantItem(index), nil, true)
-	end
-	controls.save = new("ButtonControl", nil, {-88, 100, 80, 20}, "Enchant", function()
-		self:SetDisplayItem(enchantItem())
-		main:ClosePopup()
-	end)
-	controls.remove = new("ButtonControl", nil, {0, 100, 80, 20}, "Remove", function()
-		self:SetDisplayItem(enchantItem(nil, true))
-		main:ClosePopup()
-	end)
-	controls.close = new("ButtonControl", nil, {88, 100, 80, 20}, "Cancel", function()
-		main:ClosePopup()
-	end)
-	main:OpenPopup(550, 130, "Enchant Item", controls)
-end
-
 ---Gets the name of the anointed node on an item
 ---@param item table @The item to get the anoint from
 ---@return string @The name of the anointed node, or nil if there is no anoint