From a42e650b8d912a10f0d5dfe41d51f7a436e2dfeb Mon Sep 17 00:00:00 2001 From: Openarl Date: Thu, 16 Feb 2017 01:32:53 +1000 Subject: [PATCH] Various minor fixes --- Classes/ItemsTab.lua | 7 ++++--- Classes/TreeTab.lua | 4 ++++ Data/Bases/body.lua | 4 ++-- Modules/ModParser.lua | 1 + manifest.xml | 8 ++++---- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Classes/ItemsTab.lua b/Classes/ItemsTab.lua index 11d484a2..45990a88 100644 --- a/Classes/ItemsTab.lua +++ b/Classes/ItemsTab.lua @@ -80,6 +80,7 @@ local ItemsTabClass = common.NewClass("ItemsTab", "UndoHandler", "ControlHost", return self.slotOrder[a.slotName] < self.slotOrder[b.slotName] end) self.controls.slotHeader = common.New("LabelControl", {"BOTTOMLEFT",self.orderedSlots[1],"TOPLEFT"}, 0, -4, 0, 16, "^7Equipped items:") + self:PopulateSlots() -- Build item list self.controls.itemList = common.New("ItemList", {"TOPLEFT",self.orderedSlots[1],"TOPRIGHT"}, 20, 0, 360, 308, self) @@ -376,7 +377,7 @@ function ItemsTabClass:CraftItem() main:ClosePopup() local item = makeItem(popup.controls.base.list[popup.controls.base.sel]) self:SetDisplayItem(item) - if not item.craftable then + if not item.craftable and item.rarity ~= "NORMAL" then self:EditDisplayItemText() end self.lastCraftRaritySel = popup.controls.rarity.sel @@ -507,12 +508,12 @@ function ItemsTabClass:SetDisplayItem(item) pre.list = prefixTable pre.outputTable = "prefixes" pre.outputIndex = i - pre.sel = isValueInArray(prefixList, item.prefixes[i] or "None") + pre.sel = isValueInArray(prefixList, item.prefixes[i] or "None") or 1 local suf = self.controls["displayItemAffix"..(i+item.affixLimit/2)] suf.list = suffixTable suf.outputTable = "suffixes" suf.outputIndex = i - suf.sel = isValueInArray(suffixList, item.suffixes[i] or "None") + suf.sel = isValueInArray(suffixList, item.suffixes[i] or "None") or 1 end end else diff --git a/Classes/TreeTab.lua b/Classes/TreeTab.lua index 5ebbd0d5..979f19fe 100644 --- a/Classes/TreeTab.lua +++ b/Classes/TreeTab.lua @@ -176,6 +176,10 @@ function TreeTabClass:SetActiveSpec(specId) end end end + if self.build.itemsTab.orderList[1] then + -- Update item slots if items have been loaded already + self.build.itemsTab:PopulateSlots() + end end function TreeTabClass:OpenSpecManagePopup() diff --git a/Data/Bases/body.lua b/Data/Bases/body.lua index 46a52083..6e83bf8a 100644 --- a/Data/Bases/body.lua +++ b/Data/Bases/body.lua @@ -10,8 +10,8 @@ itemBases["Plate Vest"] = { itemBases["Chestplate"] = { type = "Body Armour", subType = "Armour", - armour = { armourBase = 49, }, - req = { level = 6, str = 25, movementPenalty = 5, }, + armour = { armourBase = 49, movementPenalty = 5, }, + req = { level = 6, str = 25, }, } itemBases["Copper Plate"] = { type = "Body Armour", diff --git a/Modules/ModParser.lua b/Modules/ModParser.lua index 180d17bf..85357316 100644 --- a/Modules/ModParser.lua +++ b/Modules/ModParser.lua @@ -57,6 +57,7 @@ local modNameList = { ["maximum life"] = "Life", ["mana"] = "Mana", ["maximum mana"] = "Mana", + ["mana regeneration"] = "ManaRegen", ["mana regeneration rate"] = "ManaRegen", ["mana cost"] = "ManaCost", ["mana cost of skills"] = "ManaCost", diff --git a/manifest.xml b/manifest.xml index 5baa1635..d530dadf 100644 --- a/manifest.xml +++ b/manifest.xml @@ -24,7 +24,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -68,7 +68,7 @@ - +