diff --git a/Core/HolidayEvents.lua b/Core/HolidayEvents.lua index ba53f888..9313dcea 100644 --- a/Core/HolidayEvents.lua +++ b/Core/HolidayEvents.lua @@ -37,6 +37,10 @@ local HolidayEvents = { [CONSTANTS.ART_TEXTURES.MIDSUMMER_ONGOING] = CONSTANTS.HOLIDAY_TEXTURES.MIDSUMMER_FESTIVAL, [CONSTANTS.ART_TEXTURES.MIDSUMMER_START] = CONSTANTS.HOLIDAY_TEXTURES.MIDSUMMER_FESTIVAL, + [CONSTANTS.ART_TEXTURES.NOBLEGARDEN_END] = CONSTANTS.HOLIDAY_TEXTURES.NOBLEGARDEN, + [CONSTANTS.ART_TEXTURES.NOBLEGARDEN_ONGOING] = CONSTANTS.HOLIDAY_TEXTURES.NOBLEGARDEN, + [CONSTANTS.ART_TEXTURES.NOBLEGARDEN_START] = CONSTANTS.HOLIDAY_TEXTURES.NOBLEGARDEN, + [CONSTANTS.ART_TEXTURES.WINTERVEIL_END] = CONSTANTS.HOLIDAY_TEXTURES.WINTERS_VEIL, [CONSTANTS.ART_TEXTURES.WINTERVEIL_IEND] = CONSTANTS.HOLIDAY_TEXTURES.WINTERS_VEIL, [CONSTANTS.ART_TEXTURES.WINTERVEIL_ONGOING] = CONSTANTS.HOLIDAY_TEXTURES.WINTERS_VEIL, diff --git a/DB/Mounts/HolidayEvents.lua b/DB/Mounts/HolidayEvents.lua index be708b2b..6adb21b6 100644 --- a/DB/Mounts/HolidayEvents.lua +++ b/DB/Mounts/HolidayEvents.lua @@ -80,6 +80,21 @@ local holidayEventMounts = { holidayTexture = CONSTANTS.HOLIDAY_TEXTURES.HALLOWS_END, coords = { { m = 435, i = true } }, }, + ["Noble Flying Carpet"] = { + cat = CONSTANTS.ITEM_CATEGORIES.HOLIDAY, + type = CONSTANTS.ITEM_TYPES.MOUNT, + method = CONSTANTS.DETECTION_METHODS.USE, + name = L["Noble Flying Carpet"], + spellId = 432455, + itemId = 212599, + items = { 216874 }, + chance = 100, -- Might be higher after the adjustment? (Needs more data) + holidayTexture = CONSTANTS.HOLIDAY_TEXTURES.NOBLEGARDEN, + coords = { + { m = CONSTANTS.UIMAPIDS.DUROTAR }, + { m = CONSTANTS.UIMAPIDS.ELWYNN_FOREST }, + }, + }, } Rarity.ItemDB.MergeItems(Rarity.ItemDB.mounts, holidayEventMounts) diff --git a/DB/SharedConstants.lua b/DB/SharedConstants.lua index 3410a772..3c2788e8 100644 --- a/DB/SharedConstants.lua +++ b/DB/SharedConstants.lua @@ -19,8 +19,10 @@ C.UIMAPIDS = { -- Dummy Zone (For items that can be obtained anywhere.) NONE = 0, -- Classic Zones + DUROTAR = 1, ARATHI_HIGHLANDS = 14, HILLSBRAD_FOOTHILLS = 25, + ELWYNN_FOREST = 37, DARKSHORE = 62, SILITHUS = 81, -- Wrath of the Lich King Zones @@ -199,6 +201,7 @@ C.HOLIDAY_TEXTURES = { PILGRIMS_BOUNTY = "Calendar_HarvestFestival", LOVE_IS_IN_THE_AIR = "Calendar_LoveInTheAir", MIDSUMMER_FESTIVAL = "Calendar_Midsummer", + NOBLEGARDEN = "Calendar_Noblegarden", } -- Copied from https://www.townlong-yak.com/framexml/live/Helix/ArtTextureID.lua @@ -229,6 +232,9 @@ C.ART_TEXTURES = { MIDSUMMER_END = 235472, MIDSUMMER_ONGOING = 235473, MIDSUMMER_START = 235474, + NOBLEGARDEN_END = 235475, + NOBLEGARDEN_ONGOING = 235476, + NOBLEGARDEN_START = 235477, WINTERVEIL_END = 235482, WINTERVEIL_IEND = 235483, WINTERVEIL_ONGOING = 235484, diff --git a/Locales.lua b/Locales.lua index f17368e5..1273501e 100644 --- a/Locales.lua +++ b/Locales.lua @@ -2,6 +2,7 @@ local L L = LibStub("AceLocale-3.0"):NewLocale("Rarity", "enUS", true) -- L["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"] = true +L["Noble Flying Carpet"] = true L["Clayscale Hornstrider"] = true L["Falling Star Catcher"] = true L["Falling Star Flinger"] = true