From 2c996a9a296530455dcca803d5d4cd8933510c2a Mon Sep 17 00:00:00 2001 From: Syntriax Date: Thu, 23 Dec 2021 13:41:32 +0300 Subject: [PATCH] Typo Fix and Namespace Changes --- 2D/OneDimensional2DAirMovement.cs | 5 ++--- 2D/OneDimensional2DGroundMovement.cs | 5 ++--- ColliderCheck/Ground/IGroundCheck.cs | 2 +- ColliderCheck/Ground/TwoDimensionalBoxChildGroundCheck.cs | 2 +- IMovement.cs | 2 +- IStateSwitch.cs.meta => IState.cs.meta | 2 +- SpecialAction/Actions/PlatformerJump.cs | 5 ++--- 7 files changed, 10 insertions(+), 13 deletions(-) rename IStateSwitch.cs.meta => IState.cs.meta (83%) diff --git a/2D/OneDimensional2DAirMovement.cs b/2D/OneDimensional2DAirMovement.cs index cc3f8c0..23ceb59 100644 --- a/2D/OneDimensional2DAirMovement.cs +++ b/2D/OneDimensional2DAirMovement.cs @@ -1,5 +1,4 @@ using Syntriax.Modules.Movement.ColliderCheck; -using Syntriax.Modules.Movement.ColliderCheck.Ground; using UnityEngine; namespace Syntriax.Modules.Movement @@ -14,7 +13,7 @@ namespace Syntriax.Modules.Movement public bool IsActive => StateEnabled && !groundCheck.IsCollided(); public bool StateEnabled { get; set; } = true; - public float SpeedMultiplier { get; set; } = 1f; + public float MovementMultiplier { get; set; } = 1f; private void Start() { @@ -48,7 +47,7 @@ namespace Syntriax.Modules.Movement public void Move(float x = 0, float y = 0, float z = 0) { - moveValue = x * SpeedMultiplier; + moveValue = x * MovementMultiplier; } } } diff --git a/2D/OneDimensional2DGroundMovement.cs b/2D/OneDimensional2DGroundMovement.cs index 66fac0c..5cfc184 100644 --- a/2D/OneDimensional2DGroundMovement.cs +++ b/2D/OneDimensional2DGroundMovement.cs @@ -1,5 +1,4 @@ using Syntriax.Modules.Movement.ColliderCheck; -using Syntriax.Modules.Movement.ColliderCheck.Ground; using UnityEngine; namespace Syntriax.Modules.Movement @@ -13,7 +12,7 @@ namespace Syntriax.Modules.Movement public bool IsActive => StateEnabled && groundCheck.IsCollided(); public bool StateEnabled { get; set; } = true; - public float SpeedMultiplier { get; set; } = 1f; + public float MovementMultiplier { get; set; } = 1f; private void Start() { @@ -38,7 +37,7 @@ namespace Syntriax.Modules.Movement public void Move(float x = 0, float y = 0, float z = 0) { - moveValue = x * SpeedMultiplier; + moveValue = x * MovementMultiplier; } } } diff --git a/ColliderCheck/Ground/IGroundCheck.cs b/ColliderCheck/Ground/IGroundCheck.cs index a3e7221..402a9aa 100644 --- a/ColliderCheck/Ground/IGroundCheck.cs +++ b/ColliderCheck/Ground/IGroundCheck.cs @@ -1,4 +1,4 @@ -namespace Syntriax.Modules.Movement.ColliderCheck.Ground +namespace Syntriax.Modules.Movement.ColliderCheck { public interface IGroundCheck : IColliderCheck { } } diff --git a/ColliderCheck/Ground/TwoDimensionalBoxChildGroundCheck.cs b/ColliderCheck/Ground/TwoDimensionalBoxChildGroundCheck.cs index 0791d0b..98a6642 100644 --- a/ColliderCheck/Ground/TwoDimensionalBoxChildGroundCheck.cs +++ b/ColliderCheck/Ground/TwoDimensionalBoxChildGroundCheck.cs @@ -1,4 +1,4 @@ -namespace Syntriax.Modules.Movement.ColliderCheck.Ground +namespace Syntriax.Modules.Movement.ColliderCheck { public class TwoDimensionalBoxChildGroundCheck : TwoDimensionalBoxChildColliderCheck, IGroundCheck { } } diff --git a/IMovement.cs b/IMovement.cs index 299e2f3..7dc4004 100644 --- a/IMovement.cs +++ b/IMovement.cs @@ -2,7 +2,7 @@ namespace Syntriax.Modules.Movement { public interface IMovement { - float SpeedMultiplier { get; set; } + float MovementMultiplier { get; set; } bool IsActive { get; } void Move(float x = 0f, float y = 0f, float z = 0f); } diff --git a/IStateSwitch.cs.meta b/IState.cs.meta similarity index 83% rename from IStateSwitch.cs.meta rename to IState.cs.meta index ba13095..1d371a8 100644 --- a/IStateSwitch.cs.meta +++ b/IState.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bc4a8610b5876e14ab81beef027850b2 +guid: 02daadcda38072a4ca4798b8f8800f53 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/SpecialAction/Actions/PlatformerJump.cs b/SpecialAction/Actions/PlatformerJump.cs index b9b490e..1163420 100644 --- a/SpecialAction/Actions/PlatformerJump.cs +++ b/SpecialAction/Actions/PlatformerJump.cs @@ -1,5 +1,4 @@ using Syntriax.Modules.Movement.ColliderCheck; -using Syntriax.Modules.Movement.ColliderCheck.Ground; using UnityEngine; namespace Syntriax.Modules.Movement.SpecialAction @@ -42,9 +41,9 @@ namespace Syntriax.Modules.Movement.SpecialAction ApplySuspension(fallMultiplier); } - private void ApplySuspension(float multipier) + private void ApplySuspension(float multiplier) { - rigid.velocity += Physics2D.gravity * multipier; + rigid.velocity += Physics2D.gravity * multiplier; } private void Jump()