Merge pull request #3082 from wowsims/drw_ptr

update ptr drw
wowsims · May 12, 2023 · aaf0fcb · aaf0fcb
2 parents 16a4fd6 + 85a385b
commit aaf0fcb
Show file tree

Hide file tree

Showing 7 changed files with 161 additions and 151 deletions.
diff --git a/sim/deathknight/blood_strike.go b/sim/deathknight/blood_strike.go
@@ -106,10 +106,7 @@ func (dk *Deathknight) registerDrwBloodStrikeSpell() {
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			baseDamage := 764 +
-				bonusBaseDamage +
-				spell.Unit.MHNormalizedWeaponDamage(sim, spell.MeleeAttackPower()) +
-				spell.BonusWeaponDamage()
+			baseDamage := 764 + bonusBaseDamage + dk.DrwWeaponDamage(sim, spell)
 
 			baseDamage *= dk.RoRTSBonus(target) *
 				(1.0 + dk.drwCountActiveDiseases(target)*diseaseMulti)

diff --git a/sim/deathknight/dancing_rune_weapon.go b/sim/deathknight/dancing_rune_weapon.go
@@ -109,6 +109,16 @@ func (runeWeapon *RuneWeaponPet) Initialize() {
 	runeWeapon.dkOwner.registerDrwDeathCoilSpell()
 }
 
+func (dk *Deathknight) DrwWeaponDamage(sim *core.Simulation, spell *core.Spell) float64 {
+	if dk.Inputs.NewDrw {
+		return spell.Unit.MHWeaponDamage(sim, spell.MeleeAttackPower()) +
+			spell.BonusWeaponDamage()
+	} else {
+		return spell.Unit.MHNormalizedWeaponDamage(sim, spell.MeleeAttackPower()) +
+			spell.BonusWeaponDamage()
+	}
+}
+
 func (dk *Deathknight) NewRuneWeapon() *RuneWeaponPet {
 	// Remove any hit that would be given by NocS as it does not translate to pets
 	nocsHit := 0.0

diff --git a/sim/deathknight/death_strike.go b/sim/deathknight/death_strike.go
@@ -97,6 +97,7 @@ func (dk *Deathknight) registerDeathStrikeSpell() {
 
 func (dk *Deathknight) registerDrwDeathStrikeSpell() {
 	bonusBaseDamage := dk.sigilOfAwarenessBonus()
+	hasGlyph := dk.HasMajorGlyph(proto.DeathknightMajorGlyph_GlyphOfDeathStrike)
 
 	dk.RuneWeapon.DeathStrike = dk.RuneWeapon.RegisterSpell(core.SpellConfig{
 		ActionID:    DeathStrikeActionID.WithTag(1),
@@ -110,11 +111,11 @@ func (dk *Deathknight) registerDrwDeathStrikeSpell() {
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			baseDamage := 297 +
-				bonusBaseDamage +
-				spell.Unit.MHNormalizedWeaponDamage(sim, spell.MeleeAttackPower()) +
-				spell.BonusWeaponDamage()
+			baseDamage := 297 + bonusBaseDamage + dk.DrwWeaponDamage(sim, spell)
 
+			if hasGlyph {
+				baseDamage *= 1 + 0.01*core.MinFloat(dk.CurrentRunicPower(), 25)
+			}
 			spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMeleeWeaponSpecialHitAndCrit)
 		},
 	})