Merge pull request #419 from MUnique/dev/fix-monster-attack-range

MUnique · Jun 21, 2024 · 918e936 · 918e936
2 parents 254630f + 76c68f4
commit 918e936
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/GameLogic/NPC/AttackAreaTargetInDirectionTrapIntelligence.cs b/src/GameLogic/NPC/AttackAreaTargetInDirectionTrapIntelligence.cs
@@ -29,7 +29,7 @@ protected override async ValueTask TickAsync()
         }
 
         var targetsInRange = this.PossibleTargets.Where(target => this.Trap.GetDirectionTo(target) == this.Trap.Rotation)
-            .Where(target => this.Trap.IsInRange(target.Position, this.Trap.Definition.AttackRange + 1))
+            .Where(target => this.Trap.IsInRange(target.Position, this.Trap.Definition.AttackRange))
             .Where(target => !this.Map.Terrain.SafezoneMap[target.Position.X, target.Position.Y]);
 
         bool hasAttacked = false;

diff --git a/src/GameLogic/NPC/BasicMonsterIntelligence.cs b/src/GameLogic/NPC/BasicMonsterIntelligence.cs
@@ -239,7 +239,7 @@ private async ValueTask TickAsync()
         }
 
         // Target in Attack Range?
-        if (target.IsInRange(this.Monster.Position, this.Monster.Definition.AttackRange + 1) && !this.Monster.IsAtSafezone())
+        if (target.IsInRange(this.Monster.Position, this.Monster.Definition.AttackRange) && !this.Monster.IsAtSafezone())
         {
             await this.Monster.AttackAsync(target).ConfigureAwait(false);  // yes, attack
             return;