Merge branch 'master' into RogueAbsorbSet

wowsims · Dec 14, 2024 · f030843 · f030843
2 parents d00f6ed + 65cb818
commit f030843
Show file tree

Hide file tree

Showing 46 changed files with 5,587 additions and 4,009 deletions.
diff --git a/assets/database/db.bin b/assets/database/db.bin
diff --git a/assets/database/db.json b/assets/database/db.json
diff --git a/assets/database/leftover_db.bin b/assets/database/leftover_db.bin
diff --git a/assets/database/leftover_db.json b/assets/database/leftover_db.json
diff --git a/assets/db_inputs/atlasloot_db.json b/assets/db_inputs/atlasloot_db.json
diff --git a/assets/db_inputs/wowhead_gearplannerdb.txt b/assets/db_inputs/wowhead_gearplannerdb.txt
diff --git a/sim/common/sod/item_effects/phase_6.go b/sim/common/sod/item_effects/phase_6.go
@@ -78,9 +78,37 @@ func init() {
 	// 		  (2.1s cooldown)
 	core.NewItemEffect(ObsidianChampion, func(agent core.Agent) {
 		character := agent.GetCharacter()
-		vanilla.StrengthOfTheChampionAura(character)
-		vanilla.EnrageAura446327(character)
+
 		ObsidianEdgedAura(ObsidianChampion, agent)
+
+		strengthAura := vanilla.StrengthOfTheChampionAura(character)
+		enrageAura := vanilla.EnrageAura446327(character)
+
+		procMask := character.GetProcMaskForItem(ObsidianChampion)
+
+		core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
+			Name:              "Obsidian Champion (Strength)",
+			Callback:          core.CallbackOnSpellHitDealt,
+			Outcome:           core.OutcomeLanded,
+			ProcMask:          procMask,
+			SpellFlagsExclude: core.SpellFlagSuppressWeaponProcs,
+			PPM:               1, // Estimated based on data from WoW Armaments Discord
+			Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+				strengthAura.Activate(sim)
+			},
+		})
+
+		core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
+			Name:              "Obsidian Champion (Enrage)",
+			Callback:          core.CallbackOnSpellHitDealt,
+			Outcome:           core.OutcomeLanded,
+			ProcMask:          procMask,
+			SpellFlagsExclude: core.SpellFlagSuppressWeaponProcs,
+			PPM:               1, // Estimated based on data from WoW Armaments Discord
+			Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+				enrageAura.Activate(sim)
+			},
+		})
 	})
 
 	// https://www.wowhead.com/classic/item=233801/obsidian-defender