code refactoring

ValentinGurkov · ValentinGurkov · commit 7fbbace60e0f · 2019-11-27T15:49:53.000+02:00
diff --git a/Attributes/Health.cs b/Attributes/Health.cs
@@ -81,6 +81,24 @@ public void TakeDamage(GameObject instigator, float damage) {
             }
         }
 
+        public void Heal(float healthPercentToRestore) {
+            healthPoints.value = Mathf.Min(healthPoints.value + (MaxHealthPoints * healthPercentToRestore / 100), MaxHealthPoints);
+            if (onHealthUpdate != null) {
+                onHealthUpdate();
+            }
+        }
+
+        public object CaptureState() {
+            return healthPoints.value;
+        }
+
+        public void RestoreState(object state) {
+            healthPoints.value = (float) state;
+            if (healthPoints.value <= 0) {
+                Die();
+            }
+        }
+
         private void AwardExperience(GameObject instigator) {
             Experience experience = instigator.GetComponent<Experience>();
             if (experience == null) {
@@ -110,23 +128,5 @@ private void Die() {
             actionScheduler.CancelCurrentAction();
             IsDead = true;
         }
-
-        public void Heal(float healthPercentToRestore) {
-            healthPoints.value = Mathf.Min(healthPoints.value + (MaxHealthPoints * healthPercentToRestore / 100), MaxHealthPoints);
-            if (onHealthUpdate != null) {
-                onHealthUpdate();
-            }
-        }
-
-        public object CaptureState() {
-            return healthPoints.value;
-        }
-
-        public void RestoreState(object state) {
-            healthPoints.value = (float) state;
-            if (healthPoints.value <= 0) {
-                Die();
-            }
-        }
     }
 }
diff --git a/Combat/CombatTarget.cs b/Combat/CombatTarget.cs
@@ -1,5 +1,5 @@
 ﻿using RPG.Attributes;
-using RPG.UI;
+using RPG.Core;
 using UnityEngine;
 
 namespace RPG.Combat {
diff --git a/Combat/HealthPickup.cs b/Combat/HealthPickup.cs
@@ -14,5 +14,11 @@ private void OnTriggerEnter(Collider other) {
             }
         }
 
+        private void Pickup(Health health, GameObject healFX, float healthPercentToRestore, bool respawnable, float respawnTime) {
+            Instantiate(healFX, health.transform);
+            health.Heal(healthPercentToRestore);
+            base.Pickup(respawnable, respawnTime);
+        }
+
     }
 }
diff --git a/Combat/PickupBase.cs b/Combat/PickupBase.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections;
 using RPG.Attributes;
+using RPG.Core;
 using RPG.Movement;
-using RPG.UI;
 using UnityEngine;
 using UnityEngine.Events;
 
@@ -33,18 +33,7 @@ private void ShowPickup(bool shouldShow) {
             }
         }
 
