From 3b865bbd13769eb1f1d5f0208208231ae7438345 Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Wed, 14 Aug 2019 17:17:48 +0300 Subject: [PATCH] Refactor namespaces --- Assets/Scripts/AI/AIBehaviour.cs | 1 + Assets/Scripts/AI/BehaviourBranch.cs | 1 + Assets/Scripts/AI/BehaviourLeaf.cs | 1 + Assets/Scripts/AI/BehaviourNode.cs | 1 + Assets/Scripts/AI/Behaviours/Follow.cs | 1 + Assets/Scripts/AI/Behaviours/MeleeAttackFollowed.cs | 2 ++ Assets/Scripts/AI/Behaviours/Wander.cs | 1 + Assets/Scripts/AI/EnemyFollower.cs | 2 +- Assets/Scripts/AI/PlayerFollower.cs | 2 +- Assets/Scripts/AI/Trigger.cs | 1 + Assets/Scripts/AI/Triggers/EnemySighted.cs | 1 + Assets/Scripts/AI/Triggers/PlayerSighted.cs | 6 ++++-- Assets/Scripts/Effects/BloodDripper.cs | 2 +- Assets/Scripts/Effects/BloodLauncher.cs | 3 ++- Assets/Scripts/Effects/BloodParticle.cs | 2 +- Assets/Scripts/Effects/CameraFX.cs | 2 +- Assets/Scripts/Effects/Explodable.cs | 5 ++++- Assets/Scripts/Enemies/Enemy.cs | 2 +- Assets/Scripts/Enemies/EnemySpawner.cs | 2 +- Assets/Scripts/Enemies/Health.cs | 4 +++- Assets/Scripts/GUI/BackToMainMenuButton.cs | 2 +- Assets/Scripts/GUI/GoreToggler.cs | 3 ++- Assets/Scripts/GUI/HUDController.cs | 3 ++- Assets/Scripts/GUI/MainMenuController.cs | 2 +- Assets/Scripts/Guns/Bullet.cs | 2 +- Assets/Scripts/Guns/Gun.cs | 6 +++--- Assets/Scripts/Guns/RevolverBullet.cs | 7 +++++-- Assets/Scripts/Player/{Player.cs => PlayerController.cs} | 5 +++-- .../Player/{Player.cs.meta => PlayerController.cs.meta} | 0 Assets/Scripts/Player/PlayerFun.cs | 4 ++-- Assets/Scripts/Player/PunchingHand.cs | 4 +++- Assets/Scripts/Utils/AcceleratedMovement.cs | 2 +- Assets/Scripts/Utils/CameraHelper.cs | 2 +- Assets/Scripts/Utils/Options.cs | 2 +- 34 files changed, 56 insertions(+), 30 deletions(-) rename Assets/Scripts/Player/{Player.cs => PlayerController.cs} (97%) rename Assets/Scripts/Player/{Player.cs.meta => PlayerController.cs.meta} (100%) diff --git a/Assets/Scripts/AI/AIBehaviour.cs b/Assets/Scripts/AI/AIBehaviour.cs index adb4c1a..214b3a3 100644 --- a/Assets/Scripts/AI/AIBehaviour.cs +++ b/Assets/Scripts/AI/AIBehaviour.cs @@ -1,4 +1,5 @@ using UnityEngine; +using Saltosion.OneWeapon.Enemies; namespace Saltosion.OneWeapon.AI { public abstract class AIBehaviour : MonoBehaviour { diff --git a/Assets/Scripts/AI/BehaviourBranch.cs b/Assets/Scripts/AI/BehaviourBranch.cs index 39942af..361c587 100644 --- a/Assets/Scripts/AI/BehaviourBranch.cs +++ b/Assets/Scripts/AI/BehaviourBranch.cs @@ -1,5 +1,6 @@ using System; using UnityEngine; +using Saltosion.OneWeapon.Enemies; namespace Saltosion.OneWeapon.AI { [Serializable] diff --git a/Assets/Scripts/AI/BehaviourLeaf.cs b/Assets/Scripts/AI/BehaviourLeaf.cs index fe04371..f27aaf7 100644 --- a/Assets/Scripts/AI/BehaviourLeaf.cs +++ b/Assets/Scripts/AI/BehaviourLeaf.cs @@ -1,5 +1,6 @@ using System; using UnityEngine; +using Saltosion.OneWeapon.Enemies; namespace Saltosion.OneWeapon.AI { [Serializable] diff --git a/Assets/Scripts/AI/BehaviourNode.cs b/Assets/Scripts/AI/BehaviourNode.cs index 86cb203..0eecf82 100644 --- a/Assets/Scripts/AI/BehaviourNode.cs +++ b/Assets/Scripts/AI/BehaviourNode.cs @@ -1,5 +1,6 @@ using System; using UnityEngine; +using Saltosion.OneWeapon.Enemies; namespace Saltosion.OneWeapon.AI { [Serializable] diff --git a/Assets/Scripts/AI/Behaviours/Follow.cs b/Assets/Scripts/AI/Behaviours/Follow.cs index 3e2080e..5ae64dd 100644 --- a/Assets/Scripts/AI/Behaviours/Follow.cs +++ b/Assets/Scripts/AI/Behaviours/Follow.cs @@ -1,4 +1,5 @@ using UnityEngine; +using Saltosion.OneWeapon.Enemies; namespace Saltosion.OneWeapon.AI.Behaviours { public class Follow : AIBehaviour { diff --git a/Assets/Scripts/AI/Behaviours/MeleeAttackFollowed.cs b/Assets/Scripts/AI/Behaviours/MeleeAttackFollowed.cs index 831cca5..83cbd4e 100644 --- a/Assets/Scripts/AI/Behaviours/MeleeAttackFollowed.cs +++ b/Assets/Scripts/AI/Behaviours/MeleeAttackFollowed.cs @@ -1,6 +1,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using Saltosion.OneWeapon.Player; +using Saltosion.OneWeapon.Enemies; namespace Saltosion.OneWeapon.AI.Behaviours { public class MeleeAttackFollowed : AIBehaviour { diff --git a/Assets/Scripts/AI/Behaviours/Wander.cs b/Assets/Scripts/AI/Behaviours/Wander.cs index 802d113..de4785a 100644 --- a/Assets/Scripts/AI/Behaviours/Wander.cs +++ b/Assets/Scripts/AI/Behaviours/Wander.cs @@ -1,4 +1,5 @@ using UnityEngine; +using Saltosion.OneWeapon.Enemies; namespace Saltosion.OneWeapon.AI.Behaviours { public class Wander : AIBehaviour { diff --git a/Assets/Scripts/AI/EnemyFollower.cs b/Assets/Scripts/AI/EnemyFollower.cs index 12ce559..4682e30 100644 --- a/Assets/Scripts/AI/EnemyFollower.cs +++ b/Assets/Scripts/AI/EnemyFollower.cs @@ -1,7 +1,7 @@ using UnityEngine; using Saltosion.OneWeapon.AI; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.AI { [RequireComponent(typeof(AI.Behaviours.Follow), typeof(AI.Triggers.EnemySighted))] public class EnemyFollower : MonoBehaviour { public AI.Behaviours.Follow Follow; diff --git a/Assets/Scripts/AI/PlayerFollower.cs b/Assets/Scripts/AI/PlayerFollower.cs index 65d60f9..ec58d93 100644 --- a/Assets/Scripts/AI/PlayerFollower.cs +++ b/Assets/Scripts/AI/PlayerFollower.cs @@ -1,7 +1,7 @@ using UnityEngine; using Saltosion.OneWeapon.AI; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.AI { [RequireComponent(typeof(AI.Behaviours.Follow), typeof(AI.Triggers.PlayerSighted))] public class PlayerFollower : MonoBehaviour { public AI.Behaviours.Follow Follow; diff --git a/Assets/Scripts/AI/Trigger.cs b/Assets/Scripts/AI/Trigger.cs index f1a5671..d9043b4 100644 --- a/Assets/Scripts/AI/Trigger.cs +++ b/Assets/Scripts/AI/Trigger.cs @@ -1,4 +1,5 @@ using UnityEngine; +using Saltosion.OneWeapon.Enemies; namespace Saltosion.OneWeapon.AI { public abstract class Trigger : MonoBehaviour { diff --git a/Assets/Scripts/AI/Triggers/EnemySighted.cs b/Assets/Scripts/AI/Triggers/EnemySighted.cs index fa1eb83..bd1aa62 100644 --- a/Assets/Scripts/AI/Triggers/EnemySighted.cs +++ b/Assets/Scripts/AI/Triggers/EnemySighted.cs @@ -1,5 +1,6 @@ using UnityEngine; using Saltosion.OneWeapon.Utils; +using Saltosion.OneWeapon.Enemies; namespace Saltosion.OneWeapon.AI.Triggers { public class EnemySighted : Trigger { diff --git a/Assets/Scripts/AI/Triggers/PlayerSighted.cs b/Assets/Scripts/AI/Triggers/PlayerSighted.cs index 5805f34..89f4c2f 100644 --- a/Assets/Scripts/AI/Triggers/PlayerSighted.cs +++ b/Assets/Scripts/AI/Triggers/PlayerSighted.cs @@ -1,13 +1,15 @@ using UnityEngine; using Saltosion.OneWeapon.Utils; +using Saltosion.OneWeapon.Player; +using Saltosion.OneWeapon.Enemies; namespace Saltosion.OneWeapon.AI.Triggers { public class PlayerSighted : Trigger { public float Radius; - public Player Player { get; private set; } + public PlayerController Player { get; private set; } public override bool IsTriggered(Enemy subject) { - Player = Util.GetClosestTo(transform, Radius, true); + Player = Util.GetClosestTo(transform, Radius, true); return Player != null; } diff --git a/Assets/Scripts/Effects/BloodDripper.cs b/Assets/Scripts/Effects/BloodDripper.cs index 608fff6..e5a1d96 100644 --- a/Assets/Scripts/Effects/BloodDripper.cs +++ b/Assets/Scripts/Effects/BloodDripper.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Effects { public class BloodDripper : MonoBehaviour { public Vector2 DripOffset = new Vector2(0, -0.5f); public int DripCount = 5; diff --git a/Assets/Scripts/Effects/BloodLauncher.cs b/Assets/Scripts/Effects/BloodLauncher.cs index 02b4b8d..1b19f0c 100644 --- a/Assets/Scripts/Effects/BloodLauncher.cs +++ b/Assets/Scripts/Effects/BloodLauncher.cs @@ -1,8 +1,9 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using Saltosion.OneWeapon.Utils; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Effects { public class BloodLauncher : MonoBehaviour { private static BloodLauncher Singleton; public GameObject StructuralParticlePrefab; diff --git a/Assets/Scripts/Effects/BloodParticle.cs b/Assets/Scripts/Effects/BloodParticle.cs index 00af2a8..56568e2 100644 --- a/Assets/Scripts/Effects/BloodParticle.cs +++ b/Assets/Scripts/Effects/BloodParticle.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Effects { public class BloodParticle : MonoBehaviour { public SpriteRenderer Renderer; diff --git a/Assets/Scripts/Effects/CameraFX.cs b/Assets/Scripts/Effects/CameraFX.cs index 0f0398d..480f3a3 100644 --- a/Assets/Scripts/Effects/CameraFX.cs +++ b/Assets/Scripts/Effects/CameraFX.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Effects { public class CameraFX : MonoBehaviour { public Transform Player; public Transform ShakeHandle; diff --git a/Assets/Scripts/Effects/Explodable.cs b/Assets/Scripts/Effects/Explodable.cs index a5c7dd7..a1ddbab 100644 --- a/Assets/Scripts/Effects/Explodable.cs +++ b/Assets/Scripts/Effects/Explodable.cs @@ -1,8 +1,11 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using Saltosion.OneWeapon.Utils; +using Saltosion.OneWeapon.Player; +using Saltosion.OneWeapon.Enemies; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Effects { public class Explodable : MonoBehaviour { public GameObject[] BodypartPrefabs; public bool DebugExplode = false; diff --git a/Assets/Scripts/Enemies/Enemy.cs b/Assets/Scripts/Enemies/Enemy.cs index 73f4cd6..6e08280 100644 --- a/Assets/Scripts/Enemies/Enemy.cs +++ b/Assets/Scripts/Enemies/Enemy.cs @@ -1,7 +1,7 @@ using UnityEngine; using Saltosion.OneWeapon.AI; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Enemies { [RequireComponent(typeof(Rigidbody2D))] public class Enemy : MonoBehaviour { [Header("Debug Info")] diff --git a/Assets/Scripts/Enemies/EnemySpawner.cs b/Assets/Scripts/Enemies/EnemySpawner.cs index 79445eb..987c567 100644 --- a/Assets/Scripts/Enemies/EnemySpawner.cs +++ b/Assets/Scripts/Enemies/EnemySpawner.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Enemies { public class EnemySpawner : MonoBehaviour { public GameObject[] EnemyPrefabs; public float SpawnCooldown = 5.0f; diff --git a/Assets/Scripts/Enemies/Health.cs b/Assets/Scripts/Enemies/Health.cs index 74544b2..a881c50 100644 --- a/Assets/Scripts/Enemies/Health.cs +++ b/Assets/Scripts/Enemies/Health.cs @@ -1,8 +1,10 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using Saltosion.OneWeapon.Player; +using Saltosion.OneWeapon.Effects; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Enemies { public class Health : MonoBehaviour { public float MaxHealth; public float CurrentHealth; diff --git a/Assets/Scripts/GUI/BackToMainMenuButton.cs b/Assets/Scripts/GUI/BackToMainMenuButton.cs index 508df71..a1c4300 100644 --- a/Assets/Scripts/GUI/BackToMainMenuButton.cs +++ b/Assets/Scripts/GUI/BackToMainMenuButton.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; -namespace Saltosion.OneWeapon.Menus { +namespace Saltosion.OneWeapon.GUI { public class BackToMainMenuButton : MonoBehaviour { public int MainMenuScene; diff --git a/Assets/Scripts/GUI/GoreToggler.cs b/Assets/Scripts/GUI/GoreToggler.cs index 340a4b5..4106750 100644 --- a/Assets/Scripts/GUI/GoreToggler.cs +++ b/Assets/Scripts/GUI/GoreToggler.cs @@ -1,8 +1,9 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using Saltosion.OneWeapon.Utils; -namespace Saltosion.OneWeapon.Menus { +namespace Saltosion.OneWeapon.GUI { public class GoreToggler : MonoBehaviour { public GameObject GoreObject; public GameObject CensoredObject; diff --git a/Assets/Scripts/GUI/HUDController.cs b/Assets/Scripts/GUI/HUDController.cs index f9590d0..2de3066 100644 --- a/Assets/Scripts/GUI/HUDController.cs +++ b/Assets/Scripts/GUI/HUDController.cs @@ -2,8 +2,9 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using Saltosion.OneWeapon.Player; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.GUI { public class HUDController : MonoBehaviour { public PlayerFun PlayerFun; diff --git a/Assets/Scripts/GUI/MainMenuController.cs b/Assets/Scripts/GUI/MainMenuController.cs index 652f534..b370013 100644 --- a/Assets/Scripts/GUI/MainMenuController.cs +++ b/Assets/Scripts/GUI/MainMenuController.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; -namespace Saltosion.OneWeapon.Menus { +namespace Saltosion.OneWeapon.GUI { public class MainMenuController : MonoBehaviour { public int PlayGameScene; public int OptionsMenuScene; diff --git a/Assets/Scripts/Guns/Bullet.cs b/Assets/Scripts/Guns/Bullet.cs index af33ba0..636ce5b 100644 --- a/Assets/Scripts/Guns/Bullet.cs +++ b/Assets/Scripts/Guns/Bullet.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Guns { public class Bullet : MonoBehaviour { public Vector2 Direction; diff --git a/Assets/Scripts/Guns/Gun.cs b/Assets/Scripts/Guns/Gun.cs index 9f82b33..34b7847 100644 --- a/Assets/Scripts/Guns/Gun.cs +++ b/Assets/Scripts/Guns/Gun.cs @@ -1,9 +1,9 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using Saltosion.OneWeapon.Player; - -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Guns { public class Gun : MonoBehaviour { public Bullet Bullet; @@ -24,7 +24,7 @@ namespace Saltosion.OneWeapon { if (IsHeld) { return; } - Player Player = collider.GetComponent(); + PlayerController Player = collider.GetComponent(); if (Player != null) { IsHeld = true; Player.SetGun(this); diff --git a/Assets/Scripts/Guns/RevolverBullet.cs b/Assets/Scripts/Guns/RevolverBullet.cs index a8f2117..4d1da50 100644 --- a/Assets/Scripts/Guns/RevolverBullet.cs +++ b/Assets/Scripts/Guns/RevolverBullet.cs @@ -1,8 +1,11 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using Saltosion.OneWeapon.Player; +using Saltosion.OneWeapon.Enemies; +using Saltosion.OneWeapon.Effects; -namespace Saltosion.OneWeapon.Bullets { +namespace Saltosion.OneWeapon.Guns { [RequireComponent(typeof(Bullet))] public class RevolverBullet : MonoBehaviour { @@ -32,7 +35,7 @@ namespace Saltosion.OneWeapon.Bullets { } void OnTriggerEnter2D(Collider2D collider) { - if (collider.GetComponent() != null) { + if (collider.GetComponent() != null) { // don't hit the player! return; } diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/PlayerController.cs similarity index 97% rename from Assets/Scripts/Player/Player.cs rename to Assets/Scripts/Player/PlayerController.cs index 738062b..15ea410 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -4,9 +4,10 @@ using UnityEngine; using UnityEngine.Animations; using Saltosion.OneWeapon.Effects; using Saltosion.OneWeapon.Utils; +using Saltosion.OneWeapon.Guns; -namespace Saltosion.OneWeapon { - public class Player : MonoBehaviour { +namespace Saltosion.OneWeapon.Player { + public class PlayerController : MonoBehaviour { public Rigidbody2D Body; public Transform Hand; diff --git a/Assets/Scripts/Player/Player.cs.meta b/Assets/Scripts/Player/PlayerController.cs.meta similarity index 100% rename from Assets/Scripts/Player/Player.cs.meta rename to Assets/Scripts/Player/PlayerController.cs.meta diff --git a/Assets/Scripts/Player/PlayerFun.cs b/Assets/Scripts/Player/PlayerFun.cs index b690433..a175d58 100644 --- a/Assets/Scripts/Player/PlayerFun.cs +++ b/Assets/Scripts/Player/PlayerFun.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Player { public class PlayerFun : MonoBehaviour { - public Player Player; + public PlayerController Player; public float MaxFun = 100; public float FunDegradeSpeed = 5; diff --git a/Assets/Scripts/Player/PunchingHand.cs b/Assets/Scripts/Player/PunchingHand.cs index 9dd6c7f..94d071d 100644 --- a/Assets/Scripts/Player/PunchingHand.cs +++ b/Assets/Scripts/Player/PunchingHand.cs @@ -1,8 +1,10 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using Saltosion.OneWeapon.Enemies; +using Saltosion.OneWeapon.Effects; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Player { public class PunchingHand : MonoBehaviour { public bool Punching = false; diff --git a/Assets/Scripts/Utils/AcceleratedMovement.cs b/Assets/Scripts/Utils/AcceleratedMovement.cs index 1abbf55..53121d7 100644 --- a/Assets/Scripts/Utils/AcceleratedMovement.cs +++ b/Assets/Scripts/Utils/AcceleratedMovement.cs @@ -36,4 +36,4 @@ namespace Saltosion.OneWeapon.Utils { Bobbing.BobbingMultiplier = SpeedPercentage; } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Utils/CameraHelper.cs b/Assets/Scripts/Utils/CameraHelper.cs index 69fa57a..a05228f 100644 --- a/Assets/Scripts/Utils/CameraHelper.cs +++ b/Assets/Scripts/Utils/CameraHelper.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Utils { public class CameraHelper : MonoBehaviour { public Camera Camera; [Range(1, 4)] diff --git a/Assets/Scripts/Utils/Options.cs b/Assets/Scripts/Utils/Options.cs index e899eb5..060f306 100644 --- a/Assets/Scripts/Utils/Options.cs +++ b/Assets/Scripts/Utils/Options.cs @@ -1,4 +1,4 @@ -namespace Saltosion.OneWeapon { +namespace Saltosion.OneWeapon.Utils { public class Options { public static bool CensorGore = false; }