wip on movement refactoring

Assets/Art/Personnages/Materials/Zombie_D.mat

@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
@@ -11,7 +11,6 @@ Material:
   m_ShaderKeywords: 
   m_LightmapFlags: 5
   m_CustomRenderQueue: -1
-  stringTagMap: {}
   m_SavedProperties:
     serializedVersion: 2
     m_TexEnvs:
@@ -19,7 +18,7 @@ Material:
         first:
           name: _MainTex
         second:
-          m_Texture: {fileID: 2800000, guid: 42d44e344655dbb45a41346b6e63f938, type: 3}
+          m_Texture: {fileID: 2800000, guid: 210ab39a171414f4b9c044b4bd1d755e, type: 3}
           m_Scale: {x: 1, y: 1}
           m_Offset: {x: 0, y: 0}
       data:
@@ -79,6 +78,10 @@ Material:
           m_Scale: {x: 1, y: 1}
           m_Offset: {x: 0, y: 0}
     m_Floats:
+      data:
+        first:
+          name: _Cutoff
+        second: .5
       data:
         first:
           name: _SrcBlend
@@ -87,10 +90,6 @@ Material:
         first:
           name: _DstBlend
         second: 0
-      data:
-        first:
-          name: _Cutoff
-        second: .5
       data:
         first:
           name: _Parallax

Assets/Prefabs/Camera1.prefab

@@ -91,7 +91,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   y: 25
   offsetZ: -5
-  transitionDuration: .100000001
+  transitionDuration: .400000006
 --- !u!124 &12432070
 Behaviour:
   m_ObjectHideFlags: 1

Assets/Prefabs/Camera2.prefab

@@ -91,7 +91,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   y: 25
   offsetZ: -5
-  transitionDuration: .100000001
+  transitionDuration: .400000006
 --- !u!124 &12404998
 Behaviour:
   m_ObjectHideFlags: 1

Assets/Prefabs/Node.prefab

@@ -1,5 +1,23 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &146510
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 499176}
+  - 33: {fileID: 3387428}
+  - 135: {fileID: 13504392}
+  - 23: {fileID: 2391114}
+  m_Layer: 0
+  m_Name: Sphere
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &192496
 GameObject:
   m_ObjectHideFlags: 0
@@ -26,9 +44,53 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 499176}
   m_Father: {fileID: 0}
   m_RootOrder: 0
+--- !u!4 &499176
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 146510}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: .232019186, y: .345522404, z: .439758539}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 472566}
+  m_RootOrder: 0
+--- !u!23 &2391114
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 146510}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_SubsetIndices: 
+  m_StaticBatchRoot: {fileID: 0}
+  m_UseLightProbes: 1
+  m_ReflectionProbeUsage: 1
+  m_ProbeAnchor: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_ImportantGI: 0
+  m_AutoUVMaxDistance: .5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+--- !u!33 &3387428
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 146510}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!114 &11413560
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -45,6 +107,18 @@ MonoBehaviour:
   n_down: {fileID: 0}
   n_right: {fileID: 0}
   pos: {x: 0, y: 0, z: 0}
+--- !u!135 &13504392
+SphereCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 146510}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: .5
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!135 &13597038
 SphereCollider:
   m_ObjectHideFlags: 1

Assets/Prefabs/Node_1.prefab

@@ -1,13 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 0}
-  m_IsPrefabParent: 1

Assets/Prefabs/VampireSquad.prefab

@@ -488,7 +488,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &179586
 GameObject:
   m_ObjectHideFlags: 1
@@ -519,7 +519,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &181710
 GameObject:
   m_ObjectHideFlags: 1
@@ -565,7 +565,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &192032
 GameObject:
   m_ObjectHideFlags: 1
@@ -1229,7 +1229,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2aef95dc5d20b9940b40da72e3a41995, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  speed: .100000001
+  speed: .5
   dir: 5
   movementManager: {fileID: 0}
 --- !u!135 &13537670

