commented my code and fixed some last minute visual bugs

SCCapstone · Apr 22, 2024 · aef661a · aef661a
1 parent 407799f
commit aef661a
Show file tree

Hide file tree

Showing 18 changed files with 158 additions and 15 deletions.
diff --git a/Assets/Scenes/RC1 Levels/Jason's Level.unity b/Assets/Scenes/RC1 Levels/Jason's Level.unity
@@ -8744,7 +8744,7 @@ BoxCollider2D:
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0.016304016, y: -0.040762305}
+  m_Offset: {x: -0.0043821335, y: -0.026972413}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
@@ -8755,7 +8755,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 1.2771835, y: 1.1467445}
+  m_Size: {x: 1.5667706, y: 1.4914901}
   m_EdgeRadius: 0
 --- !u!212 &1056180411
 SpriteRenderer:
@@ -37359,7 +37359,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!95 &1426395666
 Animator:
   serializedVersion: 5
@@ -68655,7 +68655,7 @@ BoxCollider2D:
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: -0.0034475327, y: -0.027579784}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
@@ -68666,7 +68666,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 1, y: 1}
+  m_Size: {x: 1.5860691, y: 1.4964337}
   m_EdgeRadius: 0
 --- !u!114 &2114044730
 MonoBehaviour:

diff --git a/Assets/Scenes/RC1 Levels/JasonLevel2.unity b/Assets/Scenes/RC1 Levels/JasonLevel2.unity
@@ -753,7 +753,7 @@ BoxCollider2D:
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0.016304016, y: -0.040762305}
+  m_Offset: {x: -0.014526367, y: -0.021143436}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
@@ -764,7 +764,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 1.2771835, y: 1.1467445}
+  m_Size: {x: 1.6975899, y: 1.4998856}
   m_EdgeRadius: 0
 --- !u!212 &77452158
 SpriteRenderer:
@@ -58137,7 +58137,7 @@ BoxCollider2D:
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: -0.042040348, y: -0.0028026104}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
@@ -58148,7 +58148,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 1, y: 1}
+  m_Size: {x: 1.622201, y: 1.4428277}
   m_EdgeRadius: 0
 --- !u!212 &889575791
 SpriteRenderer:

diff --git a/Assets/Scripts/BossEnemyStageOne.cs b/Assets/Scripts/BossEnemyStageOne.cs
@@ -4,6 +4,7 @@
 
 public class BossEnemyStageOne : MonoBehaviour
 {
+    // Variable Declarations
     private float directionX;
     public float moveSpeed;
     private Rigidbody2D myRigidBody;
@@ -13,6 +14,10 @@ public class BossEnemyStageOne : MonoBehaviour
     public BossHealthStageOne bossHealth;
 
     // Start is called before the first frame update
+    // Gets access to player's health script
+    // Gets access to the boss' health script
+    // Sets the boss' direction when starting level
+    // Gets the boss' rigidbody
     void Start()
     {
         localScale = transform.localScale;
@@ -22,6 +27,9 @@ void Start()
         bossHealth = GameObject.FindGameObjectWithTag("Enemy").GetComponent<BossHealthStageOne>();
     }
 
+    // Allows the boss to take damage from metal crates
+    // Hurts the player if the boss and the player touch
+    // Changes the boss' direction when they touch a wall
     private void OnTriggerEnter2D(Collider2D collision)
     {
         if (collision.transform.CompareTag("Wall"))
@@ -38,11 +46,13 @@ private void OnTriggerEnter2D(Collider2D collision)
         }
     }
 
+    // actually moves the boss
     private void FixedUpdate()
     {
         myRigidBody.velocity = new Vector2(directionX * moveSpeed, myRigidBody.velocity.y);
     }
 
+    // Flips the boss sprite when they switch directions
     void LateUpdate()
     {
         if (directionX > 0)
@@ -63,6 +73,8 @@ void LateUpdate()
 
         FlipY();
     }
