overspend1/PathOfBuilding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove item versioning

Browse Source
This commit is contained in:
ppoelzl
2020-11-04 18:59:40 +01:00
parent 8dc1243a8e
commit 196ce04de6
10 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Classes/ImportTab.lua
View File

@@ -578,7 +578,7 @@ function ImportTabClass:ImportItem(itemData, slotName)
return
end
local item = new("Item", self.build.targetVersion)
local item = new("Item")
-- Determine rarity, display name and base type of the item
item.rarity = rarityMap[itemData.frameType]

5
Classes/Item.lua
View File

@@ -47,8 +47,7 @@ end
local influenceInfo = itemLib.influenceInfo
local ItemClass = newClass("Item", function(self, targetVersion, raw)
self.targetVersion = targetVersion
local ItemClass = newClass("Item", function(self, raw)
if raw then
self:ParseRaw(itemLib.sanitiseItemText(raw))
end
@@ -64,7 +63,7 @@ end
-- Parse raw item data and extract item name, base type, quality, and modifiers
function ItemClass:ParseRaw(raw)
self.raw = raw
local verData = data[self.targetVersion]
local verData = data[liveTargetVersion]
self.name = "?"
self.rarity = "UNIQUE"
self.quality = nil

2
Classes/ItemDBControl.lua
View File

@@ -297,7 +297,7 @@ end
function ItemDBClass:OnSelClick(index, item, doubleClick)
if IsKeyDown("CTRL") then
-- Add item
local newItem = new("Item", self.itemsTab.build.targetVersion, item.raw)
local newItem = new("Item", item.raw)
newItem:NormaliseQuality()
self.itemsTab:AddItem(newItem, true)

4
Classes/ItemListControl.lua
View File

@@ -76,7 +76,7 @@ end
function ItemListClass:ReceiveDrag(type, value, source)
if type == "Item" then
local newItem = new("Item", self.itemsTab.build.targetVersion, value.raw)
local newItem = new("Item", value.raw)
newItem:NormaliseQuality()
self.itemsTab:AddItem(newItem, true, self.selDragIndex)
self.itemsTab:PopulateSlots()
@@ -115,7 +115,7 @@ function ItemListClass:OnSelClick(index, itemId, doubleClick)
self.itemsTab.build.buildFlag = true
end
elseif doubleClick then
local newItem = new("Item", item.targetVersion, item:BuildRaw())
local newItem = new("Item", item:BuildRaw())
newItem.id = item.id
self.itemsTab:SetDisplayItem(newItem)
end

2
Classes/ItemSetListControl.lua
View File

@@ -95,7 +95,7 @@ function ItemSetListClass:ReceiveDrag(type, value, source)
itemSet.title = value.title
for slotName, verItem in pairs(value.slots) do
local item = verItem[self.itemsTab.build.targetVersion]
local newItem = new("Item", self.itemsTab.build.targetVersion, item.raw)
local newItem = new("Item", item.raw)
newItem:NormaliseQuality()
self.itemsTab:AddItem(newItem, true)
itemSet[slotName].selItemId = newItem.id

2
Classes/ItemSlotControl.lua
View File

@@ -108,7 +108,7 @@ function ItemSlotClass:ReceiveDrag(type, value, source)
if value.id and self.itemsTab.items[value.id] then
self:SetSelItemId(value.id)
else
local newItem = new("Item", self.itemsTab.build.targetVersion, value.raw)
local newItem = new("Item", value.raw)
newItem:NormaliseQuality()
self.itemsTab:AddItem(newItem, true)
self:SetSelItemId(newItem.id)

20
Classes/ItemsTab.lua
View File

@@ -736,7 +736,7 @@ function ItemsTabClass:Load(xml, dbFileName)
self.itemSetOrderList = { }
for _, node in ipairs(xml) do
if node.elem == "Item" then
local item = new("Item", self.build.targetVersion, "")
local item = new("Item", "")
item.id = tonumber(node.attrib.id)
item.variant = tonumber(node.attrib.variant)
if node.attrib.variantAlt then
@@ -1029,7 +1029,7 @@ function ItemsTabClass:EquipItemInSet(item, itemSetId)
slotName = slotName .. " Swap"
end
if not item.id or not self.items[item.id] then
item = new("Item", self.build.targetVersion, item.raw)
item = new("Item", item.raw)
self:AddItem(item, true)
end
local altSlot = slotName:gsub("1","2")
@@ -1211,7 +1211,7 @@ end
-- Attempt to create a new item from the given item raw text and sets it as the new display item
function ItemsTabClass:CreateDisplayItemFromRaw(itemRaw, normalise)
local newItem = new("Item", self.build.targetVersion, itemRaw)
local newItem = new("Item", itemRaw)
if newItem.base then
if normalise then
newItem:NormaliseQuality()
@@ -1586,7 +1586,7 @@ end
function ItemsTabClass:CraftItem()
local controls = { }
local function makeItem(base)
local item = new("Item", self.build.targetVersion)
local item = new("Item")
item.name = base.name
item.base = base.base
item.baseName = base.name
@@ -1689,12 +1689,12 @@ function ItemsTabClass:EditDisplayItemText()
main:ClosePopup()
end)
controls.save.enabled = function()
local item = new("Item", self.build.targetVersion, buildRaw())
local item = new("Item", buildRaw())
return item.base ~= nil
end
controls.save.tooltipFunc = function(tooltip)
tooltip:Clear()
local item = new("Item", self.build.targetVersion, buildRaw())
local item = new("Item", buildRaw())
if item.base then
self:AddItemTooltip(tooltip, item, nil, true)
else
@@ -1764,7 +1764,7 @@ function ItemsTabClass:EnchantDisplayItem(enchantSlot)
buildLabyrinthList()
buildEnchantmentList()
local function enchantItem()
local item = new("Item", self.build.targetVersion, self.displayItem:BuildRaw())
local item = new("Item", self.displayItem:BuildRaw())
item.id = self.displayItem.id
if #item.enchantModLines >= self.enchantSlot then
t_remove(item.enchantModLines, self.enchantSlot)
@@ -1840,7 +1840,7 @@ end
---@return table @The new item
function ItemsTabClass:anointItem(node)
self.anointEnchantSlot = self.anointEnchantSlot or 1
local item = new("Item", self.build.targetVersion, self.displayItem:BuildRaw())
local item = new("Item", self.displayItem:BuildRaw())
item.id = self.displayItem.id
if #item.enchantModLines >= self.anointEnchantSlot then
t_remove(item.enchantModLines, self.anointEnchantSlot)
@@ -1965,7 +1965,7 @@ function ItemsTabClass:CorruptDisplayItem()
control:SelByValue(selfMod, "mod")
end
local function corruptItem()
local item = new("Item", self.build.targetVersion, self.displayItem:BuildRaw())
local item = new("Item", self.displayItem:BuildRaw())
item.id = self.displayItem.id
item.corrupted = true
local newImplicit = { }
@@ -2095,7 +2095,7 @@ function ItemsTabClass:AddCustomModifierToDisplayItem()
t_insert(sourceList, { label = "Custom", sourceId = "CUSTOM" })
buildMods(sourceList[1].sourceId)
local function addModifier()
local item = new("Item", self.build.targetVersion, self.displayItem:BuildRaw())
local item = new("Item", self.displayItem:BuildRaw())
item.id = self.displayItem.id
local sourceId = sourceList[controls.source.selIndex].sourceId
if sourceId == "CUSTOM" then

2
Classes/SharedItemListControl.lua
View File

@@ -48,7 +48,7 @@ function SharedItemListClass:ReceiveDrag(type, value, source)
if type == "Item" then
local verItem = { raw = value:BuildRaw() }
for _, targetVersion in ipairs(targetVersionList) do
local newItem = new("Item", targetVersion, verItem.raw)
local newItem = new("Item", verItem.raw)
if not value.id then
newItem:NormaliseQuality()
end

2
Classes/SharedItemSetListControl.lua
View File

@@ -83,7 +83,7 @@ function SharedItemSetListClass:ReceiveDrag(type, value, source)
local item = self.itemsTab.items[slot.selItemId]
local verItem = { raw = item:BuildRaw() }
for _, targetVersion in ipairs(targetVersionList) do
local newItem = new("Item", targetVersion, verItem.raw)
local newItem = new("Item", verItem.raw)
if not value.id then
newItem:NormaliseQuality()
end

8
Modules/Main.lua
View File

@@ -79,7 +79,7 @@ function main:Init()
self.uniqueDB[targetVersion] = { list = { } }
for type, typeList in pairs(data.uniques) do
for _, raw in pairs(typeList) do
local newItem = new("Item", targetVersion, "Rarity: Unique\n"..raw)
local newItem = new("Item", "Rarity: Unique\n"..raw)
if newItem.base then
newItem:NormaliseQuality()
self.uniqueDB[targetVersion].list[newItem.name] = newItem
@@ -90,7 +90,7 @@ function main:Init()
end
self.rareDB[targetVersion] = { list = { } }
for _, raw in pairs(data[targetVersion].rares) do
local newItem = new("Item", targetVersion, "Rarity: Rare\n"..raw)
local newItem = new("Item", "Rarity: Rare\n"..raw)
if newItem.base then
newItem:NormaliseQuality()
if newItem.crafted then
@@ -427,7 +427,7 @@ function main:LoadSettings()
end
end
for _, targetVersion in ipairs(targetVersionList) do
verItem[targetVersion] = new("Item", targetVersion, verItem.raw)
verItem[targetVersion] = new("Item", verItem.raw)
end
t_insert(self.sharedItemList, verItem)
elseif child.elem == "ItemSet" then
@@ -441,7 +441,7 @@ function main:LoadSettings()
end
end
for _, targetVersion in ipairs(targetVersionList) do
verItem[targetVersion] = new("Item", targetVersion, verItem.raw)
verItem[targetVersion] = new("Item", verItem.raw)
end
sharedItemSet.slots[grandChild.attrib.slotName] = verItem
end