Frost Mage Spec Fixes for MOP

sim/mage/_talents_frost.go

@@ -89,9 +89,6 @@ func (mage *Mage) registerIcyVeinsCD() {
 		},
 		OnExpire: func(_ *core.Aura, sim *core.Simulation) {
 			icyVeinsMod.Deactivate()
-			if mage.t13ProcAura != nil {
-				mage.t13ProcAura.Deactivate(sim)
-			}
 		},
 	})
 
@@ -107,22 +104,17 @@ func (mage *Mage) registerIcyVeinsCD() {
 		Cast: core.CastConfig{
 			CD: core.Cooldown{
 				Timer:    mage.NewTimer(),
-				Duration: time.Second * time.Duration(180*[]float64{1, .93, .86, .80}[mage.Talents.IceFloes]),
+				Duration: time.Second * 180,
 			},
 			DefaultCast: core.Cast{
 				NonEmpty: true,
 			},
 		},
 
-		ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
-			// Need to check for icy veins already active in case Cold Snap is used right after.
-			return !icyVeinsAura.IsActive() && !mage.frostfireOrb.IsEnabled()
-		},
-
 		ApplyEffects: func(sim *core.Simulation, _ *core.Unit, spell *core.Spell) {
 			icyVeinsAura.Activate(sim)
-			if mage.T13_4pc.IsActive() {
-				spell.CD.Reduce(time.Second * time.Duration(15*mage.t13ProcAura.GetStacks()))
+			if mage.T14_4pc.IsActive() {
+				spell.CD.Reduce(time.second * 90)
 			}
 		},
 	})

sim/mage/frost/brain_freeze.go

@@ -0,0 +1,58 @@
+package frost
+
+import (
+	"time"
+
+	"github.com/wowsims/mop/sim/core"
+	"github.com/wowsims/mop/sim/core/stats"
+	"github.com/wowsims/mop/sim/mage"
+)
+
+func (frost *FrostMage) registerBrainFreeze() {
+	/*
+		https://www.wowhead.com/mop-classic/spell=44549/brain-freeze and https://www.wowhead.com/mop-classic/spell=44614/frostfire-bolt for more information.
+	*/
+	buff := frost.RegisterAura(core.Aura{
+		Label:     "Brain Freeze",
+		ActionID:  core.ActionID{SpellID: 44549},
+		Duration:  time.Second * 15,
+		MaxStacks: 1,
+	}).AttachSpellMod(core.SpellModConfig{
+		Kind:       core.SpellMod_PowerCost_Pct,
+		FloatValue: -1,
+		ClassMask:  mage.MageSpellFrostfireBolt,
+	}).AttachSpellMod(core.SpellModConfig{
+		Kind:       core.SpellMod_CastTime_Pct,
+		FloatValue: -1,
+		ClassMask:  mage.MageSpellFrostfireBolt,
+	})
+
+	/*
+		Shatter doubles the crit chance of spells against frozen targets and then adds an additional 50%, hence critChance * 2 + 50
+		https://www.wowhead.com/mop-classic/spell=12982/shatter for more information.
+	*/
+	critMod := frost.AddDynamicMod(core.SpellModConfig{
+		ClassMask:  mage.MageSpellFrostfireBolt,
+		FloatValue: frost.GetStat(stats.SpellCritPercent)*2 + 50,
+		Kind:       core.SpellMod_BonusCrit_Percent,
+	})
+
+	buff.OnStacksChange = func(aura *core.Aura, sim *core.Simulation, oldStacks, newStacks int32) {
+		critMod.Activate()
+	}
+
+	buff.ApplyOnExpire(func(aura *core.Aura, sim *core.Simulation) {
+		critMod.Deactivate()
+	})
+
+	core.MakeProcTriggerAura(&frost.Unit, core.ProcTrigger{
+		Name:           "Brain Freeze - Trigger",
+		ClassSpellMask: mage.MageSpellFrostfireBolt,
+		Callback:       core.CallbackOnCastComplete,
+		Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+			buff.Activate(sim)
+			buff.AddStack(sim)
+		},
+	})
+
+}

sim/mage/frost/fingers_of_frost.go

@@ -0,0 +1,60 @@
+package frost
+
+import (
+	"time"
+
+	"github.com/wowsims/mop/sim/core"
+	"github.com/wowsims/mop/sim/core/stats"
+	"github.com/wowsims/mop/sim/mage"
+)
+
+func (frost *FrostMage) registerFingersOfFrost() {
+	/*
+		Ice Lance does 4x Damage against Frozen enemies, FoF adds a bonus 25%.
+		This effect affects Deep Freeze as well but does no damage so it's been ommitted. \
+		https://www.wowhead.com/mop-classic/spell=30455/ice-lance and https://www.wowhead.com/mop-classic/spell=112965/fingers-of-frost for more information.
+	*/
+	buff := frost.RegisterAura(core.Aura{
+		Label:     "Fingers of Frost",
+		ActionID:  core.ActionID{SpellID: 112965},
+		Duration:  time.Second * 15,
+		MaxStacks: 2,
+	}).AttachSpellMod(core.SpellModConfig{
+		Kind:       core.SpellMod_DamageDone_Pct,
+		FloatValue: 4.0,
+		ClassMask:  mage.MageSpellIceLance,
+	}).AttachSpellMod(core.SpellModConfig{
+		Kind:       core.SpellMod_DamageDone_Pct,
+		FloatValue: 0.25,
+		ClassMask:  mage.MageSpellIceLance,
+	})
+
+	/*
+		Shatter doubles the crit chance of spells against frozen targets and then adds an additional 50%, hence critChance * 2 + 50
+		https://www.wowhead.com/mop-classic/spell=12982/shatter for more information.
+	*/
+	critMod := frost.AddDynamicMod(core.SpellModConfig{
+		ClassMask:  mage.MageSpellIceLance,
+		FloatValue: frost.GetStat(stats.SpellCritPercent)*2 + 50,
+		Kind:       core.SpellMod_BonusCrit_Percent,
+	})
+
+	buff.OnStacksChange = func(aura *core.Aura, sim *core.Simulation, oldStacks, newStacks int32) {
+		critMod.Activate()
+	}
+
+	buff.ApplyOnExpire(func(aura *core.Aura, sim *core.Simulation) {
+		critMod.Deactivate()
+	})
+
+	core.MakeProcTriggerAura(&frost.Unit, core.ProcTrigger{
+		Name:           "Fingers of Frost - Trigger",
+		ClassSpellMask: mage.MageSpellIceLance,
+		Callback:       core.CallbackOnCastComplete,
+		Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+			buff.Activate(sim)
+			buff.AddStack(sim)
+		},
+	})
+
+}