-        public void Pickup(Health health, GameObject healFX, float healthPercentToRestore, bool respawnable, float respawnTime) {
-            Instantiate(healFX, health.transform);
-            health.Heal(healthPercentToRestore);
-            if (respawnable) {
-                StartCoroutine(HideForSeconds(respawnTime));
-            } else {
-                Destroy(gameObject);
-            }
-        }
-
-        public void Pickup(Fighter fighter, WeaponConfig weapon, bool respawnable, float respawnTime) {
-            fighter.EquipWeapon(weapon);
+        public void Pickup(bool respawnable, float respawnTime) {
             if (respawnable) {
                 StartCoroutine(HideForSeconds(respawnTime));
             } else {
diff --git a/Combat/WeaponConfig.cs b/Combat/WeaponConfig.cs
@@ -17,6 +17,10 @@ public class WeaponConfig : ScriptableObject {
         private const string DESTORYING = "Destroying";
         private enum HAND { LEFT, RIGHT }
 
+        public float Range => weaponRange;
+        public float Damage => weaponDamage;
+        public float PercentageBous => percentageBonus;
+
         public Transform GetTransform(Transform rightHand, Transform leftHand) {
             return hand == HAND.RIGHT ? rightHand : leftHand;
         }
@@ -58,11 +62,5 @@ public void LaunchProjectile(Transform rightHand, Transform leftHand, Health tar
             Projectile projectileInstance = Instantiate(projectile, GetTransform(rightHand, leftHand).position, Quaternion.identity);
             projectileInstance.SetTarget(target, instigator, calculatedDamage, updateUI);
         }
-
-        public float Range => weaponRange;
-
-        public float Damage => weaponDamage;
-
-        public float PercentageBous => percentageBonus;
     }
 }
diff --git a/Combat/WeaponPickup.cs b/Combat/WeaponPickup.cs
@@ -10,5 +10,11 @@ private void OnTriggerEnter(Collider other) {
         if (other.gameObject.CompareTag("Player")) {
             Pickup(other.GetComponent<Fighter>(), weapon, respawnable, respawnTime);
         }
+
+    }
+
+    public void Pickup(Fighter fighter, WeaponConfig weapon, bool respawnable, float respawnTime) {
+        fighter.EquipWeapon(weapon);
+        base.Pickup(respawnable, respawnTime);
     }
 }
diff --git a/Control/AIController.cs b/Control/AIController.cs
@@ -92,7 +92,6 @@ private void AggrevateNearbyEnemies() {
                     continue;
                 }
                 ai.Aggrevate();
-
             }
         }
 
