Merge pull request #1192 from hillerstorm/ret_apl_tweaks

wowsims · Nov 11, 2024 · 4c3f888 · 4c3f888
2 parents e62daf1 + f4c4b51
commit 4c3f888
Show file tree

Hide file tree

Showing 7 changed files with 621 additions and 135 deletions.
diff --git a/sim/common/cata/other_effects.go b/sim/common/cata/other_effects.go
@@ -561,6 +561,12 @@ func init() {
 				5,
 				buffDuration)
 
+			buffAura := character.RegisterAura(core.Aura{
+				Label:    "Apparatus of Khaz'goroth" + labelSuffix,
+				ActionID: core.ActionID{ItemID: apparatusItemID},
+				Duration: buffDuration,
+			})
+
 			titanicPower := character.RegisterAura(core.Aura{
 				Label:     "Titanic Power" + labelSuffix,
 				ActionID:  core.ActionID{SpellID: 96923},
@@ -582,7 +588,7 @@ func init() {
 			}
 
 			core.MakePermanent(core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
-				Name:       "Titanic Power Aura" + labelSuffix,
+				Name:       "Titanic Power Trigger" + labelSuffix,
 				ActionID:   core.ActionID{SpellID: 96924},
 				Callback:   core.CallbackOnSpellHitDealt,
 				ProcMask:   core.ProcMaskMelee,
@@ -640,6 +646,7 @@ func init() {
 						panic("unexpected statType")
 					}
 
+					buffAura.Activate(sim)
 					titanicPower.Deactivate(sim)
 				},
 				ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {

diff --git a/sim/paladin/glyphs.go b/sim/paladin/glyphs.go
@@ -88,7 +88,7 @@ func registerGlyphOfExorcism(paladin *Paladin) {
 		core.CalcScalingSpellAverageEffect(proto.Class_ClassPaladin, 2.663)
 
 	// Used for checking "Is Aura Known" in the APL
-	glyphOfExorcismAura := paladin.GetOrRegisterAura(core.Aura{
+	paladin.GetOrRegisterAura(core.Aura{
 		ActionID: core.ActionID{SpellID: 54934},
 		Label:    "Glyph of Exorcism (DoT)" + paladin.Label,
 	})
@@ -105,7 +105,6 @@ func registerGlyphOfExorcism(paladin *Paladin) {
 		ThreatMultiplier: 1,
 
 		Dot: core.DotConfig{
-			Aura:                *glyphOfExorcismAura,
 			NumberOfTicks:       3,
 			AffectedByCastSpeed: false,
 			TickLength:          2 * time.Second,

diff --git a/sim/paladin/items.go b/sim/paladin/items.go
@@ -23,6 +23,13 @@ var ItemSetReinforcedSapphiriumBattleplate = core.NewItemSet(core.ItemSet{
 		},
 		4: func(agent core.Agent) {
 			// Handled in inquisition.go
+
+			paladin := agent.(PaladinAgent).GetPaladin()
+			// Used for APL aura check
+			core.MakePermanent(paladin.RegisterAura(core.Aura{
+				Label:    "Reinforced Sapphirium Battleplate - T11 4pc",
+				ActionID: core.ActionID{SpellID: 90299},
+			}))
 		},
 	},
 })
@@ -53,6 +60,13 @@ var ItemSetBattleplateOfImmolation = core.NewItemSet(core.ItemSet{
 		},
 		4: func(agent core.Agent) {
 			// Handled in talents_retribution.go
+
+			paladin := agent.(PaladinAgent).GetPaladin()
+			// Used for APL aura check
+			core.MakePermanent(paladin.RegisterAura(core.Aura{
+				Label:    "Battleplate of Immolation - T12 4pc",
+				ActionID: core.ActionID{SpellID: 99116},
+			}))
 		},
 	},
 })