Merge pull request #4106 from Horatio27/itemswap_fixes

ItemSwap fixes, added some additional support for ItemSwapping to enh spells, Stormstrike/Lavallash just to reduce the amount of error's that can happen.
wowsims · Dec 23, 2023 · 339ba20 · 339ba20
2 parents f8200b5 + 36e2c57
commit 339ba20
Show file tree

Hide file tree

Showing 9 changed files with 457 additions and 439 deletions.
diff --git a/sim/core/attack.go b/sim/core/attack.go
@@ -428,9 +428,9 @@ func (unit *Unit) OnAutoAttack(_ *Simulation, _ *Spell) {}
 func (aa *AutoAttacks) finalize() {
 	if aa.AutoSwingMelee {
 		aa.mh.spell = aa.mh.unit.GetOrRegisterSpell(aa.mh.config)
-		if aa.IsDualWielding {
-			aa.oh.spell = aa.oh.unit.GetOrRegisterSpell(aa.oh.config)
-		}
+
+		// Will keep keep the OH spell registered for Item swapping
+		aa.oh.spell = aa.oh.unit.GetOrRegisterSpell(aa.oh.config)
 	}
 	if aa.AutoSwingRanged {
 		aa.ranged.spell = aa.ranged.unit.GetOrRegisterSpell(aa.ranged.config)

diff --git a/sim/core/character.go b/sim/core/character.go
@@ -420,6 +420,7 @@ func (character *Character) AddPartyBuffs(partyBuffs *proto.PartyBuffs) {
 
 func (character *Character) initialize(agent Agent) {
 	character.majorCooldownManager.initialize(character)
+	character.ItemSwap.initialize(character)
 
 	character.gcdAction = &PendingAction{
 		Priority: ActionPriorityGCD,

diff --git a/sim/core/item_swaps.go b/sim/core/item_swaps.go
@@ -73,7 +73,6 @@ func (character *Character) enableItemSwap(itemSwap *proto.ItemSwap, mhCritMulti
 	}
 
 	character.ItemSwap = ItemSwap{
-		character:            character,
 		mhCritMultiplier:     mhCritMultiplier,
 		ohCritMultiplier:     ohCritMultiplier,
 		rangedCritMultiplier: rangedCritMultiplier,
@@ -83,6 +82,10 @@ func (character *Character) enableItemSwap(itemSwap *proto.ItemSwap, mhCritMulti
 	}
 }
 
+func (swap *ItemSwap) initialize(character *Character) {
+	swap.character = character
+}
+
 func (character *Character) RegisterOnItemSwap(callback OnSwapItem) {
 	if character == nil || !character.ItemSwap.IsEnabled() {
 		return
@@ -136,7 +139,7 @@ func (swap *ItemSwap) RegisterOnSwapItemForEnchantEffect(effectID int32, aura *A
 }
 
 func (swap *ItemSwap) IsEnabled() bool {
-	return swap.character != nil
+	return swap.character != nil && len(swap.slots) > 0
 }
 
 func (swap *ItemSwap) IsSwapped() bool {
@@ -172,6 +175,7 @@ func (swap *ItemSwap) SwapItems(sim *Simulation, slots []proto.ItemSlot, useGCD
 	newStats := stats.Stats{}
 	has2H := swap.GetItem(proto.ItemSlot_ItemSlotMainHand).HandType == proto.HandType_HandTypeTwoHand
 	for _, slot := range slots {
+
 		//will swap both on the MainHand Slot for 2H.
 		if slot == proto.ItemSlot_ItemSlotOffHand && has2H {
 			continue
@@ -252,8 +256,10 @@ func (swap *ItemSwap) swapWeapon(slot proto.ItemSlot) {
 		}
 	case proto.ItemSlot_ItemSlotOffHand:
 		if character.AutoAttacks.AutoSwingMelee {
-			character.AutoAttacks.SetOH(character.WeaponFromOffHand(swap.ohCritMultiplier))
-			//Special case for when the OHAuto Spell was set up with a non weapon and does not have a crit multiplier.
+			weapon := character.WeaponFromOffHand(swap.ohCritMultiplier)
+			character.AutoAttacks.SetOH(weapon)
+
+			character.AutoAttacks.IsDualWielding = weapon.SwingSpeed != 0
 			character.PseudoStats.CanBlock = character.OffHand().WeaponType == proto.WeaponType_WeaponTypeShield
 		}
 	case proto.ItemSlot_ItemSlotRanged:

diff --git a/sim/core/unit.go b/sim/core/unit.go
@@ -237,10 +237,10 @@ func (unit *Unit) AddDynamicDamageTakenModifier(ddtm DynamicDamageTakenModifier)
 }
 
 func (unit *Unit) AddStatsDynamic(sim *Simulation, bonus stats.Stats) {
-	if unit.Env == nil || !unit.Env.IsFinalized() {
-		if !unit.Env.MeasuringStats {
-			panic("Not finalized, use AddStats instead!")
-		}
+	if unit.Env == nil {
+		panic("Environment not constructed.")
+	} else if !unit.Env.IsFinalized() && !unit.Env.MeasuringStats {
+		panic("Not finalized, use AddStats instead!")
 	}
 
 	unit.statsWithoutDeps.AddInplace(&bonus)