flag cleanup

wowsims · Dec 23, 2024 · d2390a6 · d2390a6
1 parent cf1e859
commit d2390a6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 52 deletions.
diff --git a/sim/core/apl.go b/sim/core/apl.go
@@ -2,7 +2,6 @@ package core
 
 import (
 	"fmt"
-	"slices"
 	"time"
 
 	"github.com/wowsims/classic/sim/core/proto"
@@ -170,9 +169,6 @@ func (rot *APLRotation) reset(sim *Simulation) {
 	rot.inLoop = false
 	rot.interruptChannelIf = nil
 	rot.allowChannelRecastOnInterrupt = false
-	rot.allowCastWhileChanneling = slices.ContainsFunc(rot.unit.Spellbook, func(spell *Spell) bool {
-		return spell.Flags.Matches(SpellFlagCastWhileChanneling)
-	})
 	for _, action := range rot.allAPLActions() {
 		action.impl.Reset(sim)
 	}

diff --git a/sim/core/cast.go b/sim/core/cast.go
@@ -194,20 +194,10 @@ func (spell *Spell) makeCastFunc(config CastConfig) CastSuccessFunc {
 		}
 
 		if hc := spell.Unit.Hardcast; spell.Unit.IsCasting(sim) {
-			// Attempt to use a queued cast-while-casting spell mid-hard cast
-			if cwc := spell.Unit.castWhileCastingAction; cwc != nil {
-				cwc.OnAction(sim)
-			}
-
 			return spell.castFailureHelper(sim, "casting/channeling %v for %s, curTime = %s", hc.ActionID, hc.Expires-sim.CurrentTime, sim.CurrentTime)
 		}
 
-		if dot := spell.Unit.ChanneledDot; spell.Unit.IsChanneling(sim) && !spell.Flags.Matches(SpellFlagCastWhileChanneling) {
-			// Attempt to use a queued cast-while-casting spell mid-hard cast
-			if cwc := spell.Unit.castWhileCastingAction; cwc != nil {
-				cwc.OnAction(sim)
-			}
-
+		if dot := spell.Unit.ChanneledDot; spell.Unit.IsChanneling(sim) {
 			return spell.castFailureHelper(sim, "channeling %v for %s, curTime = %s", dot.ActionID, dot.expires-sim.CurrentTime, sim.CurrentTime)
 		}
 
@@ -233,36 +223,6 @@ func (spell *Spell) makeCastFunc(config CastConfig) CastSuccessFunc {
 			spell.Unit.AutoAttacks.StopMeleeUntil(sim, restartMeleeAt, false)
 		}
 
-		// Castable-while-casting spells
-		if spell.Flags.Matches(SpellFlagCastWhileCasting) {
-			// Queue cast-while-casting spells to cast 750 ms into the next hard-cast
-			pa := &PendingAction{
-				NextActionAt: sim.CurrentTime + GCDDefault/2,
-				OnAction: func(sim *Simulation) {
-					spell.LastCastAt = sim.CurrentTime
-
-					if sim.Log != nil && !spell.Flags.Matches(SpellFlagNoLogs) {
-						spell.Unit.Log(sim, "Casting %s (Cost = %0.03f, Cast Time = %s, Effective Time = %s)",
-							spell.ActionID, max(0, spell.CurCast.Cost), spell.CurCast.CastTime, spell.CurCast.EffectiveTime())
-						spell.Unit.Log(sim, "Completed cast %s", spell.ActionID)
-					}
-
-					if spell.Cost != nil {
-						spell.Cost.SpendCost(sim, spell)
-					}
-
-					spell.applyEffects(sim, target)
-
-					if !spell.Flags.Matches(SpellFlagNoOnCastComplete) {
-						spell.Unit.OnCastComplete(sim, spell)
-					}
-				},
-			}
-			spell.Unit.castWhileCastingAction = pa
-			sim.AddPendingAction(pa)
-			return true
-		}
-
 		// Hardcasts
 		if spell.CurCast.CastTime > 0 {
 			if sim.Log != nil && !spell.Flags.Matches(SpellFlagNoLogs) {

diff --git a/sim/core/flags.go b/sim/core/flags.go
@@ -186,8 +186,6 @@ const (
 	SpellFlagDefensiveEquipment                            // Indicates this spell a defensive equippable item activation spell
 	SpellFlagResetAttackSwing                              // Indicates this spell resets the melee swing timer.
 	SpellFlagCastTimeNoGCD                                 // Indicates this spell is off the GCD (e.g. hunter's Auto Shot)
-	SpellFlagCastWhileCasting                              // Indicates this spell can be cast while another spell is being cast (e.g. mage's Fire Blast with Overheat rune)
-	SpellFlagCastWhileChanneling                           // Indicates this spell can be cast while another spell is being channeled (e.g. spriest's T2.5 4pc set bonus)
 	SpellFlagPureDot                                       // Indicates this spell is a dot with no initial damage component
 	SpellFlagPassiveSpell                                  // Indicates this spell is applied/cast as a result of another spell
 	SpellFlagSuppressWeaponProcs                           // Indicates this spell cannot proc weapon chance on hits or enchants

diff --git a/sim/core/spell.go b/sim/core/spell.go
@@ -521,15 +521,15 @@ func (spell *Spell) CanCast(sim *Simulation, target *Unit) bool {
 	}
 
 	// While casting no other action is possible except rare cast-while-casting spells
-	if spell.Unit.IsCasting(sim) && !spell.Flags.Matches(SpellFlagCastWhileCasting) {
+	if spell.Unit.IsCasting(sim) {
 		//if sim.Log != nil {
 		//	sim.Log("Cant cast because already casting")
 		//}
 		return false
 	}
 
 	// While channeling no other action is possible except rare cast-while-channeling spells
-	if spell.Unit.IsChanneling(sim) && !spell.Flags.Matches(SpellFlagCastWhileChanneling) {
+	if spell.Unit.IsChanneling(sim) {
 		//if sim.Log != nil {
 		//	sim.Log("Cant cast because already channeling")
 		//}

diff --git a/sim/core/unit.go b/sim/core/unit.go
@@ -140,9 +140,8 @@ type Unit struct {
 	Hardcast Hardcast
 
 	// GCD-related PendingActions.
-	gcdAction              *PendingAction
-	hardcastAction         *PendingAction
-	castWhileCastingAction *PendingAction
+	gcdAction      *PendingAction
+	hardcastAction *PendingAction
 
 	// Cached mana return values per tick.
 	manaTickWhileCasting    float64