Merge branch 'master' of https://github.com/new-00-0ne/System-Purge

Assets/Resources/Prefabs/Enemy/Flying Enemy.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 3618f6054127b764196df66b030efa0d
-timeCreated: 1454231680
+guid: e98fe5e64ed309843a5f45f86ab687d2
+timeCreated: 1454257207
 licenseType: Free
 NativeFormatImporter:
   userData: 

Assets/Resources/Prefabs/Enemy/WalkingEnemy.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 25f479fa6d93a7b4a90e1cfc8cae89d3
+timeCreated: 1454258086
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Scripts/AIScripts/Enemy.cs

@@ -6,6 +6,7 @@ using System;
 public class Enemy : Controller{
     public bool isAir;
     private state currentState;
+	private Animator mAnimator;
     public LayerMask enemyMask;
     public bool rightdirection;
     public float[] time = new float[10];
@@ -14,11 +15,14 @@ public class Enemy : Controller{
     void Start ()
     {
         print("start");
+		mAnimator = GetComponent<Animator> ();
         changestate(new idle());
 	}
 	// Update is called once per frame
 	void Update ()
     {
+		mAnimator.SetFloat ("Speed", GetComponent<Rigidbody2D> ().velocity.magnitude);
+		//mAnimator.SetFloat ("Player Health", GameObject.FindWithTag ("Scene_Object").GetComponent<Rigidbody2D>());
         currentState.Execute();
 	}
     public void changestate(state newstate)

Assets/Resources/Scripts/AIScripts/hover.cs

@@ -8,7 +8,7 @@ public class hover : MonoBehaviour
     public float speed = 1;
     public bool flyPattern; // false is x-axis, true is y axis YOU HAPPY???? good
     public float maxFlightDistance = 0; // if flight distance is 0, fly foreva, probably should never do.. lol
-    float distanceFlown;
+    float distanceFlown = 0;
     Rigidbody2D myBody;
     Transform myTrans;
     BoxCollider2D hitBox;
@@ -74,6 +74,7 @@ public class hover : MonoBehaviour
             Vector3 currentRot = myTrans.eulerAngles;
             currentRot.y += 180;
             myTrans.eulerAngles = currentRot;
+            //print("DUMB ");
             distanceFlown = 0;
         }
 

Assets/Sprites/SpriteAnimations/SpiderController.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a85a73eb6330eaa4fb472f22a8a78955
+timeCreated: 1454227347
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/SpriteAnimations/SpiderFab.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bdb824d553c6df645b8240a915ac7828
+timeCreated: 1454258941
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: