Folder/Namespace Structure Improvements

Implementations/2D/OneDirectional2DAirMovement.cs

@@ -0,0 +1,40 @@
+using Syntriax.Modules.Movement.ColliderTrigger;
+using UnityEngine;
+
+namespace Syntriax.Modules.Movement.Implementations.TwoDimensional
+{
+    public class OneDirectional2DAirMovement : OneDirectional2DMovementBase
+    {
+        protected override float moveValue { get; set; } = 0f;
+        protected IGroundTrigger groundTrigger = null;
+
+        protected override void Start()
+        {
+            base.Start();
+            groundTrigger = GetComponentInChildren<IGroundTrigger>();
+            groundTrigger.OnTriggered.AddListener(OnGroundTrigger);
+        }
+
+        private void OnGroundTrigger(bool isGrounded)
+            => CanTakeOver = !isGrounded;
+
+        public override void ApplyMovement()
+        {
+            Vector2 velocity = rigid.velocity;
+            velocity.x += moveValue * Time.fixedDeltaTime;
+
+            if (moveValue != 0f)
+            {
+                if (Mathf.Abs(velocity.x) > Mathf.Abs(moveValue))
+                    velocity.x = moveValue;
+                else if (Mathf.Abs(velocity.x - moveValue) > Mathf.Abs(moveValue))
+                    velocity.x += moveValue * Time.fixedDeltaTime;
+            }
+
+            rigid.velocity = velocity;
+        }
+
+        protected override void OnDeactivated() { }
+        protected override void OnActivated() { }
+    }
+}

Implementations/2D/OneDirectional2DAirMovement.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2f38efc38cadfd94ba8698189577f60f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Implementations/2D/OneDirectional2DGroundMovement.cs

@@ -0,0 +1,31 @@
+using Syntriax.Modules.Movement.ColliderTrigger;
+using UnityEngine;
+
+namespace Syntriax.Modules.Movement.Implementations.TwoDimensional
+{
+    public class OneDirectional2DGroundMovement : OneDirectional2DMovementBase
+    {
+        protected override float moveValue { get; set; } = 0f;
+        protected IGroundTrigger groundTrigger = null;
+
+        protected override void Start()
+        {
+            base.Start();
+            groundTrigger = GetComponentInChildren<IGroundTrigger>();
+            groundTrigger.OnTriggered.AddListener(OnGroundTrigger);
+        }
+
+        private void OnGroundTrigger(bool isGrounded)
+            => CanTakeOver = isGrounded;
+
+        public override void ApplyMovement()
+        {
+            Vector2 velocity = rigid.velocity;
+            velocity.x = moveValue;
+            rigid.velocity = velocity;
+        }
+
+        protected override void OnDeactivated() { }
+        protected override void OnActivated() { }
+    }
+}

Implementations/2D/OneDirectional2DGroundMovement.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9c73429b47407634daead7ee1b52629d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Implementations/2D/OneDirectional2DMovementBase.cs

@@ -0,0 +1,10 @@
+namespace Syntriax.Modules.Movement.Implementations.TwoDimensional
+{
+    public abstract class OneDirectional2DMovementBase : TwoDimensionalMovementBase
+    {
+        protected abstract float moveValue { get; set; }
+
+        public override void Move(float x = 0, float y = 0, float z = 0)
+            => moveValue = x * BaseSpeed * MovementMultiplier;
+    }
+}

Implementations/2D/OneDirectional2DMovementBase.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 51ee606e68723324b92b9d16835c1625
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Implementations/2D/OneWay2DAirMovement.cs

@@ -0,0 +1,40 @@
+using Syntriax.Modules.Movement.ColliderTrigger;
+using UnityEngine;
+
+namespace Syntriax.Modules.Movement.Implementations.TwoDimensional
+{
+    public class OneWay2DAirMovement : OneWay2DMovementBase
+    {
+        protected override float moveValue { get; set; } = 0f;
+        protected IGroundTrigger groundTrigger = null;
+
+        protected override void Start()
+        {
+            base.Start();
+            groundTrigger = GetComponentInChildren<IGroundTrigger>();
+            groundTrigger.OnTriggered.AddListener(OnGroundTrigger);
+        }
+
+        private void OnGroundTrigger(bool isGrounded)
+            => CanTakeOver = !isGrounded;
+
+        public override void ApplyMovement()
+        {
+            Vector2 velocity = rigid.velocity;
+            velocity.x += moveValue * Time.fixedDeltaTime;
+
+            if (moveValue != 0f)
+            {
+                if (Mathf.Abs(velocity.x) > Mathf.Abs(moveValue))
+                    velocity.x = moveValue;
+                else if (Mathf.Abs(velocity.x - moveValue) > Mathf.Abs(moveValue))
+                    velocity.x += moveValue * Time.fixedDeltaTime;
+            }
+
+            rigid.velocity = velocity;
+        }
+
+        protected override void OnDeactivated() { }
+        protected override void OnActivated() { }
+    }
+}

