update drw scaling and specials, add blood presets

wowsims · Jan 13, 2023 · c9ed0ad · c9ed0ad
1 parent 07ab4f6
commit c9ed0ad
Show file tree

Hide file tree

Showing 10 changed files with 371 additions and 255 deletions.
diff --git a/sim/deathknight/dancing_rune_weapon.go b/sim/deathknight/dancing_rune_weapon.go
@@ -65,12 +65,9 @@ func (dk *Deathknight) registerDancingRuneWeaponCD() {
 			dk.RuneWeapon.EnableWithTimeout(sim, dk.Gargoyle, duration)
 			dk.RuneWeapon.CancelGCDTimer(sim)
 
-			// Scale Damage Multipliers
+			// Auto attacks snapshot damage dealt multipliers at half
 			dk.RuneWeapon.PseudoStats.DamageDealtMultiplier = 0.5 * dk.PseudoStats.DamageDealtMultiplier
-
 			dk.RuneWeapon.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexPhysical] = dk.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexPhysical]
-			dk.RuneWeapon.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexShadow] = dk.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexShadow]
-			dk.RuneWeapon.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexFrost] = dk.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexFrost]
 
 			dancingRuneWeaponAura.Activate(sim)
 		},
@@ -124,7 +121,7 @@ func (dk *Deathknight) NewRuneWeapon() *RuneWeaponPet {
 	runeWeapon.OnPetDisable = runeWeapon.disable
 
 	runeWeapon.EnableAutoAttacks(runeWeapon, core.AutoAttackOptions{
-		MainHand:       dk.WeaponFromMainHand(2),
+		MainHand:       dk.WeaponFromMainHand(dk.DefaultMeleeCritMultiplier()),
 		AutoSwingMelee: true,
 	})
 
@@ -167,13 +164,12 @@ var runeWeaponBaseStats = stats.Stats{
 
 var runeWeaponStatInheritance = func(ownerStats stats.Stats) stats.Stats {
 	return stats.Stats{
-		stats.AttackPower:      ownerStats[stats.AttackPower],
-		stats.MeleeHaste:       ownerStats[stats.MeleeHaste],
-		stats.MeleeHit:         ownerStats[stats.MeleeHit],
-		stats.MeleeCrit:        ownerStats[stats.MeleeCrit],
-		stats.SpellHit:         ownerStats[stats.SpellHit],
-		stats.SpellCrit:        ownerStats[stats.SpellCrit],
-		stats.Expertise:        ownerStats[stats.Expertise],
-		stats.ArmorPenetration: ownerStats[stats.ArmorPenetration],
+		stats.AttackPower: ownerStats[stats.AttackPower],
+		stats.MeleeHaste:  ownerStats[stats.MeleeHaste],
+		stats.MeleeHit:    ownerStats[stats.MeleeHit],
+		stats.MeleeCrit:   ownerStats[stats.MeleeCrit],
+		stats.SpellHit:    ownerStats[stats.SpellHit],
+		stats.SpellCrit:   ownerStats[stats.SpellCrit],
+		stats.Expertise:   ownerStats[stats.Expertise],
 	}
 }
diff --git a/sim/deathknight/death_coil.go b/sim/deathknight/death_coil.go
@@ -59,9 +59,10 @@ func (dk *Deathknight) registerDrwDeathCoilSpell() {
 		ActionID:    DeathCoilActionID,
 		SpellSchool: core.SpellSchoolShadow,
 		ProcMask:    core.ProcMaskSpellDamage,
+		Flags:       core.SpellFlagIgnoreAttackerModifiers,
 
 		BonusCritRating: dk.darkrunedBattlegearCritBonus() * core.CritRatingPerCritChance,
-		DamageMultiplier: 1 *
+		DamageMultiplier: 0.5 *
 			(1.0 + float64(dk.Talents.Morbidity)*0.05) *
 			core.TernaryFloat64(dk.HasMajorGlyph(proto.DeathknightMajorGlyph_GlyphOfDarkDeath), 1.15, 1.0),
 		CritMultiplier:   dk.RuneWeapon.DefaultMeleeCritMultiplier(),

diff --git a/sim/deathknight/death_strike.go b/sim/deathknight/death_strike.go
@@ -114,11 +114,11 @@ func (dk *Deathknight) registerDrwDeathStrikeSpell() {
 		ActionID:    DeathStrikeActionID.WithTag(1),
 		SpellSchool: core.SpellSchoolPhysical,
 		ProcMask:    core.ProcMaskMeleeSpecial,
-		Flags:       core.SpellFlagMeleeMetrics | core.SpellFlagIncludeTargetBonusDamage,
+		Flags:       core.SpellFlagMeleeMetrics | core.SpellFlagIncludeTargetBonusDamage | core.SpellFlagIgnoreAttackerModifiers,
 
 		BonusCritRating:  (dk.annihilationCritBonus() + dk.improvedDeathStrikeCritBonus()) * core.CritRatingPerCritChance,
-		DamageMultiplier: .75 * dk.improvedDeathStrikeDamageBonus(),
-		CritMultiplier:   dk.RuneWeapon.DefaultMeleeCritMultiplier(),
+		DamageMultiplier: .5 * .75 * dk.improvedDeathStrikeDamageBonus(),
+		CritMultiplier:   dk.bonusCritMultiplier(dk.Talents.MightOfMograine),
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {

diff --git a/sim/deathknight/diseases.go b/sim/deathknight/diseases.go
@@ -209,9 +209,9 @@ func (dk *Deathknight) registerDrwFrostFever() {
 		ActionID:    actionID,
 		SpellSchool: core.SpellSchoolFrost,
 		ProcMask:    core.ProcMaskSpellDamage,
-		Flags:       core.SpellFlagDisease,
+		Flags:       core.SpellFlagDisease | core.SpellFlagIgnoreAttackerModifiers,
 
-		DamageMultiplier: core.TernaryFloat64(dk.HasMajorGlyph(proto.DeathknightMajorGlyph_GlyphOfIcyTouch), 1.2, 1.0),
+		DamageMultiplier: 0.5 * core.TernaryFloat64(dk.HasMajorGlyph(proto.DeathknightMajorGlyph_GlyphOfIcyTouch), 1.2, 1.0),
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, unit *core.Unit, spell *core.Spell) {
@@ -255,11 +255,10 @@ func (dk *Deathknight) registerDrwBloodPlague() {
 		ActionID:    actionID,
 		SpellSchool: core.SpellSchoolShadow,
 		ProcMask:    core.ProcMaskSpellDamage,
-		Flags:       core.SpellFlagDisease,
+		Flags:       core.SpellFlagDisease | core.SpellFlagIgnoreAttackerModifiers,
 
-		DamageMultiplier: 1,
-		// TODO: Shouldn't this be dk.RuneWeapon?
-		CritMultiplier:   dk.DefaultMeleeCritMultiplier(),
+		DamageMultiplier: 0.5,
+		CritMultiplier:   dk.RuneWeapon.DefaultMeleeCritMultiplier(),
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, unit *core.Unit, spell *core.Spell) {