From ede90cac44233a75072166537a3892df5a44f5aa Mon Sep 17 00:00:00 2001 From: Gogo1951 <55365231+Gogo1951@users.noreply.github.com> Date: Mon, 25 Nov 2024 07:40:19 -0600 Subject: [PATCH 01/11] Update TranqRotate.toc Updated for new game client. Your add-on works great with Anniversary Edition. Hit me up if you want a hand setting up GitHub actions on this to help with deployments to CurseForge. It'll take 30 seconds. (= Gogo1951 on Discord. --- TranqRotate.toc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TranqRotate.toc b/TranqRotate.toc index 8a53836..576fb81 100644 --- a/TranqRotate.toc +++ b/TranqRotate.toc @@ -1,4 +1,4 @@ -## Interface: 11504 +## Interface: 11505 ## Title: TranqRotate |cff00aa002.2.9|r ## Notes: A tranqshot rotation assistant ## Author: Slivo From af17415ef0f7793946af8313a62298d497923a8c Mon Sep 17 00:00:00 2001 From: Slivo Date: Mon, 25 Nov 2024 15:53:24 +0100 Subject: [PATCH 02/11] Remove TBC toc file --- TranqRotate.toc | 2 +- TranqRotate_TBC.toc | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 TranqRotate_TBC.toc diff --git a/TranqRotate.toc b/TranqRotate.toc index 576fb81..1aa292b 100644 --- a/TranqRotate.toc +++ b/TranqRotate.toc @@ -1,4 +1,4 @@ -## Interface: 11505 +## Interface: 11505, 20504 ## Title: TranqRotate |cff00aa002.2.9|r ## Notes: A tranqshot rotation assistant ## Author: Slivo diff --git a/TranqRotate_TBC.toc b/TranqRotate_TBC.toc deleted file mode 100644 index 68877bc..0000000 --- a/TranqRotate_TBC.toc +++ /dev/null @@ -1,40 +0,0 @@ -## Interface: 20504 -## Title: TranqRotate |cff00aa002.2.9|r -## Notes: A tranqshot rotation assistant -## Author: Slivo -## Version: 2.2.9 -## 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 From a87b68d66e6cb7f224a6fe12adf3e753736fce42 Mon Sep 17 00:00:00 2001 From: Slivo Date: Mon, 25 Nov 2024 16:11:38 +0100 Subject: [PATCH 03/11] Add github action --- .github/workflows/package.yml | 40 +++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/package.yml diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml new file mode 100644 index 0000000..674f6d5 --- /dev/null +++ b/.github/workflows/package.yml @@ -0,0 +1,40 @@ +# description of this workflow, can be anything you want +name: Package and release + +# we need to let GitHub know _when_ we want to release, typically only when we create a new tag. +# this will target only tags, and not all pushes to the master branch. +# this part can be heavily customized to your liking, like targeting only tags that match a certain word, +# other branches or even pullrequests. +on: + push: + tags: + - '**' + +# a workflow is built up as jobs, and within these jobs are steps +jobs: + + # "release" is a job, you can name it anything you want + release: + + # we can run our steps on pretty much anything, but the "ubuntu-latest" image is a safe bet + runs-on: ubuntu-latest + + # specify the environment variables used by the packager, matching the secrets from the project on GitHub + env: + CF_API_KEY: ${{ secrets.CF_API_KEY }} + WAGO_API_TOKEN: ${{ secrets.WAGO_API_TOKEN }} + GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }} # "GITHUB_TOKEN" is a secret always provided to the workflow + # for your own token, the name cannot start with "GITHUB_" + + # "steps" holds a list of all the steps needed to package and release our AddOn + steps: + + # we first have to clone the AddOn project, this is a required step + - name: Clone project + uses: actions/checkout@v3 + with: + fetch-depth: 0 # gets entire git history, needed for automatic changelogs + + # once cloned, we just run the GitHub Action for the packager project + - name: Package and release + uses: BigWigsMods/packager@v2 \ No newline at end of file From 0562d175dd08c823ba134d00920542e17846c8a0 Mon Sep 17 00:00:00 2001 From: Slivo Date: Mon, 25 Nov 2024 16:16:19 +0100 Subject: [PATCH 04/11] update version to 2.2.10 --- TranqRotate.toc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TranqRotate.toc b/TranqRotate.toc index 1aa292b..abbd342 100644 --- a/TranqRotate.toc +++ b/TranqRotate.toc @@ -1,8 +1,8 @@ ## Interface: 11505, 20504 -## Title: TranqRotate |cff00aa002.2.9|r +## Title: TranqRotate |cff00aa002.2.10|r ## Notes: A tranqshot rotation assistant ## Author: Slivo -## Version: 2.2.9 +## Version: 2.2.10 ## SavedVariables: TranqRotateDb ## OptionalDeps: Ace3 From e29f6c841094efd49b540a1d131a93a97f058fcf Mon Sep 17 00:00:00 2001 From: Slivo Date: Mon, 25 Nov 2024 16:16:51 +0100 Subject: [PATCH 05/11] Update changelog --- changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.md b/changelog.md index efcb005..fff7b2c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ ## TranqRotate Changelog +#### v2.2.10 + +- Update toc for 1.15.5 + #### v2.2.9 - Frenzy detection - update spell IDs to match Blizzard changes From 774136f4598d6a69defb4433e4b94dcd12a098a5 Mon Sep 17 00:00:00 2001 From: Slivo Date: Mon, 25 Nov 2024 17:32:44 +0100 Subject: [PATCH 06/11] Add curse and wago IDs --- TranqRotate.toc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TranqRotate.toc b/TranqRotate.toc index abbd342..e3357df 100644 --- a/TranqRotate.toc +++ b/TranqRotate.toc @@ -6,6 +6,9 @@ ## SavedVariables: TranqRotateDb ## OptionalDeps: Ace3 +## X-Curse-Project-ID: 353296 +## X-Wago-ID: baNDJ8Ko + #@no-lib-strip@ libs\LibStub\LibStub.lua libs\CallbackHandler-1.0\CallbackHandler-1.0.xml From a7c184cf0dbdd385a7e8c62a8da8a07a5977721e Mon Sep 17 00:00:00 2001 From: Slivo Date: Mon, 25 Nov 2024 17:33:13 +0100 Subject: [PATCH 07/11] Set release file name --- .github/workflows/package.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 674f6d5..e13ada9 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -37,4 +37,6 @@ jobs: # once cloned, we just run the GitHub Action for the packager project - name: Package and release - uses: BigWigsMods/packager@v2 \ No newline at end of file + uses: BigWigsMods/packager@v2 + with: + args: -n {package-name}-{project-version}:{package-name}-{project-version} \ No newline at end of file From 9fc6ddfe84727fd2c078d3d4aa883dde7465c29d Mon Sep 17 00:00:00 2001 From: Slivo Date: Mon, 25 Nov 2024 18:38:45 +0100 Subject: [PATCH 08/11] Add empty line --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index e13ada9..9bf57ca 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -39,4 +39,4 @@ jobs: - name: Package and release uses: BigWigsMods/packager@v2 with: - args: -n {package-name}-{project-version}:{package-name}-{project-version} \ No newline at end of file + args: -n {package-name}-{project-version}:{package-name}-{project-version} From b4201b920408a4d38115685538277a27c88ac138 Mon Sep 17 00:00:00 2001 From: Slivo Date: Mon, 25 Nov 2024 20:43:22 +0100 Subject: [PATCH 09/11] Adds some print for automated backup alerts --- locales/enUS.lua | 4 ++++ locales/frFR.lua | 4 ++++ locales/ruRU.lua | 4 ++++ locales/zhCN.lua | 4 ++++ locales/zhTW.lua | 4 ++++ src/events.lua | 2 ++ 6 files changed, 22 insertions(+) diff --git a/locales/enUS.lua b/locales/enUS.lua index 5fda013..c171a0d 100644 --- a/locales/enUS.lua +++ b/locales/enUS.lua @@ -139,6 +139,10 @@ local L = { ["PRINT_FAILED_TRANQ_RESIST"] = "%s's tranqshot was resisted!", ["PRINT_FAILED_TRANQ_MISS_OR_RESIST"] = "%s's tranqshot was missed or resisted!", + -- Incapacitated backup call printed messages + ["PRINT_INCAPACITATED_BACKUP_CALL"] = "Backup has been automatically requested because your were incapacitated", + ["PRINT_TIMED_BACKUP_CALL"] = "Backup has been automatically requested because your were too slow", + -- Version check printed messages ["VERSION_CHECK_HEADER"] = "Version check", ["VERSION_CHECK_YOU"] = "You", diff --git a/locales/frFR.lua b/locales/frFR.lua index c0aee19..3255a82 100644 --- a/locales/frFR.lua +++ b/locales/frFR.lua @@ -141,6 +141,10 @@ local L = { ["PRINT_FAILED_TRANQ_RESIST"] = "Le tranqshot de %s a été résisté!", ["PRINT_FAILED_TRANQ_MISS_OR_RESIST"] = "Le tranqshot de %s a raté ou a été résisté!", + -- Incapacitated backup call printed messages + ["PRINT_INCAPACITATED_BACKUP_CALL"] = "Un backup a été demandé automatiquement parce que vous étiez 'paralysé'", + ["PRINT_TIMED_BACKUP_CALL"] = "Un backup a été demandé automatiquement parce que vous avez mis trop de temps à tranq", + -- Version check printed messages ["VERSION_CHECK_HEADER"] = "Contrôle des versions", ["VERSION_CHECK_YOU"] = "Vous", diff --git a/locales/ruRU.lua b/locales/ruRU.lua index 4cc0d28..cd6e63a 100644 --- a/locales/ruRU.lua +++ b/locales/ruRU.lua @@ -141,6 +141,10 @@ local L = { ["PRINT_FAILED_TRANQ_RESIST"] = "%s's tranqshot was resisted!", ["PRINT_FAILED_TRANQ_MISS_OR_RESIST"] = "%s's tranqshot was missed or resisted!", + -- Incapacitated backup call printed messages + ["PRINT_INCAPACITATED_BACKUP_CALL"] = "Backup has been automatically requested because your were incapacitated", + ["PRINT_TIMED_BACKUP_CALL"] = "Backup has been automatically requested because your were too slow", + -- Version check printed messages ["VERSION_CHECK_HEADER"] = "Version check", ["VERSION_CHECK_YOU"] = "You", diff --git a/locales/zhCN.lua b/locales/zhCN.lua index 3896e27..f34164c 100644 --- a/locales/zhCN.lua +++ b/locales/zhCN.lua @@ -141,6 +141,10 @@ local L = { ["PRINT_FAILED_TRANQ_RESIST"] = "%s's tranqshot was resisted!", ["PRINT_FAILED_TRANQ_MISS_OR_RESIST"] = "%s's tranqshot was missed or resisted!", + -- Incapacitated backup call printed messages + ["PRINT_INCAPACITATED_BACKUP_CALL"] = "Backup has been automatically requested because your were incapacitated", + ["PRINT_TIMED_BACKUP_CALL"] = "Backup has been automatically requested because your were too slow", + -- Version check printed messages ["VERSION_CHECK_HEADER"] = "Version check", ["VERSION_CHECK_YOU"] = "You", diff --git a/locales/zhTW.lua b/locales/zhTW.lua index 73b60c8..971a766 100644 --- a/locales/zhTW.lua +++ b/locales/zhTW.lua @@ -141,6 +141,10 @@ local L = { ["PRINT_FAILED_TRANQ_RESIST"] = "%s's tranqshot was resisted!", ["PRINT_FAILED_TRANQ_MISS_OR_RESIST"] = "%s's tranqshot was missed or resisted!", + -- Incapacitated backup call printed messages + ["PRINT_INCAPACITATED_BACKUP_CALL"] = "Backup has been automatically requested because your were incapacitated", + ["PRINT_TIMED_BACKUP_CALL"] = "Backup has been automatically requested because your were too slow", + -- Version check printed messages ["VERSION_CHECK_HEADER"] = "Version check", ["VERSION_CHECK_YOU"] = "You", diff --git a/src/events.lua b/src/events.lua index ccbb496..1c4cfcc 100644 --- a/src/events.lua +++ b/src/events.lua @@ -75,6 +75,7 @@ function TranqRotate:COMBAT_LOG_EVENT_UNFILTERED() if (TranqRotate.db.profile.enableIncapacitatedBackupAlert and TranqRotate:isPlayedIncapacitatedByDebuff()) then TranqRotate:alertBackup(TranqRotate.db.profile.unableToTranqMessage) + TranqRotate:printPrefixedMessage(string.format(L['PRINT_INCAPACITATED_BACKUP_CALL'])) end end @@ -158,6 +159,7 @@ function TranqRotate:handleTimedAlert() C_Timer.After(TranqRotate.db.profile.timedBackupAlertDelay, function() if (TranqRotate.frenzy and TranqRotate:isPlayerNextTranq()) then TranqRotate:alertBackup(TranqRotate.db.profile.unableToTranqMessage) + TranqRotate:printPrefixedMessage(string.format(L['PRINT_TIMED_BACKUP_CALL'])) end end) end From 08716d57a980c583358f0bcca7f685fda3f62799 Mon Sep 17 00:00:00 2001 From: Slivo Date: Mon, 25 Nov 2024 20:44:26 +0100 Subject: [PATCH 10/11] Update changelog --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index fff7b2c..11437fb 100644 --- a/changelog.md +++ b/changelog.md @@ -3,6 +3,7 @@ #### v2.2.10 - Update toc for 1.15.5 +- Add chat messages to explain the reason of an automated backup alert #### v2.2.9 From 0788c0102d45573c1bcfbc01b602c295cb0638ab Mon Sep 17 00:00:00 2001 From: Slivo Date: Mon, 25 Nov 2024 20:51:17 +0100 Subject: [PATCH 11/11] Replace single quotes by double quotes --- locales/frFR.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/frFR.lua b/locales/frFR.lua index 3255a82..4986bb7 100644 --- a/locales/frFR.lua +++ b/locales/frFR.lua @@ -142,7 +142,7 @@ local L = { ["PRINT_FAILED_TRANQ_MISS_OR_RESIST"] = "Le tranqshot de %s a raté ou a été résisté!", -- Incapacitated backup call printed messages - ["PRINT_INCAPACITATED_BACKUP_CALL"] = "Un backup a été demandé automatiquement parce que vous étiez 'paralysé'", + ["PRINT_INCAPACITATED_BACKUP_CALL"] = "Un backup a été demandé automatiquement parce que vous étiez \"paralysé\"", ["PRINT_TIMED_BACKUP_CALL"] = "Un backup a été demandé automatiquement parce que vous avez mis trop de temps à tranq", -- Version check printed messages