Implementations/2D/OneWay2DAirMovement.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ccd6df43b281de34fb8ea893de8ec4c6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Implementations/2D/OneWay2DGroundMovement.cs

@@ -0,0 +1,31 @@
+using Syntriax.Modules.Movement.ColliderTrigger;
+using UnityEngine;
+
+namespace Syntriax.Modules.Movement.Implementations.TwoDimensional
+{
+    public class OneWay2DGroundMovement : OneWay2DMovementBase
+    {
+        protected override float moveValue { get; set; } = 0f;
+        protected IGroundTrigger groundTrigger = null;
+
+        protected override void Start()
+        {
+            base.Start();
+            groundTrigger = GetComponentInChildren<IGroundTrigger>();
+            groundTrigger.OnTriggered.AddListener(OnGroundTrigger);
+        }
+
+        private void OnGroundTrigger(bool isGrounded)
+            => CanTakeOver = isGrounded;
+
+        public override void ApplyMovement()
+        {
+            Vector2 velocity = rigid.velocity;
+            velocity.x = moveValue;
+            rigid.velocity = velocity;
+        }
+
+        protected override void OnDeactivated() { }
+        protected override void OnActivated() { }
+    }
+}

Implementations/2D/OneWay2DGroundMovement.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f7b798018f7cc444c92f7f17b0501bc7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Implementations/2D/OneWay2DMovementBase.cs

@@ -0,0 +1,10 @@
+namespace Syntriax.Modules.Movement.Implementations.TwoDimensional
+{
+    public abstract class OneWay2DMovementBase : TwoDimensionalMovementBase
+    {
+        protected abstract float moveValue { get; set; }
+
+        public override void Move(float x = 0, float y = 0, float z = 0)
+            => moveValue = x * BaseSpeed * MovementMultiplier;
+    }
+}

Implementations/2D/OneWay2DMovementBase.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 842775d6c36b58f40a18f3d930e04173
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Implementations/2D/TwoDimensionalMovementBase.cs

@@ -0,0 +1,69 @@
+using Syntriax.Modules.Movement.State;
+using UnityEngine;
+using UnityEngine.Events;
+
+namespace Syntriax.Modules.Movement.Implementations.TwoDimensional
+{
+    [RequireComponent(typeof(Rigidbody2D))]
+    public abstract class TwoDimensionalMovementBase : MonoBehaviour, IMovement
+    {
+        protected Rigidbody2D rigid = null;
+        protected IToggleState toggleState = null;
+        protected IMovementController movementController = null;
+        private bool _canTakeOver = false;
+
+        public float BaseSpeed { get; set; } = 1f;
+        public float MovementMultiplier { get; set; } = 1f;
+
+        public UnityEvent<bool> OnTakeOverStateChanged { get; protected set; } = null;
+        public bool CanTakeOver
+        {
+            get => _canTakeOver;
+            protected set
+            {
+                bool isNewValue = _canTakeOver != value;
+
+                _canTakeOver = value;
+
+                if (isNewValue)
+                    OnTakeOverStateChanged.Invoke(value);
+            }
+        }
+
+        public IToggleState ToggleState { get; protected set; } = null;
+
+        protected virtual void Awake()
+        {
+            OnTakeOverStateChanged = new UnityEvent<bool>();
+        }
+
+        protected virtual void Start()
+        {
+            rigid = GetComponent<Rigidbody2D>();
+            toggleState = GetComponent<ToggleState>();
+            movementController = GetComponent<IMovementController>();
+
+            movementController.OnMovementActivated.AddListener(OnActivated);
+            movementController.OnMovementDeactivated.AddListener(OnDeactivated);
+        }
+
+        protected abstract void OnDeactivated();
+        private void OnDeactivated(IMovement movement)
+        {
+            if ((object)movement != this)
+                return;
+            OnDeactivated();
+        }
+
+        protected abstract void OnActivated();
+        private void OnActivated(IMovement movement)
+        {
+            if ((object)movement != this)
+                return;
+            OnActivated();
+        }
+
+        public abstract void Move(float x = 0, float y = 0, float z = 0);
+        public abstract void ApplyMovement();
+    }
+}

Implementations/2D/TwoDimensionalMovementBase.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b4a8f74afcbe280448862bac89545353
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: