Reformat Bomb Code

Assets/Scripts/src/Ammo/BombController.cs

@@ -1,68 +1,72 @@
 using System.Collections;
-using System.Collections.Generic;
+using src.Managers;
 using UnityEngine;
 
-public class BombController : MonoBehaviour, IExplosable
+namespace src.Ammo
 {
-    public GameObject explosionPrefab;
+    public class BombController : MonoBehaviour, IExplosable
-
-    BombStatsManager bombStatsUtil = BombStatsManager.Instance;
-    bool exploded = false;
-
-    // Start is called before the first frame update
-    void Start()
     {
-        Invoke("Explode", bombStatsUtil.Timer);
+        public GameObject explosionPrefab;
-    }
 
-    void Explode()
+        private readonly BombStatsManager _bombStatsUtil = BombStatsManager.Instance;
-    {
+        private bool _exploded;
-        Instantiate(explosionPrefab, transform.position, Quaternion.identity);
 
-        GetComponent<SpriteRenderer>().enabled = false;
+        // Start is called before the first frame update
-        transform.Find("2DCollider").gameObject.SetActive(false);
+        void Start()
-
-        StartCoroutine(CreateExplosions(Vector3.down));
-        StartCoroutine(CreateExplosions(Vector3.left));
-        StartCoroutine(CreateExplosions(Vector3.up));
-        StartCoroutine(CreateExplosions(Vector3.right));
-      
-        exploded = true;
-        Destroy(gameObject, 0.3f);
-    }
-
-    private IEnumerator CreateExplosions(Vector3 direction)
-    {
-        for (int i = 1; i < bombStatsUtil.Power; i++)
         {
-            RaycastHit2D hit = Physics2D.Raycast(new Vector2(transform.position.x, transform.position.y), direction, i, 1 << 8);
+            Invoke(nameof(Explode), _bombStatsUtil.Timer);
-            if (!hit.collider)
-            {
-                Instantiate(explosionPrefab, transform.position + (i * direction), explosionPrefab.transform.rotation);
-            }
-            else
-            {
-                break;
-            }
-
         }
 
-        yield return new WaitForSeconds(0.05f);
+        void Explode()
-
-    }
-
-    public void OnTriggerEnter2D(Collider2D other)
-    {
-        if (!exploded && other.CompareTag("Explosion"))
         {
-            onExplosion();
+            Instantiate(explosionPrefab, transform.position, Quaternion.identity);
+
+            GetComponent<SpriteRenderer>().enabled = false;
+            transform.Find("2DCollider").gameObject.SetActive(false);
+
+            StartCoroutine(CreateExplosions(Vector3.down));
+            StartCoroutine(CreateExplosions(Vector3.left));
+            StartCoroutine(CreateExplosions(Vector3.up));
+            StartCoroutine(CreateExplosions(Vector3.right));
+
+            _exploded = true;
+            Destroy(gameObject, 0.3f);
+        }
+
+        private IEnumerator CreateExplosions(Vector3 direction)
+        {
+            for (int i = 1; i < _bombStatsUtil.Power; i++)
+            {
+                RaycastHit2D hit = Physics2D.Raycast(transform.position, direction, i,
+                    1 << 8);
+                if (!hit.collider)
+                {
+                    Instantiate(explosionPrefab, transform.position + i * direction, 
+                        explosionPrefab.transform.rotation);
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            yield return new WaitForSeconds(0.05f);
+        }
+
+        public void OnTriggerEnter2D(Collider2D other)
+        {
+            if (!_exploded && other.CompareTag("Explosion"))
+            {
+                onExplosion();
+            }
+        }
+
+        public void onExplosion()
+        {
+            // In caz ca o bomba loveste bomba, dam cancel la explozie
+            // sa nu explodeze twice si o explodam automagic
+            CancelInvoke(nameof(Explode));
+            Explode();
         }
     }
-
+}
-    public void onExplosion()
-    {
-        //In caz ca o bomba loveste bomba, dam cancel la explozie sa nu explodeze twice si o explodam automagic
-        CancelInvoke("Explode");
-        Explode();
-    }
-}

Assets/Scripts/src/Ammo/Explosion.cs

@@ -1,13 +1,14 @@
 using System.Collections;
 using System.Collections.Generic;
+using src.Managers;
 using UnityEngine;
 
 public class Explosion : MonoBehaviour
 {
-    BombStatsManager bombUtil = BombStatsManager.Instance;
+    private readonly BombStatsManager _bombUtil = BombStatsManager.Instance;
 
     public void Start()
     {
-        Destroy(gameObject, bombUtil.ExplosionDuration);
+        Destroy(gameObject, _bombUtil.ExplosionDuration);
     }
 }

Assets/Scripts/src/Managers/BombStatsManager.cs

@@ -1,36 +1,27 @@
-using System.Collections;
+namespace src.Managers
-using System.Collections.Generic;
-
-public sealed class BombStatsManager
 {
-    
+    public sealed class BombStatsManager
-    private static readonly BombStatsManager instance = new BombStatsManager();
-    const int MAX_POWER = 7;
-
-    public int Power { get; private set; } = 3;
-
-    public float Timer { get; } = 3.0f;
-
-    public float ExplosionDuration { get; } = 0.55f;
-
-    private BombStatsManager()
     {
-    }
+        private const int MaxPower = 7;
 
-    public static BombStatsManager Instance
+        public int Power { get; private set; } = 3;
-    {
+
-        get
+        public float Timer { get; } = 3.0f;
+
+        public float ExplosionDuration { get; } = 0.55f;
+
+        private BombStatsManager()
         {
-            return instance;
+        }
+
+        public static BombStatsManager Instance { get; } = new BombStatsManager();
+
+        public void IncreasePower()
+        {
+            if (Power <= MaxPower)
+            {
+                Power++;
+            }
         }
     }
-
+}
-    public void increasePower()
-    {
-        if(Power <= MAX_POWER)
-        {
-            Power++;
-        }
-    }
-
-}