+
+    // Flips the enemy sprite when gravity is changed
     public void FlipY()
     {
         Vector3 scale = transform.localScale;

diff --git a/Assets/Scripts/BossEnemyStageThree.cs b/Assets/Scripts/BossEnemyStageThree.cs
@@ -4,6 +4,7 @@
 
 public class BossEnemyStageThree : MonoBehaviour
 {
+    // Variable Declarations
     private float directionX;
     public float moveSpeed;
     private Rigidbody2D myRigidBody;
@@ -13,6 +14,10 @@ public class BossEnemyStageThree : MonoBehaviour
     public BossHealthStageThree bossHealth;
 
     // Start is called before the first frame update
+    // Gets access to player's health script
+    // Gets access to the boss' health script
+    // Sets the boss' direction when starting level
+    // Gets the boss' rigidbody
     void Start()
     {
         localScale = transform.localScale;
@@ -22,6 +27,9 @@ void Start()
         bossHealth = GameObject.FindGameObjectWithTag("Enemy").GetComponent<BossHealthStageThree>();
     }
 
+    // Allows the boss to take damage from metal crates
+    // Hurts the player if the boss and the player touch
+    // Changes the boss' direction when they touch a wall
     private void OnTriggerEnter2D(Collider2D collision)
     {
         if (collision.transform.CompareTag("Wall"))
@@ -38,11 +46,13 @@ private void OnTriggerEnter2D(Collider2D collision)
         }
     }
 
+    // actually moves the boss
     private void FixedUpdate()
     {
         myRigidBody.velocity = new Vector2(directionX * moveSpeed, myRigidBody.velocity.y);
     }
 
+    // Flips the boss sprite when they switch directions
     void LateUpdate()
     {
         if (directionX > 0)
@@ -63,6 +73,8 @@ void LateUpdate()
 
         FlipY();
     }
+
+    // Flips the enemy sprite when gravity is changed
     public void FlipY()
     {
         Vector3 scale = transform.localScale;

diff --git a/Assets/Scripts/BossEnemyStageTwo.cs b/Assets/Scripts/BossEnemyStageTwo.cs
@@ -4,6 +4,7 @@
 
 public class BossEnemyStageTwo : MonoBehaviour
 {
+    // Variable Declarations
     private float directionX;
     public float moveSpeed;
     private Rigidbody2D myRigidBody;
@@ -13,6 +14,10 @@ public class BossEnemyStageTwo : MonoBehaviour
     public BossHealthStageTwo bossHealth;
 
     // Start is called before the first frame update
+    // Gets access to player's health script
+    // Gets access to the boss' health script
+    // Sets the boss' direction when starting level
+    // Gets the boss' rigidbody
     void Start()
     {
         localScale = transform.localScale;
@@ -22,6 +27,9 @@ void Start()
         bossHealth = GameObject.FindGameObjectWithTag("Enemy").GetComponent<BossHealthStageTwo>();
     }
 
+    // Allows the boss to take damage from metal crates
+    // Hurts the player if the boss and the player touch
+    // Changes the boss' direction when they touch a wall
     private void OnTriggerEnter2D(Collider2D collision)
     {
         if (collision.transform.CompareTag("Wall"))
@@ -38,11 +46,13 @@ private void OnTriggerEnter2D(Collider2D collision)
         }
     }
 
+    // actually moves the boss
     private void FixedUpdate()
     {
         myRigidBody.velocity = new Vector2(directionX * moveSpeed, myRigidBody.velocity.y);
     }
 
+    // Flips the boss sprite when they switch directions
     void LateUpdate()
     {
         if (directionX > 0)
@@ -63,6 +73,8 @@ void LateUpdate()
 
         FlipY();
     }
+
+    // Flips the enemy sprite when gravity is changed
     public void FlipY()
     {
         Vector3 scale = transform.localScale;

diff --git a/Assets/Scripts/BossHealthStageOne.cs b/Assets/Scripts/BossHealthStageOne.cs
@@ -5,8 +5,10 @@
 
 public class BossHealthStageOne : MonoBehaviour
 {
+    // Variable Declarations
     public int maxHealth = 15;
     public int currentHealth;
+    // Array of boss health
     public Image[] Health;
     public Sprite fullHeart;
     public Sprite emptyHeart;
@@ -16,13 +18,16 @@ public class BossHealthStageOne : MonoBehaviour
 
 
     // Start is called before the first frame update
+    // Sets current health to max health
+    // Gets access to exit level script
     void Start()
     {
         exitLevel = GameObject.FindGameObjectWithTag("Exit").GetComponent<ExitLevelScriptV2>();
         currentHealth = maxHealth;
     }
 
     // Update is called once per frame
+    // Keeps track of boss health
     void Update()
     {
         for (int index = 0; index < Health.Length; index++)
@@ -47,6 +52,10 @@ void Update()
         }
     }
 
+    // Makes the boss take damage
+    // plays the hurt sound effect
+    // plays boss hurt animation
+    // Goes to the next level if boss reaches certain health
     public void TakeDamage(int amount)
     {
         currentHealth -= amount;
@@ -60,6 +69,7 @@ public void TakeDamage(int amount)
         }
     }
 
+    // plays boss animations after a certain time
     public IEnumerator GoBackToNormalAnimation()
     {
         yield return new WaitForSeconds(1);

diff --git a/Assets/Scripts/BossHealthStageThree.cs b/Assets/Scripts/BossHealthStageThree.cs
@@ -5,8 +5,10 @@
 
 public class BossHealthStageThree : MonoBehaviour
 {
+    // Variable Declarations
     public int maxHealth = 15;
     public int currentHealth;
+    // Array of boss health
     public Image[] Health;
     public Sprite fullHeart;
     public Sprite emptyHeart;
@@ -16,13 +18,17 @@ public class BossHealthStageThree : MonoBehaviour
 
 
     // Start is called before the first frame update
+    // Start is called before the first frame update
+    // Sets current health to max health
+    // Gets access to exit level script
     void Start()
     {
         exitLevel = GameObject.FindGameObjectWithTag("Exit").GetComponent<ExitLevelScriptV2>();
         currentHealth = 5;
     }
 
     // Update is called once per frame
+    // Keeps track of boss health
     void Update()
     {
         for (int index = 0; index < Health.Length; index++)
@@ -47,6 +53,10 @@ void Update()
         }
     }
 
+    // Makes the boss take damage
+    // plays the hurt sound effect
+    // plays boss hurt animation
+    // Goes to the next level if boss reaches certain health
     public void TakeDamage(int amount)
     {
         currentHealth -= amount;
@@ -60,6 +70,7 @@ public void TakeDamage(int amount)
         }
     }
 
+    // plays boss animations after a certain time
     public IEnumerator GoBackToNormalAnimation()
     {
         yield return new WaitForSeconds(1);

diff --git a/Assets/Scripts/BossHealthStageTwo.cs b/Assets/Scripts/BossHealthStageTwo.cs
@@ -5,8 +5,10 @@
 
 public class BossHealthStageTwo : MonoBehaviour
 {
+    // Variable Declarations
     public int maxHealth = 15;
     public int currentHealth;
+    // Array of boss health
     public Image[] Health;
     public Sprite fullHeart;
     public Sprite emptyHeart;
@@ -16,13 +18,18 @@ public class BossHealthStageTwo : MonoBehaviour
 
 
     // Start is called before the first frame update
+    // Start is called before the first frame update
+    // Start is called before the first frame update
+    // Sets current health to max health
+    // Gets access to exit level script
     void Start()
     {
         exitLevel = GameObject.FindGameObjectWithTag("Exit").GetComponent<ExitLevelScriptV2>();
         currentHealth = 10;
     }
 
     // Update is called once per frame
+    // Keeps track of boss health
     void Update()
     {
         for (int index = 0; index < Health.Length; index++)
@@ -47,6 +54,10 @@ void Update()
         }
     }
 
+    // Makes the boss take damage
+    // plays the hurt sound effect
+    // plays boss hurt animation
+    // Goes to the next level if boss reaches certain health
     public void TakeDamage(int amount)
     {
         currentHealth -= amount;
@@ -60,6 +71,7 @@ public void TakeDamage(int amount)
         }
     }
 
+    // plays boss animations after a certain time
     public IEnumerator GoBackToNormalAnimation()
     {
         yield return new WaitForSeconds(1);