fix woodcarved moonstalker CD timer, update feral/enh APLs

wowsims · Aug 2, 2024 · 3854529 · 3854529
1 parent eb96523
commit 3854529
Show file tree

Hide file tree

Showing 6 changed files with 156 additions and 152 deletions.
diff --git a/sim/common/sod/item_effects/phase_4.go b/sim/common/sod/item_effects/phase_4.go
@@ -77,10 +77,12 @@ func init() {
 			return
 		}
 
+		duration := time.Second * 15
+
 		aura := character.RegisterAura(core.Aura{
 			ActionID: core.ActionID{ItemID: WoodcarvedMoonstalker},
 			Label:    "Woodcarved Moonstalker",
-			Duration: time.Second * 15,
+			Duration: duration,
 			OnGain: func(aura *core.Aura, sim *core.Simulation) {
 				character.AddStatDynamic(sim, stats.Strength, 60)
 			},
@@ -96,9 +98,13 @@ func init() {
 
 			Cast: core.CastConfig{
 				CD: core.Cooldown{
-					Timer:    character.GetOffensiveTrinketCD(),
+					Timer:    character.NewTimer(),
 					Duration: time.Second * 90,
 				},
+				SharedCD: core.Cooldown{
+					Timer:    character.GetOffensiveTrinketCD(),
+					Duration: duration,
+				},
 			},
 
 			ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {

diff --git a/sim/core/consumes.go b/sim/core/consumes.go
@@ -1009,7 +1009,7 @@ func makePotionActivation(potionType proto.Potions, character *Character, potion
 		// Mark as 'Encounter Only' so that users are forced to select the generic Potion
 		// placeholder action instead of specific potion spells, in APL prepull. This
 		// prevents a mismatch between Consumes and Rotation settings.
-		mcd.Spell.Flags |= SpellFlagEncounterOnly | SpellFlagPotion
+		mcd.Spell.Flags |= SpellFlagEncounterOnly | SpellFlagPotion | SpellFlagCastTimeNoGCD
 		oldApplyEffects := mcd.Spell.ApplyEffects
 		mcd.Spell.ApplyEffects = func(sim *Simulation, target *Unit, spell *Spell) {
 			oldApplyEffects(sim, target, spell)