@@ -108,7 +107,7 @@ private void PatrolBehaviour() {
             Vector3 nextPosition = guardPosition.value;
 
             if (patrolPath != null) {
-                if (AtWayPoint()) {
+                if (IsAtWayPoint()) {
                     if (dwellTime < timeSinceLastWaypoint) {
                         timeSinceLastWaypoint = 0f;
                         CycleWaypoint();
@@ -121,7 +120,7 @@ private void PatrolBehaviour() {
             mover.StartMovement(nextPosition, patrolSpeedFraction);
         }
 
-        private bool AtWayPoint() {
+        private bool IsAtWayPoint() {
             return IsTargetInRange(transform, GetCurrentWaypoint(), wayPointTolerance);
         }
 
@@ -141,6 +140,5 @@ private void OnDrawGizmosSelected() {
         public void Aggrevate() {
             timeSinceAggrevated = 0;
         }
-
     }
 }
diff --git a/Control/PlayerController.cs b/Control/PlayerController.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using RPG.Attributes;
+using RPG.Core;
 using RPG.Movement;
-using RPG.UI;
 using UnityEngine;
 using UnityEngine.AI;
 using UnityEngine.EventSystems;
diff --git a/Core/CursorType.cs b/Core/CursorType.cs
@@ -1,4 +1,4 @@
-namespace RPG.UI {
+namespace RPG.Core {
   public enum CursorType {
     None,
     Movement,
diff --git a/Core/CursorType.cs.meta b/Core/CursorType.cs.meta
diff --git a/Core/IRaycastable.cs b/Core/IRaycastable.cs
@@ -1,6 +1,6 @@
 ﻿using UnityEngine;
 
-namespace RPG.UI {
+namespace RPG.Core {
     public interface IRaycastable {
         bool HandleRaycast(GameObject callingObject);
 
diff --git a/Core/IRaycastable.cs.meta b/Core/IRaycastable.cs.meta
diff --git a/NPC/DialogueInitiator.cs b/NPC/DialogueInitiator.cs
@@ -1,5 +1,5 @@
 ﻿using RPG.Conversing;
-using RPG.UI;
+using RPG.Core;
 using UnityEngine;
 using UnityEngine.Events;
 
diff --git a/NPC/NPC.cs b/NPC/NPC.cs
@@ -1,6 +1,5 @@
 ﻿using RPG.Core;
 using RPG.Movement;
-using RPG.UI;
 using UnityEngine;
 using static RPG.Util.Utility;
 
diff --git a/Questing/HUD.meta b/Questing/HUD.meta
diff --git a/Questing/QuestGiver.cs b/Questing/QuestGiver.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using RPG.Conversing;
+using RPG.Core;
 using RPG.NPC;
 using RPG.Saving;
-using RPG.UI;
 using UnityEngine;
 
 namespace RPG.Questing {
diff --git a/SceneManagement/Portal.cs b/SceneManagement/Portal.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections;
 using RPG.Control;
+using RPG.Core;
 using RPG.Questing;
-using RPG.UI;
 using UnityEngine;
 using UnityEngine.AI;
 using UnityEngine.SceneManagement;
diff --git a/UI/EnemyHealthDisplay.cs b/UI/EnemyHealthDisplay.cs
@@ -1,8 +1,9 @@
 ﻿using System;
+using RPG.Combat;
 using TMPro;
 using UnityEngine;
 
-namespace RPG.Combat {
+namespace RPG.UI {
     public class EnemyHealthDisplay : MonoBehaviour {
         private Fighter fighter;
 
diff --git a/UI/EnemyHealthDisplay.cs.meta b/UI/EnemyHealthDisplay.cs.meta
diff --git a/UI/ExperienceDisplay.cs b/UI/ExperienceDisplay.cs
@@ -1,8 +1,9 @@
 ﻿using System;
+using RPG.Stats;
 using TMPro;
 using UnityEngine;
 
-namespace RPG.Stats {
+namespace RPG.UI {
     public class ExperienceDisplay : MonoBehaviour {
         private Experience experience;
         private TextMeshProUGUI text;
diff --git a/UI/ExperienceDisplay.cs.meta b/UI/ExperienceDisplay.cs.meta
diff --git a/UI/HealthBar.cs b/UI/HealthBar.cs
@@ -1,6 +1,7 @@
-﻿using UnityEngine;
+﻿using RPG.Attributes;
+using UnityEngine;
 
-namespace RPG.Attributes {
+namespace RPG.UI {
     public class HealthBar : MonoBehaviour {
 
         [SerializeField] private Health healthComponent = null;
diff --git a/UI/HealthBar.cs.meta b/UI/HealthBar.cs.meta
diff --git a/UI/HealthDisplay.cs b/UI/HealthDisplay.cs
@@ -1,8 +1,9 @@
 ﻿using System;
+using RPG.Attributes;
 using TMPro;
 using UnityEngine;
 
-namespace RPG.Attributes {
+namespace RPG.UI {
     public class HealthDisplay : MonoBehaviour {
         private Health health;
         private TextMeshProUGUI text;
diff --git a/UI/HealthDisplay.cs.meta b/UI/HealthDisplay.cs.meta
diff --git a/UI/LevelToDisplay.cs b/UI/LevelToDisplay.cs
@@ -1,8 +1,9 @@
 ﻿using System;
+using RPG.Stats;
 using TMPro;
 using UnityEngine;
 
-namespace RPG.Stats {
+namespace RPG.UI {
     public class LevelToDisplay : MonoBehaviour {
         private BaseStats baseStats;
         private TextMeshProUGUI text;
diff --git a/UI/LevelToDisplay.cs.meta b/UI/LevelToDisplay.cs.meta
diff --git a/UI/QuestToDisplay.cs b/UI/QuestToDisplay.cs
@@ -1,8 +1,9 @@
 ﻿using System;
+using RPG.Questing;
 using TMPro;
 using UnityEngine;
 
-namespace RPG.Questing {
+namespace RPG.UI {
     public class QuestToDisplay : MonoBehaviour {
         private TextMeshProUGUI text;
         private string defaultText;
diff --git a/UI/QuestToDisplay.cs.meta b/UI/QuestToDisplay.cs.meta

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,11 @@ private void OnTriggerEnter(Collider other) {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
	`17`	`+ private void Pickup(Health health, GameObject healFX, float healthPercentToRestore, bool respawnable, float respawnTime) {`
	`18`	`+ Instantiate(healFX, health.transform);`
	`19`	`+ health.Heal(healthPercentToRestore);`
	`20`	`+ base.Pickup(respawnable, respawnTime);`
	`21`	`+ }`
	`22`	`+`
`17`	`23`	`}`
`18`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,10 @@ public class WeaponConfig : ScriptableObject {`
`17`	`17`	`private const string DESTORYING = "Destroying";`
`18`	`18`	`private enum HAND { LEFT, RIGHT }`
`19`	`19`
	`20`	`+ public float Range => weaponRange;`
	`21`	`+ public float Damage => weaponDamage;`
	`22`	`+ public float PercentageBous => percentageBonus;`
	`23`	`+`
`20`	`24`	`public Transform GetTransform(Transform rightHand, Transform leftHand) {`
`21`	`25`	`return hand == HAND.RIGHT ? rightHand : leftHand;`
`22`	`26`	`}`
`@@ -58,11 +62,5 @@ public void LaunchProjectile(Transform rightHand, Transform leftHand, Health tar`
`58`	`62`	`Projectile projectileInstance = Instantiate(projectile, GetTransform(rightHand, leftHand).position, Quaternion.identity);`
`59`	`63`	`projectileInstance.SetTarget(target, instigator, calculatedDamage, updateUI);`
`60`	`64`	`}`
`61`		`-`
`62`		`- public float Range => weaponRange;`
`63`		`-`
`64`		`- public float Damage => weaponDamage;`
`65`		`-`
`66`		`- public float PercentageBous => percentageBonus;`
`67`	`65`	`}`
`68`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,11 @@ private void OnTriggerEnter(Collider other) {`
`10`	`10`	`if (other.gameObject.CompareTag("Player")) {`
`11`	`11`	`Pickup(other.GetComponent<Fighter>(), weapon, respawnable, respawnTime);`
`12`	`12`	`}`
	`13`	`+`
	`14`	`+ }`
	`15`	`+`
	`16`	`+ public void Pickup(Fighter fighter, WeaponConfig weapon, bool respawnable, float respawnTime) {`
	`17`	`+ fighter.EquipWeapon(weapon);`
	`18`	`+ base.Pickup(respawnable, respawnTime);`
`13`	`19`	`}`
`14`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,6 @@ private void AggrevateNearbyEnemies() {`
`92`	`92`	`continue;`
`93`	`93`	`}`
`94`	`94`	`ai.Aggrevate();`
`95`		`-`
`96`	`95`	`}`
`97`	`96`	`}`
`98`	`97`
`@@ -108,7 +107,7 @@ private void PatrolBehaviour() {`
`108`	`107`	`Vector3 nextPosition = guardPosition.value;`
`109`	`108`
`110`	`109`	`if (patrolPath != null) {`
`111`		`- if (AtWayPoint()) {`
	`110`	`+ if (IsAtWayPoint()) {`
`112`	`111`	`if (dwellTime < timeSinceLastWaypoint) {`
`113`	`112`	`timeSinceLastWaypoint = 0f;`
`114`	`113`	`CycleWaypoint();`
`@@ -121,7 +120,7 @@ private void PatrolBehaviour() {`
`121`	`120`	`mover.StartMovement(nextPosition, patrolSpeedFraction);`
`122`	`121`	`}`
`123`	`122`
`124`		`- private bool AtWayPoint() {`
	`123`	`+ private bool IsAtWayPoint() {`
`125`	`124`	`return IsTargetInRange(transform, GetCurrentWaypoint(), wayPointTolerance);`
`126`	`125`	`}`
`127`	`126`
`@@ -141,6 +140,5 @@ private void OnDrawGizmosSelected() {`
`141`	`140`	`public void Aggrevate() {`
`142`	`141`	`timeSinceAggrevated = 0;`
`143`	`142`	`}`
`144`		`-`
`145`	`143`	`}`
`146`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace RPG.UI {`
	`1`	`+namespace RPG.Core {`
`2`	`2`	`public enum CursorType {`
`3`	`3`	`None,`
`4`	`4`	`Movement,`