Merge branch 'master' of https://github.com/crazysam/cloudwrangler

Conflicts:
	Assets/Scenes/CloudSandbox.unity

Author: gamedevsam

Assets/Prefabs/CloudPrefab.prefab

@@ -73,12 +73,6 @@ void Update()
 
             rigidbody.AddForce(deltaPosition * pullVelocity * deltaMag);
         }
-        else if (state == CloudState.Dead)
-        {
-            rigidbody.velocity = Vector3.zero;
-            particleSystem.enableEmission = false;
-            gameObject.SetActive(false);
-        }
     }
 
 	public void SetNormalState()
@@ -91,17 +85,17 @@ public void SetNormalState()
 
 	public void SetDeadState()
 	{
-        rigidbody.velocity = Vector3.zero;
+        state = CloudState.Dead;
         particleSystem.enableEmission = false;
-		state = CloudState.Dead;
-		gameObject.SetActive(false);
+        rigidbody.velocity = Vector3.zero;
+        gameObject.SetActive(false);
 	}
 
     void OnCollisionEnter(Collision collision)
     {
         if (collision.gameObject.name.Equals("Walls"))
         {
-            print("WALL HIT");
+            print(collision.gameObject.name);
             flip *= -1;
         }
     }
@@ -127,9 +121,8 @@ void OnTriggerExit(Collider collision)
         {
             if (state == CloudState.Rain)
             {
-                state = CloudState.Dead;
-                particleSystem.enableEmission = false;
                 rainingClouds.Remove(this);
+                SetDeadState();
             }
         }
     }