Reset bunkers after starting a new round

Author: adamgraham

Assets/Scenes/Space Invaders.unity

@@ -245,9 +245,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 459f605e13eced949a32904be2fa0a25, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  player: {fileID: 1639391302}
-  invaders: {fileID: 962212320}
-  mysteryShip: {fileID: 1154390492}
   scoreText: {fileID: 1984502043}
   livesText: {fileID: 188796889}
   gameOverUI: {fileID: 797358150}

Assets/Scripts/Bunker.cs

@@ -24,32 +24,41 @@ public class Bunker : MonoBehaviour
     /// </summary>
     private BoxCollider2D _collider;
 
+    /// <summary>
+    /// The original texture of the sprite so we can clone it.
+    /// </summary>
+    private Texture2D _originalTexture;
+
     private void Awake()
     {
         _spriteRenderer = GetComponent<SpriteRenderer>();
         _collider = GetComponent<BoxCollider2D>();
+        _originalTexture = _spriteRenderer.sprite.texture;
 
-        // Each bunker needs a unique instance of the sprite since we will be
-        // changing the source texture
-        CreateSpriteInstance();
+        ResetBunker();
     }
 
-    private void CreateSpriteInstance()
+    public void ResetBunker()
     {
-        Sprite sprite = _spriteRenderer.sprite;
+        // Each bunker needs a unique instance of the sprite texture since we
+        // will be modifying it at the source
+        CopyTexture(_originalTexture);
+    }
 
+    private void CopyTexture(Texture2D source)
+    {
         // Create a copy of the source texture with the same properties
-        Texture2D texture = new Texture2D(sprite.texture.width, sprite.texture.height, sprite.texture.format, false);
-        texture.filterMode = sprite.texture.filterMode;
-        texture.alphaIsTransparency = sprite.texture.alphaIsTransparency;
-        texture.anisoLevel = sprite.texture.anisoLevel;
-        texture.wrapMode = sprite.texture.wrapMode;
-        texture.SetPixels(sprite.texture.GetPixels());
-        texture.Apply();
-
-        // Create a new sprite using the cloned texture
-        Sprite instance = Sprite.Create(texture, sprite.rect, new Vector2(0.5f, 0.5f), sprite.pixelsPerUnit);
-        _spriteRenderer.sprite = instance;
+        Texture2D copy = new Texture2D(source.width, source.height, source.format, false);
+        copy.filterMode = source.filterMode;
+        copy.alphaIsTransparency = source.alphaIsTransparency;
+        copy.anisoLevel = source.anisoLevel;
+        copy.wrapMode = source.wrapMode;
+        copy.SetPixels(source.GetPixels());
+        copy.Apply();
+
+        // Create a new sprite using the copied texture
+        Sprite sprite = Sprite.Create(copy, _spriteRenderer.sprite.rect, new Vector2(0.5f, 0.5f), _spriteRenderer.sprite.pixelsPerUnit);
+        _spriteRenderer.sprite = sprite;
     }
 
     public bool CheckPoint(Vector3 hitPoint, out int px, out int py)

Assets/Scripts/GameManager.cs

@@ -10,20 +10,22 @@ public sealed class GameManager : MonoBehaviour
     /// <summary>
     /// A reference to the player game object.
     /// </summary>
-    [Tooltip("A reference to the player game object.")]
-    public Player player;
+    private Player player;
 
     /// <summary>
     /// A reference to the invaders game object.
     /// </summary>
-    [Tooltip("A reference to the invaders game object.")]
-    public Invaders invaders;
+    private Invaders invaders;
 
     /// <summary>
     /// A reference to the MysteryShip game object.
     /// </summary>
-    [Tooltip("A reference to the MysteryShip game object.")]
-    public MysteryShip mysteryShip;
+    private MysteryShip mysteryShip;
+
+    /// <summary>
+    /// A reference to all of the bunker game objects.
+    /// </summary>
+    private Bunker[] bunkers;
 
     /// <summary>
     /// The UI text that displays the player's score.
@@ -53,6 +55,14 @@ public sealed class GameManager : MonoBehaviour
     /// </summary>
     public int lives { get; private set; }
 
+    private void Awake()
+    {
+        this.player = FindObjectOfType<Player>();
+        this.invaders = FindObjectOfType<Invaders>();
+        this.mysteryShip = FindObjectOfType<MysteryShip>();
+        this.bunkers = FindObjectsOfType<Bunker>();
+    }
+
     private void Start()
     {
         // Register callbacks for game state
@@ -74,28 +84,32 @@ private void Update()
 
     private void NewGame()
     {
+        // Hide the game over UI
+        this.gameOverUI.SetActive(false);
+
         // Reset score and lives
         SetScore(0);
         SetLives(3);
 
+        // Start the first round
+        NewRound();
+    }
+
+    private void NewRound()
+    {
         // Reset all of the invaders
         this.invaders.ResetInvaders();
         this.invaders.gameObject.SetActive(true);
 
-        // Hide the game over UI
-        this.gameOverUI.SetActive(false);
+        // Reset all of the bunkers
+        for (int i = 0; i < this.bunkers.Length; i++) {
+            this.bunkers[i].ResetBunker();
+        }
 
         // Spawn the player
         Respawn();
     }
 
-    private void GameOver()
-    {
-        // Show the game over UI and hide the invaders
-        this.gameOverUI.SetActive(true);
-        this.invaders.gameObject.SetActive(false);
-    }
-
     private void Respawn()
     {
         // Reset the position of the player
@@ -107,6 +121,13 @@ private void Respawn()
         this.player.gameObject.SetActive(true);
     }
 
+    private void GameOver()
+    {
+        // Show the game over UI and hide the invaders
+        this.gameOverUI.SetActive(true);
+        this.invaders.gameObject.SetActive(false);
+    }
+
     private void SetScore(int score)
     {
         // Set score and update UI text
@@ -142,6 +163,11 @@ private void OnInvaderKilled(Invader invader)
     {
         // Increment score by how much the invader is worth
         SetScore(this.score + invader.score);
+
+        // Start a new round after all invaders have been killed
+        if (this.invaders.amountKilled == this.invaders.totalAmount) {
+            NewRound();
+        }
     }
 
     private void OnMysteryShipKilled(MysteryShip mysteryShip)

Assets/Scripts/Invaders.cs

@@ -168,12 +168,12 @@ private void Update()
             }
 
             // Check the left edge or right edge based on the current direction
-            if (_direction.x > 0.0f && invader.position.x >= (rightEdge.x - 1.0f))
+            if (_direction == Vector3.right && invader.position.x >= (rightEdge.x - 1.0f))
             {
                 AdvanceRow();
                 break;
             }
-            else if (invader.position.x <= (leftEdge.x + 1.0f))
+            else if (_direction == Vector3.left && invader.position.x <= (leftEdge.x + 1.0f))
             {
                 AdvanceRow();
                 break;
@@ -200,14 +200,12 @@ private void OnInvaderKilled(Invader invader)
         // Disable the invader that was killed
         invader.gameObject.SetActive(false);
 
+        // Increment the amount of invaders killed so the game manager can check
+        // if they are all dead
+        this.amountKilled++;
+
         // Invoke the kill callback
         this.killed(invader);
-
-        // Increment the amount of invaders that have been killed and reset all
-        // of them after they have all been killed
-        if (++this.amountKilled >= this.totalAmount) {
-            ResetInvaders();
-        }
     }
 
     public void ResetInvaders()