Merge branch 'master' into feature/aoe-cap-multiplier-flag

Author: 1337LutZ

sim/core/TestProtoVersioning.results

@@ -0,0 +1 @@
+saved_version_number: 1

sim/monk/brewmaster/keg_smash.go

@@ -10,6 +10,7 @@ import (
 func (bm *BrewmasterMonk) registerKegSmash() {
 	actionID := core.ActionID{SpellID: 121253}
 	chiMetrics := bm.NewChiMetrics(actionID)
+	results := make([]*core.SpellResult, bm.Env.GetNumTargets())
 
 	bm.RegisterSpell(core.SpellConfig{
 		ActionID:       actionID,
@@ -45,12 +46,11 @@ func (bm *BrewmasterMonk) registerKegSmash() {
 		},
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			var results []*core.SpellResult
 			missedTargets := 0
-			for _, enemyTarget := range sim.Encounter.TargetUnits {
+			for i, enemyTarget := range sim.Encounter.TargetUnits {
 				baseDamage := bm.CalculateMonkStrikeDamage(sim, spell)
 				result := spell.CalcDamage(sim, enemyTarget, baseDamage, spell.OutcomeMeleeSpecialHitAndCrit)
-				results = append(results, result)
+				results[i] = result
 				if !result.Landed() {
 					missedTargets++
 				}

sim/monk/ww_fists_of_fury.go

@@ -20,6 +20,7 @@ var fofDebuffActionID = core.ActionID{SpellID: 117418}
 
 func fistsOfFuryTickSpellConfig(monk *Monk, pet *StormEarthAndFirePet) core.SpellConfig {
 	numTargets := monk.Env.GetNumTargets()
+	results := make([]*core.SpellResult, numTargets)
 
 	config := core.SpellConfig{
 		ActionID:       fofDebuffActionID,
@@ -33,20 +34,18 @@ func fistsOfFuryTickSpellConfig(monk *Monk, pet *StormEarthAndFirePet) core.Spel
 		ThreatMultiplier: 1,
 		CritMultiplier:   monk.DefaultCritMultiplier(),
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			results := make([]*core.SpellResult, numTargets)
 			baseDamage := monk.CalculateMonkStrikeDamage(sim, spell)
 
 			// Damage is split between all mobs, each hit rolls for hit/crit separately
 			baseDamage /= float64(numTargets)
 
-			for idx := int32(0); idx < numTargets; idx++ {
-				currentTarget := sim.Environment.GetTargetUnit(idx)
-				result := spell.CalcDamage(sim, currentTarget, baseDamage, spell.OutcomeMeleeSpecialHitAndCrit)
-				results[idx] = result
+			for i, enemyTarget := range sim.Encounter.TargetUnits {
+				result := spell.CalcDamage(sim, enemyTarget, baseDamage, spell.OutcomeMeleeSpecialHitAndCrit)
+				results[i] = result
 			}
 
-			for idx := int32(0); idx < numTargets; idx++ {
-				spell.DealDamage(sim, results[idx])
+			for _, result := range results {
+				spell.DealDamage(sim, result)
 			}
 		},
 	}