Merge branch 'master' into fix/warlock-p3

wowsims · Jan 20, 2025 · f4e12f5 · f4e12f5
2 parents df460c3 + 33c755e
commit f4e12f5
Show file tree

Hide file tree

Showing 6 changed files with 435 additions and 322 deletions.
diff --git a/sim/core/item_swaps.go b/sim/core/item_swaps.go
@@ -226,12 +226,12 @@ func (swap *ItemSwap) ProcessTinker(spell *Spell, slots []proto.ItemSlot) {
 		isUniqueItem := swap.GetEquippedItemBySlot(slot).ID != swap.GetUnequippedItemBySlot(slot).ID
 
 		var newSpellCD time.Duration
-		timeToReady := spell.CD.TimeToReady(sim)
 		if isUniqueItem {
 			// Unique items have a 30s CD regardless of the spell CD being > 30s or not
-			newSpellCD = max(timeToReady, time.Second*30)
+			newSpellCD = time.Second * 30
 		} else {
 			// Items with the same ItemID share the CD and does not get reset to 30s
+			timeToReady := spell.CD.TimeToReady(sim)
 			newSpellCD = TernaryDuration(timeToReady > 30, timeToReady, time.Second*30)
 		}