some changes

gabo1208 · Nov 29, 2017 · 9734f6b · 9734f6b
1 parent cfaba5b
commit 9734f6b
Show file tree

Hide file tree

Showing 18 changed files with 155 additions and 26 deletions.
diff --git a/.vs/IA Videojuegos/v15/.suo b/.vs/IA Videojuegos/v15/.suo
diff --git a/.vs/IA Videojuegos/v15/Server/sqlite3/storage.ide b/.vs/IA Videojuegos/v15/Server/sqlite3/storage.ide
diff --git a/.vs/IA Videojuegos/v15/sqlite3/storage.ide b/.vs/IA Videojuegos/v15/sqlite3/storage.ide
diff --git a/Assets/scenes/Level_1.unity b/Assets/scenes/Level_1.unity
diff --git a/Assets/scripts/EnemyScript.cs b/Assets/scripts/EnemyScript.cs
@@ -4,10 +4,6 @@
 
 public class EnemyScript : MonoBehaviour
 {
-    public float initx;
-    public float inity;
-    public float angSpeed = 5f;
-    public float velocity = 1.0f;
     public float minSpeed = 1.0f;
     public float maxSpeed = 4.0f;
     public float stop = 1f;
@@ -29,6 +25,15 @@ public class EnemyScript : MonoBehaviour
     private Vector3 direction, target;
     private NavMeshScript navmeshScript;
 
+    // State machine variables
+    public float initx;
+    public float inity;
+    public float angSpeed = 5f;
+    public float velocity = 1.0f;
+    public bool targetSpotted = false;
+    public bool smellDetected = false;
+    public bool targetScaped = true;
+
     private void Start()
     {
         initx = transform.localScale.x;
@@ -47,7 +52,7 @@ private void Start()
 
     private void Update()
     {
-        // if not path following, choose behaviors
+        /* if not path following, choose behaviors
         if (switcher != 9){
             target = player.transform.position;
             direction = target - transform.position;
@@ -85,7 +90,7 @@ private void Update()
                 switcher = 9;
                 //"Follow Path";
             }
-        }
+        }*/
         // weapon activated, shoot
         if (weapon.enabled){
             shoot();
@@ -101,7 +106,7 @@ private void Update()
                 //"Follow Path"
                 pathFollowing();
                 break;
-            case 8:
+            /*case 8:
                 //"Pursue"
                 pursue(direction);
                 break;
@@ -135,7 +140,7 @@ private void Update()
             case 1:
                 //"Alinear"
                 align();
-                break;
+                break;*/
             default:
                 break;
         }

diff --git a/Assets/scripts/NodeScript.cs b/Assets/scripts/NodeScript.cs
@@ -5,6 +5,8 @@
 public class NodeScript : MonoBehaviour {
     public GameObject[] conections;
     public bool active = true;
+    public int smellLevel = 0;
+    public string smellType = "";
 
 	// Use this for initialization
 	void Start () {

diff --git a/Assets/scripts/PlayerScript.cs b/Assets/scripts/PlayerScript.cs
@@ -9,6 +9,7 @@ public class PlayerScript : MonoBehaviour {
     public bool jumping = false;
     private Vector3 gravity;
     public Rigidbody rb;
+    public bool visible = true;
 
     // Use this for initialization
     void Start () {

diff --git a/Library/Collab/CollabSnapshot_3e1c516f-e2a8-401a-9087-d8567273424e.txt b/Library/Collab/CollabSnapshot_3e1c516f-e2a8-401a-9087-d8567273424e.txt
diff --git a/Library/CurrentLayout.dwlt b/Library/CurrentLayout.dwlt
@@ -110,7 +110,7 @@ MonoBehaviour:
   m_MinSize: {x: 887, y: 492}
   m_MaxSize: {x: 22012, y: 14042}
   vertical: 0
-  controlID: 46
+  controlID: 169
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -159,7 +159,7 @@ MonoBehaviour:
   m_MinSize: {x: 408, y: 492}
   m_MaxSize: {x: 14008, y: 14042}
   vertical: 1
-  controlID: 47
+  controlID: 135
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -183,7 +183,7 @@ MonoBehaviour:
   m_MinSize: {x: 408, y: 221}
   m_MaxSize: {x: 8008, y: 4021}
   vertical: 0
-  controlID: 48
+  controlID: 70
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -441,7 +441,7 @@ MonoBehaviour:
     height: 710
   m_TreeViewState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 
+    m_SelectedIDs: 52050000
     m_LastClickedID: 0
     m_ExpandedIDs: e6fbffff00000000
     m_RenameOverlay:
@@ -670,7 +670,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 8025000076250000d4f7ffff00000000f6240000fa24000068c2ffff
     m_RenameOverlay:
       m_UserAcceptedRename: 0

diff --git a/Library/ProjectSettings.asset b/Library/ProjectSettings.asset
@@ -590,8 +590,8 @@ PlayerSettings:
     UNet: 1
   facebookSdkVersion: 7.9.1
   apiCompatibilityLevel: 2
-  cloudProjectId: 
-  projectName: 
-  organizationId: 
+  cloudProjectId: 3e1c516f-e2a8-401a-9087-d8567273424e
+  projectName: IA Videojuegos
+  organizationId: gabillo
   cloudEnabled: 0
   enableNewInputSystem: 0
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/Library/assetDatabase3 b/Library/assetDatabase3
diff --git a/Library/metadata/00/00000000000000004000000000000000 b/Library/metadata/00/00000000000000004000000000000000
diff --git a/Library/metadata/19/19f1d72145022454a981026226a3b9ed b/Library/metadata/19/19f1d72145022454a981026226a3b9ed
diff --git a/Library/metadata/65/6569b9b712285084ab8a73ea8f5ac50c b/Library/metadata/65/6569b9b712285084ab8a73ea8f5ac50c
diff --git a/Library/metadata/8b/8b7e5856fc65c764091ce395f6ac1b0b b/Library/metadata/8b/8b7e5856fc65c764091ce395f6ac1b0b
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -590,8 +590,8 @@ PlayerSettings:
     UNet: 1
   facebookSdkVersion: 7.9.1
   apiCompatibilityLevel: 2
-  cloudProjectId: 
-  projectName: 
-  organizationId: 
+  cloudProjectId: 3e1c516f-e2a8-401a-9087-d8567273424e
+  projectName: IA Videojuegos
+  organizationId: gabillo
   cloudEnabled: 0
   enableNewInputSystem: 0