diff --git a/Libs/LibOpenRaid/Functions.lua b/Libs/LibOpenRaid/Functions.lua index 62002ee7..9cfc94ec 100644 --- a/Libs/LibOpenRaid/Functions.lua +++ b/Libs/LibOpenRaid/Functions.lua @@ -430,15 +430,7 @@ end function openRaidLib.GetFoodTierFromAura(auraInfo) local foodTable = openRaidLib.GetFoodInfoBySpellId(auraInfo.spellId) if (foodTable) then - local points = auraInfo.points - if (points) then - for i = 1, #points do - local foodTier = foodTable.tier[points[i]] - if (foodTier) then - return foodTier - end - end - end + return foodTable.tier end return nil end diff --git a/Libs/LibOpenRaid/ThingsToMantain_Ascension.lua b/Libs/LibOpenRaid/ThingsToMantain_Ascension.lua index 3ffdd2d2..873bd8a8 100644 --- a/Libs/LibOpenRaid/ThingsToMantain_Ascension.lua +++ b/Libs/LibOpenRaid/ThingsToMantain_Ascension.lua @@ -76,8 +76,6 @@ end LIB_OPEN_RAID_MANA_POTIONS = {} -LIB_OPEN_RAID_FOOD_BUFF = {} --default -LIB_OPEN_RAID_FLASK_BUFF = {} --default LIB_OPEN_RAID_BLOODLUST = { [2825] = true, --bloodlust diff --git a/plugins/Details_RaidCheck/Details_RaidCheck.lua b/plugins/Details_RaidCheck/Details_RaidCheck.lua index a263b645..93822a78 100644 --- a/plugins/Details_RaidCheck/Details_RaidCheck.lua +++ b/plugins/Details_RaidCheck/Details_RaidCheck.lua @@ -101,11 +101,6 @@ local CreatePluginFrames = function() function DetailsRaidCheck.GetPlayerAmount() local playerAmount = GetNumGroupMembers() - --limit to 20 if in mythic raid and the option is enabled - local _, _, difficulty = GetInstanceInfo() - if (difficulty == 16 and DetailsRaidCheck.db.mythic_1_4 and playerAmount > 20) then - playerAmount = 20 - end return playerAmount end @@ -184,10 +179,8 @@ local CreatePluginFrames = function() {text = "Repair", width = 45}, {text = "Food", width = 45}, {text = "Flask", width = 45}, - {text = "Rune", width = 45}, - {text = "M+ Score", width = 60}, - --{text = "Pre-Pot Last Try", width = 100}, - --{text = "Using Details!", width = 100}, + {text = "Pre-Pot Last Try", width = 100}, + {text = "Using Details!", width = 100}, } local headerOptions = { padding = 2, @@ -266,16 +259,10 @@ local CreatePluginFrames = function() local flaskTierIndicator = DF:CreateLabel(line, "", 12, "white") flaskTierIndicator:SetPoint("left", flaskIndicator, "right", 6, 0) - --no rune - local runeIndicator = DF:CreateImage(line, "", scrollLineHeight, scrollLineHeight) - - --mythic+ - local mythicPlusIndicator = DF:CreateLabel(line) - --no pre pot - --local PrePotIndicator = DF:CreateImage (line, "", scroll_line_height, scroll_line_height) + local PrePotIndicator = DF:CreateImage (line, "", scroll_line_height, scroll_line_height) --using details! - --local DetailsIndicator = DF:CreateImage(line, "", scroll_line_height, scroll_line_height) + local DetailsIndicator = DF:CreateImage(line, "", scroll_line_height, scroll_line_height) line:AddFrameToHeaderAlignment(roleIcon) line:AddFrameToHeaderAlignment(talentsRow) @@ -283,10 +270,8 @@ local CreatePluginFrames = function() line:AddFrameToHeaderAlignment(repairStatus) line:AddFrameToHeaderAlignment(foodIndicator) line:AddFrameToHeaderAlignment(flaskIndicator) - line:AddFrameToHeaderAlignment(runeIndicator) - line:AddFrameToHeaderAlignment(mythicPlusIndicator) - --line:AddFrameToHeaderAlignment(PrePotIndicator) - --line:AddFrameToHeaderAlignment(DetailsIndicator) + line:AddFrameToHeaderAlignment(PrePotIndicator) + line:AddFrameToHeaderAlignment(DetailsIndicator) line:AlignWithHeader(DetailsRaidCheck.Header, "left") @@ -301,10 +286,8 @@ local CreatePluginFrames = function() line.FoodTierIndicator = foodTierIndicator line.FlaskIndicator = flaskIndicator line.FlaskTierIndicator = flaskTierIndicator - line.RuneIndicator = runeIndicator - line.MythicPlusIndicator = mythicPlusIndicator - --line.PrePotIndicator = PrePotIndicator - --line.DetailsIndicator = DetailsIndicator + line.PrePotIndicator = PrePotIndicator + line.DetailsIndicator = DetailsIndicator return line end @@ -431,12 +414,8 @@ local CreatePluginFrames = function() line.FlaskTierIndicator.text = "" end - line.RuneIndicator.texture = playerTable.Rune and [[Interface\Scenarios\ScenarioIcon-Check]] or "" - --line.PrePotIndicator.texture = playerTable.PrePot and [[Interface\Scenarios\ScenarioIcon-Check]] or "" - --line.DetailsIndicator.texture = playerTable.UseDetails and [[Interface\Scenarios\ScenarioIcon-Check]] or "" - - --mythic+ score - line.MythicPlusIndicator.text = playerTable.MythicPlusScore and playerTable.MythicPlusScore > 0 and playerTable.MythicPlusScore or "" + line.PrePotIndicator.texture = playerTable.PrePot and [[Interface\Scenarios\ScenarioIcon-Check]] or "" + line.DetailsIndicator.texture = playerTable.UseDetails and [[Interface\Scenarios\ScenarioIcon-Check]] or "" end end end @@ -548,36 +527,6 @@ local CreatePluginFrames = function() DetailsRaidCheck:SendMsgToChannel(reportString, "PARTY") end end - - elseif (button == "MiddleButton") then - --report focus aug - local reportString = "Details!: Not using Rune: " - local groupMembersAmount = GetNumGroupMembers() - local _, _, difficulty = GetInstanceInfo() - if (difficulty == 16 and DetailsRaidCheck.db.mythic_1_4 and groupMembersAmount > 20) then - groupMembersAmount = 20 - end - - for i = 1, groupMembersAmount do - local unitID = getUnitId(i) - local name = UnitName(unitID) - local unitSerial = UnitGUID(unitID) - if (not DetailsRaidCheck.havefocusaug_table[unitSerial]) then - reportString = reportString .. DetailsRaidCheck:GetOnlyName(name) .. " " - end - end - - if (DetailsRaidCheck.db.use_report_panel) then - DetailsRaidCheck.report_lines = reportString - DetailsRaidCheck:SendReportWindow(reportFunc) - else - if (IsInRaid()) then - DetailsRaidCheck:SendMsgToChannel(reportString, "RAID") - else - DetailsRaidCheck:SendMsgToChannel(reportString, "PARTY") - end - end - end end) local updateRaidCheckFrame = function(self, deltaTime) --~update @@ -623,27 +572,6 @@ local CreatePluginFrames = function() end end - local mythicPlusScore = 0 - local RaiderIO = _G.RaiderIO - - if (RaiderIO) then - local playerName, playerRealm = unitNameWithRealm:match("(.+)%-(.+)") - local faction = UnitFactionGroup(unitNameWithRealm) - faction = faction == "Horde" and 2 or 1 - - --local rioProfile = RaiderIO.GetProfile(playerName, playerRealm, faction == "Horde" and 2 or 1) - local rioProfile = RaiderIO.GetProfile(playerName, playerRealm) or RaiderIO.GetProfile(unitName, GetRealmName()) - - if (rioProfile and rioProfile.mythicKeystoneProfile) then - local mythicPlusProfile = rioProfile.mythicKeystoneProfile - local previousScore = mythicPlusProfile.previousScore or 0 - local currentScore = mythicPlusProfile.currentScore or 0 - --mythicPlusScore = previousScore and previousScore > currentScore and previousScore or currentScore - --mythicPlusScore = mythicPlusScore or currentScore - mythicPlusScore = currentScore - end - end - --order by class > alphabetically by the unit name unitClassID = (((unitClassID or 0) + 128) ^ 4) + tonumber(string.byte (unitName, 1) .. "" .. string.byte(unitName, 2)) @@ -659,10 +587,8 @@ local CreatePluginFrames = function() Food = DetailsRaidCheck.unitWithFoodTable[unitSerial], Flask = DetailsRaidCheck.unitsWithFlaskTable[unitSerial], PrePot = DetailsRaidCheck.usedprepot_table[cleuName], - Rune = DetailsRaidCheck.havefocusaug_table[unitSerial], Eating = DetailsRaidCheck.iseating_table[unitSerial], UseDetails = Details.trusted_characters[unitSerial], - MythicPlusScore = mythicPlusScore, }) end @@ -690,20 +616,6 @@ local CreatePluginFrames = function() end end - local mythicPlusScore = 0 - local RaiderIO = _G.RaiderIO - - if (RaiderIO) then - local rioProfile = RaiderIO.GetProfile(unitName, GetRealmName()) - if (rioProfile and rioProfile.mythicKeystoneProfile) then - local mythicPlusProfile = rioProfile.mythicKeystoneProfile - local previousScore = mythicPlusProfile.previousScore or 0 - local currentScore = mythicPlusProfile.currentScore or 0 - mythicPlusScore = previousScore and previousScore > currentScore and previousScore or currentScore - mythicPlusScore = mythicPlusScore or currentScore - end - end - tinsert (PlayerData, {unitName, unitClassID, Name = unitName, UnitNameRealm = unitNameWithRealm, @@ -716,10 +628,8 @@ local CreatePluginFrames = function() Food = DetailsRaidCheck.unitWithFoodTable[unitSerial], Flask = DetailsRaidCheck.unitsWithFlaskTable[unitSerial], PrePot = DetailsRaidCheck.usedprepot_table[cleuName], - Rune = DetailsRaidCheck.havefocusaug_table[unitSerial], Eating = DetailsRaidCheck.iseating_table[unitSerial], UseDetails = Details.trusted_characters[unitSerial], - MythicPlusScore = mythicPlusScore, }) end @@ -813,10 +723,6 @@ local CreatePluginFrames = function() end end - if (runeIds[spellId]) then - DetailsRaidCheck.havefocusaug_table[unitSerial] = spellId - end - if (buffName == localizedFoodDrink) then DetailsRaidCheck.iseating_table[unitSerial] = true end @@ -836,7 +742,6 @@ local CreatePluginFrames = function() function DetailsRaidCheck:BuffTrackTick() wipe(DetailsRaidCheck.unitsWithFlaskTable) wipe(DetailsRaidCheck.unitWithFoodTable) - wipe(DetailsRaidCheck.havefocusaug_table) wipe(DetailsRaidCheck.iseating_table) local hasConsumables = { @@ -886,13 +791,6 @@ local buildOptionsPanel = function() desc = "If enabled, pre potion for tanks are also shown.", name = "Track Tank Pre Pot" }, - { - type = "toggle", - get = function() return DetailsRaidCheck.db.mythic_1_4 end, - set = function (self, fixedparam, value) DetailsRaidCheck.db.mythic_1_4 = value end, - desc = "When raiding on Mythic difficult, only check the first 4 groups.", - name = "Mythic 1-4 Group Only" - }, {type = "breakline"}, @@ -902,21 +800,21 @@ local buildOptionsPanel = function() get = function() return DetailsRaidCheck.db.food_tier1 end, set = function (self, fixedparam, value) DetailsRaidCheck.db.food_tier1 = value end, desc = "Consider players using Tier 1 food.", - name = "Food Tier 1 [41]" + name = "Food Tier 1 [Normal]" }, { type = "toggle", get = function() return DetailsRaidCheck.db.food_tier2 end, set = function (self, fixedparam, value) DetailsRaidCheck.db.food_tier2 = value end, desc = "Consider players using Tier 2 food.", - name = "Food Tier 2 [55]" + name = "Food Tier 2 [Rare High-Risk]" }, { type = "toggle", get = function() return DetailsRaidCheck.db.food_tier3 end, set = function (self, fixedparam, value) DetailsRaidCheck.db.food_tier3 = value end, desc = "Consider players using Tier 3 food.", - name = "Food Tier 3 [>= 75]" + name = "Food Tier 3 [Epic High-Risk]" }, } @@ -957,10 +855,9 @@ function DetailsRaidCheck:OnEvent(_, event, ...) local defaultSettings = { pre_pot_healers = false, --do not report pre pot for healers pre_pot_tanks = false, --do not report pre pot for tanks - mythic_1_4 = true, --only track groups 1-4 on mythic use_report_panel = true, --if true, shows the report panel - food_tier1 = true, --legion food tiers + food_tier1 = true, food_tier2 = true, food_tier3 = true, } diff --git a/plugins/Details_RaidCheck/Details_RaidCheck.toc b/plugins/Details_RaidCheck/Details_RaidCheck.toc index 571aabbf..c1aa1643 100644 --- a/plugins/Details_RaidCheck/Details_RaidCheck.toc +++ b/plugins/Details_RaidCheck/Details_RaidCheck.toc @@ -6,8 +6,4 @@ ## X-Wago-ID: WL6Jk2Kv -#@no-lib-strip@ -embeds.xml -#@end-no-lib-strip@ - Details_RaidCheck.lua diff --git a/plugins/Details_RaidCheck/Libs/AceLocale-3.0/AceLocale-3.0.lua b/plugins/Details_RaidCheck/Libs/AceLocale-3.0/AceLocale-3.0.lua deleted file mode 100644 index e1337813..00000000 --- a/plugins/Details_RaidCheck/Libs/AceLocale-3.0/AceLocale-3.0.lua +++ /dev/null @@ -1,137 +0,0 @@ ---- **AceLocale-3.0** manages localization in addons, allowing for multiple locale to be registered with fallback to the base locale for untranslated strings. --- @class file --- @name AceLocale-3.0 --- @release $Id: AceLocale-3.0.lua 1035 2011-07-09 03:20:13Z kaelten $ -local MAJOR,MINOR = "AceLocale-3.0", 6 - -local AceLocale, oldminor = LibStub:NewLibrary(MAJOR, MINOR) - -if not AceLocale then return end -- no upgrade needed - --- Lua APIs -local assert, tostring, error = assert, tostring, error -local getmetatable, setmetatable, rawset, rawget = getmetatable, setmetatable, rawset, rawget - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: GAME_LOCALE, geterrorhandler - -local gameLocale = GetLocale() -if gameLocale == "enGB" then - gameLocale = "enUS" -end - -AceLocale.apps = AceLocale.apps or {} -- array of ["AppName"]=localetableref -AceLocale.appnames = AceLocale.appnames or {} -- array of [localetableref]="AppName" - --- This metatable is used on all tables returned from GetLocale -local readmeta = { - __index = function(self, key) -- requesting totally unknown entries: fire off a nonbreaking error and return key - rawset(self, key, key) -- only need to see the warning once, really - geterrorhandler()(MAJOR..": "..tostring(AceLocale.appnames[self])..": Missing entry for '"..tostring(key).."'") - return key - end -} - --- This metatable is used on all tables returned from GetLocale if the silent flag is true, it does not issue a warning on unknown keys -local readmetasilent = { - __index = function(self, key) -- requesting totally unknown entries: return key - rawset(self, key, key) -- only need to invoke this function once - return key - end -} - --- Remember the locale table being registered right now (it gets set by :NewLocale()) --- NOTE: Do never try to register 2 locale tables at once and mix their definition. -local registering - --- local assert false function -local assertfalse = function() assert(false) end - --- This metatable proxy is used when registering nondefault locales -local writeproxy = setmetatable({}, { - __newindex = function(self, key, value) - rawset(registering, key, value == true and key or value) -- assigning values: replace 'true' with key string - end, - __index = assertfalse -}) - --- This metatable proxy is used when registering the default locale. --- It refuses to overwrite existing values --- Reason 1: Allows loading locales in any order --- Reason 2: If 2 modules have the same string, but only the first one to be --- loaded has a translation for the current locale, the translation --- doesn't get overwritten. --- -local writedefaultproxy = setmetatable({}, { - __newindex = function(self, key, value) - if not rawget(registering, key) then - rawset(registering, key, value == true and key or value) - end - end, - __index = assertfalse -}) - ---- Register a new locale (or extend an existing one) for the specified application. --- :NewLocale will return a table you can fill your locale into, or nil if the locale isn't needed for the players --- game locale. --- @paramsig application, locale[, isDefault[, silent]] --- @param application Unique name of addon / module --- @param locale Name of the locale to register, e.g. "enUS", "deDE", etc. --- @param isDefault If this is the default locale being registered (your addon is written in this language, generally enUS) --- @param silent If true, the locale will not issue warnings for missing keys. Must be set on the first locale registered. If set to "raw", nils will be returned for unknown keys (no metatable used). --- @usage --- -- enUS.lua --- local L = LibStub("AceLocale-3.0"):NewLocale("TestLocale", "enUS", true) --- L["string1"] = true --- --- -- deDE.lua --- local L = LibStub("AceLocale-3.0"):NewLocale("TestLocale", "deDE") --- if not L then return end --- L["string1"] = "Zeichenkette1" --- @return Locale Table to add localizations to, or nil if the current locale is not required. -function AceLocale:NewLocale(application, locale, isDefault, silent) - - -- GAME_LOCALE allows translators to test translations of addons without having that wow client installed - local gameLocale = GAME_LOCALE or gameLocale - - local app = AceLocale.apps[application] - - if silent and app and getmetatable(app) ~= readmetasilent then - geterrorhandler()("Usage: NewLocale(application, locale[, isDefault[, silent]]): 'silent' must be specified for the first locale registered") - end - - if not app then - if silent=="raw" then - app = {} - else - app = setmetatable({}, silent and readmetasilent or readmeta) - end - AceLocale.apps[application] = app - AceLocale.appnames[app] = application - end - - if locale ~= gameLocale and not isDefault then - return -- nop, we don't need these translations - end - - registering = app -- remember globally for writeproxy and writedefaultproxy - - if isDefault then - return writedefaultproxy - end - - return writeproxy -end - ---- Returns localizations for the current locale (or default locale if translations are missing). --- Errors if nothing is registered (spank developer, not just a missing translation) --- @param application Unique name of addon / module --- @param silent If true, the locale is optional, silently return nil if it's not found (defaults to false, optional) --- @return The locale table for the current language. -function AceLocale:GetLocale(application, silent) - if not silent and not AceLocale.apps[application] then - error("Usage: GetLocale(application[, silent]): 'application' - No locales registered for '"..tostring(application).."'", 2) - end - return AceLocale.apps[application] -end diff --git a/plugins/Details_RaidCheck/Libs/AceLocale-3.0/AceLocale-3.0.xml b/plugins/Details_RaidCheck/Libs/AceLocale-3.0/AceLocale-3.0.xml deleted file mode 100644 index e017af0c..00000000 --- a/plugins/Details_RaidCheck/Libs/AceLocale-3.0/AceLocale-3.0.xml +++ /dev/null @@ -1,4 +0,0 @@ - -