fix glancing blows, channel cancelling

wowsims · Dec 29, 2024 · c0f8343 · c0f8343
1 parent fc7d34b
commit c0f8343
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/assets/database/db.bin b/assets/database/db.bin
diff --git a/assets/database/db.json b/assets/database/db.json
@@ -8742,8 +8742,8 @@
 {"effectId":63,"spellId":13538,"name":"Enchant Chest - Lesser Absorption","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":66,"spellId":7457,"name":"Enchant Bracer - Minor Stamina","type":6,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":66,"spellId":7863,"name":"Enchant Boots - Minor Stamina","type":10,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":242,"spellId":7748,"name":"Enchant Chest - Lesser Health","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":243,"spellId":7766,"name":"Enchant Bracer - Minor Spirit","type":6,"stats":[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":246,"spellId":7776,"name":"Enchant Chest - Lesser Mana","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},

diff --git a/assets/database/leftover_db.bin b/assets/database/leftover_db.bin
diff --git a/sim/core/apl.go b/sim/core/apl.go
@@ -22,8 +22,6 @@ type APLRotation struct {
 
 	// If true, can recast channel when interrupted.
 	allowChannelRecastOnInterrupt bool
-	// Checking for cast-while-channeling spells to allow the APL to not evaluate during channels unless absolutely necessary
-	allowCastWhileChanneling bool
 
 	// Used inside of actions/value to determine whether they will occur during the prepull or regular rotation.
 	parsingPrepull bool
@@ -186,7 +184,11 @@ func (apl *APLRotation) DoNextAction(sim *Simulation) {
 		return
 	}
 
-	if apl.unit.IsChanneling(sim) && !apl.allowCastWhileChanneling {
+	if apl.shouldInterruptChannel(sim) {
+		apl.unit.ChanneledDot.Cancel(sim)
+	}
+
+	if apl.unit.IsChanneling(sim) {
 		return
 	}
 

diff --git 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
@@ -27,7 +27,7 @@ export class DamageMetricsTable extends MetricsTable<ActionMetrics> {
 				};
 			}),
 			{
-				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,