Merge pull request #877 from adocoD/fixrangeandmsspeed

Updated Base ranged range and MS
wowsims · Jul 8, 2024 · 6ae85d5 · 6ae85d5
2 parents 486886f + eb69a44
commit 6ae85d5
Show file tree

Hide file tree

Showing 21 changed files with 201 additions and 198 deletions.
diff --git a/sim/core/attack.go b/sim/core/attack.go
@@ -517,14 +517,14 @@ func (aa *AutoAttacks) startPull(sim *Simulation) {
 
 	aa.enabled = true
 
-	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= 5 {
+	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= MaxMeleeAttackDistance {
 		aa.mh.addWeaponAttack(sim, aa.mh.unit.SwingSpeed())
 		if aa.IsDualWielding {
 			aa.oh.addWeaponAttack(sim, aa.mh.curSwingSpeed)
 		}
 	}
 
-	if aa.AutoSwingRanged && aa.mh.unit.DistanceFromTarget >= 8 {
+	if aa.AutoSwingRanged && aa.mh.unit.DistanceFromTarget >= MinRangedAttackDistance {
 		aa.ranged.addWeaponAttack(sim, aa.ranged.unit.RangedSwingSpeed())
 	}
 }
@@ -566,7 +566,7 @@ func (aa *AutoAttacks) EnableAutoSwing(sim *Simulation) {
 
 	aa.enabled = true
 
-	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= 5 {
+	if aa.AutoSwingMelee && aa.mh.unit.DistanceFromTarget <= MaxMeleeAttackDistance {
 		aa.mh.swingAt = max(aa.mh.swingAt, sim.CurrentTime, 0)
 		aa.mh.addWeaponAttack(sim, aa.mh.unit.SwingSpeed())
 		if aa.IsDualWielding {
@@ -575,7 +575,7 @@ func (aa *AutoAttacks) EnableAutoSwing(sim *Simulation) {
 		}
 	}
 
-	if aa.AutoSwingRanged && aa.mh.unit.DistanceFromTarget >= 8 {
+	if aa.AutoSwingRanged && aa.mh.unit.DistanceFromTarget >= MinRangedAttackDistance {
 		aa.ranged.swingAt = max(aa.ranged.swingAt, sim.CurrentTime, 0)
 		aa.ranged.addWeaponAttack(sim, aa.ranged.unit.RangedSwingSpeed())
 	}

diff --git a/sim/core/constants.go b/sim/core/constants.go
@@ -13,6 +13,9 @@ const SpellBatchWindow = time.Millisecond * 10
 const DefaultAttackPowerPerDPS = 14.0
 const ArmorPenPerPercentArmor = 13.99
 
+const MaxMeleeAttackDistance = 5
+const MinRangedAttackDistance = 12
+
 const MissDodgeParryBlockCritChancePerDefense = 0.04
 
 const DefenseRatingToChanceReduction = (1.0 / DefenseRatingPerDefense) * MissDodgeParryBlockCritChancePerDefense / 100

diff --git a/sim/core/unit.go b/sim/core/unit.go
@@ -428,7 +428,7 @@ func (unit *Unit) MoveTo(moveRange float64, sim *Simulation) {
 	unit.moveSpell.Cast(sim, unit.CurrentTarget)
 
 	sim.AddPendingAction(NewPeriodicAction(sim, PeriodicActionOptions{
-		Period:          time.Millisecond * 500,
+		Period:          time.Millisecond * 1000 / 7,
 		NumTicks:        int(moveTicks),
 		TickImmediately: false,