refactored code

Author: ValentinGurkov

Audio/Footsteps.cs

@@ -1,7 +1,7 @@
 using UnityEngine;
 
 namespace RPG.Audio {
-    //TODO
+    // TODO
     /// <summary>
     /// The implementation for footsteps sounds is still TODO
     /// </summary>

Combat/PickupBase.cs

@@ -8,7 +8,7 @@ namespace RPG.Combat {
     public class PickupBase : MonoBehaviour, IRaycastable {
         private Collider objectCollider;
 
-        [SerializeField] public OnPickupEvent onPickup;
+        [SerializeField] private OnPickupEvent onPickup;
 
         [System.Serializable]
         public class OnPickupEvent : UnityEvent<PickupBase> { }

Combat/WeaponConfig.cs

@@ -58,7 +58,7 @@ public bool HasProjectile() {
             return projectile != null;
         }
 
-        //TODO finish this
+        // TODO finish this
         /// <summary>
         ///
         /// </summary>

Conversing/DialogueManager.cs

@@ -48,7 +48,7 @@ public void ContinueDialogue() {
 
         }
 
-        //TODO Implement close dialogue on moving away from NPC
+        // TODO Implement close dialogue on moving away from NPC
         public void CloseDialogue() {
             Debug.Log("End of conversation with.");
             animator.SetBool(IS_OPEN_TRIGGER, false);

Movement/Mover.cs

@@ -11,12 +11,12 @@ public class Mover : MonoBehaviour, IAction, ISaveable {
         [SerializeField] private float maxSpeed = 6f;
         [SerializeField] private float maxNavPathLength = 40f;
         [SerializeField] private float interactStoppingDistance = 3f;
+        private float originalStoppingDistance = 0;
+        private Action callbackOnReachingDestination = null;
         private NavMeshAgent navMeshAgent;
         private Animator animator;
         private ActionScheduler actionScheduler;
         private Health health;
-        private Action callbackOnReachingDestination = null;
-        private float originalStoppingDistance = 0;
 
         private void Awake() {
             navMeshAgent = GetComponent<NavMeshAgent>();
@@ -90,6 +90,7 @@ public Mover StartMovement(Vector3 destination, float speedFraction) {
 
             return this;
         }
+
         public void Cancel() {
             navMeshAgent.isStopped = true;
         }

NPC/DialogueInitiator.cs

@@ -8,15 +8,14 @@ public class DialogueInitiator : NPCBase {
         [SerializeField] private Dialogue dialogue;
         [SerializeField] private DialogueManager dialogueManager;
         [SerializeField] public OnDialogueInitiatedEvent onDialogeInitiated;
+        private bool isInteracting = false;
 
         [System.Serializable]
         public class OnDialogueInitiatedEvent : UnityEvent<DialogueInitiator> { }
 
         public new CursorType Cursor => CursorType.Converse;
         public DialogueManager DialogueManager => dialogueManager;
 
-        private bool isInteracting = false;
-
         private void OnEnable() {
             dialogueManager.onDialogueClose += EndInteraction;
         }
@@ -25,6 +24,10 @@ private void OnDisable() {
             dialogueManager.onDialogueClose -= EndInteraction;
         }
 
+        private void EndInteraction() {
+            isInteracting = false;
+        }
+
         public override void Interact() {
             if (!isInteracting) {
                 StartDialogue(dialogue);
@@ -36,10 +39,5 @@ public void StartDialogue(Dialogue dialogue) {
             onDialogeInitiated.Invoke(this);
             isInteracting = true;
         }
-
-        void EndInteraction() {
-            isInteracting = false;
-        }
-
     }
 }

NPC/NPCBase.cs

@@ -13,7 +13,7 @@ public virtual void Interact() { }
         public bool HandleRaycast(GameObject callingObject) {
             if (Input.GetMouseButtonDown(0)) {
                 if (IsTargetInRange(callingObject.transform, transform, 2.5f)) {
-                    //TODO make this work with CharacterBehaviour's smooth LookAt. Maybe use a Coroutine?
+                    // TODO make this work with CharacterBehaviour's smooth LookAt. Maybe use a Coroutine?
                     transform.LookAt(callingObject.transform);
                     callingObject.transform.LookAt(transform);
                     Interact();

Questing/Goal/ConversationGoal.cs

@@ -11,16 +11,16 @@ public ConversationGoal(Stage stage, string target, string description) {
             Description = description;
         }
 
-        public override void Init() {
-            base.Init();
-            EventSystem.OnTalkedToNPC += TalkedToNPC;
-        }
-
         private void TalkedToNPC(DialogueInitiator npc) {
             if (Stage.Active && npc.name.Contains(Target)) {
                 Complete();
                 EventSystem.OnTalkedToNPC -= TalkedToNPC;
             }
         }
+
+        public override void Init() {
+            base.Init();
+            EventSystem.OnTalkedToNPC += TalkedToNPC;
+        }
     }
 }

Questing/Goal/Goal.cs

@@ -6,8 +6,8 @@ public class Goal {
         public event Action<Stage, Goal> onComplete;
         public bool Completed { get; set; } = false;
         public string Description { get; set; } = "";
-        protected Stage Stage { get; set; } = null;
         public int CurrentAmount { get; set; } = 0;
+        protected Stage Stage { get; set; } = null;
         protected int RequiredAmount { get; set; } = 1;
 
         public virtual void Init() { }

Questing/Goal/PickupGoal.cs

@@ -2,9 +2,9 @@
 using RPG.Events;
 
 namespace RPG.Questing {
-  public class PickuppGoal : Goal {
-    private string Pickup;
-    public PickuppGoal(Stage stage, string pickup, int currentAmount, int requiredAmount, string description = "", bool completed = false) {
+  public class PickupGoal : Goal {
+    public string Pickup;
+    public PickupGoal(Stage stage, string pickup, int currentAmount, int requiredAmount, string description = "", bool completed = false) {
       Stage = stage;
       Pickup = pickup;
       CurrentAmount = currentAmount;
@@ -25,7 +25,6 @@ private void ItemPickedUp(PickupBase pickup) {
           EventSystem.OnItemPickedUp -= ItemPickedUp;
         }
       }
-
     }
   }
 }