diff --git a/FurnitureCatalogue/FurCGui.lua b/FurnitureCatalogue/FurCGui.lua index a34fe08..85ee73e 100644 --- a/FurnitureCatalogue/FurCGui.lua +++ b/FurnitureCatalogue/FurCGui.lua @@ -357,6 +357,10 @@ local function createGui() control.comboBox = control.comboBox or ZO_ComboBox_ObjectFromContainer(control) comboBox = control.comboBox + local function HideTooltip(control) + ClearTooltip(InformationTooltip) + end + -- ruthlessly stolen from LAM local function SetupTooltips(comboBox, choicesTooltips) local function ShowTooltip(control) @@ -364,9 +368,7 @@ local function createGui() SetTooltipText(InformationTooltip, control.tooltip) InformationTooltipTopLevel:BringWindowToTop() end - local function HideTooltip(control) - ClearTooltip(InformationTooltip) - end + -- allow for tooltips on the drop down entries local originalShow = comboBox.ShowDropdownInternal @@ -377,8 +379,7 @@ local function createGui() local entry = entries[i] local control = entries[i].item - control.tooltip = choicesTooltips[i] - + control.tooltip = choicesTooltips[i] if control.tooltip then entry.onMouseEnter = control:GetHandler("OnMouseEnter") entry.onMouseExit = control:GetHandler("OnMouseExit") @@ -399,6 +400,7 @@ local function createGui() control:SetHandler("OnMouseExit", entry.onMouseExit) control.tooltip = nil end + HideTooltip(self) originalHide(self) end end @@ -406,6 +408,7 @@ local function createGui() function OnItemSelect(control, choiceText, somethingElse) local dropdownName = tostring(control.m_name):gsub("FurC_Dropdown", "") FurC.SetDropdownChoice(dropdownName, choiceText) + HideTooltip(control) PlaySound(SOUNDS.POSITIVE_CLICK) end @@ -416,7 +419,7 @@ local function createGui() for _, characterName in ipairs(FurC.GetAccountCrafters()) do addedDropdownCharacterNames[characterName] = true table.insert(validChoices, characterName) - table.insert(dropdownData["Tooltips"..dropdownName], string.format("%s%s", GetString(SI_FURC_STRING_RECIPESFORCHAR), characterName)) + table.insert(dropdownData["Tooltips"..dropdownName], zo_strformat(GetString(SI_FURC_STRING_RECIPESFORCHAR), characterName)) end end diff --git a/FurnitureCatalogue/FurnitureCatalogue.txt b/FurnitureCatalogue/FurnitureCatalogue.txt index 0d3914d..8655ab9 100644 --- a/FurnitureCatalogue/FurnitureCatalogue.txt +++ b/FurnitureCatalogue/FurnitureCatalogue.txt @@ -1,6 +1,6 @@ ## Title: FurnitureCatalogue ## Author: manavortex -## Version: 2.2.3 +## Version: 2.2.4a ## APIVersion: 100022 ## SavedVariables: FurnitureCatalogue_Settings ## OptionalDependsOn: pChat diff --git a/FurnitureCatalogue/data/Homestead/H_LuxuryFurnisher.lua b/FurnitureCatalogue/data/Homestead/H_LuxuryFurnisher.lua index 37ee088..b5d29fb 100644 --- a/FurnitureCatalogue/data/Homestead/H_LuxuryFurnisher.lua +++ b/FurnitureCatalogue/data/Homestead/H_LuxuryFurnisher.lua @@ -86,23 +86,6 @@ FurC.LuxuryFurnisher[FURC_HOMESTEAD] = { itemDate = "2017-04-07", }, - - [120847] = { -- Dock Winch - itemPrice = 10000, - itemDate = "2017-03-31", - }, - [120846] = { -- Anchor - itemPrice = 4500, - itemDate = "2017-03-31", - }, - [120848] = { -- Fishing Pole Rack - itemPrice = 2500, - itemDate = "2017-03-31", - }, - [121269] = { -- Ocean Antler Coral - itemPrice = 7500, - itemDate = "2017-03-31", - }, diff --git a/FurnitureCatalogue/data/LuxuryFurnisher.lua b/FurnitureCatalogue/data/LuxuryFurnisher.lua index 660fde0..44c0889 100644 --- a/FurnitureCatalogue/data/LuxuryFurnisher.lua +++ b/FurnitureCatalogue/data/LuxuryFurnisher.lua @@ -2,16 +2,28 @@ FurC.LuxuryFurnisher = FurC.LuxuryFurnisher or {} FurC.LuxuryFurnisher[FURC_DRAGONS] = { - [117875] = { -- Wedding Gazebo, Bare - itemPrice = 35000, - itemDate = "2018-02-17", - }, - [134824] = { -- Redguard Tent, Rounded Silk + + + [134828] = { -- Antler Coral, Branched Spiree itemPrice = 100000, - itemDate = "2018-02-24", + itemDate = "2018-03-17", + }, + [120847] = { -- Dock Winch + itemPrice = 10000, + itemDate = "2018-03-17", + }, + [120849] = { -- Anchor + itemPrice = 10000, + itemDate = "2018-03-17", + }, + [120848] = { -- Fishing Pole Rack + itemPrice = 2500, + itemDate = "2018-03-17", + }, + [121269] = { -- Ocean Antler Coral + itemPrice = 7500, + itemDate = "2017-03-31", }, -} -FurC.LuxuryFurnisher[FURC_CLOCKWORK] = { [121268] = { -- Fisher's Catch of the Day Rack @@ -36,8 +48,6 @@ FurC.LuxuryFurnisher[FURC_CLOCKWORK] = { }, - - [120806] = { -- Hew'S Bane Candlestick itemPrice = 2500, itemDate = "2018-03-03", @@ -78,6 +88,19 @@ FurC.LuxuryFurnisher[FURC_CLOCKWORK] = { itemDate = "2018-02-30", }, + + [117875] = { -- Wedding Gazebo, Bare + itemPrice = 35000, + itemDate = "2018-02-17", + }, + [134824] = { -- Redguard Tent, Rounded Silk + itemPrice = 100000, + itemDate = "2018-02-24", + }, +} +FurC.LuxuryFurnisher[FURC_CLOCKWORK] = { + + [134466] = { -- Ayleid Sconce, Empty itemPrice = 4000, diff --git a/FurnitureCatalogue/data/MiscItemSources.lua b/FurnitureCatalogue/data/MiscItemSources.lua index 87f9019..e64fe58 100644 --- a/FurnitureCatalogue/data/MiscItemSources.lua +++ b/FurnitureCatalogue/data/MiscItemSources.lua @@ -204,7 +204,6 @@ FurC.MiscItemSources = { [118903] = FURC_CANBEFISHED, -- Coral, Crown [118896] = FURC_CANBEFISHED, -- Seashell, Sandcake [118901] = FURC_CANBEFISHED, -- Sea sponge - [121269] = FURC_CANBEFISHED, -- Ocean Antler Coral [118338] = FURC_CANBEFISHED, -- Fish, Bass [118339] = FURC_CANBEFISHED, -- Fish, Salmon [118337] = FURC_CANBEFISHED, -- Fish, Trout