Ensure boss NPCs can still be attacked when under siege

ethanmoffat · Sep 14, 2022 · a33c682 · a33c682
1 parent 43c9729
commit a33c682
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/EOLib/Domain/Character/AttackValidationActions.cs b/EOLib/Domain/Character/AttackValidationActions.cs
@@ -2,7 +2,6 @@
 using EOLib.Domain.Extensions;
 using EOLib.Domain.Map;
 using EOLib.IO.Repositories;
-using Optional.Collections;
 using System.Linq;
 
 namespace EOLib.Domain.Character
@@ -13,14 +12,17 @@ public class AttackValidationActions : IAttackValidationActions
         private readonly ICharacterProvider _characterProvider;
         private readonly IMapCellStateProvider _mapCellStateProvider;
         private readonly IEIFFileProvider _eifFileProvider;
+        private readonly IENFFileProvider _enfFileProvider;
 
         public AttackValidationActions(ICharacterProvider characterProvider,
                                        IMapCellStateProvider mapCellStateProvider,
-                                       IEIFFileProvider eifFileProvider)
+                                       IEIFFileProvider eifFileProvider,
+                                       IENFFileProvider enfFileProvider)
         {
             _characterProvider = characterProvider;
             _mapCellStateProvider = mapCellStateProvider;
             _eifFileProvider = eifFileProvider;
+            _enfFileProvider = enfFileProvider;
         }
 
         public AttackValidationError ValidateCharacterStateBeforeAttacking()
@@ -40,7 +42,14 @@ public AttackValidationError ValidateCharacterStateBeforeAttacking()
                 .GetCellStateAt(rp.GetDestinationX(), rp.GetDestinationY())
                 .NPC.Match(
                     some: npc => npc.OpponentID.Match(
-                        some: id => id != _characterProvider.MainCharacter.ID ? AttackValidationError.NotYourBattle : AttackValidationError.OK,
+                        some: id =>
+                        {
+                            var notYourBattle = id != _characterProvider.MainCharacter.ID;
+                            var isBossNpc = _enfFileProvider.ENFFile[npc.ID].Boss > 0;
+                            return notYourBattle && !isBossNpc
+                                ? AttackValidationError.NotYourBattle
+                                : AttackValidationError.OK;
+                        },
                         none: () => AttackValidationError.OK),
                     none: () => AttackValidationError.OK);
         }