fix(trinkets): fix both Marks of the Champions

Author: Bisonpasfute

sim/common/tbc/items_trinkets.go

@@ -898,24 +898,46 @@ func init() {
 	// Mark of the Champion (physical): +150 AP vs Undead and Demons.
 	core.NewItemEffect(23206, func(agent core.Agent) {
 		character := agent.GetCharacter()
-		character.Env.RegisterPostFinalizeEffect(func() {
-			for _, at := range character.AttackTables {
-				bonus := stats.Stats{stats.AttackPower: 150, stats.RangedAttackPower: 150}
-				at.MobTypeBonusStats[proto.MobType_MobTypeUndead] = at.MobTypeBonusStats[proto.MobType_MobTypeUndead].Add(bonus)
-				at.MobTypeBonusStats[proto.MobType_MobTypeDemon] = at.MobTypeBonusStats[proto.MobType_MobTypeDemon].Add(bonus)
-			}
-		})
+		bonus := stats.Stats{stats.AttackPower: 150, stats.RangedAttackPower: 150}
+		aura := core.MakePermanent(character.RegisterAura(core.Aura{
+			Label:    "Mark of the Champion (Physical)",
+			ActionID: core.ActionID{ItemID: 23206},
+		})).
+			ApplyOnGain(func(_ *core.Aura, _ *core.Simulation) {
+				for _, at := range character.AttackTables {
+					at.MobTypeBonusStats[proto.MobType_MobTypeUndead] = at.MobTypeBonusStats[proto.MobType_MobTypeUndead].Add(bonus)
+					at.MobTypeBonusStats[proto.MobType_MobTypeDemon] = at.MobTypeBonusStats[proto.MobType_MobTypeDemon].Add(bonus)
+				}
+			}).
+			ApplyOnExpire(func(_ *core.Aura, _ *core.Simulation) {
+				for _, at := range character.AttackTables {
+					at.MobTypeBonusStats[proto.MobType_MobTypeUndead] = at.MobTypeBonusStats[proto.MobType_MobTypeUndead].Subtract(bonus)
+					at.MobTypeBonusStats[proto.MobType_MobTypeDemon] = at.MobTypeBonusStats[proto.MobType_MobTypeDemon].Subtract(bonus)
+				}
+			})
+		character.ItemSwap.RegisterProc(23206, aura)
 	})
 
 	// Mark of the Champion (spell): +85 spell damage vs Undead and Demons.
 	core.NewItemEffect(23207, func(agent core.Agent) {
 		character := agent.GetCharacter()
-		character.Env.RegisterPostFinalizeEffect(func() {
-			for _, at := range character.AttackTables {
-				bonus := stats.Stats{stats.SpellDamage: 85}
-				at.MobTypeBonusStats[proto.MobType_MobTypeUndead] = at.MobTypeBonusStats[proto.MobType_MobTypeUndead].Add(bonus)
-				at.MobTypeBonusStats[proto.MobType_MobTypeDemon] = at.MobTypeBonusStats[proto.MobType_MobTypeDemon].Add(bonus)
-			}
-		})
+		bonus := stats.Stats{stats.SpellDamage: 85}
+		aura := core.MakePermanent(character.RegisterAura(core.Aura{
+			Label:    "Mark of the Champion (Spell)",
+			ActionID: core.ActionID{ItemID: 23207},
+		})).
+			ApplyOnGain(func(_ *core.Aura, _ *core.Simulation) {
+				for _, at := range character.AttackTables {
+					at.MobTypeBonusStats[proto.MobType_MobTypeUndead] = at.MobTypeBonusStats[proto.MobType_MobTypeUndead].Add(bonus)
+					at.MobTypeBonusStats[proto.MobType_MobTypeDemon] = at.MobTypeBonusStats[proto.MobType_MobTypeDemon].Add(bonus)
+				}
+			}).
+			ApplyOnExpire(func(_ *core.Aura, _ *core.Simulation) {
+				for _, at := range character.AttackTables {
+					at.MobTypeBonusStats[proto.MobType_MobTypeUndead] = at.MobTypeBonusStats[proto.MobType_MobTypeUndead].Subtract(bonus)
+					at.MobTypeBonusStats[proto.MobType_MobTypeDemon] = at.MobTypeBonusStats[proto.MobType_MobTypeDemon].Subtract(bonus)
+				}
+			})
+		character.ItemSwap.RegisterProc(23207, aura)
 	})
 }

sim/druid/balance/TestBalance.results

@@ -94,6 +94,13 @@ dps_results: {
   tps: 1225.01389
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-Biznicks247x128Accurascope-2523"
+ value: {
+  dps: 1412.39069
+  tps: 1339.58641
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-BlackenedNaaruSliver-34427"
  value: {
@@ -585,13 +592,6 @@ dps_results: {
   tps: 1339.58641
  }
 }
-dps_results: {
- key: "TestBalance-AllItems-StabilizedEterniumScope-2523"
- value: {
-  dps: 1412.39069
-  tps: 1339.58641
- }
-}
 dps_results: {
  key: "TestBalance-AllItems-StaffofNaturalFury-31334"
  value: {

sim/druid/feralbear/TestFeralBear.results

@@ -349,6 +349,15 @@ dps_results: {
   hps: 71.35766
  }
 }
+dps_results: {
+ key: "TestFeralBear-AllItems-Biznicks247x128Accurascope-2523"
+ value: {
+  dps: 421.70348
+  tps: 650.89173
+  dtps: 1095.61128
+  hps: 74.14484
+ }
+}
 dps_results: {
  key: "TestFeralBear-AllItems-BlackenedNaaruSliver-34427"
  value: {
@@ -1510,15 +1519,6 @@ dps_results: {
   hps: 74.14484
  }
 }
-dps_results: {
- key: "TestFeralBear-AllItems-StabilizedEterniumScope-2523"
- value: {
-  dps: 421.70348
-  tps: 650.89173
-  dtps: 1095.61128
-  hps: 74.14484
- }
-}
 dps_results: {
  key: "TestFeralBear-AllItems-StaffofNaturalFury-31334"
  value: {