diff --git a/FurCData.lua b/FurCData.lua index 47ca386..37a9a45 100644 --- a/FurCData.lua +++ b/FurCData.lua @@ -446,13 +446,12 @@ local function scanFromFiles(shouldScanCharacter) end FurC.IsLoading(true) - task:Call(scanRollis) + task:Call(scanRecipeFile) :Then(scanMiscItemFile) - :Then(scanRecipeFile) + :Then(scanRollis) :Then(scanVendorFiles) :Then(scanRollis) :Then(scanFestivalFiles) - :Then(scanRumourRecipes) :Then( function() if shouldScanCharacter then @@ -461,6 +460,7 @@ local function scanFromFiles(shouldScanCharacter) startupMessage(GetString(SI_FURC_VERBOSE_STARTUP)) end end) + :Then(scanRumourRecipes) :Then(FurC.UpdateGui) startupMessage(GetString(SI_FURC_VERBOSE_DB_UPTODATE)) diff --git a/FurCFilter.lua b/FurCFilter.lua index 04ecf67..0b37a5e 100644 --- a/FurCFilter.lua +++ b/FurCFilter.lua @@ -158,8 +158,10 @@ function FurC.MatchFilter(currentItemId, currentRecipeArray) if recipeArray.origin == FURC_RUMOUR then - if filterAllOnTextSearch and not FurC.GetFilterAllOnTextNoRumour() then return false end - if (hideRumours and ddSource ~= FURC_RUMOUR) then return false end + if filterAllOnTextSearch and not FurC.GetFilterAllOnTextNoRumour() then + return false + end + if hideRumours then return false end end if recipeArray.origin == FURC_CROWN then @@ -167,10 +169,9 @@ function FurC.MatchFilter(currentItemId, currentRecipeArray) if hideCrownStore and ddSource ~= FURC_CROWN then return false end end - if not (filterAllOnTextSearch or matchDropdownFilter()) then return false end + if not (filterAllOnTextSearch or matchDropdownFilter()) then return false end - if not matchSearchString then return false end if not matchSearchString() then return false end if not (FurC.settings.filterCraftingTypeAll or matchCraftingTypeFilter()) then return false end if not (FurC.settings.filterQualityAll or matchQualityFilter()) then return false end diff --git a/data/MiscItemSources.lua b/data/MiscItemSources.lua index 4bf63ed..c34d648 100644 --- a/data/MiscItemSources.lua +++ b/data/MiscItemSources.lua @@ -252,7 +252,7 @@ FurC.MiscItemSources[FURC_HOMESTEAD] = { [118221] = GetString(SI_FURC_CHESTS), -- Painting of Summer, Sturdy [118222] = GetString(SI_FURC_CHESTS), -- Painting of Jungle, Sturdy [118223] = GetString(SI_FURC_CHESTS), -- Painting of Palms, Sturdy - [190912] = GetString(SI_FURC_CHESTS), -- Painting of Lake, Sturdy + }, [FURC_CROWN] = { diff --git a/data/RumourRecipes.lua b/data/RumourRecipes.lua index 0deb567..f8169ac 100644 --- a/data/RumourRecipes.lua +++ b/data/RumourRecipes.lua @@ -15,7 +15,7 @@ FurC.RumourRecipes = { 118297, -- Mantikora Horns, Wall Mount 118242, -- Rug, Bearskin - 121207, -- Recipe: Orcish Table with Fur_S_ + 121208, -- Recipe: Orcish Table with Fur_S_ 121210, -- Recipe: Orcish Throne, Skull 121212, -- Recipe: Orcish Effigy, Bear 121213, -- Recipe: Orcish Skull Goblet, Empty @@ -58,7 +58,10 @@ FurC.RumourRecipes = { 121217, -- Redguard Lamp, Oil - 121215, -- Redguard Canopy, Dusk + 121215, -- Redguard Canopy, Dusk + 119426, -- Bread, Plain + 121102, -- Chicken Dinner, Display + 121103, -- Chicken Meal, Display } \ No newline at end of file diff --git a/startup.lua b/startup.lua index 39c6ecb..0a843d2 100644 --- a/startup.lua +++ b/startup.lua @@ -256,7 +256,7 @@ end -- initialization stuff function FurnitureCatalogue_Initialize(eventCode, addOnName) - if (addOnName ~= "FurnitureCatalogue") then return end + if (addOnName ~= FurnitureCatalogue.name) then return end FurnitureCatalogue.settings = ZO_SavedVars:NewAccountWide("FurnitureCatalogue_Settings", 2, nil, defaults)