From a44e301cac179d5dae75baae349ab20a5ac065dd Mon Sep 17 00:00:00 2001 From: Slivo Date: Tue, 15 Oct 2024 22:05:32 +0200 Subject: [PATCH 1/6] Fix spell IDs --- TranqRotate.toc | 4 +- TranqRotate_TBC.toc | 4 +- changelog.md | 342 ++++++++++++++++++++++---------------------- src/constants.lua | 9 +- src/events.lua | 38 +++-- 5 files changed, 211 insertions(+), 186 deletions(-) diff --git a/TranqRotate.toc b/TranqRotate.toc index 95aefd7..a3e3dda 100644 --- a/TranqRotate.toc +++ b/TranqRotate.toc @@ -1,8 +1,8 @@ ## Interface: 11504 -## Title: TranqRotate |cff00aa002.2.8|r +## Title: TranqRotate |cff00aa002.2.9-beta|r ## Notes: A tranqshot rotation assistant ## Author: Slivo -## Version: 2.2.8 +## Version: 2.2.9-beta ## SavedVariables: TranqRotateDb ## OptionalDeps: Ace3 diff --git a/TranqRotate_TBC.toc b/TranqRotate_TBC.toc index a77e8e3..dee8db6 100644 --- a/TranqRotate_TBC.toc +++ b/TranqRotate_TBC.toc @@ -1,8 +1,8 @@ ## Interface: 20504 -## Title: TranqRotate |cff00aa002.2.8|r +## Title: TranqRotate |cff00aa002.2.9-beta|r ## Notes: A tranqshot rotation assistant ## Author: Slivo -## Version: 2.2.8 +## Version: 2.2.9-beta ## SavedVariables: TranqRotateDb ## OptionalDeps: Ace3 diff --git a/changelog.md b/changelog.md index 333587b..e8aceb5 100644 --- a/changelog.md +++ b/changelog.md @@ -1,169 +1,173 @@ -## TranqRotate Changelog - -#### v2.2.8 - -- Bump toc for 1.15.4 - -#### v2.2.7 - -- Update blind icon tooltip message -- Improve French translations - -#### v2.2.6 - -- Bump toc for 1.15.2 -- Update Ace3 libs - -#### v2.2.5 - -- Bump toc for 1.15.0 - -#### v2.2.4 - -- Minor fix regarding version checks -- Bump toc for 1.14.3 & 2.5.4 - -#### v2.2.3 - -- Incapacitated backup alert should now work properly - -#### v2.2.2 - -- Bump toc for 1.14.1 -- Add tooltip to title bar buttons (Thanks Vinny) - -#### v2.2.1 - -- Bump toc for 1.14.0 - -#### v2.2.0 - -- Adds several translations -- Adds a button to reset window position in general settings -- Update Ace3 libs -- Improves rotation automatic reset after boss fight -- Drag and drop backend changes - -#### v2.1.0 - -- Removes server suffixes from player names everywhere (connected realms) -- Adds an option to re-add shortened or full server suffixes to player names (in case of unlikely namesake) -- Adds rotation reset sync -- Removes the ability to re-sync tranq order from the reset button -- Adds highlighted "next" hunter to the tranq rotation sync - -#### v2.0.0 - -- Fix connected realms sync issues - **BREAKING CHANGES** - -#### v1.8.0 - -- Adds different announces messages for boss and trash (Boss announces can call next player, trash announces can call target) -- Adds raid marker symbol to chat tranq announces -- Adds "available update" chat notifications -- Removes server suffix from hunter names on era connected realms - -#### v1.7.0 - -- Adds an icon on hunter not using the addon (You can disable it in the settings) -- Adds `/tranq test` command to toggle the test mode -- Improves and fix player addon version checks - -#### v1.6.1 - -- Update ace3 libs for TBC prepatch -- Fix few minor issues with test mode -- Fix a lua error using `/tranq check` with non hunter users - -#### v1.6.0 - -- Improves miss and resist tranqshot handling (no more duplicate announces or whispers) -- Adds gluth fear to handled list of incapacitating debuffs -- Adds `/tranq check` command to display the version other users have installed -- Adds printing of fail to chat window -- Fix timed alert feature that never worked (forgot to call it :D), changed default value to disabled -- Fix an ui error when trying to send announces on say/yell channel in open world (test mode) -- Fix windows hiding unexpectedly when changing settings - -#### v1.5.1 - -- Handles the new dispel resistance mechanic -- Fix a bad nil check in comms -- Fix a logic issue in hunter list cleaning function - -#### v1.5.0 - -- Restricted ordering tranq rotation to raid leader, raid assists and hunters -- Added a frenzy cooldown progress bar under the title bar -- Added configurable optional timed backup alert -- Added configurable optional incapacitated backup alert -- Fix font for koKR player names -- Fix main window showing up when login in while already in a raid with option to mask window enabled - -#### v1.4.0 - -- TranqRotate now play a sound when you need to tranq (You can disable it in the settings) -- Added an option to not show up the window each time you join a raid -- Added an option to have the window show up when you target a tranq-able boss -- Rotation will now reset when you kill the boss -- Adds an option to report the main rotation on multiple lines -- Adds a `report` slash command to print the rotation to the configured channel - -#### v1.3.0 - -- Adds arcane shot test mode -- Adds sound when user is the next to tranq (Added setting toggle to switch if off) -- Adds some logic to rotation, TranqRotate will skip a hunter if it's tranq ability isn't ready -- Update zhCN & zhTW locales, thanks to LeePich -- Adds raid check and update display when player leave combat -- Fix rotation logic with dead or offline players -- Adds hunters tranq cooldown display -- Use a font that support unicode character for asian player names - -#### v1.2.0 - -- Main window don't show up in battleground anymore -- Fix potential bug in rotation when backup hunter use tranq -- Adds `/tranq backup` command to manually alert backup if required (use that with a macro) -- Remove turn to tranq from a hunter that dies and set it to the following in rotation -- Adds hunter list and tranqshot synchronization -- Adds resync and raid refresh feature to the reset button - -#### v1.1.0 - -- Adds TranqRotate window -- Adds raid hunters detection -- Adds rotation handling -- Adds main window position change using drag & drop -- Adds main window position lock setting -- Adds hunter death and disconnection display on hunter frames -- Adds hunter group and order change using drag & drop -- Adds lock/unlock slash command option -- Adds toggle slash command option -- Adds "broadcast rotation setup to raid chat" -- Adds rotation reset button to re-initialize betweeen/after pulls -- Adds whisper message to next hunter and all backup hunters when you miss -- Adds close button to top bar -- Adds option to hide main window when not in a raid - -- Change base slash command to display available options -- Change slash command settings to `/tranq settings` - -- Splits code in multiple files -- Moves all lua files to src/ -- Use first target change event to update raid status if player login while already in raid -- Updates game interface version to 11303 - -#### v1.0.1 - -- Fix missing libs in toc file - -#### v1.0.0 - -- Adds slash command -- Adds settings -- Adds base combat log handling -- Adds automatic success and fail tranqshot messages -- Adds frFR locale -- Adds znTW locale -- Adds zhCN locale +## TranqRotate Changelog + +#### v2.2.9 + +- Update bosses spells ID's to match blizzard changes + +#### v2.2.8 + +- Bump toc for 1.15.4 + +#### v2.2.7 + +- Update blind icon tooltip message +- Improve French translations + +#### v2.2.6 + +- Bump toc for 1.15.2 +- Update Ace3 libs + +#### v2.2.5 + +- Bump toc for 1.15.0 + +#### v2.2.4 + +- Minor fix regarding version checks +- Bump toc for 1.14.3 & 2.5.4 + +#### v2.2.3 + +- Incapacitated backup alert should now work properly + +#### v2.2.2 + +- Bump toc for 1.14.1 +- Add tooltip to title bar buttons (Thanks Vinny) + +#### v2.2.1 + +- Bump toc for 1.14.0 + +#### v2.2.0 + +- Adds several translations +- Adds a button to reset window position in general settings +- Update Ace3 libs +- Improves rotation automatic reset after boss fight +- Drag and drop backend changes + +#### v2.1.0 + +- Removes server suffixes from player names everywhere (connected realms) +- Adds an option to re-add shortened or full server suffixes to player names (in case of unlikely namesake) +- Adds rotation reset sync +- Removes the ability to re-sync tranq order from the reset button +- Adds highlighted "next" hunter to the tranq rotation sync + +#### v2.0.0 + +- Fix connected realms sync issues - **BREAKING CHANGES** + +#### v1.8.0 + +- Adds different announces messages for boss and trash (Boss announces can call next player, trash announces can call target) +- Adds raid marker symbol to chat tranq announces +- Adds "available update" chat notifications +- Removes server suffix from hunter names on era connected realms + +#### v1.7.0 + +- Adds an icon on hunter not using the addon (You can disable it in the settings) +- Adds `/tranq test` command to toggle the test mode +- Improves and fix player addon version checks + +#### v1.6.1 + +- Update ace3 libs for TBC prepatch +- Fix few minor issues with test mode +- Fix a lua error using `/tranq check` with non hunter users + +#### v1.6.0 + +- Improves miss and resist tranqshot handling (no more duplicate announces or whispers) +- Adds gluth fear to handled list of incapacitating debuffs +- Adds `/tranq check` command to display the version other users have installed +- Adds printing of fail to chat window +- Fix timed alert feature that never worked (forgot to call it :D), changed default value to disabled +- Fix an ui error when trying to send announces on say/yell channel in open world (test mode) +- Fix windows hiding unexpectedly when changing settings + +#### v1.5.1 + +- Handles the new dispel resistance mechanic +- Fix a bad nil check in comms +- Fix a logic issue in hunter list cleaning function + +#### v1.5.0 + +- Restricted ordering tranq rotation to raid leader, raid assists and hunters +- Added a frenzy cooldown progress bar under the title bar +- Added configurable optional timed backup alert +- Added configurable optional incapacitated backup alert +- Fix font for koKR player names +- Fix main window showing up when login in while already in a raid with option to mask window enabled + +#### v1.4.0 + +- TranqRotate now play a sound when you need to tranq (You can disable it in the settings) +- Added an option to not show up the window each time you join a raid +- Added an option to have the window show up when you target a tranq-able boss +- Rotation will now reset when you kill the boss +- Adds an option to report the main rotation on multiple lines +- Adds a `report` slash command to print the rotation to the configured channel + +#### v1.3.0 + +- Adds arcane shot test mode +- Adds sound when user is the next to tranq (Added setting toggle to switch if off) +- Adds some logic to rotation, TranqRotate will skip a hunter if it's tranq ability isn't ready +- Update zhCN & zhTW locales, thanks to LeePich +- Adds raid check and update display when player leave combat +- Fix rotation logic with dead or offline players +- Adds hunters tranq cooldown display +- Use a font that support unicode character for asian player names + +#### v1.2.0 + +- Main window don't show up in battleground anymore +- Fix potential bug in rotation when backup hunter use tranq +- Adds `/tranq backup` command to manually alert backup if required (use that with a macro) +- Remove turn to tranq from a hunter that dies and set it to the following in rotation +- Adds hunter list and tranqshot synchronization +- Adds resync and raid refresh feature to the reset button + +#### v1.1.0 + +- Adds TranqRotate window +- Adds raid hunters detection +- Adds rotation handling +- Adds main window position change using drag & drop +- Adds main window position lock setting +- Adds hunter death and disconnection display on hunter frames +- Adds hunter group and order change using drag & drop +- Adds lock/unlock slash command option +- Adds toggle slash command option +- Adds "broadcast rotation setup to raid chat" +- Adds rotation reset button to re-initialize betweeen/after pulls +- Adds whisper message to next hunter and all backup hunters when you miss +- Adds close button to top bar +- Adds option to hide main window when not in a raid + +- Change base slash command to display available options +- Change slash command settings to `/tranq settings` + +- Splits code in multiple files +- Moves all lua files to src/ +- Use first target change event to update raid status if player login while already in raid +- Updates game interface version to 11303 + +#### v1.0.1 + +- Fix missing libs in toc file + +#### v1.0.0 + +- Adds slash command +- Adds settings +- Adds base combat log handling +- Adds automatic success and fail tranqshot messages +- Adds frFR locale +- Adds znTW locale +- Adds zhCN locale diff --git a/src/constants.lua b/src/constants.lua index 8374527..ecfe0b6 100644 --- a/src/constants.lua +++ b/src/constants.lua @@ -62,23 +62,26 @@ TranqRotate.constants = { ['cooldown'] = 9, }, [14020] = { -- chromaggus - ['frenzy'] = 23342, + ['frenzy'] = 23128, ['cooldown'] = 16, }, [15509] = { -- huhuran - ['frenzy'] = 19451, + ['frenzy'] = 26051, ['cooldown'] = 13, }, [15932] = { -- gluth - ['frenzy'] = 19451, + ['frenzy'] = 28371, ['cooldown'] = 10, }, }, ["incapacitatingDebuffs"] = { 19408, -- Magmadar fear + 461125, -- Magmadar fear SOD ? 23171, -- Chromaggus Bronze affliction stun + 23310, -- Chromaggus Time lapse 23311, -- Chromaggus Time lapse + 23312, -- Chromaggus Time lapse 29685, -- Gluth fear }, diff --git a/src/events.lua b/src/events.lua index 9c2ffa0..0a186f2 100644 --- a/src/events.lua +++ b/src/events.lua @@ -20,9 +20,11 @@ eventFrame:SetScript( C_Timer.After(5, function() TranqRotate:updateRaidStatus() end) - else - TranqRotate[event](TranqRotate, ...) + + return end + + TranqRotate[event](TranqRotate, ...) end ) @@ -45,11 +47,11 @@ function TranqRotate:COMBAT_LOG_EVENT_UNFILTERED() TranqRotate:rotate(hunter) if (sourceGUID == UnitGUID("player")) then TranqRotate:sendAnnounceMessage( - TranqRotate:getTranqSuccessMessage( - TranqRotate:isTranqableBoss(destGUID), - destName, - destRaidFlags - ) + TranqRotate:getTranqSuccessMessage( + TranqRotate:isTranqableBoss(destGUID), + destName, + destRaidFlags + ) ) end elseif (event == "SPELL_MISSED" or event == "SPELL_DISPEL_FAILED") then @@ -60,8 +62,13 @@ function TranqRotate:COMBAT_LOG_EVENT_UNFILTERED() end end end - elseif (event == "SPELL_AURA_APPLIED" and TranqRotate:isBossFrenzy(spellName, sourceGUID)) then + + return + end + + if (event == "SPELL_AURA_APPLIED" and TranqRotate:isBossFrenzy(spellName, sourceGUID)) then TranqRotate.frenzy = true + if (TranqRotate:isPlayerNextTranq()) then TranqRotate:handleTimedAlert() TranqRotate:throwTranqAlert() @@ -70,17 +77,28 @@ function TranqRotate:COMBAT_LOG_EVENT_UNFILTERED() TranqRotate:alertBackup(TranqRotate.db.profile.unableToTranqMessage) end end + if(TranqRotate.db.profile.showFrenzyCooldownProgress) then local type, id = TranqRotate:getIdFromGuid(sourceGUID) TranqRotate:startBossFrenzyCooldown(TranqRotate.constants.bosses[id].cooldown) end - elseif (event == "SPELL_AURA_REMOVED" and TranqRotate:isBossFrenzy(spellName, sourceGUID)) then + + return + end + + if (event == "SPELL_AURA_REMOVED" and TranqRotate:isBossFrenzy(spellName, sourceGUID)) then TranqRotate.frenzy = false - elseif (event == "UNIT_DIED" and TranqRotate:isTranqableBoss(destGUID)) then + + return + end + + if (event == "UNIT_DIED" and TranqRotate:isTranqableBoss(destGUID)) then if (TranqRotate:isPlayerAllowedToManageRotation()) then TranqRotate:endEncounter() end TranqRotate.mainFrame.frenzyFrame:Hide() + + return end end From 50b5b105d45d89b339686ac0974396666ba8228c Mon Sep 17 00:00:00 2001 From: Slivo Date: Fri, 18 Oct 2024 16:35:26 +0200 Subject: [PATCH 2/6] rename beta version --- TranqRotate.toc | 4 ++-- TranqRotate_TBC.toc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TranqRotate.toc b/TranqRotate.toc index a3e3dda..5e33911 100644 --- a/TranqRotate.toc +++ b/TranqRotate.toc @@ -1,8 +1,8 @@ ## Interface: 11504 -## Title: TranqRotate |cff00aa002.2.9-beta|r +## Title: TranqRotate |cff00aa002.2.9-beta1|r ## Notes: A tranqshot rotation assistant ## Author: Slivo -## Version: 2.2.9-beta +## Version: 2.2.9-beta1 ## SavedVariables: TranqRotateDb ## OptionalDeps: Ace3 diff --git a/TranqRotate_TBC.toc b/TranqRotate_TBC.toc index dee8db6..331dee2 100644 --- a/TranqRotate_TBC.toc +++ b/TranqRotate_TBC.toc @@ -1,8 +1,8 @@ ## Interface: 20504 -## Title: TranqRotate |cff00aa002.2.9-beta|r +## Title: TranqRotate |cff00aa002.2.9-beta1|r ## Notes: A tranqshot rotation assistant ## Author: Slivo -## Version: 2.2.9-beta +## Version: 2.2.9-beta1 ## SavedVariables: TranqRotateDb ## OptionalDeps: Ace3 From e802a8d6639d54367c0eb23d7cc814e86a88e21b Mon Sep 17 00:00:00 2001 From: Slivo Date: Fri, 18 Oct 2024 16:36:58 +0200 Subject: [PATCH 3/6] fix changelog --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index e8aceb5..e3971d2 100644 --- a/changelog.md +++ b/changelog.md @@ -93,7 +93,7 @@ - Handles the new dispel resistance mechanic - Fix a bad nil check in comms -- Fix a logic issue in hunter list cleaning function +- Fix a logic issue in hunter list cleaning function #### v1.5.0 From f42ff69af5d574150500de341468f42d649fa8b9 Mon Sep 17 00:00:00 2001 From: Slivo Date: Fri, 18 Oct 2024 16:38:58 +0200 Subject: [PATCH 4/6] fix indentation --- src/events.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/events.lua b/src/events.lua index 0a186f2..ccbb496 100644 --- a/src/events.lua +++ b/src/events.lua @@ -47,11 +47,11 @@ function TranqRotate:COMBAT_LOG_EVENT_UNFILTERED() TranqRotate:rotate(hunter) if (sourceGUID == UnitGUID("player")) then TranqRotate:sendAnnounceMessage( - TranqRotate:getTranqSuccessMessage( - TranqRotate:isTranqableBoss(destGUID), - destName, - destRaidFlags - ) + TranqRotate:getTranqSuccessMessage( + TranqRotate:isTranqableBoss(destGUID), + destName, + destRaidFlags + ) ) end elseif (event == "SPELL_MISSED" or event == "SPELL_DISPEL_FAILED") then From 6b6523ba6e751f565196c36326f9e68b242ae4d6 Mon Sep 17 00:00:00 2001 From: Slivo Date: Fri, 18 Oct 2024 16:42:53 +0200 Subject: [PATCH 5/6] reword changelog --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index e3971d2..efcb005 100644 --- a/changelog.md +++ b/changelog.md @@ -2,7 +2,7 @@ #### v2.2.9 -- Update bosses spells ID's to match blizzard changes +- Frenzy detection - update spell IDs to match Blizzard changes #### v2.2.8 From 7e61070c883b375a5e726fdeb0dbd0f09332b8c4 Mon Sep 17 00:00:00 2001 From: Slivo Date: Wed, 23 Oct 2024 10:12:23 +0200 Subject: [PATCH 6/6] update toc for 2.2.9 --- TranqRotate.toc | 4 ++-- TranqRotate_TBC.toc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TranqRotate.toc b/TranqRotate.toc index 5e33911..8a53836 100644 --- a/TranqRotate.toc +++ b/TranqRotate.toc @@ -1,8 +1,8 @@ ## Interface: 11504 -## Title: TranqRotate |cff00aa002.2.9-beta1|r +## Title: TranqRotate |cff00aa002.2.9|r ## Notes: A tranqshot rotation assistant ## Author: Slivo -## Version: 2.2.9-beta1 +## Version: 2.2.9 ## SavedVariables: TranqRotateDb ## OptionalDeps: Ace3 diff --git a/TranqRotate_TBC.toc b/TranqRotate_TBC.toc index 331dee2..68877bc 100644 --- a/TranqRotate_TBC.toc +++ b/TranqRotate_TBC.toc @@ -1,8 +1,8 @@ ## Interface: 20504 -## Title: TranqRotate |cff00aa002.2.9-beta1|r +## Title: TranqRotate |cff00aa002.2.9|r ## Notes: A tranqshot rotation assistant ## Author: Slivo -## Version: 2.2.9-beta1 +## Version: 2.2.9 ## SavedVariables: TranqRotateDb ## OptionalDeps: Ace3