From 1e44f2582260f7d5906114b78b13a8a9f999a1e5 Mon Sep 17 00:00:00 2001 From: MysticalOS Date: Fri, 17 May 2024 02:33:35 -0400 Subject: [PATCH] rescope jikun nest location selector to signify arrows are gone, but alerts can still be tailored --- DBM-Raids-MoP/ThroneofThunder/JiKun.lua | 58 ++++++++++++------------- DBM-Raids-MoP/localization.en.lua | 4 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/DBM-Raids-MoP/ThroneofThunder/JiKun.lua b/DBM-Raids-MoP/ThroneofThunder/JiKun.lua index 0e5a4c5..135a39a 100644 --- a/DBM-Raids-MoP/ThroneofThunder/JiKun.lua +++ b/DBM-Raids-MoP/ThroneofThunder/JiKun.lua @@ -292,29 +292,29 @@ function mod:CHAT_MSG_MONSTER_EMOTE(msg, _, _, _, target) elseif flockCount == 19 then specWarnBigBirdSoon:Schedule(20, L.Upper.." ("..DBM_COMMON_L.UNKNOWN..")") elseif flockCount == 2 then specWarnBigBird:Show(L.Lower.." ("..L.SouthEast..")") - if self.Options.ShowNestArrows == "Guardians" then - DBM.Arrow:ShowRunTo(nestCoords[2][1], nestCoords[2][2], 3, 10, true) - end + --if self.Options.ShowNestArrows == "Guardians" then + -- DBM.Arrow:ShowRunTo(nestCoords[2][1], nestCoords[2][2], 3, 10, true) + --end elseif flockCount == 5 then specWarnBigBird:Show(L.Lower.." ("..L.NorthWest..")") - if self.Options.ShowNestArrows == "Guardians" then - DBM.Arrow:ShowRunTo(nestCoords[5][1], nestCoords[5][2], 3, 10, true) - end + --if self.Options.ShowNestArrows == "Guardians" then + -- DBM.Arrow:ShowRunTo(nestCoords[5][1], nestCoords[5][2], 3, 10, true) + --end elseif flockCount == 8 then specWarnBigBird:Show(L.Upper.." ("..L.NorthWest..")") - if self.Options.ShowNestArrows == "Guardians" then - DBM.Arrow:ShowRunTo(nestCoords[10][1], nestCoords[10][2], 3, 10, true) - end + --if self.Options.ShowNestArrows == "Guardians" then + -- DBM.Arrow:ShowRunTo(nestCoords[10][1], nestCoords[10][2], 3, 10, true) + --end elseif flockCount == 11 then specWarnBigBird:Show(L.Upper.." ("..L.SouthEast..")") - if self.Options.ShowNestArrows == "Guardians" then - DBM.Arrow:ShowRunTo(nestCoords[7][1], nestCoords[7][2], 3, 10, true) - end + --if self.Options.ShowNestArrows == "Guardians" then + -- DBM.Arrow:ShowRunTo(nestCoords[7][1], nestCoords[7][2], 3, 10, true) + --end elseif flockCount == 14 then specWarnBigBird:Show(L.Lower.." ("..L.SouthWest..")") - if self.Options.ShowNestArrows == "Guardians" then - DBM.Arrow:ShowRunTo(nestCoords[3][1], nestCoords[3][2], 3, 10, true) - end + --if self.Options.ShowNestArrows == "Guardians" then + -- DBM.Arrow:ShowRunTo(nestCoords[3][1], nestCoords[3][2], 3, 10, true) + --end --Reports of birds in next two nests but not precise locations elseif flockCount == 17 then specWarnBigBird:Show(L.Lower.." ("..DBM_COMMON_L.UNKNOWN..")") elseif flockCount == 20 then specWarnBigBird:Show(L.Upper.." ("..DBM_COMMON_L.UNKNOWN..")") @@ -327,39 +327,39 @@ function mod:CHAT_MSG_MONSTER_EMOTE(msg, _, _, _, target) else--Since we know persons location, in addition to arrows, we can fire specWarnFlock for only the nests they have chosen arrows for. --Lower Nests if currentLocation:find(L.ArrowLower.." "..L.NorthEast) and self.Options.ShowNestArrows == "Northeast" then - DBM.Arrow:ShowRunTo(nestCoords[1][1], nestCoords[1][2], 3, 10, true) + --DBM.Arrow:ShowRunTo(nestCoords[1][1], nestCoords[1][2], 3, 10, true) specWarnFlock:Show(currentDirection, flockName, flockCountText.." ("..currentLocation..")") elseif currentLocation:find(L.ArrowLower.." "..L.SouthEast) and self.Options.ShowNestArrows == "Southeast" then - DBM.Arrow:ShowRunTo(nestCoords[2][1], nestCoords[2][2], 3, 10, true) + --DBM.Arrow:ShowRunTo(nestCoords[2][1], nestCoords[2][2], 3, 10, true) specWarnFlock:Show(currentDirection, flockName, flockCountText.." ("..currentLocation..")") elseif currentLocation:find(L.ArrowLower.." "..L.SouthWest) and self.Options.ShowNestArrows == "Southwest" then - DBM.Arrow:ShowRunTo(nestCoords[3][1], nestCoords[3][2], 3, 10, true) + --DBM.Arrow:ShowRunTo(nestCoords[3][1], nestCoords[3][2], 3, 10, true) specWarnFlock:Show(currentDirection, flockName, flockCountText.." ("..currentLocation..")") elseif currentLocation:find(L.ArrowLower.." "..L.West) and self.Options.ShowNestArrows == "West" then - DBM.Arrow:ShowRunTo(nestCoords[4][1], nestCoords[4][2], 3, 10, true) + --DBM.Arrow:ShowRunTo(nestCoords[4][1], nestCoords[4][2], 3, 10, true) specWarnFlock:Show(currentDirection, flockName, flockCountText.." ("..currentLocation..")") elseif currentLocation:find(L.ArrowLower.." "..L.NorthWest) and self.Options.ShowNestArrows == "Northwest" then - DBM.Arrow:ShowRunTo(nestCoords[5][1], nestCoords[5][2], 3, 10, true) + --DBM.Arrow:ShowRunTo(nestCoords[5][1], nestCoords[5][2], 3, 10, true) specWarnFlock:Show(currentDirection, flockName, flockCountText.." ("..currentLocation..")") --Upper Nests elseif currentLocation:find(L.ArrowUpper.." "..L.NorthEast) and self.Options.ShowNestArrows == "Northeast" then - DBM.Arrow:ShowRunTo(nestCoords[6][1], nestCoords[6][2], 3, 10, true) + --DBM.Arrow:ShowRunTo(nestCoords[6][1], nestCoords[6][2], 3, 10, true) specWarnFlock:Show(currentDirection, flockName, flockCountText.." ("..currentLocation..")") elseif currentLocation:find(L.ArrowUpper.." "..L.SouthEast) and self.Options.ShowNestArrows == "Southeast" then - DBM.Arrow:ShowRunTo(nestCoords[7][1], nestCoords[7][2], 3, 10, true) + --DBM.Arrow:ShowRunTo(nestCoords[7][1], nestCoords[7][2], 3, 10, true) specWarnFlock:Show(currentDirection, flockName, flockCountText.." ("..currentLocation..")") elseif (currentLocation:find(L.Middle10) or currentLocation:find(L.ArrowUpper.." "..L.SouthWest)) and self.Options.ShowNestArrows == "Southwest" then - if self:IsDifficulty("normal25", "heroic25") then - DBM.Arrow:ShowRunTo(nestCoords[8][1], nestCoords[8][2], 3, 10, true) - else - DBM.Arrow:ShowRunTo(nestCoords[9][1], nestCoords[9][2], 3, 10, true) - end + --if self:IsDifficulty("normal25", "heroic25") then + -- DBM.Arrow:ShowRunTo(nestCoords[8][1], nestCoords[8][2], 3, 10, true) + --else + -- DBM.Arrow:ShowRunTo(nestCoords[9][1], nestCoords[9][2], 3, 10, true) + --end specWarnFlock:Show(currentDirection, flockName, flockCountText.." ("..currentLocation..")") elseif currentLocation:find(L.Middle25) and self.Options.ShowNestArrows == "West" then - DBM.Arrow:ShowRunTo(nestCoords[9][1], nestCoords[9][2], 3, 10, true) + --DBM.Arrow:ShowRunTo(nestCoords[9][1], nestCoords[9][2], 3, 10, true) specWarnFlock:Show(currentDirection, flockName, flockCountText.." ("..currentLocation..")") elseif currentLocation:find(L.ArrowUpper.." "..L.NorthWest) and self.Options.ShowNestArrows == "Northwest" then - DBM.Arrow:ShowRunTo(nestCoords[10][1], nestCoords[10][2], 3, 10, true) + --DBM.Arrow:ShowRunTo(nestCoords[10][1], nestCoords[10][2], 3, 10, true) specWarnFlock:Show(currentDirection, flockName, flockCountText.." ("..currentLocation..")") end end diff --git a/DBM-Raids-MoP/localization.en.lua b/DBM-Raids-MoP/localization.en.lua index 1eb5148..677bcab 100644 --- a/DBM-Raids-MoP/localization.en.lua +++ b/DBM-Raids-MoP/localization.en.lua @@ -471,8 +471,8 @@ L:SetOptionLocalization({ specWarnBigBirdSoon = DBM_CORE_L.AUTO_SPEC_WARN_OPTIONS.soon:format("ej7827"), timerFlockCD = DBM_CORE_L.AUTO_TIMER_OPTIONS.nextcount:format("ej7348"), RangeFrame = DBM_CORE_L.AUTO_RANGE_OPTION_TEXT:format(10, 138923), - ShowNestArrows = "Show DBM arrow for nest activations", - Never = "Never", + ShowNestArrows = "Show special alerts only for your selected nest location", + Never = "All nests", Northeast = "Blue - Lower & Upper NE", Southeast = "Green - Lower & Upper SE", Southwest = "Purple/Red - Lower SW & Upper SW(25) or Upper Middle(10)",