fix channeled mana regen (#3704)

* fix channeled mana regen * remove rogue files
wowsims · Sep 19, 2023 · e127095 · e127095
1 parent c7fce18
commit e127095
Show file tree

Hide file tree

Showing 8 changed files with 949 additions and 954 deletions.
diff --git a/sim/core/mana.go b/sim/core/mana.go
@@ -192,11 +192,6 @@ func (unit *Unit) UpdateManaRegenRates() {
 
 // Applies 1 'tick' of mana regen, which worth 2s of regeneration based on mp5/int/spirit/etc.
 func (unit *Unit) ManaTick(sim *Simulation) {
-	if unit.ChanneledDot != nil {
-		// Mana is not regenerated during channels
-		return
-	}
-
 	if sim.CurrentTime < unit.PseudoStats.FiveSecondRuleRefreshTime {
 		regen := unit.manaTickWhileCasting
 		unit.AddMana(sim, MaxFloat(0, regen), unit.manaCastingMetrics)
@@ -334,7 +329,7 @@ func (mc *ManaCost) LogCostFailure(sim *Simulation, spell *Spell) {
 func (mc *ManaCost) SpendCost(sim *Simulation, spell *Spell) {
 	if spell.CurCast.Cost > 0 {
 		spell.Unit.SpendMana(sim, spell.CurCast.Cost, mc.ResourceMetrics)
-		spell.Unit.PseudoStats.FiveSecondRuleRefreshTime = sim.CurrentTime + time.Second*5
+		spell.Unit.PseudoStats.FiveSecondRuleRefreshTime = MaxDuration(sim.CurrentTime+time.Second*5, spell.Unit.Hardcast.Expires)
 	}
 }
 func (mc *ManaCost) IssueRefund(_ *Simulation, _ *Spell) {}