code refactoring, interrupting attack animation if changing combat target

Author: ValentinGurkov

Combat/CombatTarget.cs

@@ -1,16 +1,15 @@
 using RPG.Attributes;
 using RPG.Core;
-using RPG.NPC;
 using UnityEngine;
 
 namespace RPG.Combat {
 
     [RequireComponent(typeof(Health))]
-    public class CombatTarget : NPCBase {
+    public class CombatTarget : MonoBehaviour, IRaycastable {
 
-        public new CursorType Cursor => CursorType.Combat;
+        public CursorType Cursor => CursorType.Combat;
 
-        public new bool HandleRaycast(GameObject callingObject) {
+        public bool HandleRaycast(GameObject callingObject) {
             Fighter fighter = callingObject.GetComponent<Fighter>();
             if (!fighter.CanAttack(gameObject)) {
                 return false;

Combat/Fighter.cs

@@ -22,6 +22,7 @@ public class Fighter : MonoBehaviour, IAction, ISaveable, IModifierProvider {
         private const string ATTACK_TRIGGER = "attack";
         private const string STOP_ATTACK_TRIGGER = "stopAttack";
         private Health target;
+        private Health prevTarget;
         private Mover mover;
         private ActionScheduler actionScheduler;
         private Animator animator;
@@ -73,6 +74,10 @@ private void Update() {
                 return;
             }
 
+            if (CombatTargetChanged(target)) {
+                StopAttack();
+            }
+
             if (!GetIsInRange(target.transform)) {
                 mover.MoveTo(target.transform.position, 1f);
                 stopped = false;
@@ -85,6 +90,18 @@ private void Update() {
             }
         }
 
+        private bool CombatTargetChanged(Health newTarget) {
+            if (prevTarget == null) {
+                prevTarget = newTarget;
+                return false;
+            }
+            if (newTarget != prevTarget) {
+                prevTarget = newTarget;
+                return true;
+            }
+            return false;
+        }
+
         private Weapon SetupDefaultWeapon() {
             return defaultWeapon.Spawn(rightHandTransform, leftHandTransform, animator);
         }

SceneManagement/SavingWrapper.cs

@@ -14,14 +14,6 @@ private void Awake() {
             StartCoroutine(LoadLastScene());
         }
 
-        private IEnumerator LoadLastScene() {
-            savingSystem = GetComponent<SavingSystem>();
-            yield return savingSystem.LoadLastScene(defaultSaveFile);
-            fader = FindObjectOfType<Fader>();
-            fader.FadeOutImmediate();
-            yield return fader.FadeIn(fadeOutTime);
-        }
-
         private void Update() {
             if (Input.GetKeyDown(KeyCode.S)) {
                 Save();
@@ -34,6 +26,14 @@ private void Update() {
             }
         }
 
+        private IEnumerator LoadLastScene() {
+            savingSystem = GetComponent<SavingSystem>();
+            yield return savingSystem.LoadLastScene(defaultSaveFile);
+            fader = FindObjectOfType<Fader>();
+            fader.FadeOutImmediate();
+            yield return fader.FadeIn(fadeOutTime);
+        }
+
         public void Save() {
             savingSystem.Save(defaultSaveFile);
         }