sim/mage/frost/frost.go

@@ -52,6 +52,8 @@ func (frostMage *FrostMage) Initialize() {
 	frostMage.Mage.Initialize()
 
 	frostMage.registerSummonWaterElementalSpell()
+	frostMage.registerFingersOfFrost()
+	frostMage.registerBrainFreeze()
 }
 
 func (frostMage *FrostMage) ApplyTalents() {
@@ -78,8 +80,14 @@ func (frostMage *FrostMage) ApplyTalents() {
 
 	// Frost Mastery Bonus
 
+	/*
+		Mastery needs to be redone in general
+			Need to implement Icicles
+			Need to Change Damage Amp to be for Water Ele Waterbolt
+			https://www.wowhead.com/mop-classic/spell=76613/mastery-icicles
+	*/
 	frostMasteryMod := frostMage.Mage.AddDynamicMod(core.SpellModConfig{
-		ClassMask:  mage.MageSpellIceLance | mage.MageSpellDeepFreeze,
+		ClassMask:  mage.MageSpellIceLance, //TODO: I need to learn more about ClassMask so that I can place in the water elemental Water Bolt spell here.
 		FloatValue: frostMage.GetMasteryBonus(),
 		Kind:       core.SpellMod_DamageDone_Pct,
 	})

sim/mage/frost/water_elemental.go

@@ -16,15 +16,16 @@ func (Mage *FrostMage) registerSummonWaterElementalSpell() {
 		Flags:    core.SpellFlagAPL,
 
 		ManaCost: core.ManaCostOptions{
-			BaseCostPercent: 16,
+			BaseCostPercent: 3,
 		},
 		Cast: core.CastConfig{
 			DefaultCast: core.Cast{
-				GCD: core.GCDDefault,
+				GCD:      core.GCDDefault,
+				CastTime: 1500 * time.Millisecond,
 			},
 			CD: core.Cooldown{
 				Timer:    Mage.NewTimer(),
-				Duration: time.Minute * 3,
+				Duration: time.Minute * 1,
 			},
 		},
 

sim/mage/items.go

@@ -129,3 +129,33 @@ var ItemSetTimeLordsRegalia = core.NewItemSet(core.ItemSet{
 		},
 	},
 })
+
+var ItemSetRegaliaOfTheBurningScroll = core.NewItemSet(core.ItemSet{
+	Name: "Regalia of the Burning Scroll",
+	Bonuses: map[int32]core.ApplySetBonus{
+		// Increases the damage done by your Arcane Missiles spell by 7%, increases the damage done by your Pyroblast spell by 8%, and increases the damage done by your Ice Lance spell by 12%.
+		//TODO
+		2: func(_ core.Agent, setBonusAura *core.Aura) {
+			setBonusAura.AttachSpellMod(core.SpellModConfig{
+				Kind:       core.SpellMod_DamageDone_Pct,
+				ClassMask:  MageSpellIceLance,
+				FloatValue: 12,
+			})
+			setBonusAura.AttachSpellMod(core.SpellModConfig{
+				Kind:       core.SpellMod_DamageDone_Pct,
+				ClassMask:  MageSpellArcaneMissilesCast | MageSpellArcaneMissilesTick, //TODO: is AM both missle and tick?
+				FloatValue: 7,
+			})
+			setBonusAura.AttachSpellMod(core.SpellModConfig{
+				Kind:       core.SpellMod_DamageDone_Pct,
+				ClassMask:  MageSpellPyroblast,
+				FloatValue: 8,
+			})
+		},
+		// Increases the damage bonus of Arcane Power by an additional 10%, reduces the cooldown of Icy Veins by 50%, and reduces the cooldown of Combustion by 20%.
+		4: func(agent core.Agent, setBonusAura *core.Aura) {
+			mage := agent.(MageAgent).GetMage()
+			mage.T14_4pc = setBonusAura
+		},
+	},
+})

sim/mage/mage.go

@@ -54,6 +54,7 @@ type Mage struct {
 	// Item sets
 	T12_4pc *core.Aura
 	T13_4pc *core.Aura
+	T14_4pc *core.Aura
 }
 
 func (mage *Mage) GetCharacter() *core.Character {