Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v1.6.1 #46

Merged
merged 5 commits into from
May 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions TranqRotate.toc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## Interface: 11307
## Title: TranqRotate |cff00aa001.6.0|r
## Title: TranqRotate |cff00aa001.6.1|r
## Notes: A tranqshot rotation assistant
## Author: Slivo
## Version: 1.6.0
## Version: 1.6.1
## SavedVariables: TranqRotateDb
## OptionalDeps: Ace3

Expand Down
6 changes: 6 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
## TranqRotate Changelog

#### 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)
Expand Down
24 changes: 13 additions & 11 deletions src/events.lua
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,19 @@ function TranqRotate:COMBAT_LOG_EVENT_UNFILTERED()

if (spellName == tranqShot or (TranqRotate.testMode and spellName == arcaneShot)) then
local hunter = TranqRotate:getHunter(nil, sourceGUID)
if (event == "SPELL_CAST_SUCCESS") then
TranqRotate:sendSyncTranq(hunter, false, timestamp)
TranqRotate:rotate(hunter)
if (sourceGUID == UnitGUID("player")) then
TranqRotate:sendAnnounceMessage(TranqRotate.db.profile.announceSuccessMessage, destName)
end
elseif (event == "SPELL_MISSED" or event == "SPELL_DISPEL_FAILED") then
TranqRotate:sendSyncTranq(hunter, true, timestamp, event)
TranqRotate:handleFailTranq(hunter, event)
if (sourceGUID == UnitGUID("player")) then
TranqRotate:sendAnnounceMessage(TranqRotate.db.profile.announceFailMessage, destName)
if (hunter) then
if (event == "SPELL_CAST_SUCCESS") then
TranqRotate:sendSyncTranq(hunter, false, timestamp)
TranqRotate:rotate(hunter)
if (sourceGUID == UnitGUID("player")) then
TranqRotate:sendAnnounceMessage(TranqRotate.db.profile.announceSuccessMessage, destName)
end
elseif (event == "SPELL_MISSED" or event == "SPELL_DISPEL_FAILED") then
TranqRotate:sendSyncTranq(hunter, true, timestamp, event)
TranqRotate:handleFailTranq(hunter, event)
if (sourceGUID == UnitGUID("player")) then
TranqRotate:sendAnnounceMessage(TranqRotate.db.profile.announceFailMessage, destName)
end
end
end
elseif (event == "SPELL_AURA_APPLIED" and TranqRotate:isBossFrenzy(spellName, sourceGUID)) then
Expand Down
4 changes: 2 additions & 2 deletions src/tranqRotate.lua
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function TranqRotate:sendAnnounceMessage(message, targetName)
TranqRotate.db.profile.channelType == "SAY" or TranqRotate.db.profile.channelType == "YELL"
)
) then
TranqRotate:printPrefixedMessage(message .. " " .. L["YELL_SAY_DISABLED_OPEN_WORLD"])
TranqRotate:printPrefixedMessage(string.format(message, targetName) .. " " .. L["YELL_SAY_DISABLED_OPEN_WORLD"])
return
end

Expand Down Expand Up @@ -260,7 +260,7 @@ function TranqRotate:checkVersions()
end
for key, player in pairs(TranqRotate.addonVersions) do
if (player ~= UnitName("player")) then
TranqRotate:printPrefixedMessage(hunter.name .. " - " .. TranqRotate:formatAddonVersion(hunter.addonVersion))
TranqRotate:printPrefixedMessage(player .. " - " .. TranqRotate:formatAddonVersion(hunter.addonVersion))
end
end
end
Expand Down