[CodeStyle] refactoring v1

Author: teogor

Assets/Scripts/Action.cs

@@ -33,15 +33,15 @@ public virtual void Continue(GameObject obj)
         public abstract void Update();
         public abstract void End();
 
-        public void SetState(ETriggerStates state)
+        public void SetState(ETriggerStates triggerState)
         {
-            this.state = state;
-            enabled = state == ETriggerStates.RUNNING;
+            state = triggerState;
+            enabled = triggerState == ETriggerStates.RUNNING;
         }
 
-        public bool IsState(ETriggerStates state)
+        public bool IsState(ETriggerStates triggerState)
         {
-            return this.state == state;
+            return state == triggerState;
         }
     }
 }

Assets/Scripts/Events/EventOnUse.cs

@@ -23,11 +23,11 @@ public override void Update()
                 {
                     if (IsState(ETriggerRunMode.ASYNCHRONOUSLY))
                     {
-                        if (!UpdateAsyn()) Continue();
+                        if (!UpdateAsync()) Continue();
                     }
                     else
                     {
-                        if (!UpdateSyn()) Continue();
+                        if (!UpdateSync()) Continue();
                     }
                 }
 

Assets/Scripts/Events/EventOnUseTransmitter.cs

@@ -21,18 +21,14 @@ private void Start()
             SetState(ETriggerStates.NOT_ACTIVATED);
         }
 
-        private void Update()
-        {
-        }
-
         public void Log(string msg)
         {
             if (debug) Debug.Log(msg);
         }
 
-        public bool IsState(ETriggerStates state)
+        public bool IsState(ETriggerStates State)
         {
-            return this.state == state;
+            return this.state == State;
         }
 
         public void SetState(ETriggerStates state)

Assets/Scripts/Events/EventOnZone.cs

@@ -3,6 +3,6 @@
     internal interface ITriggerStates
     {
         void SetState(ETriggerStates state);
-        bool IsState(ETriggerStates state);
+        bool IsState(ETriggerStates State);
     }
 }

Assets/Scripts/Interfaces/ITriggerStates.cs

@@ -7,11 +7,6 @@ public class SimpleController : MonoBehaviour
     public float speedMove = 150.0f;
     private GameObject usingItem;
 
-    private void Start()
-    {
-    }
-
-
     private void Update()
     {
         transform.Rotate(0f, Input.GetAxis("Horizontal") * Time.deltaTime * speedMove, 0f);

Assets/Scripts/SimpleController.cs

@@ -6,23 +6,17 @@ public abstract class Event : MonoBehaviour, IDebug, ITriggerExecute
     {
         public QueueActions queue;
 
-
         [SerializeField] protected ETriggerRunMode runMode = ETriggerRunMode.SYNCHRONOUSLY;
         [SerializeField] protected ETriggerWorkMode workMode = ETriggerWorkMode.FIRE;
 
-
         public bool once = true;
 
-
         public bool debug;
 
-
         [SerializeField] protected int countTriggered;
 
-
         private ETriggerStates state = ETriggerStates.NOT_ACTIVATED;
 
-
         protected GameObject whoTriggered;
 
         private void Start()
@@ -37,7 +31,6 @@ public void Log(string msg)
 
         public abstract void Update();
 
-
         public void Run(GameObject obj)
         {
             if (IsState(ETriggerStates.NOT_ACTIVATED) || IsState(ETriggerStates.FINISHED))
@@ -83,8 +76,7 @@ public void Pause()
 
         public abstract void End();
 
-
-        protected bool UpdateSyn()
+        protected bool UpdateSync()
         {
             if (queue.Current() == null)
             {
@@ -107,13 +99,11 @@ protected bool UpdateSyn()
             return CheckOver();
         }
 
-
-        protected bool UpdateAsyn()
+        protected bool UpdateAsync()
         {
             return CheckOver();
         }
 
-
         private bool CheckOver()
         {
             if (IsAllActionsExecuted())
@@ -151,7 +141,6 @@ private void NewStart(GameObject obj)
             countTriggered++;
         }
 
-
         protected void PopAction(GameObject obj)
         {
             queue.Next();
@@ -164,21 +153,18 @@ protected void PopAction(GameObject obj)
             }
         }
 
-
         protected void RunSynchronously(GameObject obj)
         {
             PopAction(obj);
         }
 
-
         protected void RunAsynchronously(GameObject obj)
         {
             whoTriggered = obj;
             Log("Starting asyn actions");
             foreach (var action in queue.GetActions()) action.Run(obj);
         }
 
-
         protected bool IsAllActionsExecuted()
         {
             return queue.IsAllActionsExecuted();
@@ -215,7 +201,6 @@ public bool IsState(ETriggerWorkMode workMode)
             return this.workMode == workMode;
         }
 
-
         protected abstract void Init();
     }
 }

Assets/Scripts/Trigger.cs

@@ -8,13 +8,9 @@ public class AllowedLayers
     {
         public List<int> list;
 
-
         public bool IsAllowed(int layer)
         {
-            if (IsEmpty())
-                return true;
-
-            return list.Contains(layer);
+            return IsEmpty() || list.Contains(layer);
         }
 
 
@@ -23,10 +19,9 @@ public bool IsAllowed(int[] layers)
             return false;
         }
 
-
         private bool IsEmpty()
         {
-            return list != null && list.Count == 0;
+            return list is {Count: 0};
         }
     }
 }