Merge pull request #3957 from vigo2/vigo/weapon-preps

Vigo/weapon preps
wowsims · Oct 28, 2023 · eb79430 · eb79430
2 parents b568d3d + 13ae60c
commit eb79430
Show file tree

Hide file tree

Showing 58 changed files with 2,583 additions and 2,680 deletions.
diff --git a/sim/common/tbc/enchant_effects.go b/sim/common/tbc/enchant_effects.go
@@ -14,9 +14,9 @@ func init() {
 
 	// TODO: Crusader, Mongoose, and Executioner could also be modelled as AddWeaponEffect instead
 	core.AddWeaponEffect(1897, func(agent core.Agent, slot proto.ItemSlot) {
-		w := &agent.GetCharacter().AutoAttacks.MH
+		w := agent.GetCharacter().AutoAttacks.MH()
 		if slot == proto.ItemSlot_ItemSlotOffHand {
-			w = &agent.GetCharacter().AutoAttacks.OH
+			w = agent.GetCharacter().AutoAttacks.OH()
 		}
 		w.BaseDamageMin += 5
 		w.BaseDamageMax += 5
@@ -47,9 +47,9 @@ func init() {
 	})
 
 	core.AddWeaponEffect(963, func(agent core.Agent, slot proto.ItemSlot) {
-		w := &agent.GetCharacter().AutoAttacks.MH
+		w := agent.GetCharacter().AutoAttacks.MH()
 		if slot == proto.ItemSlot_ItemSlotOffHand {
-			w = &agent.GetCharacter().AutoAttacks.OH
+			w = agent.GetCharacter().AutoAttacks.OH()
 		}
 		w.BaseDamageMin += 7
 		w.BaseDamageMax += 7
@@ -134,7 +134,7 @@ func init() {
 	})
 
 	core.AddWeaponEffect(2723, func(agent core.Agent, _ proto.ItemSlot) {
-		w := &agent.GetCharacter().AutoAttacks.Ranged
+		w := agent.GetCharacter().AutoAttacks.Ranged()
 		w.BaseDamageMin += 12
 		w.BaseDamageMax += 12
 	})

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,17 +40,9 @@ func init() {
 			Label:    "Hand of Justice",
 			Duration: core.NeverExpires,
 			OnInit: func(aura *core.Aura, sim *core.Simulation) {
-				handOfJusticeSpell = character.GetOrRegisterSpell(core.SpellConfig{
-					ActionID:     core.ActionID{ItemID: 11815},
-					SpellSchool:  core.SpellSchoolPhysical,
-					ProcMask:     core.ProcMaskMeleeMHAuto,
-					Flags:        core.SpellFlagMeleeMetrics | core.SpellFlagIncludeTargetBonusDamage | core.SpellFlagNoOnCastComplete,
-					ApplyEffects: character.AutoAttacks.MHConfig.ApplyEffects,
-
-					DamageMultiplier: 1,
-					CritMultiplier:   character.DefaultMeleeCritMultiplier(),
-					ThreatMultiplier: 1,
-				})
+				config := character.AutoAttacks.MHConfig
+				config.ActionID = core.ActionID{ItemID: 11815}
+				handOfJusticeSpell = character.GetOrRegisterSpell(config)
 			},
 			OnReset: func(aura *core.Aura, sim *core.Simulation) {
 				aura.Activate(sim)

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
 			}
 
@@ -193,7 +193,7 @@ func init() {
 					},
 				})
 
-				if character.AutoAttacks.IsDualWielding {
+				if character.AutoAttacks.IsDualWielding() {
 					ohSpell = character.GetOrRegisterSpell(core.SpellConfig{
 						ActionID:         core.ActionID{SpellID: 71434}, // "Manifest Anger"
 						SpellSchool:      core.SpellSchoolPhysical,

diff --git a/sim/common/wotlk/enchant_effects.go b/sim/common/wotlk/enchant_effects.go
@@ -263,7 +263,7 @@ func init() {
 	})
 
 	core.AddWeaponEffect(3843, func(agent core.Agent, _ proto.ItemSlot) {
-		w := &agent.GetCharacter().AutoAttacks.Ranged
+		w := agent.GetCharacter().AutoAttacks.Ranged()
 		w.BaseDamageMin += 15
 		w.BaseDamageMax += 15
 	})