Skip to content

Miscellaneous trinket fixes #1502

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.

Sign up for GitHub

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

Jump to bottom
Merged
NerdEgghead merged 7 commits into from
May 25, 2025
Merged

Miscellaneous trinket fixes #1502

NerdEgghead merged 7 commits into from
May 25, 2025

Conversation

@NerdEgghead
Copy link
Contributor

@NerdEgghead NerdEgghead commented May 25, 2025

Fixes for a handful of trinket issues uncovered during #1491 :

  • Fixed on-use Dodge and Parry trinkets to be on the shared offensive trinket CD timer rather than the defensive one.
  • Also moved Mirror of Broken Images to the shared offensive trinket CD.
  • Fixed CD duration on Bloodthirsty Gladiator's Badge of Conquest.
  • Fixed bugs with Battlemaster trinket buff values and CD durations.

@NerdEgghead
Fixed Dodge active trinkets to be on the shared offensive trinket CD
08ece96 
rather than the defensive one.

 On branch bugfix/fix-trinkets
 Changes to be committed:
	modified:   sim/common/shared/shared_utils.go
	modified:   sim/death_knight/blood/TestBlood.results
	modified:   sim/death_knight/frost/TestFrost.results
	modified:   sim/druid/guardian/TestGuardian.results
	modified:   sim/hunter/beast_mastery/TestBM.results
	modified:   sim/hunter/marksmanship/TestMM.results
	modified:   sim/mage/arcane/TestArcane.results
	modified:   sim/paladin/retribution/TestRetribution.results
	modified:   sim/shaman/elemental/TestElemental.results
	modified:   sim/warlock/affliction/TestAffliction.results
	modified:   sim/warlock/demonology/TestDemonology.results
	modified:   sim/warlock/destruction/TestDestruction.results
	modified:   sim/warrior/arms/TestArms.results
@NerdEgghead
Fixed CD duration on Bloodthirsty Gladiator's Badge of Conquest
373f08a 
 On branch bugfix/fix-trinkets
 Changes to be committed:
	modified:   sim/common/cata/stat_bonus_cds.go
	modified:   sim/death_knight/blood/TestBlood.results
	modified:   sim/death_knight/frost/TestFrost.results
	modified:   sim/druid/feral/TestFeral.results
	modified:   sim/druid/guardian/TestGuardian.results
	modified:   sim/hunter/beast_mastery/TestBM.results
	modified:   sim/hunter/marksmanship/TestMM.results
	modified:   sim/hunter/survival/TestSV.results
	modified:   sim/mage/arcane/TestArcane.results
	modified:   sim/rogue/assassination/TestAssassination.results
	modified:   sim/rogue/combat/TestCombat.results
	modified:   sim/rogue/subtlety/TestSubtlety.results
	modified:   sim/shaman/elemental/TestElemental.results
	modified:   sim/shaman/enhancement/TestEnhancement.results
	modified:   sim/warlock/affliction/TestAffliction.results
	modified:   sim/warlock/demonology/TestDemonology.results
	modified:   sim/warlock/destruction/TestDestruction.results
	modified:   sim/warrior/arms/TestArms.results
	modified:   sim/warrior/fury/TestFury.results
@NerdEgghead
Fixed proc value on boosted Idol of Destruction trinkets
2a46c62 
 On branch bugfix/fix-trinkets
 Changes to be committed:
	modified:   sim/common/cata/stat_bonus_procs.go
	modified:   sim/death_knight/blood/TestBlood.results
	modified:   sim/death_knight/frost/TestFrost.results
	modified:   sim/death_knight/unholy/TestUnholy.results
	modified:   sim/druid/balance/TestBalance.results
	modified:   sim/druid/feral/TestFeral.results
	modified:   sim/druid/guardian/TestGuardian.results
	modified:   sim/hunter/beast_mastery/TestBM.results
	modified:   sim/hunter/marksmanship/TestMM.results
	modified:   sim/hunter/survival/TestSV.results
	modified:   sim/mage/arcane/TestArcane.results
	modified:   sim/mage/fire/TestFire.results
	modified:   sim/paladin/protection/TestProtection.results
	modified:   sim/paladin/retribution/TestRetribution.results
	modified:   sim/priest/shadow/TestShadow.results
	modified:   sim/rogue/assassination/TestAssassination.results
	modified:   sim/shaman/elemental/TestElemental.results
	modified:   sim/shaman/enhancement/TestEnhancement.results
	modified:   sim/warlock/affliction/TestAffliction.results
	modified:   sim/warlock/demonology/TestDemonology.results
	modified:   sim/warlock/destruction/TestDestruction.results
@NerdEgghead
Fixed on-use Parry trinkets to also be on the shared offensive trinket
05d411c 
CD rather than the defensive one.

 On branch bugfix/fix-trinkets
 Changes to be committed:
	modified:   sim/common/shared/shared_utils.go
	modified:   sim/death_knight/blood/TestBlood.results
	modified:   sim/death_knight/frost/TestFrost.results
	modified:   sim/mage/arcane/TestArcane.results
	modified:   sim/paladin/retribution/TestRetribution.results
	modified:   sim/shaman/elemental/TestElemental.results
	modified:   sim/warlock/affliction/TestAffliction.results
	modified:   sim/warlock/destruction/TestDestruction.results
	modified:   sim/warrior/arms/TestArms.results
@NerdEgghead
Revert "Fixed proc value on boosted Idol of Destruction trinkets"
79b3fcc 
This reverts commit 2a46c62.
@NerdEgghead
Also move Mirror of Broken Images to shared offensive trinket CD
a0e64d1 
 On branch bugfix/fix-trinkets
 Changes to be committed:
	modified:   sim/common/cata/stat_bonus_cds.go
	modified:   sim/death_knight/blood/TestBlood.results
	modified:   sim/death_knight/frost/TestFrost.results
	modified:   sim/mage/arcane/TestArcane.results
	modified:   sim/paladin/retribution/TestRetribution.results
	modified:   sim/shaman/elemental/TestElemental.results
	modified:   sim/warlock/affliction/TestAffliction.results
	modified:   sim/warlock/destruction/TestDestruction.results
	modified:   sim/warrior/arms/TestArms.results
@NerdEgghead
Fixed bugs with Battlemaster trinket buff values and CD durations
be39aad 
 On branch bugfix/fix-trinkets
 Changes to be committed:
	modified:   sim/common/cata/stat_bonus_cds.go
	modified:   sim/death_knight/blood/TestBlood.results
	modified:   sim/death_knight/frost/TestFrost.results
	modified:   sim/druid/feral/TestFeral.results
	modified:   sim/warlock/affliction/TestAffliction.results
	modified:   sim/warlock/demonology/TestDemonology.results
@NerdEgghead NerdEgghead merged commit c1edf66 into master May 25, 2025
3 checks passed
@NerdEgghead NerdEgghead deleted the bugfix/fix-trinkets branch May 25, 2025 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Druid Hunter Mage Paladin Rogue Shaman Warlock Warrior

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@NerdEgghead