From 3e1212a7ec79dc910aa9b22152f6fdaa9bb4538c Mon Sep 17 00:00:00 2001 From: Flamanis Date: Sat, 20 Apr 2024 10:15:23 -0500 Subject: [PATCH] Cata fixes. --- Libs/DF/textentry.lua | 2 +- Libs/LibOpenRaid/ThingsToMantain_Cata.lua | 3 +++ core/parser.lua | 2 +- functions/ej_cache.lua | 1 + functions/raidinfo.lua | 1 + plugins/Details_RaidCheck/Details_RaidCheck.lua | 2 +- 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Libs/DF/textentry.lua b/Libs/DF/textentry.lua index a8c4708e..452ad5f7 100644 --- a/Libs/DF/textentry.lua +++ b/Libs/DF/textentry.lua @@ -460,7 +460,7 @@ detailsFramework.TextEntryCounter = detailsFramework.TextEntryCounter or 1 end self:SetJustifyH("left") - self:SetJustifyV("center") + self:SetJustifyV("middle") self:SetTextInsets(18, 14, 0, 0) local magnifyingGlassTexture = self:CreateTexture(nil, "OVERLAY") diff --git a/Libs/LibOpenRaid/ThingsToMantain_Cata.lua b/Libs/LibOpenRaid/ThingsToMantain_Cata.lua index 2b3cbeab..7d152008 100644 --- a/Libs/LibOpenRaid/ThingsToMantain_Cata.lua +++ b/Libs/LibOpenRaid/ThingsToMantain_Cata.lua @@ -608,6 +608,9 @@ elseif (GetBuildInfo():match ("%d") == "2") then elseif (GetBuildInfo():match ("%d") == "3") then LIB_OPEN_RAID_SPELL_CUSTOM_NAMES = {} +elseif (GetBuildInfo():match ("%d") == "4") then + LIB_OPEN_RAID_SPELL_CUSTOM_NAMES = {} + else LIB_OPEN_RAID_SPELL_CUSTOM_NAMES = { [44461] = {name = GetSpellInfo(44461) .. " (" .. L["STRING_EXPLOSION"] .. ")"}, --Living Bomb (explosion) diff --git a/core/parser.lua b/core/parser.lua index 03c61a49..00e4ec0d 100755 --- a/core/parser.lua +++ b/core/parser.lua @@ -2364,7 +2364,7 @@ end function parser:heal_absorb(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, spellSchool, shieldOwnerSerial, shieldOwnerName, shieldOwnerFlags, shieldOwnerFlags2, shieldSpellId, shieldName, shieldType, amount) - if (isWOTLK or isERA) then + if (isCATA or isWOTLK or isERA) then if (not amount) then --melee shieldOwnerSerial, shieldOwnerName, shieldOwnerFlags, shieldOwnerFlags2, shieldSpellId, shieldName, shieldType, amount = spellId, spellName, spellSchool, shieldOwnerSerial, shieldOwnerName, shieldOwnerFlags, shieldOwnerFlags2, shieldSpellId diff --git a/functions/ej_cache.lua b/functions/ej_cache.lua index bcb36932..b925c36c 100644 --- a/functions/ej_cache.lua +++ b/functions/ej_cache.lua @@ -158,6 +158,7 @@ function Details222.EJCache.CreateEncounterJournalDump() --use current tier for dungeons, as the current tier shows the dungeons used for the current season of Mythic+ local startIndex, endIndex if (bIsRaid) then + if currentTierId == 1 then break end --Cata has only one tier. Looking up tier 0 errors. ~CATA EJ_SelectTier(currentTierId - 1) --print("tier selected:", currentTierId - 1, "raids") --debug startIndex = raidTierStartIndex endIndex = 20 diff --git a/functions/raidinfo.lua b/functions/raidinfo.lua index 519f245c..70e3e425 100644 --- a/functions/raidinfo.lua +++ b/functions/raidinfo.lua @@ -7,6 +7,7 @@ local tinsert = tinsert local addonName, Details222 = ... function Details.InstallRaidInfo() + if not DetailsFramework.IsDragonflightWow() then return end --In Cata, EJ_SelectInstance will fail due to instance not existing. This file only contains dragonflight raids anyways. Best keep it on DF only. do local INSTANCE_EJID = 1200 local INSTANCE_MAPID = 2522 diff --git a/plugins/Details_RaidCheck/Details_RaidCheck.lua b/plugins/Details_RaidCheck/Details_RaidCheck.lua index b72812e1..f6615217 100644 --- a/plugins/Details_RaidCheck/Details_RaidCheck.lua +++ b/plugins/Details_RaidCheck/Details_RaidCheck.lua @@ -1,6 +1,6 @@ --do not load if this is a classic version of the game -if (DetailsFramework.IsTBCWow() or DetailsFramework.IsWotLKWow() or DetailsFramework.IsClassicWow()) then +if (DetailsFramework.IsTBCWow() or DetailsFramework.IsWotLKWow() or DetailsFramework.IsClassicWow() or DetailsFramework.IsCataWow()) then return end