Merge branch 'enemyHorizontal' into 'master'

double jump fix and enemy prefab fix See merge request !40

Merge branch 'enemyHorizontal' into 'master'
double jump fix and enemy prefab fix See merge request !40
29927019 · Andrew R Van Buren · 50259636 · dace62b8 · 29927019 · 29927019
Commit 29927019 authored Mar 31, 2017 by Andrew R Van Buren
4 changed files
--- a/Assets/Prefabs/Enemy/VerticalEnemyLeftWall.prefab
+++ b/Assets/Prefabs/Enemy/VerticalEnemyLeftWall.prefab
--- a/Assets/Prefabs/Enemy/VerticalEnemy.prefab
+++ b/Assets/Prefabs/Enemy/VerticalEnemy.prefab
--- a/Assets/Scenes/enemyTest.unity
+++ b/Assets/Scenes/enemyTest.unity
--- a/Assets/Scripts/Birb/Jump.cs
+++ b/Assets/Scripts/Birb/Jump.cs
@@ -36,7 +36,8 @@ public class Jump : AbstractBehavior {
 	}

 	void FixedUpdate() {
-		if (jumpRequested) {
+        Debug.Log(airJumpsMade);
+        if (jumpRequested) {
 			Activate();
 			jumpRequested = false;
 		}
@@ -77,4 +78,8 @@ public class Jump : AbstractBehavior {
 		return Mathf.Sqrt(-2 * gravity * height);
 	}

+    void OnCollisionEnter2D(Collision2D other)
+    {
+        airJumpsMade = 0;
+    }
 }