Merge branch 'master' of https://github.com/wowsims/sod

wowsims · Jun 30, 2024 · 660e2b5 · 660e2b5
2 parents 5ae1113 + 6b9bdb6
commit 660e2b5
Show file tree

Hide file tree

Showing 56 changed files with 1,526 additions and 1,578 deletions.
diff --git a/proto/common.proto b/proto/common.proto
@@ -469,6 +469,10 @@ enum WeaponImbue {
 	SolidWeightstone = 18;
 	DenseWeightstone = 19;
 
+	// Spell Oils
+	ShadowOil = 21;
+	FrostOil = 22;
+
 	// Windfury Imbues
 	WildStrikes = 7;
 	Windfury = 8;
@@ -479,10 +483,6 @@ enum WeaponImbue {
 	FrostbrandWeapon = 11;
 	WindfuryWeapon = 12;
 
-	// Spell Oils
-	ShadowOil = 21;
-	FrostOil = 22;
-
 	// Rogue imbues
 	InstantPoison = 23;
 	DeadlyPoison = 24;

diff --git a/sim/core/debuffs.go b/sim/core/debuffs.go
@@ -87,7 +87,7 @@ func applyDebuffEffects(target *Unit, targetIdx int, debuffs *proto.Debuffs, rai
 	}
 
 	if debuffs.MarkOfChaos {
-		MakePermanent(MarkOfChaosDebuffAura(target, level))
+		MakePermanent(MarkOfChaosDebuffAura(target))
 	} else {
 		if debuffs.CurseOfElements {
 			MakePermanent(CurseOfElementsAura(target, level))
@@ -582,14 +582,14 @@ func MekkatorqueFistDebuffAura(target *Unit, playerLevel int32) *Aura {
 }
 
 // Mark of Chaos does not stack with Curse of Shadows and Elements
-func MarkOfChaosDebuffAura(target *Unit, level int32) *Aura {
+func MarkOfChaosDebuffAura(target *Unit) *Aura {
 	dmgMod := 1.11
 	resistance := 75.0
 
 	aura := target.GetOrRegisterAura(Aura{
 		Label:    "Mark of Chaos",
 		ActionID: ActionID{SpellID: 461615},
-		Duration: time.Second * 60,
+		Duration: NeverExpires, // Duration is set by the applying curse
 	})
 
 	// 0.01 priority as this overwrites the other spells of this category and does not allow them to be recast

diff --git a/sim/core/spell_result.go b/sim/core/spell_result.go
@@ -579,5 +579,6 @@ func (spell *Spell) applyTargetHealingModifiers(damage float64, attackTable *Att
 	}
 
 	return damage *
-		attackTable.Defender.PseudoStats.HealingTakenMultiplier
+		attackTable.Defender.PseudoStats.HealingTakenMultiplier *
+		attackTable.HealingDealtMultiplier
 }
diff --git a/sim/core/target.go b/sim/core/target.go
@@ -265,8 +265,9 @@ type AttackTable struct {
 	//  Explicitly for hunters' "Monster Slaying" and "Humanoid Slaying", but likewise for rogues' "Murder", or trolls' "Beastslaying".
 	CritMultiplier float64
 
-	DamageDealtMultiplier float64 // attacker buff, applied in applyAttackerModifiers()
-	DamageTakenMultiplier float64 // defender debuff, applied in applyTargetModifiers()
+	DamageDealtMultiplier  float64 // attacker buff, applied in applyAttackerModifiers()
+	DamageTakenMultiplier  float64 // defender debuff, applied in applyTargetModifiers()
+	HealingDealtMultiplier float64
 
 	// This is for "Apply Aura: Mod Damage Done By Caster" effects.
 	// If set, the damage taken multiplier is multiplied by the callbacks result.
@@ -282,8 +283,9 @@ func NewAttackTable(attacker *Unit, defender *Unit, weapon *Item) *AttackTable {
 
 		CritMultiplier: 1,
 
-		DamageDealtMultiplier: 1,
-		DamageTakenMultiplier: 1,
+		DamageDealtMultiplier:  1,
+		DamageTakenMultiplier:  1,
+		HealingDealtMultiplier: 1,
 	}
 
 	if defender.Type == EnemyUnit {