Beta (beta beta) Push

For sake of play testing
aps16104 · Apr 21, 2020 · 7e89c92 · 7e89c92
1 parent d8a7b16
commit 7e89c92
Show file tree

Hide file tree

Showing 21 changed files with 172 additions and 132 deletions.
diff --git a/Platformer/Assets/Scripts/Level 1/Player_Controller.cs b/Platformer/Assets/Scripts/Level 1/Player_Controller.cs
@@ -70,6 +70,10 @@ void TakeDamage(int damage)
 		{
 		 currentHealth -= damage; //take damage     
 		 healthbar.SetHealth(currentHealth); //modify health bar
+        if (currentHealth < 0)
+        {
+            Time.timeScale = 0f;
+        }
 		}
 
 
@@ -90,6 +94,11 @@ void OnTriggerEnter2D(Collider2D other) //Pickups
 			healthbar.SetHealth(currentHealth); //Full HealthBar
         }
 
+        if (other.gameObject.CompareTag("Enemy"))
+        {
+            TakeDamage(20);
+        }
+
         //Ninja star is in the weapon script (easier that way for some reason )
     }
 

diff --git a/Platformer/Assets/Scripts/Level 1/Weapon.cs b/Platformer/Assets/Scripts/Level 1/Weapon.cs
@@ -6,11 +6,11 @@ public class Weapon : MonoBehaviour
 {
     public Transform firePoint; //where player is shooting from
     public GameObject bulletPrefab;
-	public int shots;
+	public int shots = 5;
 
 	void Update()
     {
-        if (Input.GetKeyDown(KeyCode.Space))
+        if (Input.GetKeyDown(KeyCode.Q))
         {
             Shoot();
         }