Merge branch 'feature/warlock' of https://github.com/wowsims/mop into feature/warlock

Author: 1337LutZ

sim/core/aura_helpers.go

@@ -476,6 +476,22 @@ func (parentAura *Aura) AttachAdditivePseudoStatBuff(fieldPointer *float64, bonu
 	return parentAura
 }
 
+func (parentAura *Aura) AttachMultiplyCastSpeed(multiplier float64) *Aura {
+	parentAura.ApplyOnGain(func(_ *Aura, _ *Simulation) {
+		parentAura.Unit.MultiplyCastSpeed(multiplier)
+	})
+
+	parentAura.ApplyOnExpire(func(_ *Aura, _ *Simulation) {
+		parentAura.Unit.MultiplyCastSpeed(1 / multiplier)
+	})
+
+	if parentAura.IsActive() {
+		parentAura.Unit.MultiplyCastSpeed(multiplier)
+	}
+
+	return parentAura
+}
+
 type ShieldStrengthCalculator func(unit *Unit) float64
 
 type DamageAbsorptionAura struct {

sim/core/buffs.go

@@ -203,6 +203,7 @@ func applyBuffEffects(agent Agent, raidBuffs *proto.RaidBuffs, _ *proto.PartyBuf
 		if raidBuffs.Heroism {
 			registerBloodlustCD(agent, 32182)
 		}
+
 		if raidBuffs.TimeWarp {
 			registerBloodlustCD(agent, 80353)
 		}

sim/core/dot.go

@@ -47,6 +47,7 @@ type Dot struct {
 
 	BaseTickCount  int32 // base tick count without haste applied
 	remainingTicks int32
+	tmpExtraTicks  int32 // extra ticks that are added during the runtime of the dot
 
 	BonusCoefficient float64 // EffectBonusCoefficient in SpellEffect client DB table, "SP mod" on Wowhead (not necessarily shown there even if > 0)
 
@@ -97,6 +98,7 @@ func (dot *Dot) recomputeAuraDuration(sim *Simulation) {
 	nextTick := dot.TimeUntilNextTick(sim)
 
 	dot.remainingTicks = dot.BaseTickCount
+	dot.tmpExtraTicks = 0
 	if dot.affectedByCastSpeed {
 		// round the tickPeriod to the nearest full ms, same as ingame. This can best be seen ingame in how haste caps
 		// work. For example shadowflame should take 1009 haste rating with the 5%/3% haste buffs without rounding, but
@@ -159,7 +161,7 @@ func (dot *Dot) RemainingTicks() int32 {
 }
 
 func (dot *Dot) TickCount() int32 {
-	return dot.HastedTickCount() - dot.remainingTicks
+	return dot.HastedTickCount() + dot.tmpExtraTicks - dot.remainingTicks
 }
 
 func (dot *Dot) OutstandingDmg() float64 {
@@ -170,6 +172,17 @@ func (dot *Dot) BaseDuration() time.Duration {
 	return time.Duration(dot.BaseTickCount) * dot.BaseTickLength
 }
 
+// Adds a tick to the current active dot and extends it's duration
+func (dot *Dot) AddTick() {
+	if !dot.active {
+		return
+	}
+
+	dot.tmpExtraTicks++
+	dot.remainingTicks++
+	dot.UpdateExpires(dot.expires + dot.TickPeriod())
+}
+
 // Copy's the original DoT's period and duration to the current DoT.
 // This is only currently used for Mage's Impact DoT spreading and Enhancement's ImprovedLava Lash.
 func (dot *Dot) CopyDotAndApply(sim *Simulation, originaldot *Dot) {
@@ -178,6 +191,7 @@ func (dot *Dot) CopyDotAndApply(sim *Simulation, originaldot *Dot) {
 
 	dot.tickPeriod = originaldot.tickPeriod
 	dot.remainingTicks = originaldot.remainingTicks
+	dot.tmpExtraTicks = 0
 
 	// must be set before Activate
 	dot.Duration = originaldot.ExpiresAt() - sim.CurrentTime // originaldot.Duration

sim/core/mana.go

@@ -161,7 +161,7 @@ func (unit *Unit) ManaRegenPerSecondWhileCombat() float64 {
 	regenRate := unit.MP5ManaRegenPerSecond()
 
 	if unit.manaBar.hasteEffectsRegen {
-		regenRate *= (1 + unit.stats[stats.HasteRating]/HasteRatingPerHastePercent/100)
+		regenRate *= unit.TotalSpellHasteMultiplier()
 	}
 
 	spiritRegenRate := 0.0

sim/core/pet.go

@@ -32,6 +32,7 @@ type PetConfig struct {
 	IsGuardian                      bool
 	HasDynamicMeleeSpeedInheritance bool
 	HasDynamicCastSpeedInheritance  bool
+	HasResourceRegenInheritance     bool
 }
 
 // Pet is an extension of Character, for any entity created by a player that can
@@ -62,6 +63,8 @@ type Pet struct {
 	hasDynamicMeleeSpeedInheritance bool
 	// If true the pet will automatically inherit the owner's cast speed
 	hasDynamicCastSpeedInheritance bool
+	// If true the pet will automatically inherit the owner's regen speed multiplier
+	hasResourceRegenInheritance bool
 
 	isReset bool
 
@@ -102,6 +105,7 @@ func NewPet(config PetConfig) Pet {
 		statInheritance:                 config.StatInheritance,
 		hasDynamicMeleeSpeedInheritance: config.HasDynamicMeleeSpeedInheritance,
 		hasDynamicCastSpeedInheritance:  config.HasDynamicCastSpeedInheritance,
+		hasResourceRegenInheritance:     config.HasResourceRegenInheritance,
 		enabledOnStart:                  config.EnabledOnStart,
 		isGuardian:                      config.IsGuardian,
 	}
@@ -112,10 +116,15 @@ func NewPet(config PetConfig) Pet {
 	pet.AddStats(config.BaseStats)
 	pet.addUniversalStatDependencies()
 	pet.PseudoStats.InFrontOfTarget = config.Owner.PseudoStats.InFrontOfTarget
-
 	return pet
 }
 
+func (pet *Pet) Initialize() {
+	if pet.hasResourceRegenInheritance {
+		pet.enableResourceRegenInheritance()
+	}
+}
+
 // Updates the stats for this pet in response to a stat change on the owner.
 // addedStats is the amount of stats added to the owner (will be negative if the
 // owner lost stats).
@@ -302,6 +311,12 @@ func (pet *Pet) enableDynamicCastSpeed(inheritance PetMeleeSpeedInheritance) {
 	pet.dynamicCastSpeedInheritance = inheritance
 }
 
+func (pet *Pet) enableResourceRegenInheritance() {
+	if !slices.Contains(pet.Owner.RegenInheritancePets, pet) {
+		pet.Owner.RegenInheritancePets = append(pet.Owner.RegenInheritancePets, pet)
+	}
+}
+
 // Some pets, i.E. Shadowfiend only inherit their owners stat after a brief period of time
 // Causing initial attacks and abilities to not be scaled
 func (pet *Pet) DelayInitialInheritance(time time.Duration) {

sim/core/unit.go

@@ -131,6 +131,7 @@ type Unit struct {
 	DynamicStatsPets      []*Pet
 	DynamicMeleeSpeedPets []*Pet
 	DynamicCastSpeedPets  []*Pet
+	RegenInheritancePets  []*Pet
 
 	// AutoAttacks is the manager for auto attack swings.
 	// Must be enabled to use, with "EnableAutoAttacks()".
@@ -489,6 +490,10 @@ func (unit *Unit) MultiplyResourceRegenSpeed(sim *Simulation, amount float64) {
 	} else if unit.HasEnergyBar() {
 		unit.MultiplyEnergyRegenSpeed(sim, amount)
 	}
+
+	for _, pet := range unit.RegenInheritancePets {
+		pet.MultiplyResourceRegenSpeed(sim, amount)
+	}
 }
 
 func (unit *Unit) AddBonusRangedHitPercent(percentage float64) {

sim/priest/_glyphs.go

@@ -619,73 +619,6 @@ func (priest *Priest) applySinAndPunishment() {
 	})
 }
 
-func (priest *Priest) applyShadowyApparition() {
-	if priest.Talents.ShadowyApparition == 0 {
-		return
-	}
-
-	const spellScaling = 0.515
-	const levelScaling = 0.514
-
-	spell := priest.RegisterSpell(core.SpellConfig{
-		ActionID:                 core.ActionID{SpellID: 87532},
-		MissileSpeed:             3.5,
-		ProcMask:                 core.ProcMaskEmpty, // summoned guardian, should not be able to proc stuff - verify
-		ClassSpellMask:           PriestSpellShadowyApparation,
-		Flags:                    core.SpellFlagPassiveSpell,
-		DamageMultiplier:         1,
-		DamageMultiplierAdditive: 1,
-		CritMultiplier:           priest.DefaultCritMultiplier(),
-		SpellSchool:              core.SpellSchoolShadow,
-
-		BonusCoefficient: spellScaling,
-
-		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			baseDamage := priest.ClassSpellScaling * levelScaling
-
-			// snapshot values on spawn
-			dmgMulti := spell.DamageMultiplier
-			dmgMultiAdd := spell.DamageMultiplierAdditive
-
-			spell.WaitTravelTime(sim, func(sim *core.Simulation) {
-
-				oldMulti := spell.DamageMultiplier
-				oldAdd := spell.DamageMultiplierAdditive
-
-				// calculate dmg on hit, as the apparations profit from the debuffs on the target
-				// when they reach them
-				// spell and other modifiers are snapshotted when the apparations spawn
-				spell.DamageMultiplier = dmgMulti
-				spell.DamageMultiplierAdditive = dmgMultiAdd
-
-				result := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeMagicHitAndCrit)
-				spell.DealDamage(sim, result)
-
-				// restore mods
-				spell.DamageMultiplier = oldMulti
-				spell.DamageMultiplierAdditive = oldAdd
-			})
-		},
-	})
-
-	core.MakeProcTriggerAura(&priest.Unit, core.ProcTrigger{
-		Name:           "Shadowy Apparition Aura",
-		Callback:       core.CallbackOnPeriodicDamageDealt,
-		Outcome:        core.OutcomeLanded,
-		ClassSpellMask: PriestSpellShadowWordPain,
-		Handler: func(sim *core.Simulation, _ *core.Spell, result *core.SpellResult) {
-			procChance := 0.04 * float64(priest.Talents.ShadowyApparition)
-			if priest.Moving {
-				procChance *= 5
-			}
-
-			if sim.Proc(procChance, "Shadowy Apparition Aura") {
-				spell.Cast(sim, result.Target)
-			}
-		},
-	})
-}
-
 // func (priest *Priest) applyDivineAegis() {
 // 	if priest.Talents.DivineAegis == 0 {
 // 		return

sim/priest/_power_infusion.go

@@ -0,0 +1,19 @@
+package priest
+
+import (
+	"github.com/wowsims/mop/sim/core"
+	"github.com/wowsims/mop/sim/core/proto"
+)
+
+func (priest *Priest) ApplyGlyphs() {
+	// Glyph of Dispersion
+	// Glyph of Mindspike
+	// Glyph of Shadow Word Death
+	if priest.HasMinorGlyph(proto.PriestMinorGlyph_GlyphOfTheSha) {
+		priest.AddStaticMod(core.SpellModConfig{
+			Kind:      core.SpellMod_GlobalCooldown_Flat,
+			TimeValue: -core.GCDDefault,
+			ClassMask: PriestSpellMindBender | PriestSpellShadowFiend,
+		})
+	}
+}