Assets/Prefabs/ZombieSquad.prefab

@@ -97,7 +97,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &111882
 GameObject:
   m_ObjectHideFlags: 1
@@ -158,7 +158,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &118180
 GameObject:
   m_ObjectHideFlags: 1
@@ -414,7 +414,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &168832
 GameObject:
   m_ObjectHideFlags: 1
@@ -565,7 +565,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &189536
 GameObject:
   m_ObjectHideFlags: 1
@@ -1202,7 +1202,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2aef95dc5d20b9940b40da72e3a41995, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  speed: .100000001
+  speed: .5
   dir: 5
   movementManager: {fileID: 0}
 --- !u!114 &11417522

Assets/Scenes/jp-asset-animation-movement-integration.unity.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 2f3ac2d6f98b5d14b9b49ad004510568
+guid: 72def8245a61e344db8fed70a25dc403
-timeCreated: 1439582583
+timeCreated: 1439754116
 licenseType: Free
-NativeFormatImporter:
+DefaultImporter:
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Scenes/jp-movements.unity

@@ -265,7 +265,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 406792, guid: 0264002d3ec9fe844a6e5bd1d48ad2c6, type: 2}
       propertyPath: m_RootOrder
-      value: 7
+      value: 8
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 0264002d3ec9fe844a6e5bd1d48ad2c6, type: 2}
@@ -301,7 +301,7 @@ Transform:
   - {fileID: 1244019224}
   - {fileID: 930800512}
   m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 13
 --- !u!114 &588021787
 MonoBehaviour:
   m_PrefabParentObject: {fileID: 11404586, guid: fc4d7bcae8bff4b4b8fc370f9033112f,
@@ -371,6 +371,48 @@ MonoBehaviour:
   n_down: {fileID: 930800511}
   n_right: {fileID: 1244019226}
   pos: {x: 0, y: 0, z: 0}
+--- !u!1001 &827503699
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &844786940
 GameObject:
   m_ObjectHideFlags: 0
@@ -443,7 +485,7 @@ Transform:
   m_LocalScale: {x: 10, y: 1, z: 10}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 10
 --- !u!1 &930800509
 GameObject:
   m_ObjectHideFlags: 0
@@ -568,7 +610,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 421072, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2}
       propertyPath: m_RootOrder
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 159974, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2}
       propertyPath: m_Name
@@ -620,7 +662,25 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   speed: .100000001
   dir: 5
-  mm: {fileID: 1661856900}
+  movementManager: {fileID: 1661856900}
+--- !u!1 &1153928125
+GameObject:
+  m_PrefabParentObject: {fileID: 159974, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2}
+  m_PrefabInternal: {fileID: 2086876520}
+--- !u!114 &1153928133
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1153928125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2aef95dc5d20b9940b40da72e3a41995, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  speed: .100000001
+  dir: 5
+  movementManager: {fileID: 1661856900}
 --- !u!1001 &1176908819
 Prefab:
   m_ObjectHideFlags: 0
@@ -682,7 +742,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 417792, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2}
       propertyPath: m_RootOrder
-      value: 1
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 196328, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2}
       propertyPath: m_Name
@@ -760,6 +820,24 @@ MonoBehaviour:
   n_down: {fileID: 1720001653}
   n_right: {fileID: 0}
   pos: {x: 0, y: 0, z: 0}
+--- !u!1 &1352234674
+GameObject:
+  m_PrefabParentObject: {fileID: 159974, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2}
+  m_PrefabInternal: {fileID: 1592215893}
+--- !u!114 &1352234682
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1352234674}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2aef95dc5d20b9940b40da72e3a41995, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  speed: .100000001
+  dir: 5
+  movementManager: {fileID: 1661856900}
 --- !u!1001 &1421464866
 Prefab:
   m_ObjectHideFlags: 0
@@ -797,7 +875,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 433270, guid: fc4d7bcae8bff4b4b8fc370f9033112f, type: 2}
       propertyPath: m_RootOrder
