Merge pull request #3985 from vigo2/vigo/auto-attacks

Vigo/auto attacks
wowsims · Nov 1, 2023 · 8079287 · 8079287
2 parents 38edbcb + 73e8c8e
commit 8079287
Show file tree

Hide file tree

Showing 53 changed files with 7,247 additions and 7,311 deletions.
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.AutoSwingMelee() {
+		if !character.AutoAttacks.AutoSwingMelee {
 			return
 		}
 
@@ -40,7 +40,7 @@ func init() {
 			Label:    "Hand of Justice",
 			Duration: core.NeverExpires,
 			OnInit: func(aura *core.Aura, sim *core.Simulation) {
-				config := character.AutoAttacks.MHConfig
+				config := *character.AutoAttacks.MHConfig()
 				config.ActionID = core.ActionID{ItemID: 11815}
 				handOfJusticeSpell = character.GetOrRegisterSpell(config)
 			},

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.AutoSwingMelee() {
+			if !character.AutoAttacks.AutoSwingMelee {
 				return
 			}
 
@@ -184,24 +184,24 @@ func init() {
 					SpellSchool:      core.SpellSchoolPhysical,
 					ProcMask:         core.ProcMaskMeleeMHSpecial,
 					Flags:            core.SpellFlagMeleeMetrics | core.SpellFlagIncludeTargetBonusDamage | core.SpellFlagNoOnCastComplete,
-					DamageMultiplier: character.AutoAttacks.MHConfig.DamageMultiplier * 0.5,
-					CritMultiplier:   character.AutoAttacks.MHConfig.CritMultiplier,
-					ThreatMultiplier: character.AutoAttacks.MHConfig.ThreatMultiplier,
+					DamageMultiplier: character.AutoAttacks.MHConfig().DamageMultiplier * 0.5,
+					CritMultiplier:   character.AutoAttacks.MHConfig().CritMultiplier,
+					ThreatMultiplier: character.AutoAttacks.MHConfig().ThreatMultiplier,
 					ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
 						baseDamage := character.MHWeaponDamage(sim, spell.MeleeAttackPower())
 						spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMeleeWeaponSpecialHitAndCrit)
 					},
 				})
 
-				if character.AutoAttacks.IsDualWielding() {
+				if character.AutoAttacks.IsDualWielding {
 					ohSpell = character.GetOrRegisterSpell(core.SpellConfig{
 						ActionID:         core.ActionID{SpellID: 71434}, // "Manifest Anger"
 						SpellSchool:      core.SpellSchoolPhysical,
 						ProcMask:         core.ProcMaskMeleeOHSpecial,
 						Flags:            core.SpellFlagMeleeMetrics | core.SpellFlagIncludeTargetBonusDamage | core.SpellFlagNoOnCastComplete,
-						DamageMultiplier: character.AutoAttacks.OHConfig.DamageMultiplier * 0.5,
-						CritMultiplier:   character.AutoAttacks.OHConfig.CritMultiplier,
-						ThreatMultiplier: character.AutoAttacks.OHConfig.ThreatMultiplier,
+						DamageMultiplier: character.AutoAttacks.OHConfig().DamageMultiplier * 0.5,
+						CritMultiplier:   character.AutoAttacks.OHConfig().CritMultiplier,
+						ThreatMultiplier: character.AutoAttacks.OHConfig().ThreatMultiplier,
 						ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
 							baseDamage := character.OHWeaponDamage(sim, spell.MeleeAttackPower())
 							spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMeleeWeaponSpecialHitAndCrit)