-Spin Attack can only be used once in air

-colored trails and spotlights

Pinata_Data/PlayerConnectionConfigFile

@@ -1 +1 @@
-listen 2675528360 0 0
+listen 3396129451 0 0

playable/Assets/Materials/GreenTrail.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 62969fd0a21a90d47a81c0c8616f3dc2
+NativeFormatImporter:
+  userData: 

playable/Assets/Materials/IndigoTrail.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: af4d434df47da2a45b2cb41dd01c5a5b
+NativeFormatImporter:
+  userData: 

playable/Assets/Materials/PinkTrail.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 815622912269a4e4cb2472790ff6dde7
+NativeFormatImporter:
+  userData: 

playable/Assets/Materials/YelowTrail.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: b3e6bb8917f5f2e47a6427e2b8c1b100
+NativeFormatImporter:
+  userData: 

playable/Assets/Scripts/confettiController.cs

@@ -50,10 +50,19 @@ public class confettiController : MonoBehaviour {
 		float newScale = Mathf.Lerp(0, startScale, Time.deltaTime / lifeTime);
 		transform.localScale = new Vector3(startScale-newScale, startScale-newScale, startScale-newScale);
 		
-		if (Time.time - startTime > lifeTime) {
+		if(Time.time - startTime > lifeTime) {
 			Destroy (gameObject, 0.0f);
 		}
 		
 		
 	}
+
+	void OnCollisionEnter2D(Collision2D col){
+		if (col.collider.tag == "ground" && Time.time - startTime > 2) {
+			gameObject.GetComponent<BoxCollider2D> ().enabled = false;
+			gameObject.GetComponent<Rigidbody2D> ().isKinematic = true;
+		}
+	}
+
+
 }

playable/Assets/Scripts/playerController.cs

@@ -29,6 +29,7 @@ public class playerController : MonoBehaviour {
 	private bool updateHealth = true; //if the health bar needs updating
 	private float curDirection = -1; //direction player is pointing
 	private bool canJump = true; // if player can jump
+	private bool canSpin = true; // if player can spin
 	private List<GameObject> hearts = new List<GameObject> (); //list which holds health sprites;
 	private bool isSpinning = false; //checks if player is spin attacking
 	private float lastHit;
@@ -78,7 +79,8 @@ public class playerController : MonoBehaviour {
 		}//end if
 
 		if (Input.GetAxisRaw (StrongAttackBtn)==1) {
-			if (!isSpinning && (lastAttack+attackWait) < Time.time){
+			if (!isSpinning && canSpin && Time.time - lastAttack > attackWait){
+				velocity.y = jumpHeight;
 				lastAttack = Time.time;
 				StartCoroutine (spinAttack (Vector3.down * 360, 0.2f));
 			}
@@ -153,17 +155,18 @@ public class playerController : MonoBehaviour {
 
 	private void damage (){
 		if (isHit) {
-			gameObject.GetComponent<PolygonCollider2D> ().enabled = false;
+			gameObject.GetComponentInChildren<PolygonCollider2D> ().enabled = false;
 			isHit = false;
 			lastHit = Time.time;
 		}
 		if (lastHit+invulTime < Time.time)
-			gameObject.GetComponent<PolygonCollider2D> ().enabled = true;
+			gameObject.GetComponentInChildren<PolygonCollider2D> ().enabled = true;
 
 
 	}
 	IEnumerator spinAttack(Vector3 byAngles, float inTime) {
 		isSpinning = true;
+		canSpin = false;
 		stick.isAttacking = true;
 		Debug.Log ("" + gameObject.name + "spinning");
 		Quaternion startAngle = transform.rotation;
@@ -186,10 +189,13 @@ public class playerController : MonoBehaviour {
 	
 
 	void OnCollisionEnter2D(Collision2D col){
-		if (col.collider.tag == "ground")
+		if (col.collider.tag == "ground") {
 			canJump = true;
+			canSpin = true;
+		}
 		else if (col.collider.tag == "Player") {
 			canJump = true;
+			canSpin = true;
 			}
 	}