Merge pull request #3601 from vigo2/vigo/autoAttacks

vigo/autoAttacks
wowsims · Sep 5, 2023 · 6145dd7 · 6145dd7
2 parents 1445e6c + 305a0c8
commit 6145dd7
Show file tree

Hide file tree

Showing 39 changed files with 968 additions and 983 deletions.
diff --git a/proto/shaman.proto b/proto/shaman.proto
@@ -216,9 +216,9 @@ enum ShamanImbue {
 }
 
 enum ShamanSyncType {
-    NoSync = 0;
-    SyncMainhandOffhandSwings = 1;
-    DelayOffhandSwings = 2;
+  NoSync = 0;
+  SyncMainhandOffhandSwings = 1;
+  DelayOffhandSwings = 2;
 	Auto = 3;
 }
 
@@ -269,7 +269,7 @@ message EnhancementShaman {
 		}
 		RotationType rotation_type = 2;
 
-		//TODO: add spells here for custom rotation (if nessecary?)
+		//TODO: add spells here for custom rotation (if necessary?)
 		enum CustomRotationSpell {
 			NoSpell = 0;
 			Stormstrike = 1;

diff --git a/sim/common/tbc/melee_trinkets.go b/sim/common/tbc/melee_trinkets.go
@@ -25,7 +25,7 @@ func init() {
 
 	core.NewItemEffect(11815, func(agent core.Agent) {
 		character := agent.GetCharacter()
-		if !character.AutoAttacks.IsEnabled() {
+		if !character.AutoAttacks.AutoSwingMelee {
 			return
 		}
 

diff --git a/sim/common/wotlk/capacitors.go b/sim/common/wotlk/capacitors.go
@@ -172,7 +172,7 @@ func init() {
 
 		core.NewItemEffect(itemID, func(agent core.Agent) {
 			character := agent.GetCharacter()
-			if !character.AutoAttacks.IsEnabled() {
+			if !character.AutoAttacks.AutoSwingMelee {
 				return
 			}