-      value: 6
+      value: 7
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: fc4d7bcae8bff4b4b8fc370f9033112f, type: 2}
@@ -839,7 +917,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 464164, guid: 28fb290d540b4df45a389710264d0a8e, type: 2}
       propertyPath: m_RootOrder
-      value: 10
+      value: 11
       objectReference: {fileID: 0}
     - target: {fileID: 11428944, guid: 28fb290d540b4df45a389710264d0a8e, type: 2}
       propertyPath: squadCamera
@@ -877,7 +955,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   speed: .100000001
   dir: 5
-  mm: {fileID: 1661856900}
+  movementManager: {fileID: 1661856900}
 --- !u!114 &1558258210
 MonoBehaviour:
   m_PrefabParentObject: {fileID: 11405364, guid: 0264002d3ec9fe844a6e5bd1d48ad2c6,
@@ -945,7 +1023,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 421072, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2}
       propertyPath: m_RootOrder
-      value: 5
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 159974, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2}
       propertyPath: m_Name
@@ -993,64 +1071,35 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   speed: .100000001
   dir: 5
-  mm: {fileID: 1661856900}
+  movementManager: {fileID: 1661856900}
---- !u!1 &1720001650
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 4
-  m_Component:
-  - 4: {fileID: 1720001651}
-  - 114: {fileID: 1720001653}
-  - 135: {fileID: 1720001652}
-  m_Layer: 0
-  m_Name: Node
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!4 &1720001651
 Transform:
-  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
-  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 1972892055}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1720001650}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -.540660858, y: -4.16063499, z: -3.76060629}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 433447341}
-  m_RootOrder: 0
---- !u!135 &1720001652
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1720001650}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: .100000001
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &1720001653
+MonoBehaviour:
+  m_PrefabParentObject: {fileID: 11413560, guid: e46b9140fc8aa5244af91dc52b758061,
+    type: 2}
+  m_PrefabInternal: {fileID: 1972892055}
+  m_Script: {fileID: 11500000, guid: ef5779c31ae1e344e918bafb5061a31e, type: 3}
+--- !u!1 &1743132303
+GameObject:
+  m_PrefabParentObject: {fileID: 159974, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2}
+  m_PrefabInternal: {fileID: 1104634410}
+--- !u!114 &1743132311
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1720001650}
+  m_GameObject: {fileID: 1743132303}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ef5779c31ae1e344e918bafb5061a31e, type: 3}
+  m_Script: {fileID: 11500000, guid: 2aef95dc5d20b9940b40da72e3a41995, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  n_up: {fileID: 1244019226}
+  speed: .100000001
-  n_left: {fileID: 930800511}
+  dir: 5
-  n_down: {fileID: 0}
+  movementManager: {fileID: 1793107414}
-  n_right: {fileID: 222285629}
-  pos: {x: 0, y: 0, z: 0}
 --- !u!114 &1793107414
 MonoBehaviour:
   m_PrefabParentObject: {fileID: 11410490, guid: 28fb290d540b4df45a389710264d0a8e,
@@ -1116,13 +1165,67 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 9
 --- !u!114 &1891186859
 MonoBehaviour:
   m_PrefabParentObject: {fileID: 11449880, guid: 55aad163f90cc4e40b686a69ba29569d,
     type: 2}
   m_PrefabInternal: {fileID: 2086876520}
   m_Script: {fileID: 11500000, guid: c1cd93867b8a1d7459a4fb92cac63854, type: 3}
+--- !u!1001 &1972892055
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 433447341}
+    m_Modifications:
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -.540660858
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -4.16063499
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: -3.76060629
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: .00657160394
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: .022552032
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: .0144783789
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: .999619246
+      objectReference: {fileID: 0}
+    - target: {fileID: 472566, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 11413560, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: n_up
+      value: 
+      objectReference: {fileID: 1244019226}
+    - target: {fileID: 11413560, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: n_left
+      value: 
+      objectReference: {fileID: 930800511}
+    - target: {fileID: 11413560, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+      propertyPath: n_right
+      value: 
+      objectReference: {fileID: 222285629}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: e46b9140fc8aa5244af91dc52b758061, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1001 &2009087786
 Prefab:
   m_ObjectHideFlags: 0
@@ -1160,7 +1263,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 455296, guid: 2e61328c26d7dda4d8eb6ee2099bc806, type: 2}
       propertyPath: m_RootOrder
-      value: 11
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 11486914, guid: 2e61328c26d7dda4d8eb6ee2099bc806, type: 2}
       propertyPath: squadCamera
@@ -1248,7 +1351,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 421072, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2}
       propertyPath: m_RootOrder
-      value: 4
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 159974, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2}
       propertyPath: m_Name
