From 8fba20bb33899980c753c9a325ba5cd16964594d Mon Sep 17 00:00:00 2001
From: Adrian Klingen <adrian.klingen@deptagency.com>
Date: Sat, 18 Jan 2025 11:55:55 +0100
Subject: [PATCH] Fix Synapse swap CD when having identical ItemIDs
---
sim/core/item_swaps.go | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/sim/core/item_swaps.go b/sim/core/item_swaps.go
index 69fbb95f2f..f1c9876e3d 100644
--- a/sim/core/item_swaps.go
+++ b/sim/core/item_swaps.go
@@ -218,11 +218,24 @@ func (swap *ItemSwap) RegisterActive(itemID int32) {
// Helper for handling Enchant On Use effects to set a 30s cd on the related spell.
func (swap *ItemSwap) ProcessTinker(spell *Spell, slots []proto.ItemSlot) {
- swap.character.RegisterItemSwapCallback(slots, func(sim *Simulation, _ proto.ItemSlot) {
+ swap.character.RegisterItemSwapCallback(slots, func(sim *Simulation, slot proto.ItemSlot) {
if spell == nil || !swap.initialized {
return
}
- spell.CD.Set(sim.CurrentTime + max(spell.CD.TimeToReady(sim), time.Second*30))
+
+ 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)
+ } else {
+ // Items with the same ItemID share the CD and does not get reset to 30s
+ newSpellCD = TernaryDuration(timeToReady > 30, timeToReady, time.Second*30)
+ }
+
+ spell.CD.Set(sim.CurrentTime + newSpellCD)
})
}