[UI] Results table refactor

proto/api.proto

@@ -143,6 +143,13 @@ message SimOptions {
 	bool use_labeled_rands = 9; // Use test level RNG.
 }
 
+enum SpellType {
+	SpellTypeCast = 0;
+	SpellTypePeriodic = 1;
+	// Needed for Frontend
+	SpellTypeAll = 2;
+}
+
 // The aggregated results from all uses of a particular action.
 message ActionMetrics {
 	ActionID id = 1;
@@ -154,6 +161,9 @@ 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;
+	SpellType spell_type = 5;
 }
 
 // Metrics for a specific action, when cast at a particular target.
@@ -188,12 +198,18 @@ message TargetedActionMetrics {
 	// 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 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;
 

sim/core/metrics_aggregator.go

@@ -119,10 +119,13 @@ type CharacterIterationMetrics struct {
 }
 
 type ActionMetrics struct {
-	IsMelee bool // True if melee action, false if spell action.
+	IsMelee   bool            // True if melee action, false if spell action.
+	SpellType proto.SpellType // Spell is cast, periodic (DoT or HoT) or both
 
 	// Metrics for this action, for each possible target.
 	Targets []TargetedActionMetrics
+
+	SpellSchool SpellSchool
 }
 
 type tmiListItem struct {
@@ -137,9 +140,11 @@ func (actionMetrics *ActionMetrics) ToProto(actionID ActionID) *proto.ActionMetr
 	}
 
 	return &proto.ActionMetrics{
-		Id:      actionID.ToProto(),
-		IsMelee: actionMetrics.IsMelee,
-		Targets: targetMetrics,
+		Id:          actionID.ToProto(),
+		IsMelee:     actionMetrics.IsMelee,
+		SpellType:   actionMetrics.SpellType,
+		Targets:     targetMetrics,
+		SpellSchool: int32(actionMetrics.SpellSchool),
 	}
 }
 
