Merge pull request #2923 from Horatio27/fire_ele_stats

Updated Fire Ele Spell/Stats, added handling for Draenei racial.

sim/encounters/register_all.go

@@ -3,8 +3,8 @@ package encounters
 import (
 	"github.com/wowsims/wotlk/sim/core"
 	"github.com/wowsims/wotlk/sim/encounters/naxxramas"
+	"github.com/wowsims/wotlk/sim/encounters/toc"
 	"github.com/wowsims/wotlk/sim/encounters/ulduar"
-    "github.com/wowsims/wotlk/sim/encounters/toc"
 )
 
 func init() {

sim/encounters/toc/gormok25h_ai.go

@@ -45,12 +45,12 @@ func addGormok25H(bossPrefix string) {
 type Gormok25HAI struct {
 	Target *core.Target
 
-	Impale             *core.Spell
-	StaggeringStomp    *core.Spell
-	RisingAnger        *core.Spell
-	RisingAngerAura    *core.Aura
-    
-    //ValidStompTarget   bool
+	Impale          *core.Spell
+	StaggeringStomp *core.Spell
+	RisingAnger     *core.Spell
+	RisingAngerAura *core.Aura
+
+	//ValidStompTarget   bool
 }
 
 //func GormokTargetInputs() []*proto.TargetInput {
@@ -73,7 +73,7 @@ func NewGormok25HAI() core.AIFactory {
 func (ai *Gormok25HAI) Initialize(target *core.Target, config *proto.Target) {
 	ai.Target = target
 
-    //ai.ValidStompTarget = config.TargetInputs[0].BoolValue
+	//ai.ValidStompTarget = config.TargetInputs[0].BoolValue
 
 	ai.registerImpaleSpell(target)
 	ai.registerStaggeringStompSpell(target)
@@ -87,7 +87,7 @@ func (ai *Gormok25HAI) Reset(*core.Simulation) {
 func (ai *Gormok25HAI) registerImpaleSpell(target *core.Target) {
 	actionID := core.ActionID{SpellID: 66331}
 
-    // TODO - Allegedly he can be Disarmed to suppress this ability?
+	// TODO - Allegedly he can be Disarmed to suppress this ability?
 
 	ai.Impale = target.RegisterSpell(core.SpellConfig{
 		ActionID:    actionID,
@@ -127,15 +127,15 @@ func (ai *Gormok25HAI) registerImpaleSpell(target *core.Target) {
 					dot.SnapshotCritChance = dot.Spell.PhysicalCritChance(target, attackTable)
 					dot.SnapshotAttackerMultiplier = dot.Spell.AttackerDamageMultiplier(attackTable)
 				}
-            },
+			},
 
 			OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) {
 				dot.CalcAndDealPeriodicSnapshotDamage(sim, target, dot.Spell.OutcomeAlwaysHit)
 			},
 		},
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-            // 150% weapon damage
+			// 150% weapon damage
 			baseDamage := 1.50 * spell.Unit.AutoAttacks.MH.EnemyWeaponDamage(sim, spell.MeleeAttackPower(), false)
 			spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeAlwaysHit)
 
@@ -169,7 +169,7 @@ func (ai *Gormok25HAI) registerStaggeringStompSpell(target *core.Target) {
 			},
 			DefaultCast: core.Cast{
 				CastTime: time.Millisecond * 500,
-				GCD: core.GCDDefault,
+				GCD:      core.GCDDefault,
 			},
 		},
 
@@ -179,12 +179,12 @@ func (ai *Gormok25HAI) registerStaggeringStompSpell(target *core.Target) {
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
 
 			for _, aoeTarget := range sim.Raid.GetActiveUnits() {
-            
-                // TODO - Filter targets to melee only, right now it just hits everyone
-                // TODO - Should this ignore armor? Damage in logs seems inconsistent
+
+				// TODO - Filter targets to melee only, right now it just hits everyone
+				// TODO - Should this ignore armor? Damage in logs seems inconsistent
 				baseDamage := sim.Roll(11700, 12300)
 				spell.CalcAndDealDamage(sim, aoeTarget, baseDamage, spell.OutcomeAlwaysHit)
-                // TODO - Interrupts spellcasting for 8 seconds. Does NOT stun or knockdown
+				// TODO - Interrupts spellcasting for 8 seconds. Does NOT stun or knockdown
 			}
 		},
 	})
@@ -195,10 +195,10 @@ func (ai *Gormok25HAI) registerRisingAngerSpell(target *core.Target) {
 	actionID := core.ActionID{SpellID: 66636}
 
 	ai.RisingAngerAura = target.GetOrRegisterAura(core.Aura{
-		Label:    "Rising Anger",
-		ActionID: actionID.WithTag(1),
+		Label:     "Rising Anger",
+		ActionID:  actionID.WithTag(1),
 		MaxStacks: 99,
-		Duration: time.Second * 120,
+		Duration:  time.Second * 120,
 		OnStacksChange: func(aura *core.Aura, sim *core.Simulation, oldStacks int32, newStacks int32) {
 			aura.Unit.PseudoStats.DamageDealtMultiplier /= 1 + (.15 * float64(oldStacks))
 			aura.Unit.PseudoStats.DamageDealtMultiplier *= 1 + (.15 * float64(newStacks))
@@ -228,7 +228,7 @@ func (ai *Gormok25HAI) registerRisingAngerSpell(target *core.Target) {
 
 			ai.RisingAngerAura.Activate(sim)
 			ai.RisingAngerAura.AddStack(sim)
-            
+
 		},
 	})
 

sim/shaman/elemental/TestElemental.results

@@ -1046,42 +1046,42 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongMultiTarget"
  value: {
-  dps: 15273.10165
+  dps: 15129.33896
   tps: 9171.71477
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7380.27637
+  dps: 7347.59063
   tps: 4245.09094
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9025.17225
+  dps: 8950.53382
   tps: 4778.88447
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongMultiTarget"
  value: {
-  dps: 6924.87755
+  dps: 6807.8224
   tps: 3387.93706
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongSingleTarget"
  value: {
-  dps: 4031.91121
+  dps: 4005.52044
   tps: 2250.72174
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 6642.00121
+  dps: 6582.79903
   tps: 3416.27543
  }
 }
@@ -1130,42 +1130,42 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongMultiTarget"
  value: {
-  dps: 14838.54833
+  dps: 14704.80039
   tps: 8999.86316
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7341.02902
+  dps: 7310.83985
   tps: 4243.26408
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8851.28483
+  dps: 8782.01111
   tps: 4724.57911
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongMultiTarget"
  value: {
-  dps: 6734.19727
+  dps: 6625.43171
   tps: 3371.56984
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3971.06473
+  dps: 3946.74017
   tps: 2237.18193
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 6453.02718
+  dps: 6398.01871
   tps: 3344.22541
  }
 }