Fixing up some things from review!

Author: BadJukeBox

sim/mage/frost/brain_freeze.go

@@ -43,22 +43,18 @@ func (frost *FrostMage) registerBrainFreeze() {
 		Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 			// https://github.com/simulationcraft/simc/blob/e1190fed141feec2ec7a489e80caec5138c3a6ab/engine/class_modules/sc_mage.cpp#L4169
 			if spell.Matches(mage.MageSpellLivingBombDot | mage.MageSpellLivingBombExplosion) {
-				var livingBombProcChance = 0.25
-				if sim.Proc(livingBombProcChance, "BrainFreezeProc") {
+				if sim.Proc(0.25, "BrainFreezeProc") {
 					buff.Activate(sim)
 				}
 			} else if spell.Matches(mage.MageSpellFrostBomb) {
-				var frostBombProcChance = 1.0
-				if sim.Proc(frostBombProcChance, "BrainFreezeProc") {
+				if sim.Proc(1.0, "BrainFreezeProc") {
 					buff.Activate(sim)
 				}
 			} else {
-				var netherTempestProcChance = 0.09
-				if sim.Proc(netherTempestProcChance, "BrainFreezeProc") {
+				if sim.Proc(0.09, "BrainFreezeProc") {
 					buff.Activate(sim)
 				}
 			}
-			buff.Activate(sim)
 		},
 	})
 

sim/mage/frost/icy_veins.go

@@ -0,0 +1,59 @@
+package frost
+
+import (
+	"time"
+
+	"github.com/wowsims/mop/sim/core"
+	"github.com/wowsims/mop/sim/core/proto"
+	"github.com/wowsims/mop/sim/mage"
+)
+
+func (frostMage *FrostMage) registerIcyVeinsCD() {
+	icyVeinsMod := frostMage.AddDynamicMod(core.SpellModConfig{
+		ClassMask:  mage.MageSpellsAll,
+		FloatValue: -0.2,
+		Kind:       core.SpellMod_CastTime_Pct,
+	})
+
+	actionID := core.ActionID{SpellID: 12472}
+	frostMage.icyVeinsAura = frostMage.RegisterAura(core.Aura{
+		Label:    "Icy Veins",
+		ActionID: actionID,
+		Duration: time.Second * 20,
+		OnGain: func(aura *core.Aura, sim *core.Simulation) {
+			if !frostMage.HasMajorGlyph(proto.MageMajorGlyph_GlyphOfIcyVeins) {
+				icyVeinsMod.Activate()
+			}
+		},
+		OnExpire: func(_ *core.Aura, sim *core.Simulation) {
+			if !frostMage.HasMajorGlyph(proto.MageMajorGlyph_GlyphOfIcyVeins) {
+				icyVeinsMod.Deactivate()
+			}
+		},
+	})
+
+	frostMage.IcyVeins = frostMage.RegisterSpell(core.SpellConfig{
+		ActionID:       actionID,
+		ClassSpellMask: mage.MageSpellIcyVeins,
+		Flags:          core.SpellFlagNoOnCastComplete,
+
+		Cast: core.CastConfig{
+			CD: core.Cooldown{
+				Timer:    frostMage.NewTimer(),
+				Duration: time.Minute * 3,
+			},
+			DefaultCast: core.Cast{
+				NonEmpty: true,
+			},
+		},
+
+		ApplyEffects: func(sim *core.Simulation, _ *core.Unit, spell *core.Spell) {
+			frostMage.icyVeinsAura.Activate(sim)
+		},
+	})
+
+	frostMage.AddMajorCooldown(core.MajorCooldown{
+		Spell: frostMage.IcyVeins,
+		Type:  core.CooldownTypeDPS,
+	})
+}

sim/mage/mage.go

@@ -262,16 +262,15 @@ func (mage *Mage) applyArmorSpells() {
 		},
 	})
 
-	var hasteToAdd = float64(stats.HasteRating) * 1.06
 	frostArmor := mage.RegisterAura(core.Aura{
 		ActionID: core.ActionID{SpellID: 7302},
 		Label:    "Frost Armor",
 		Duration: core.NeverExpires,
 		OnGain: func(aura *core.Aura, sim *core.Simulation) {
-			mage.AddStatDynamic(sim, stats.HasteRating, hasteToAdd) // NOTE: I know this isn't correct
+			mage.MultiplyCastSpeed(1.07)
 		},
 		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
-			mage.AddStatDynamic(sim, stats.HasteRating, -hasteToAdd)
+			mage.MultiplyCastSpeed(1 / 1.07)
 		},
 	})
 
@@ -351,6 +350,7 @@ const (
 	MageSpellCombustion
 	MageSpellCombustionApplication
 	MageSpellLast
+	MageSpellIcicle
 	MageSpellsAll        = MageSpellLast<<1 - 1
 	MageSpellLivingBomb  = MageSpellLivingBombDot | MageSpellLivingBombExplosion
 	MageSpellFireMastery = MageSpellLivingBombDot | MageSpellPyroblastDot | MageSpellCombustion // Ignite done manually in spell due to unique mechanic

sim/mage/talents_frost.go

@@ -1,8 +1,6 @@
 package mage
 
 import (
-	//"github.com/wowsims/mop/sim/core/proto"
-
 	"time"
 
 	"github.com/wowsims/mop/sim/core"
@@ -68,56 +66,6 @@ func (mage *Mage) ApplyFrostTalents() {
 
 }
 
-func (mage *Mage) registerIcyVeinsCD() {
-	if !mage.Spec.Frost {
-		return
-	}
-
-	icyVeinsMod := mage.AddDynamicMod(core.SpellModConfig{
-		ClassMask:  MageSpellsAll,
-		FloatValue: -0.2,
-		Kind:       core.SpellMod_CastTime_Pct,
-	})
-
-	actionID := core.ActionID{SpellID: 12472}
-	icyVeinsAura := mage.RegisterAura(core.Aura{
-		Label:    "Icy Veins",
-		ActionID: actionID,
-		Duration: time.Second * 20,
-		OnGain: func(aura *core.Aura, sim *core.Simulation) {
-			icyVeinsMod.Activate()
-		},
-		OnExpire: func(_ *core.Aura, sim *core.Simulation) {
-			icyVeinsMod.Deactivate()
-		},
-	})
-
-	mage.IcyVeins = mage.RegisterSpell(core.SpellConfig{
-		ActionID:       actionID,
-		ClassSpellMask: MageSpellIcyVeins,
-		Flags:          core.SpellFlagNoOnCastComplete,
-
-		Cast: core.CastConfig{
-			CD: core.Cooldown{
-				Timer:    mage.NewTimer(),
-				Duration: time.Second * 180,
-			},
-			DefaultCast: core.Cast{
-				NonEmpty: true,
-			},
-		},
-
-		ApplyEffects: func(sim *core.Simulation, _ *core.Unit, spell *core.Spell) {
-			icyVeinsAura.Activate(sim)
-		},
-	})
-
-	mage.AddMajorCooldown(core.MajorCooldown{
-		Spell: mage.IcyVeins,
-		Type:  core.CooldownTypeDPS,
-	})
-}
-
 func (mage *Mage) applyFingersOfFrost() {
 	if mage.Talents.FingersOfFrost == 0 {
 		return