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/v2.2.3 #60

Merged
merged 4 commits into from
Jan 17, 2022
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.idea
libs
copy.sh
copytbc.sh
package.sh
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ Here is a list of feature I want to implement at some point, no specific order i

Do not use github download button on this page, get the latest release zip file from https://github.com/Slivo-fr/TranqRotate/releases

Also available here https://www.curseforge.com/wow/addons/tranqrotate and there https://wowclassicui.com/fr/addons/tranqrotate
Also available on [curseforge](https://www.curseforge.com/wow/addons/tranqrotate)
4 changes: 2 additions & 2 deletions TranqRotate.toc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## Interface: 11401
## Title: TranqRotate |cff00aa002.2.2|r
## Title: TranqRotate |cff00aa002.2.3|r
## Notes: A tranqshot rotation assistant
## Author: Slivo
## Version: 2.2.2
## Version: 2.2.3
## SavedVariables: TranqRotateDb
## OptionalDeps: Ace3

Expand Down
40 changes: 40 additions & 0 deletions TranqRotate_TBC.toc
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
## Interface: 20502
## Title: TranqRotate |cff00aa002.2.3|r
## Notes: A tranqshot rotation assistant
## Author: Slivo
## Version: 2.2.3
## SavedVariables: TranqRotateDb
## OptionalDeps: Ace3

#@no-lib-strip@
libs\LibStub\LibStub.lua
libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
libs\AceDB-3.0\AceDB-3.0.xml
libs\AceDBOptions-3.0\AceDBOptions-3.0.xml
libs\AceGUI-3.0\AceGUI-3.0.xml
libs\AceConfig-3.0\AceConfig-3.0.xml
libs\AceComm-3.0\AceComm-3.0.xml
libs\AceSerializer-3.0\AceSerializer-3.0.xml
#@end-no-lib-strip@

locales\enUS.lua
locales\frFR.lua
locales\zhCN.lua
locales\zhTW.lua
locales\ruRU.lua

src\tranqRotate.lua
src\events.lua
src\rotation.lua
src\constants.lua
src\frames.lua
src\gui.lua
src\dragdrop.lua
src\comms.lua
src\defaults.lua
src\settings.lua
src\utils.lua
src\debuff.lua
src\migration.lua
src\raidIcons.lua
src\encounter.lua
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## TranqRotate Changelog

#### v2.2.3

- Incapacitated backup alert should now work properly

#### v2.2.2

- Bump toc for 1.14.1
Expand Down
23 changes: 14 additions & 9 deletions src/debuff.lua
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
-- Checks if player is incapacitated by a debuff for too long
function TranqRotate:isPlayedIncapacitatedByDebuff()

for i, debuffId in ipairs(TranqRotate.constants.incapacitatingDebuffs) do
local name, expirationTime = TranqRotate:getPlayerDebuff(debuffId)
if (name and expirationTime - GetTime() > TranqRotate.db.profile.incapacitatedDelay) then
return true
end
end

local name, _, _, _, _, expirationTime, _, _, _, spellId, _, isBossDebuff
= AuraUtil.FindAuraByName(GetSpellInfo(debuffId), "player")
return false
end

if (name) then
print(name, expirationTime - GetTime(), spellId, isBossDebuff)
function TranqRotate:getPlayerDebuff(debuffId)
for i=1, 32, 1 do
local name, icon, count, dispelType, duration, expirationTime, source, isStealable, nameplateShowPersonal,
spellId, canApplyAura, isBossDebuff, castByPlayer, nameplateShowAll, timeMod = UnitDebuff("player", i)

if (expirationTime - GetTime() > TranqRotate.constants.incapacitatedDelay) then
return true
end
if (spellId and spellId == debuffId) then
return name, expirationTime
end
end

return false
return nil
end
2 changes: 1 addition & 1 deletion src/rotation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ function TranqRotate:testRotation()
hunterToRotate = TranqRotate.rotationTables.rotation[1]
end

TranqRotate:sendSyncTranq(hunterToRotate, false, timestamp)
TranqRotate:sendSyncTranq(hunterToRotate, false, GetTime())
TranqRotate:rotate(hunterToRotate)
end

Expand Down
2 changes: 1 addition & 1 deletion src/tranqRotate.lua
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ end
function TranqRotate:printRotationSetup()

if (IsInRaid()) then
TranqRotate:sendRotationSetupBroadcastMessage('--- ' .. TranqRotate.constants.printPrefix .. L['BROADCAST_HEADER_TEXT'] .. ' ---', channel)
TranqRotate:sendRotationSetupBroadcastMessage('--- ' .. TranqRotate.constants.printPrefix .. L['BROADCAST_HEADER_TEXT'] .. ' ---')

if (TranqRotate.db.profile.useMultilineRotationReport) then
TranqRotate:printMultilineRotation(TranqRotate.rotationTables.rotation)
Expand Down