@@ -155,11 +160,13 @@ type SpellMetrics struct {
 	Parries int32
 	Blocks  int32
 
-	TotalDamage    float64 // Damage done by all casts of this spell.
-	TotalThreat    float64 // Threat generated by all casts of this spell.
-	TotalHealing   float64 // Healing done by all casts of this spell.
-	TotalShielding float64 // Shielding done by all casts of this spell.
-	TotalCastTime  time.Duration
+	TotalDamage      float64 // Damage done by all casts of this spell.
+	TotalCritDamage  float64 // Damage done by all critical casts of this spell.
+	TotalThreat      float64 // Threat generated by all casts of this spell.
+	TotalHealing     float64 // Healing done by all casts of this spell.
+	TotalCritHealing float64 // Healing done by all critical casts of this spell.
+	TotalShielding   float64 // Shielding done by all casts of this spell.
+	TotalCastTime    time.Duration
 }
 
 type TargetedActionMetrics struct {
@@ -174,30 +181,34 @@ type TargetedActionMetrics struct {
 	Blocks  int32
 	Glances int32
 
-	Damage    float64
-	Threat    float64
-	Healing   float64
-	Shielding float64
-	CastTime  time.Duration
+	Damage      float64
+	CritDamage  float64
+	Threat      float64
+	Healing     float64
+	CritHealing float64
+	Shielding   float64
+	CastTime    time.Duration
 }
 
 func (tam *TargetedActionMetrics) ToProto() *proto.TargetedActionMetrics {
 	return &proto.TargetedActionMetrics{
 		UnitIndex: tam.UnitIndex,
 
-		Casts:      tam.Casts,
-		Hits:       tam.Hits,
-		Crits:      tam.Crits,
-		Misses:     tam.Misses,
-		Dodges:     tam.Dodges,
-		Parries:    tam.Parries,
-		Blocks:     tam.Blocks,
-		Glances:    tam.Glances,
-		Damage:     tam.Damage,
-		Threat:     tam.Threat,
-		Healing:    tam.Healing,
-		Shielding:  tam.Shielding,
-		CastTimeMs: float64(tam.CastTime.Milliseconds()),
+		Casts:       tam.Casts,
+		Hits:        tam.Hits,
+		Crits:       tam.Crits,
+		Misses:      tam.Misses,
+		Dodges:      tam.Dodges,
+		Parries:     tam.Parries,
+		Blocks:      tam.Blocks,
+		Glances:     tam.Glances,
+		Damage:      tam.Damage,
+		CritDamage:  tam.CritDamage,
+		Threat:      tam.Threat,
+		Healing:     tam.Healing,
+		CritHealing: tam.CritHealing,
+		Shielding:   tam.Shielding,
+		CastTimeMs:  float64(tam.CastTime.Milliseconds()),
 	}
 }
 
@@ -308,7 +319,11 @@ func (unitMetrics *UnitMetrics) addSpellMetrics(spell *Spell, actionID ActionID,
 	}
 
 	if !ok {
-		actionMetrics = &ActionMetrics{IsMelee: spell.Flags.Matches(SpellFlagMeleeMetrics)}
+		spellType := proto.SpellType_SpellTypeCast
+		if spell.dots != nil {
+			spellType = proto.SpellType_SpellTypePeriodic
+		}
+		actionMetrics = &ActionMetrics{IsMelee: spell.Flags.Matches(SpellFlagMeleeMetrics), SpellType: spellType, SpellSchool: spell.SpellSchool}
 		unitMetrics.actions[actionID] = actionMetrics
 	}
 
@@ -331,8 +346,10 @@ func (unitMetrics *UnitMetrics) addSpellMetrics(spell *Spell, actionID ActionID,
 		tam.Blocks += spellTargetMetrics.Blocks
 		tam.Glances += spellTargetMetrics.Glances
 		tam.Damage += spellTargetMetrics.TotalDamage
+		tam.CritDamage += spellTargetMetrics.TotalCritDamage
 		tam.Threat += spellTargetMetrics.TotalThreat
 		tam.Healing += spellTargetMetrics.TotalHealing
+		tam.CritHealing += spellTargetMetrics.TotalCritHealing
 		tam.Shielding += spellTargetMetrics.TotalShielding
 		tam.CastTime += spellTargetMetrics.TotalCastTime
 

sim/core/sim_concurrent.go

@@ -152,9 +152,11 @@ func (rsrc *raidSimResultCombiner) addActionMetrics(unit *proto.UnitMetrics, add
 
 	if am == nil {
 		am = &proto.ActionMetrics{
-			Id:      add.Id,
-			IsMelee: add.IsMelee,
-			Targets: make([]*proto.TargetedActionMetrics, len(add.Targets)),
+			Id:          add.Id,
+			IsMelee:     add.IsMelee,
+			SpellType:   add.SpellType,
+			Targets:     make([]*proto.TargetedActionMetrics, len(add.Targets)),
+			SpellSchool: add.SpellSchool,
 		}
 		for i, addTgt := range add.Targets {
 			am.Targets[i] = &proto.TargetedActionMetrics{
@@ -178,8 +180,10 @@ func (rsrc *raidSimResultCombiner) addActionMetrics(unit *proto.UnitMetrics, add
 		baseTgt.Blocks += addTgt.Blocks
 		baseTgt.Glances += addTgt.Glances
 		baseTgt.Damage += addTgt.Damage
+		baseTgt.CritDamage += addTgt.CritDamage
 		baseTgt.Threat += addTgt.Threat
 		baseTgt.Healing += addTgt.Healing
+		baseTgt.CritHealing += addTgt.CritHealing
 		baseTgt.Shielding += addTgt.Shielding
 		baseTgt.CastTimeMs += addTgt.CastTimeMs
 	}

sim/core/spell_result.go

@@ -280,6 +280,9 @@ func (spell *Spell) CalcAndDealOutcome(sim *Simulation, target *Unit, outcomeApp
 func (spell *Spell) dealDamageInternal(sim *Simulation, isPeriodic bool, result *SpellResult) {
 	if sim.CurrentTime >= 0 {
 		spell.SpellMetrics[result.Target.UnitIndex].TotalDamage += result.Damage
+		if result.DidCrit() {
+			spell.SpellMetrics[result.Target.UnitIndex].TotalCritDamage += result.Damage
+		}
 		spell.SpellMetrics[result.Target.UnitIndex].TotalThreat += result.Threat
 	}
 
@@ -291,9 +294,9 @@ func (spell *Spell) dealDamageInternal(sim *Simulation, isPeriodic bool, result
 
 	if sim.Log != nil {
 		if isPeriodic {
-			spell.Unit.Log(sim, "%s %s tick %s. (Threat: %0.3f)", result.Target.LogLabel(), spell.ActionID, result.DamageString(), result.Threat)
+			spell.Unit.Log(sim, "%s %s tick %s (SpellSchool: %d). (Threat: %0.3f)", result.Target.LogLabel(), spell.ActionID, result.DamageString(), spell.SpellSchool, result.Threat)
 		} else {
-			spell.Unit.Log(sim, "%s %s %s. (Threat: %0.3f)", result.Target.LogLabel(), spell.ActionID, result.DamageString(), result.Threat)
+			spell.Unit.Log(sim, "%s %s %s (SpellSchool: %d). (Threat: %0.3f)", result.Target.LogLabel(), spell.ActionID, result.DamageString(), spell.SpellSchool, result.Threat)
 		}
 	}
 
@@ -399,6 +402,9 @@ func (dot *Dot) SnapshotHeal(target *Unit, baseHealing float64) {
 
 // Applies the fully computed spell result to the sim.
 func (spell *Spell) dealHealingInternal(sim *Simulation, isPeriodic bool, result *SpellResult) {
+	if result.DidCrit() {
+		spell.SpellMetrics[result.Target.UnitIndex].TotalCritHealing += result.Damage
+	}
 	spell.SpellMetrics[result.Target.UnitIndex].TotalHealing += result.Damage
 	spell.SpellMetrics[result.Target.UnitIndex].TotalThreat += result.Threat
 	if result.Target.HasHealthBar() {

sim/death_knight/blood/blood.go

@@ -98,7 +98,7 @@ func (bdk *BloodDeathKnight) ApplyTalents() {
 	shieldSpell := bdk.GetOrRegisterSpell(core.SpellConfig{
 		ActionID:    core.ActionID{SpellID: 77535},
 		ProcMask:    core.ProcMaskSpellHealing,
-		SpellSchool: core.SpellSchoolPhysical,
+		SpellSchool: core.SpellSchoolShadow,
 
 		DamageMultiplier: 1,
 		ThreatMultiplier: 1,

sim/death_knight/death_strike.go

@@ -39,7 +39,7 @@ func (dk *DeathKnight) registerDeathStrikeSpell() {
 		ClassSpellMask: DeathKnightSpellDeathStrikeHeal,
 
 		DamageMultiplier: 1,
-		ThreatMultiplier: 1,
+		ThreatMultiplier: 0,
 	})
 
 	doHealing := func(sim *core.Simulation, value float64) {

ui/core/components/detailed_results.tsx

@@ -1,5 +1,3 @@
-import { ref } from 'tsx-vanilla';
-
 import { REPO_NAME } from '../constants/other';
 import { DetailedResultsUpdate, SimRun, SimRunData } from '../proto/ui';
 import { SimResult } from '../proto_utils/sim_result';
@@ -8,18 +6,16 @@ import { TypedEvent } from '../typed_event';
 import { Component } from './component';
 import { AuraMetricsTable } from './detailed_results/aura_metrics';
 import { CastMetricsTable } from './detailed_results/cast_metrics';
+import { DamageMetricsTable } from './detailed_results/damage_metrics';
 import { DpsHistogram } from './detailed_results/dps_histogram';
-import { DtpsMeleeMetricsTable } from './detailed_results/dtps_melee_metrics';
-import { DtpsSpellMetricsTable } from './detailed_results/dtps_spell_metrics';
+import { DtpsMetricsTable } from './detailed_results/dtps_metrics';
 import { HealingMetricsTable } from './detailed_results/healing_metrics';
 import { LogRunner } from './detailed_results/log_runner';
-import { MeleeMetricsTable } from './detailed_results/melee_metrics';
 import { PlayerDamageMetricsTable } from './detailed_results/player_damage';
 import { PlayerDamageTakenMetricsTable } from './detailed_results/player_damage_taken';
 import { ResourceMetricsTable } from './detailed_results/resource_metrics';
 import { SimResultData } from './detailed_results/result_component';
 import { ResultsFilter } from './detailed_results/results_filter';
-import { SpellMetricsTable } from './detailed_results/spell_metrics';
 import { Timeline } from './detailed_results/timeline';
 import { ToplineResults } from './detailed_results/topline_results';
 import { RaidSimResultsManager } from './raid_sim_action';
@@ -38,17 +34,17 @@ const tabs: Tab[] = [
 		isActive: true,
 		targetId: 'damageTab',
 		label: 'Damage',
-		classes: ['damage-metrics'],
+		classes: ['damage-metrics-tab'],
 	},
 	{
 		targetId: 'healingTab',
 		label: 'Healing',
-		classes: ['healing-metrics'],
+		classes: ['healing-metrics-tab'],
 	},
 	{
 		targetId: 'damageTakenTab',
 		label: 'Damage Taken',
-		classes: ['threat-metrics'],
+		classes: ['threat-metrics-tab'],
 	},
 	{
 		targetId: 'buffsTab',
@@ -125,11 +121,14 @@ export abstract class DetailedResults extends Component {
 							<div className="player-damage-metrics" />
 						</div>
 						<div className="dr-row single-player-only">
+							<div className="damage-metrics" />
+						</div>
+						{/* <div className="dr-row single-player-only">
 							<div className="melee-metrics" />
 						</div>
 						<div className="dr-row single-player-only">
 							<div className="spell-metrics" />
-						</div>
+						</div> */}
 						<div className="dr-row dps-histogram" />
 					</div>
 					<div id="healingTab" className="tab-pane dr-tab-content healing-content fade">
@@ -145,10 +144,7 @@ export abstract class DetailedResults extends Component {
 							<div className="player-damage-taken-metrics" />
 						</div>
 						<div className="dr-row single-player-only">
-							<div className="dtps-melee-metrics" />
-						</div>
-						<div className="dr-row single-player-only">
-							<div className="dtps-spell-metrics" />
+							<div className="dtps-metrics" />
 						</div>
 						<div className="dr-row damage-taken-histogram single-player-only" />
 					</div>
@@ -218,14 +214,11 @@ export abstract class DetailedResults extends Component {
 			parent: this.rootElem.querySelector('.cast-metrics')!,
 			resultsEmitter: this.resultsEmitter,
 		});
-		new MeleeMetricsTable({
-			parent: this.rootElem.querySelector('.melee-metrics')!,
-			resultsEmitter: this.resultsEmitter,
-		});
-		new SpellMetricsTable({
-			parent: this.rootElem.querySelector('.spell-metrics')!,
+		new DamageMetricsTable({
+			parent: this.rootElem.querySelector('.damage-metrics')!,
 			resultsEmitter: this.resultsEmitter,
 		});
+
 		new HealingMetricsTable({
 			parent: this.rootElem.querySelector('.healing-spell-metrics')!,
 			resultsEmitter: this.resultsEmitter,
@@ -262,12 +255,8 @@ export abstract class DetailedResults extends Component {
 			resultsEmitter: this.resultsEmitter,
 		});
 
-		new DtpsMeleeMetricsTable({
-			parent: this.rootElem.querySelector('.dtps-melee-metrics')!,
-			resultsEmitter: this.resultsEmitter,
-		});
-		new DtpsSpellMetricsTable({
-			parent: this.rootElem.querySelector('.dtps-spell-metrics')!,
+		new DtpsMetricsTable({
+			parent: this.rootElem.querySelector('.dtps-metrics')!,
 			resultsEmitter: this.resultsEmitter,
 		});
 

ui/core/components/detailed_results/aura_metrics.ts

@@ -1,5 +1,6 @@
+import { OtherAction } from '../../proto/common';
 import { AuraMetrics, SimResult, SimResultFilter } from '../../proto_utils/sim_result';
-import { ColumnSortType, MetricsTable } from './metrics_table';
+import { ColumnSortType, MetricsTable } from './metrics_table/metrics_table';
 import { ResultComponent, ResultComponentConfig, SimResultData } from './result_component';
 
 export class AuraMetricsTable extends MetricsTable<AuraMetrics> {
@@ -52,19 +53,25 @@ export class AuraMetricsTable extends MetricsTable<AuraMetrics> {
 			}
 			const player = players[0];
 
-			const auras = player.auras;
+			const auras = this.filterMetrics(player.auras);
 			const actionGroups = AuraMetrics.groupById(auras);
-			const petGroups = player.pets.map(pet => pet.auras);
-
+			const petGroups = player.pets.map(pet => this.filterMetrics(pet.auras));
 			return actionGroups.concat(petGroups);
 		}
 	}
 
 	mergeMetrics(metrics: Array<AuraMetrics>): AuraMetrics {
-		return AuraMetrics.merge(metrics, true, metrics[0].unit?.petActionId || undefined);
+		return AuraMetrics.merge(metrics, {
+			removeTag: true,
+			actionIdOverride: metrics[0].unit?.petActionId || undefined,
+		});
 	}
 
 	shouldCollapse(metric: AuraMetrics): boolean {
 		return !metric.unit?.isPet;
 	}
+
+	filterMetrics(metrics: Array<AuraMetrics>): Array<AuraMetrics> {
+		return metrics.filter(aura => aura.actionId.otherId !== OtherAction.OtherActionMove);
+	}
 }