@@ -1338,7 +1441,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 417792, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2}
       propertyPath: m_RootOrder
-      value: 2
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 196328, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2}
       propertyPath: m_Name
@@ -1348,6 +1451,10 @@ Prefab:
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 417792, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 1.86099994
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2}
   m_IsPrefabParent: 0

Assets/Scripts/Movement.cs

@@ -0,0 +1,53 @@
+using UnityEngine;
+using System.Collections;
+
+public class Movement : MonoBehaviour {
+
+    public enum direction : int { up, down, left, right };
+    public float speed = 0.1f;
+    public int maxQueueSize = 5;
+
+    private Queue queue;
+
+    public bool overwriteQueue = false;
+
+
+    
+
+    public MovementManager movementManager;
+
+    Node target;
+
+    // Use this for initialization
+    void Start() {
+        queue = new Queue(maxQueueSize); // capacity maybe not needed
+    }
+
+    // Update is called once per frame
+    void Update() {
+        if (target != null) {
+            transform.LookAt(target.transform);
+            transform.position = Vector3.MoveTowards(transform.position, target.pos, speed);
+            Debug.Log("I tried to move to :" + target.pos);
+        }
+
+
+    }
+
+    public void changeTarget(Node newTarget) {
+        target = newTarget;
+    }
+
+    public void enqueueMove(int move) {
+        
+        //TODO: add logic to handle max size
+
+        if (overwriteQueue) {
+            queue.Clear();
+        }
+        overwriteQueue = false;
+
+        queue.Enqueue(move);
+    }
+
+}

Assets/Scripts/Movement.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: f494a4ee461d27649adf86cadd10bef4
+timeCreated: 1439835368
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/MovementManager.cs

@@ -29,8 +29,11 @@ public class MovementManager : MonoBehaviour
         moveBuffer.Enqueue("Up");
 
         moveBuffer.Enqueue("Right");
+        moveBuffer.Enqueue("Up");
 
         moveBuffer.Enqueue("Down");
+        moveBuffer.Enqueue("Down");
+
 
     }
 
@@ -51,45 +54,7 @@ public class MovementManager : MonoBehaviour
         //Debug.Log(Input.GetAxisRaw("Vertical1"));
     }
 
-    void ReadMovement()
-    {
-        if (Input.GetKeyDown(KeyCode.W))
-        {
-            moveBuffer.Enqueue("Up");
-        }
-        if (Input.GetKeyDown(KeyCode.A))
-        {
-            moveBuffer.Enqueue("Left");
-        }
-        if (Input.GetKeyDown(KeyCode.S))
-        {
-            moveBuffer.Enqueue("Down");
-        }
-        if (Input.GetKeyDown(KeyCode.D))
-        {
-            moveBuffer.Enqueue("Right");
-        }
     
-        if (Input.GetKeyDown(KeyCode.I))
-        {
-            moveBuffer.Enqueue("Up");
-        }
-        if (Input.GetKeyDown(KeyCode.J))
-        {
-            moveBuffer.Enqueue("Left");
-        }
-        if (Input.GetKeyDown(KeyCode.K))
-        {
-            moveBuffer.Enqueue("Down");
-        }
-        if (Input.GetKeyDown(KeyCode.L))
-        {
-            moveBuffer.Enqueue("Right");
-        }
-        
-
-      //  Debug.Log(p1MovBuffer.First.ToString() + "  " + p2MovBuffer.First.ToString());
-    }
 
     public void EnqueuMove(string move){
 
@@ -130,7 +95,7 @@ public class MovementManager : MonoBehaviour
     
     }
 
-    void ResetBuffer() 
+    public void ResetBuffer() 
     {
         moveBuffer = new Queue<string>(4);
     }

Assets/Scripts/Node.cs

@@ -8,8 +8,6 @@ public class Node : MonoBehaviour {
 	public Node n_down;
 	public Node n_right;
     
-    SquadMovement validSquad;
-
     public Vector3 pos;
 
     void Start()
@@ -36,19 +34,17 @@ public class Node : MonoBehaviour {
 
     void OnTriggerEnter(Collider other)
     {   
+        
         if (other.tag == "VampirePlayer" || other.tag == "ZombiePlayer") 
         {
-           validSquad = other.GetComponent<SquadMovement>();
+            Unit unit = other.GetComponent<Unit>();
-            Node newTarget = sendNextNode(validSquad.ChangeDirection());
+            int direction = unit.DequeueMove();
-           validSquad.changeTarget(newTarget);
+
-           Debug.Log((int)validSquad.dir);
+            Node newTarget = sendNextNode( direction );
+            unit.target = newTarget;
         }
     }
 
-    void OnTriggerExit(Collider other) 
-    {
-        validSquad = null;
-    }
 
     public Node sendNextNode(int direction) 
     {
@@ -87,9 +83,8 @@ public class Node : MonoBehaviour {
                 }
                 break;
 
-            case 5: //stop 
+            default : 
 
-                //validSquad.UpdateDirection();
                 return null;
         }
 

Assets/Scripts/PlayerController.cs

@@ -31,14 +31,17 @@ public class PlayerController : MonoBehaviour {
         if (Input.GetButtonDown("Opt1-" + (int)player)) {
             currentSquadIndex = 0;
             squadCamera.SetTarget(squads[0].transform);
+            movementManager.ResetBuffer();
         }
         if (Input.GetButtonDown("Opt2-" + (int)player)) {
             currentSquadIndex = 1;
             squadCamera.SetTarget(squads[1].transform);
+            movementManager.ResetBuffer();
         }
         if (Input.GetButtonDown("Opt3-" + (int)player)) {
             currentSquadIndex = 2;
             squadCamera.SetTarget(squads[2].transform);
+            movementManager.ResetBuffer();
         }
 
         // movements

Assets/Scripts/PlayerController1.cs

@@ -0,0 +1,86 @@
+using UnityEngine;
+using System.Collections;
+
+public class PlayerController1 : MonoBehaviour {
+
+    public enum Player { Player1 = 1, Player2 = 2 };
+    public Player player;
+
+    public SquadCamera squadCamera;
+    public Squad[] squads;
+    private int currentSquadIndex;
+
+    private float lastHorizontalAxis = 0f;
+    private float lastVerticalAxis = 0f;
+    
+	// Use this for initialization
+	void Start () {
+        currentSquadIndex = 0;
+        squadCamera.SetTarget(squads[currentSquadIndex].gameObject.transform);
+
+	}
+	
+	// Update is called once per frame
+	void Update () {
+
+        // switching between squads
+        if (Input.GetButtonDown("Opt1-" + (int)player)) {
+            if (currentSquadIndex != 0) {
+                squads[0].overwriteQueue = true;
+            }
+            currentSquadIndex = 0;
+        }
+        if (Input.GetButtonDown("Opt2-" + (int)player)) {
+            if (currentSquadIndex != 1) {
+                squads[1].overwriteQueue = true;
+            }
+            currentSquadIndex = 1;
+        }
+        if (Input.GetButtonDown("Opt3-" + (int)player)) {
+            if (currentSquadIndex != 2) {
+                squads[2].overwriteQueue = true;
+            } 
+            currentSquadIndex = 2;
+        }
+
+        squadCamera.SetTarget(squads[currentSquadIndex].transform);
+
+
+
+        // movements
+
+        float horizontalAxis = Input.GetAxisRaw("Horizontal" + (int)player); 
+        if (horizontalAxis != 0 && horizontalAxis != lastHorizontalAxis) { // only enqueue a move when it is a new key press
+            
+            if (horizontalAxis == 1f) {
+                squads[currentSquadIndex].EnqueueMove((int)Unit.direction.right);
+            }
+            else if (horizontalAxis == -1f) {
+                squads[currentSquadIndex].EnqueueMove((int)Unit.direction.left);
+            }
+
+        }
+        lastHorizontalAxis = horizontalAxis;
+
+        float verticalAxis = Input.GetAxisRaw("Vertical" + (int)player);
+        if (verticalAxis != 0 && verticalAxis != lastVerticalAxis) { // only enqueue a move when it is a new key press
+            
+            if (verticalAxis == 1f) {
+                squads[currentSquadIndex].EnqueueMove((int)Unit.direction.up);
+            }
+            else if (verticalAxis == -1f) {
+                squads[currentSquadIndex].EnqueueMove((int)Unit.direction.down);
+            }
+
+        }
+        lastVerticalAxis = verticalAxis;
+
+
+        //TODO add human interaction button (heal/retreat)
+
+
+        //TODO add squad mode button (transform/capture)
+
+
+	}
+}

Assets/Scripts/PlayerController1.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: afd0f82789514a745a496c254421b4fb
+timeCreated: 1439837189
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Squad.cs

@@ -46,6 +46,8 @@ public class Squad : Unit
     // Update is called once per frame
     void Update () 
     {
+        // update is overriden in VampireSquad and ZombieSquad
+
         // TODO execute movement command
         // TODO Check if all the units are dead
             // if yes destroy 

Assets/Scripts/SquadMovement.cs

@@ -12,7 +12,7 @@ using System;
 
 public class SquadMovement : MonoBehaviour {
 
-    public float speed;
+    public float speed = 0.1f;
 
     String[] movementBuffer = new String[5];
 
@@ -21,7 +21,7 @@ public class SquadMovement : MonoBehaviour {
     public enum direction : int { up = 1, down = 2, left = 3, right = 4, stop = 5 };
     public direction dir = direction.stop;
 
-    public MovementManager mm;
+    public MovementManager movementManager;
 
     Node target;
 
@@ -36,9 +36,9 @@ public class SquadMovement : MonoBehaviour {
 	void Update () {
         if(target!=null)
         {
-           
+            transform.LookAt(target.transform);
             transform.position = Vector3.MoveTowards(transform.position, target.pos, speed);
-        
+            Debug.Log("I tried to move to :" + target.pos);
         }
        
 
@@ -83,7 +83,7 @@ public class SquadMovement : MonoBehaviour {
 
         movementBuffer[bufferIndex] = "stop";
 
-        if (bufferIndex < 5) 
+        if (bufferIndex < 4) 
         {
             bufferIndex++;
         }
@@ -93,7 +93,7 @@ public class SquadMovement : MonoBehaviour {
 
    public void getNewBuffer() 
    {
-       string[] newBuffer = mm.TransferBuffer(0);
+       string[] newBuffer = movementManager.TransferBuffer(0);
        for (int i = 0; i < 4; i++)
        {
            movementBuffer[i] = newBuffer[i];

Assets/Scripts/Unit.cs

@@ -16,6 +16,17 @@ public class Unit : MonoBehaviour
     private LinkedList<Command> commandList;
     private int _hp; // the unit hp
     private CharacterBehavior _character;
+
+
+    // movements
+    public enum direction : int { up = 1, down = 2, left = 3, right = 4 };
+    public float speed = 0.5f;
+    public int maxQueueSize = 5;
+    public bool overwriteQueue = false; 
+
+    private Queue<int> queue = new Queue<int>();
+
+
     // Use this for initialization
     void Start ()
     {
@@ -27,10 +38,15 @@ public class Unit : MonoBehaviour
         Layer = TagLayerManager.HumanLayerIndex;
         IsDead = false;
         _character = GetComponent<CharacterBehavior>();
+
+
+        queue.Enqueue(4); //TEST
+
     }
 
     void Update()
     {
+
         if (IsDead)
         {
             DestroyUnit(DyingTime);
@@ -46,6 +62,21 @@ public class Unit : MonoBehaviour
         else
         {
             _character.PlayCaptureAnimation(IsCaptured);
+
+
+            // move towards the target node
+            if (target != null) {
+                
+                _character.PlayRunAnimation(true);
+                transform.LookAt(target.transform);
+                transform.position = Vector3.MoveTowards(transform.position, target.pos, speed);
+            }
+            else {
+                // if we don't have a target, then we're not moving
+                _character.PlayRunAnimation(false);
+            }
+
+
         }
     }
 
@@ -78,6 +109,47 @@ public class Unit : MonoBehaviour
         Destroy(this.transform.gameObject, dyingTime);
     }
 
+    public void EnqueueMove(int move) {
+
+        //TODO: add logic to handle max size
+
+        // overwrite the queue on first new move input if we switched to a new squad
+        if (overwriteQueue) {
+            queue.Clear();
+        }
+        overwriteQueue = false;
+        printQueue();
+        queue.Enqueue(move);
+    }
+
+    public int DequeueMove() {
+        int move;
+        
+        // if there is only one move left, we do not remove it
+        // so the unit keeps moving in the same direction
+        if (queue.Count > 1) {
+            move = queue.Dequeue();
+        }
+        else if( queue.Count == 1){
+            move = queue.Peek();
+        }
+        else {
+            move = 0;
+        }
+        printQueue();
+        return move;
+
+    }
+
+    // debug function for queue
+    private void printQueue() {
+        string queuestr = "queue size: " + queue.Count + " ==> ";
+        foreach (int m in queue) {
+            queuestr += m + ", ";
+        }
+        Debug.Log(queuestr);
+    }
+
     #region Unit properties
     public bool IsCaptured { get; set; }
     public int Hp
@@ -113,6 +185,8 @@ public class Unit : MonoBehaviour
         set { gameObject.layer = value; }
     }
 
+    public Node target { get; set; }
+
     #endregion
 
 }

Assets/Scripts/VampireSquad.cs

@@ -29,6 +29,20 @@ public class VampireSquad : Squad
             // TODO play dead animation before destroying unit
             DestroyUnit(DyingTime);
         }
+        else {
+
+            if (target != null) {
+
+                Vector3 newTarget = new Vector3(target.pos.x, transform.position.y, target.pos.z);
+
+                transform.LookAt(newTarget);
+                
+                transform.position = Vector3.MoveTowards(transform.position, newTarget, speed);
+                Debug.Log("I tried to move to :" + target.pos);
+            }
+        }
+
+
     }
 
     private void InitializeDefaultTagAndLayer()

ProjectSettings/ProjectSettings.asset

@@ -3,17 +3,19 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 6
   AndroidProfiler: 0
   defaultScreenOrientation: 4
   targetDevice: 2
+  targetGlesGraphics: -1
+  targetIOSGraphics: -1
   targetResolution: 0
   accelerometerFrequency: 60
   companyName: DefaultCompany
   productName: VZ
+  cloudProjectId: 
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
-  m_ShowUnitySplashScreen: 1
   defaultScreenWidth: 1024
   defaultScreenHeight: 768
   defaultScreenWidthWeb: 960
@@ -23,6 +25,7 @@ PlayerSettings:
   m_ActiveColorSpace: 0
   m_MTRendering: 1
   m_MobileMTRendering: 0
+  m_UseDX11: 1
   m_Stereoscopic3D: 0
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
@@ -115,11 +118,9 @@ PlayerSettings:
     serializedVersion: 2
     rgba: 0
   iOSLaunchScreenFillPct: 1
-  iOSLaunchScreenSize: 100
   iOSLaunchScreenCustomXibPath: 
   AndroidTargetDevice: 0
   AndroidSplashScreenScale: 0
-  androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: 
   AndroidKeyaliasName: 
   AndroidTVCompatibility: 1
@@ -129,7 +130,6 @@ PlayerSettings:
   - width: 320
     height: 180
     banner: {fileID: 0}
-  androidGamepadSupportLevel: 0
   resolutionDialogBanner: {fileID: 0}
   m_BuildTargetIcons:
   - m_BuildTarget: 
@@ -137,7 +137,6 @@ PlayerSettings:
     - m_Icon: {fileID: 0}
       m_Size: 128
   m_BuildTargetBatching: []
-  m_BuildTargetGraphicsAPIs: []
   webPlayerTemplate: APPLICATION:Default
   m_TemplateCustomTags: {}
   actionOnDotNetUnhandledException: 1
@@ -199,7 +198,6 @@ PlayerSettings:
   ps4ApplicationParam2: 0
   ps4ApplicationParam3: 0
   ps4ApplicationParam4: 0
-  ps4GarlicHeapSize: 2048
   ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
   ps4pnSessions: 1
   ps4pnPresence: 1
@@ -211,7 +209,6 @@ PlayerSettings:
   psp2NPTrophyPackPath: 
   psp2NPSupportGBMorGJP: 0
   psp2NPAgeRating: 12
-  psp2NPTitleDatPath: 
   psp2NPCommsID: 
   psp2NPCommunicationsID: 
   psp2NPCommsPassphrase: 
@@ -226,7 +223,6 @@ PlayerSettings:
   psp2PatchOriginalPackage: 
   psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui
   psp2KeystoneFile: 
-  psp2MemoryExpansionMode: 0
   psp2DRMType: 0
   psp2StorageType: 0
   psp2MediaCapacity: 0
@@ -254,7 +250,6 @@ PlayerSettings:
   psp2InfoBarOnStartup: 0
   psp2InfoBarColor: 0
   psmSplashimage: {fileID: 0}
-  virtualRealitySupported: 0
   spritePackerPolicy: 
   scriptingDefineSymbols: {}
   metroPackageName: VZ
@@ -343,7 +338,8 @@ PlayerSettings:
   blackberrySquareSplashScreen: {fileID: 0}
   tizenProductDescription: 
   tizenProductURL: 
-  tizenSigningProfileName: 
+  tizenCertificatePath: 
+  tizenCertificatePassword: 
   tizenGPSPermissions: 0
   tizenMicrophonePermissions: 0
   stvDeviceAddress: 
@@ -362,7 +358,6 @@ PlayerSettings:
   XboxOnePackagingOverridePath: 
   XboxOneAppManifestOverridePath: 
   XboxOnePackageEncryption: 0
-  XboxOnePackageUpdateGranularity: 2
   XboxOneDescription: 
   XboxOneIsContentPackage: 0
   XboxOneEnableGPUVariability: 0
@@ -405,9 +400,4 @@ PlayerSettings:
   WebGL::emscriptenArgs: 
   WebGL::template: APPLICATION:Default
   additionalIl2CppArgs::additionalIl2CppArgs: 
-  firstStreamedSceneWithResources: 0
+  firstStreamedLevelWithResources: 0
-  cloudProjectId: 
-  projectId: 
-  projectName: 
-  organizationId: 
-  cloudEnabled: 0

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 5.1.0f3
+m_EditorVersion: 5.0.0f4
 m_StandardAssetsVersion: 0