Allow invaders to destroy bunkers and the player

Author: adamgraham

Assets/Prefabs/Invader_Base.prefab

@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8922502034929116583}
   - component: {fileID: 8922502034929116582}
+  - component: {fileID: -4447578080803963419}
   - component: {fileID: 8922502034929116585}
   - component: {fileID: 1551307908973724939}
   m_Layer: 7
@@ -84,6 +85,27 @@ SpriteRenderer:
   m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!50 &-4447578080803963419
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8922502034929116581}
+  m_BodyType: 1
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 1
+  m_Material: {fileID: 0}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 0
 --- !u!61 &8922502034929116585
 BoxCollider2D:
   m_ObjectHideFlags: 0

Assets/Scenes/Space Invaders.unity

@@ -724,7 +724,6 @@ MonoBehaviour:
     m_RotationOrder: 4
   rows: 5
   columns: 11
-  advances: 10
   missilePrefab: {fileID: 6161936928069685931, guid: 3c328e673b90a7f418f1f1e66f83522b, type: 3}
   missileSpawnRate: 1
 --- !u!1 &1001845995

Assets/Scripts/Bunker.cs

@@ -43,6 +43,8 @@ public void ResetBunker()
         // Each bunker needs a unique instance of the sprite texture since we
         // will be modifying it at the source
         CopyTexture(_originalTexture);
+
+        this.gameObject.SetActive(true);
     }
 
     private void CopyTexture(Texture2D source)
@@ -139,4 +141,11 @@ public bool CheckCollision(BoxCollider2D other, Vector3 hitPoint)
                Splat(hitPoint + (Vector3.right * offset.x));
     }
 
+    private void OnTriggerEnter2D(Collider2D other)
+    {
+        if (other.gameObject.layer == LayerMask.NameToLayer("Invader")) {
+            this.gameObject.SetActive(false);
+        }
+    }
+
 }

Assets/Scripts/GameManager.cs

@@ -77,7 +77,7 @@ private void Start()
     private void Update()
     {
         // Start a new game once the player presses 'Return'
-        if (this.lives == 0 && Input.GetKeyDown(KeyCode.Return)) {
+        if (this.lives <= 0 && Input.GetKeyDown(KeyCode.Return)) {
             NewGame();
         }
     }
@@ -138,7 +138,7 @@ private void SetScore(int score)
     private void SetLives(int lives)
     {
         // Set lives and update UI text
-        this.lives = lives;
+        this.lives = Mathf.Max(lives, 0);
         this.livesText.text = this.lives.ToString();
     }
 
@@ -150,10 +150,10 @@ private void OnPlayerKilled()
         // Temporarily disable the player game object
         this.player.gameObject.SetActive(false);
 
-        // Respawn the player after 1 second or trigger the game over state
-        // after running out of lives
+        // Start the round over again after 1 second or trigger the game over
+        // state if out of lives
         if (this.lives > 0) {
-            Invoke(nameof(Respawn), 1.0f);
+            Invoke(nameof(NewRound), 1.0f);
         } else {
             GameOver();
         }

Assets/Scripts/Invaders.cs

@@ -58,17 +58,6 @@ public class Invaders : MonoBehaviour
     [Tooltip("The number of columns of invaders.")]
     public int columns = 11;
 
-    /// <summary>
-    /// The number of times the invaders can advance rows.
-    /// </summary>
-    [Tooltip("The number of times the invaders can advance rows.")]
-    public int advances = 10;
-
-    /// <summary>
-    /// The current row the invaders have advanced to.
-    /// </summary>
-    private int _row;
-
     /// <summary>
     /// The prefab that is cloned when an invader shoots a missile.
     /// </summary>
@@ -187,12 +176,9 @@ private void AdvanceRow()
         _direction.x *= -1.0f;
 
         // Move the entire grid of invaders down a row
-        if (_row++ < this.advances)
-        {
-            Vector3 position = this.transform.position;
-            position.y -= 1.0f;
-            this.transform.position = position;
-        }
+        Vector3 position = this.transform.position;
+        position.y -= 1.0f;
+        this.transform.position = position;
     }
 
     private void OnInvaderKilled(Invader invader)
@@ -213,7 +199,6 @@ public void ResetInvaders()
         // Reset state
         this.amountKilled = 0;
         _direction = Vector3.right;
-        _row = 0;
 
         // Reset the position of the invaders back to the top
         this.transform.position = _initialPosition;

Assets/Scripts/Player.cs

@@ -66,8 +66,9 @@ private void OnLaserDestroyed(Projectile laser)
 
     private void OnTriggerEnter2D(Collider2D other)
     {
-        // The player is killed when hit by a missile
-        if (other.gameObject.layer == LayerMask.NameToLayer("Missile")) {
+        // The player is killed when hit by a missile or invader
+        if (other.gameObject.layer == LayerMask.NameToLayer("Missile") ||
+            other.gameObject.layer == LayerMask.NameToLayer("Invader")) {
             this.killed?.Invoke();
         }
     }