From 76cfcd086435ae76e0ad0bf0333965135dd95d62 Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Sun, 29 Dec 2024 12:00:59 -0500 Subject: [PATCH] Fix crushing blows in concurrent sim --- sim/core/sim_concurrent.go | 2 ++ ui/core/components/detailed_results/damage_metrics.tsx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sim/core/sim_concurrent.go b/sim/core/sim_concurrent.go index 0adc67b3a8..ef6fd99ef8 100644 --- a/sim/core/sim_concurrent.go +++ b/sim/core/sim_concurrent.go @@ -186,6 +186,7 @@ func (rsrc *raidSimResultCombiner) addActionMetrics(unit *proto.UnitMetrics, add baseTgt.Blocks += addTgt.Blocks baseTgt.BlockedCrits += addTgt.BlockedCrits baseTgt.Glances += addTgt.Glances + baseTgt.Crushes += addTgt.Crushes baseTgt.Damage += addTgt.Damage baseTgt.ResistedDamage += addTgt.ResistedDamage baseTgt.CritDamage += addTgt.CritDamage @@ -195,6 +196,7 @@ func (rsrc *raidSimResultCombiner) addActionMetrics(unit *proto.UnitMetrics, add baseTgt.CritTickDamage += addTgt.CritTickDamage baseTgt.ResistedCritTickDamage += addTgt.ResistedCritTickDamage baseTgt.GlanceDamage += addTgt.GlanceDamage + baseTgt.CrushDamage += addTgt.CrushDamage baseTgt.BlockDamage += addTgt.BlockDamage baseTgt.BlockedCritDamage += addTgt.BlockedCritDamage baseTgt.Threat += addTgt.Threat diff --git a/ui/core/components/detailed_results/damage_metrics.tsx b/ui/core/components/detailed_results/damage_metrics.tsx index 251c47e7d4..b1ab839349 100644 --- a/ui/core/components/detailed_results/damage_metrics.tsx +++ b/ui/core/components/detailed_results/damage_metrics.tsx @@ -27,7 +27,7 @@ export class DamageMetricsTable extends MetricsTable { }; }), { - name: 'Damage done', + name: 'Damage Done', headerCellClass: 'text-center metrics-table-cell--primary-metric', columnClass: 'metrics-table-cell--primary-metric', getValue: (metric: ActionMetrics) => metric.avgDamage,