[UI] Results table refactor

.gitignore

@@ -13,7 +13,7 @@ ui/*/*/index.html
 dist
 binary_dist
 sim/web/__debug_bin
-/wowsimcatacli*
+/wowsimcli*
 /wowsimcata*
 
 # temporary files

proto/api.proto

@@ -154,6 +154,11 @@ message ActionMetrics {
 	// Note that some spells are untargeted, these will always have a single
 	// element in this array.
 	repeated TargetedActionMetrics targets = 3;
+
+	int32 spell_school = 4;
+
+	// True if action is applied/cast as a result of another action
+	bool is_passive = 5;
 }
 
 // Metrics for a specific action, when cast at a particular target.
@@ -170,6 +175,12 @@ message TargetedActionMetrics {
 	// # of times this action was a critical strike.
 	int32 crits = 3;
 
+	// # of times this action ticked on a target.
+	int32 ticks = 21;
+
+	// # of times this action was a critical tick on a target.
+	int32 crit_ticks = 22;
+
 	// # of times this action was a Miss or Resist.
 	int32 misses = 4;
 
@@ -182,18 +193,42 @@ message TargetedActionMetrics {
 	// # of times this action was a Block.
 	int32 blocks = 7;
 
+	// # of times this action was a Critical Block.
+	int32 crit_blocks = 20;
+
 	// # of times this action was a Glance.
 	int32 glances = 8;
 
 	// Total damage done to this target by this action.
 	double damage = 9;
 
+	// Total critical damage done to this target by this action.
+	double crit_damage = 15;
+
+	// Total tick damage done to this target by this action.
+	double tick_damage = 23;
+
+	// Total critical tick damage done to this target by this action.
+	double crit_tick_damage = 24;
+
+	// Total glancing damage done to this target by this action.
+	double glance_damage = 17;
+
+	// Total block damage done to this target by this action.
+	double block_damage = 18;
+
+	// Total critical block damage done to this target by this action.
+	double crit_block_damage = 19;
+
 	// Total threat done to this target by this action.
 	double threat = 10;
 
 	// Total healing done to this target by this action.
 	double healing = 11;
 
+	// Total critical healing done to this target by this action.
+	double crit_healing = 16;
+
 	// Total shielding done to this target by this action.
 	double shielding = 13;
 
@@ -268,10 +303,9 @@ message UnitMetrics {
 	int32 unit_index = 13;
 
 	DistributionMetrics dps = 1;
-	DistributionMetrics dpasp = 16;
 	DistributionMetrics threat = 8;
 	DistributionMetrics dtps = 11;
-	DistributionMetrics tmi = 17;
+	DistributionMetrics tmi = 16;
 	DistributionMetrics hps = 14;
 	DistributionMetrics tto = 15; // Time To OOM, in seconds.
 

proto/common.proto

@@ -25,7 +25,7 @@ message ProtoVersion {
 	// protos need to define an api_version field so that the UI code knows
 	// to up-convert these protos to the new format whenever api_version is
 	// missing (0) or lower than current_version_number.
-	option (current_version_number) = 2;
+	option (current_version_number) = 3;
 
 	// The actual field value is only used within unit tests.
 	int32 saved_version_number = 1;

sim/common/shared/shared_utils.go

@@ -48,7 +48,7 @@ func NewProcStatBonusEffectWithDamageProc(config ProcStatBonusEffect, damage Dam
 			ActionID:                 core.ActionID{SpellID: damage.SpellID},
 			SpellSchool:              damage.School,
 			ProcMask:                 core.ProcMaskEmpty,
-			Flags:                    core.SpellFlagNoOnCastComplete,
+			Flags:                    core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell,
 			DamageMultiplier:         1,
 			CritMultiplier:           character.DefaultSpellCritMultiplier(),
 			DamageMultiplierAdditive: 1,

sim/common/tbc/caster_trinkets.go

@@ -10,7 +10,7 @@ import (
 func init() {
 	core.AddEffectsToTest = false
 	// Offensive trinkets. Keep these in order by item ID.
-	core.NewSimpleStatOffensiveTrinketEffect(32483, stats.Stats{stats.HasteRating: 175}, time.Second*20, time.Minute*2)  // Skull of Gul'dan
+	core.NewSimpleStatOffensiveTrinketEffect(32483, stats.Stats{stats.HasteRating: 175}, time.Second*20, time.Minute*2) // Skull of Gul'dan
 	core.NewSimpleStatOffensiveTrinketEffect(33829, stats.Stats{stats.SpellPower: 211}, time.Second*20, time.Minute*2)  // Hex Shrunken Head
 	core.NewSimpleStatOffensiveTrinketEffect(34429, stats.Stats{stats.SpellPower: 320}, time.Second*15, time.Second*90) // Shifting Naaru Sliver
 

sim/common/tbc/melee_trinkets.go

@@ -17,9 +17,9 @@ func init() {
 	core.NewSimpleStatOffensiveTrinketEffect(38287, stats.Stats{stats.AttackPower: 278, stats.RangedAttackPower: 278}, time.Second*20, time.Minute*2) // Empty Direbrew Mug
 
 	// Defensive trinkets. Keep these in order by item ID.
-	core.NewSimpleStatDefensiveTrinketEffect(29387, stats.Stats{stats.DodgeRating: 200}, time.Second*40, time.Minute*2)   // Gnomeregan Auto-Blocker 600 (Cata Became Auto-Dodger)
-	core.NewSimpleStatDefensiveTrinketEffect(32501, stats.Stats{stats.Health: 1750}, time.Second*20, time.Minute*3) // Shadowmoon Insignia
-	core.NewSimpleStatDefensiveTrinketEffect(38289, stats.Stats{stats.DodgeRating: 66}, time.Second*40, time.Minute*2)    // Coren's Lucky Coin
+	core.NewSimpleStatDefensiveTrinketEffect(29387, stats.Stats{stats.DodgeRating: 200}, time.Second*40, time.Minute*2) // Gnomeregan Auto-Blocker 600 (Cata Became Auto-Dodger)
+	core.NewSimpleStatDefensiveTrinketEffect(32501, stats.Stats{stats.Health: 1750}, time.Second*20, time.Minute*3)     // Shadowmoon Insignia
+	core.NewSimpleStatDefensiveTrinketEffect(38289, stats.Stats{stats.DodgeRating: 66}, time.Second*40, time.Minute*2)  // Coren's Lucky Coin
 
 	// Proc effects. Keep these in order by item ID.
 

sim/core/TestProtoVersioning.results

@@ -1 +1 @@
-saved_version_number: 2
+saved_version_number: 3

sim/core/base_stats_auto_gen.go

@@ -1,4 +1,3 @@
-
 package core
 
 // **************************************
@@ -18,82 +17,83 @@ const SpellHitRatingPerHitPercent = 102.445740
 const DodgeRatingPerDodgePercent = 176.718900
 const ParryRatingPerParryPercent = 176.718900
 const MasteryRatingPerMasteryPoint = 179.280040
+
 var CritPerAgiMaxLevel = map[proto.Class]float64{
-proto.Class_ClassUnknown: 0.0,
-proto.Class_ClassWarrior: 0.0041,
-proto.Class_ClassPaladin: 0.0049,
-proto.Class_ClassHunter: 0.0031,
-proto.Class_ClassRogue: 0.0031,
-proto.Class_ClassPriest: 0.0049,
-proto.Class_ClassDeathKnight: 0.0041,
-proto.Class_ClassShaman: 0.0031,
-proto.Class_ClassMage: 0.0050,
-proto.Class_ClassWarlock: 0.0051,
-proto.Class_ClassDruid: 0.0031,
+	proto.Class_ClassUnknown:     0.0,
+	proto.Class_ClassWarrior:     0.0041,
+	proto.Class_ClassPaladin:     0.0049,
+	proto.Class_ClassHunter:      0.0031,
+	proto.Class_ClassRogue:       0.0031,
+	proto.Class_ClassPriest:      0.0049,
+	proto.Class_ClassDeathKnight: 0.0041,
+	proto.Class_ClassShaman:      0.0031,
+	proto.Class_ClassMage:        0.0050,
+	proto.Class_ClassWarlock:     0.0051,
+	proto.Class_ClassDruid:       0.0031,
 }
 var CritPerIntMaxLevel = map[proto.Class]float64{
-proto.Class_ClassUnknown: 0.0,
-proto.Class_ClassWarrior: 0.0000,
-proto.Class_ClassPaladin: 0.0015,
-proto.Class_ClassHunter: 0.0000,
-proto.Class_ClassRogue: 0.0000,
-proto.Class_ClassPriest: 0.0015,
-proto.Class_ClassDeathKnight: 0.0000,
-proto.Class_ClassShaman: 0.0015,
-proto.Class_ClassMage: 0.0015,
-proto.Class_ClassWarlock: 0.0015,
-proto.Class_ClassDruid: 0.0015,
+	proto.Class_ClassUnknown:     0.0,
+	proto.Class_ClassWarrior:     0.0000,
+	proto.Class_ClassPaladin:     0.0015,
+	proto.Class_ClassHunter:      0.0000,
+	proto.Class_ClassRogue:       0.0000,
+	proto.Class_ClassPriest:      0.0015,
+	proto.Class_ClassDeathKnight: 0.0000,
+	proto.Class_ClassShaman:      0.0015,
+	proto.Class_ClassMage:        0.0015,
+	proto.Class_ClassWarlock:     0.0015,
+	proto.Class_ClassDruid:       0.0015,
 }
 var ExtraClassBaseStats = map[proto.Class]stats.Stats{
-proto.Class_ClassUnknown: {},
-proto.Class_ClassWarrior: {
- stats.Mana: 0.0000,
- stats.SpellCritPercent: 0.0000,
- stats.PhysicalCritPercent: 0.0000,
-},
-proto.Class_ClassPaladin: {
- stats.Mana: 23422.0000,
- stats.SpellCritPercent: 3.3355,
- stats.PhysicalCritPercent: 0.6520,
-},
-proto.Class_ClassHunter: {
- stats.Mana: 0.0000,
- stats.SpellCritPercent: 0.0000,
- stats.PhysicalCritPercent: -1.5320,
-},
-proto.Class_ClassRogue: {
- stats.Mana: 0.0000,
- stats.SpellCritPercent: 0.0000,
- stats.PhysicalCritPercent: -0.2950,
-},
-proto.Class_ClassPriest: {
- stats.Mana: 20590.0000,
- stats.SpellCritPercent: 1.2375,
- stats.PhysicalCritPercent: 3.1765,
-},
-proto.Class_ClassDeathKnight: {
- stats.Mana: 0.0000,
- stats.SpellCritPercent: 0.0000,
- stats.PhysicalCritPercent: 0.0000,
-},
-proto.Class_ClassShaman: {
- stats.Mana: 23430.0000,
- stats.SpellCritPercent: 2.2010,
- stats.PhysicalCritPercent: 2.9220,
-},
-proto.Class_ClassMage: {
- stats.Mana: 17418.0000,
- stats.SpellCritPercent: 0.9075,
- stats.PhysicalCritPercent: 3.4540,
-},
-proto.Class_ClassWarlock: {
- stats.Mana: 20553.0000,
- stats.SpellCritPercent: 1.7000,
- stats.PhysicalCritPercent: 2.6220,
-},
-proto.Class_ClassDruid: {
- stats.Mana: 18635.0000,
- stats.SpellCritPercent: 1.8515,
- stats.PhysicalCritPercent: 7.4755,
-},
+	proto.Class_ClassUnknown: {},
+	proto.Class_ClassWarrior: {
+		stats.Mana:                0.0000,
+		stats.SpellCritPercent:    0.0000,
+		stats.PhysicalCritPercent: 0.0000,
+	},
+	proto.Class_ClassPaladin: {
+		stats.Mana:                23422.0000,
+		stats.SpellCritPercent:    3.3355,
+		stats.PhysicalCritPercent: 0.6520,
+	},
+	proto.Class_ClassHunter: {
+		stats.Mana:                0.0000,
+		stats.SpellCritPercent:    0.0000,
+		stats.PhysicalCritPercent: -1.5320,
+	},
+	proto.Class_ClassRogue: {
+		stats.Mana:                0.0000,
+		stats.SpellCritPercent:    0.0000,
+		stats.PhysicalCritPercent: -0.2950,
+	},
+	proto.Class_ClassPriest: {
+		stats.Mana:                20590.0000,
+		stats.SpellCritPercent:    1.2375,
+		stats.PhysicalCritPercent: 3.1765,
+	},
+	proto.Class_ClassDeathKnight: {
+		stats.Mana:                0.0000,
+		stats.SpellCritPercent:    0.0000,
+		stats.PhysicalCritPercent: 0.0000,
+	},
+	proto.Class_ClassShaman: {
+		stats.Mana:                23430.0000,
+		stats.SpellCritPercent:    2.2010,
+		stats.PhysicalCritPercent: 2.9220,
+	},
+	proto.Class_ClassMage: {
+		stats.Mana:                17418.0000,
+		stats.SpellCritPercent:    0.9075,
+		stats.PhysicalCritPercent: 3.4540,
+	},
+	proto.Class_ClassWarlock: {
+		stats.Mana:                20553.0000,
+		stats.SpellCritPercent:    1.7000,
+		stats.PhysicalCritPercent: 2.6220,
+	},
+	proto.Class_ClassDruid: {
+		stats.Mana:                18635.0000,
+		stats.SpellCritPercent:    1.8515,
+		stats.PhysicalCritPercent: 7.4755,
+	},
 }

sim/core/cast.go

@@ -138,7 +138,13 @@ func (spell *Spell) makeCastFunc(config CastConfig) CastSuccessFunc {
 		}
 
 		if effectiveTime := spell.CurCast.EffectiveTime(); effectiveTime != 0 {
-			spell.SpellMetrics[target.UnitIndex].TotalCastTime += effectiveTime
+
+			// do not add channeled time here as they have variable cast length
+			// cast time for channels is handled in dot.OnExpire
+			if !spell.Flags.Matches(SpellFlagChanneled) {
+				spell.SpellMetrics[target.UnitIndex].TotalCastTime += effectiveTime
+			}
+
 			spell.Unit.SetGCDTimer(sim, max(sim.CurrentTime+effectiveTime, spell.Unit.NextGCDAt()))
 		}
 

sim/core/character.go

@@ -254,7 +254,7 @@ func (character *Character) applyAllEffects(agent Agent, raidBuffs *proto.RaidBu
 	measureStats := func() *proto.UnitStats {
 		baseStats := character.GetStats()
 		character.stats = character.SortAndApplyStatDependencies(character.stats)
-		measuredStatsProto :=  &proto.UnitStats{
+		measuredStatsProto := &proto.UnitStats{
 			Stats:       character.GetStats().ToProtoArray(),
 			PseudoStats: character.GetPseudoStatsProto(),
 			ApiVersion:  GetCurrentProtoVersion(),

sim/core/dot.go

@@ -252,12 +252,15 @@ func newDot(config Dot) *Dot {
 				dot.Spell.Unit.WaitUntil(sim, sim.CurrentTime+dot.Spell.Unit.ChannelClipDelay)
 			}
 		}
+
 		dot.tickAction.Cancel(sim)
 		dot.tickAction = nil
 		if dot.isChanneled {
 			dot.Spell.Unit.ChanneledDot = nil
 			dot.Spell.Unit.Rotation.interruptChannelIf = nil
 			dot.Spell.Unit.Rotation.allowChannelRecastOnInterrupt = false
+			// track time metrics for channels
+			dot.Spell.SpellMetrics[aura.Unit.UnitIndex].TotalCastTime += dot.fadeTime - dot.StartedAt()
 		}
 	})
 

sim/core/flags.go

@@ -203,6 +203,7 @@ const (
 	SpellFlagCombatPotion                                   // Indicates this spell is the combat potion.
 	SpellFlagNoSpellMods                                    // Indicates that no spell mods should be applied to this spell
 	SpellFlagCanCastWhileMoving                             // Allows the cast to be casted while moving
+	SpellFlagPassiveSpell                                   // Indicates this spell is applied/cast as a result of another spell
 
 	// Used to let agents categorize their spells.
 	SpellFlagAgentReserved1