Merge branch 'master' into feature/add-trinket-swapping

wowsims · Jan 17, 2025 · f04f372 · f04f372
2 parents 4817d78 + 86c2697
commit f04f372
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 1 deletion.
diff --git a/sim/common/includes.go b/sim/common/includes.go
@@ -2,7 +2,7 @@ package common
 
 // Just import other directories, so importing common from elsewhere is enough.
 import (
-	// _ "github.com/wowsims/cata/sim/common/tbc"
 	_ "github.com/wowsims/cata/sim/common/cata"
+	_ "github.com/wowsims/cata/sim/common/tbc"
 	_ "github.com/wowsims/cata/sim/common/wotlk"
 )
diff --git a/sim/common/tbc/stat_bonus_procs.go b/sim/common/tbc/stat_bonus_procs.go
@@ -0,0 +1,40 @@
+package tbc
+
+import (
+	"time"
+
+	"github.com/wowsims/cata/sim/common/shared"
+	"github.com/wowsims/cata/sim/core"
+	"github.com/wowsims/cata/sim/core/stats"
+)
+
+func init() {
+	core.AddEffectsToTest = false
+
+	// Band of the Eternal Restorer
+	shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
+		Name:       "Band of the Eternal Restorer",
+		ItemID:     29309,
+		AuraID:     35087,
+		Bonus:      stats.Stats{stats.SpellPower: 93},
+		Duration:   time.Second * 10,
+		Callback:   core.CallbackOnSpellHitDealt,
+		ProcMask:   core.ProcMaskSpellDamage | core.ProcMaskSpellHealing,
+		ProcChance: 0.15,
+		ICD:        time.Second * 45,
+	})
+
+	// Shattered Sun Pendant of Restoration
+	shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
+		Name:       "Light's Salvation",
+		ItemID:     34677,
+		AuraID:     45478,
+		Bonus:      stats.Stats{stats.SpellPower: 117},
+		Duration:   time.Second * 10,
+		Callback:   core.CallbackOnSpellHitDealt,
+		ProcMask:   core.ProcMaskSpellHealing,
+		ProcChance: 0.15,
+		ICD:        time.Second * 45,
+	})
+
+}
diff --git a/sim/common/wotlk/stat_bonus_procs.go b/sim/common/wotlk/stat_bonus_procs.go
@@ -521,6 +521,18 @@ func init() {
 	// 	ProcChance: 0.10,
 	// 	ICD:        time.Second * 60,
 	// })
+	shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
+		// Ashen Band of Endless Wisdom
+		Name:       "Chilling Knowledge",
+		ItemID:     50400,
+		AuraID:     72418,
+		Bonus:      stats.Stats{stats.SpellPower: 285},
+		Duration:   time.Second * 10,
+		Callback:   core.CallbackOnSpellHitDealt,
+		ProcMask:   core.ProcMaskSpellHealing,
+		ProcChance: 0.10,
+		ICD:        time.Second * 60,
+	})
 	shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
 		// Ashen Band of Endless Destruction
 		Name:       "Frostforged Sage",

diff --git a/ui/shaman/elemental/sim.ts b/ui/shaman/elemental/sim.ts
@@ -119,11 +119,14 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecElementalShaman, {
 	},
 	itemSwapSlots: [
 		ItemSlot.ItemSlotHead,
+		ItemSlot.ItemSlotNeck,
 		ItemSlot.ItemSlotShoulder,
 		ItemSlot.ItemSlotBack,
 		ItemSlot.ItemSlotChest,
 		ItemSlot.ItemSlotHands,
 		ItemSlot.ItemSlotLegs,
+		ItemSlot.ItemSlotFinger1,
+		ItemSlot.ItemSlotFinger2,
 		ItemSlot.ItemSlotTrinket1,
 		ItemSlot.ItemSlotTrinket2,
 		ItemSlot.ItemSlotMainHand,