From f73d503c9ded4deb80297c7609ec44e195abbf66 Mon Sep 17 00:00:00 2001
From: darrelmarek <darrelmarek@tamu.edu>
Date: Thu, 21 Sep 2017 10:16:49 -0500
Subject: [PATCH] Tweaked movement

NPCs were getting kinda stuck so I made their hitboxes smaller and made movement a little more natural
---
 Project Undercover/Assets/Materials/Wall.mat          |  2 +-
 Project Undercover/Assets/Models.meta                 |  9 +++++++++
 Project Undercover/Assets/Resources/NPC.prefab        | 11 ++++++-----
 Project Undercover/Assets/Resources/Spy.prefab        | 11 ++++++-----
 .../Assets/Resources/WayPointIndicator.prefab         |  6 +++---
 .../ProjectSettings/ProjectSettings.asset             |  3 ---
 Project Undercover/ProjectSettings/ProjectVersion.txt |  2 +-
 7 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 Project Undercover/Assets/Models.meta

diff --git a/Project Undercover/Assets/Materials/Wall.mat b/Project Undercover/Assets/Materials/Wall.mat
index 4cb7fa0..60a9de3 100644
--- a/Project Undercover/Assets/Materials/Wall.mat	
+++ b/Project Undercover/Assets/Materials/Wall.mat	
@@ -72,5 +72,5 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.41176468, g: 0.41176468, b: 0.41176468, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Project Undercover/Assets/Models.meta b/Project Undercover/Assets/Models.meta
new file mode 100644
index 0000000..979ba46
--- /dev/null
+++ b/Project Undercover/Assets/Models.meta	
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: cb288d82f67d27a49bf14e1ab68d86e6
+folderAsset: yes
+timeCreated: 1505311868
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Project Undercover/Assets/Resources/NPC.prefab b/Project Undercover/Assets/Resources/NPC.prefab
index eb9fe6d..8fcfa2c 100644
--- a/Project Undercover/Assets/Resources/NPC.prefab	
+++ b/Project Undercover/Assets/Resources/NPC.prefab	
@@ -468,7 +468,8 @@ MonoBehaviour:
   onSerializeTransformOption: 3
   onSerializeRigidBodyOption: 2
   ownershipTransfer: 0
-  ObservedComponents: []
+  ObservedComponents:
+  - {fileID: 0}
   ObservedComponentsFoldoutOpen: 1
   viewIdField: 0
   instantiationId: -1
@@ -482,11 +483,11 @@ NavMeshAgent:
   m_GameObject: {fileID: 1057615597006810}
   m_Enabled: 1
   m_AgentTypeID: 0
-  m_Radius: 0.5
-  m_Speed: 1.5
-  m_Acceleration: 20
+  m_Radius: 0.3
+  m_Speed: 1
+  m_Acceleration: 1000
   avoidancePriority: 50
-  m_AngularSpeed: 100
+  m_AngularSpeed: 1000
   m_StoppingDistance: 0
   m_AutoTraverseOffMeshLink: 1
   m_AutoBraking: 1
diff --git a/Project Undercover/Assets/Resources/Spy.prefab b/Project Undercover/Assets/Resources/Spy.prefab
index 9f22bad..42786e6 100644
--- a/Project Undercover/Assets/Resources/Spy.prefab	
+++ b/Project Undercover/Assets/Resources/Spy.prefab	
@@ -508,7 +508,8 @@ MonoBehaviour:
   onSerializeTransformOption: 3
   onSerializeRigidBodyOption: 2
   ownershipTransfer: 0
-  ObservedComponents: []
+  ObservedComponents:
+  - {fileID: 0}
   ObservedComponentsFoldoutOpen: 1
   viewIdField: 0
   instantiationId: -1
@@ -607,11 +608,11 @@ NavMeshAgent:
   m_GameObject: {fileID: 1802754264274306}
   m_Enabled: 1
   m_AgentTypeID: 0
-  m_Radius: 0.5
-  m_Speed: 1.5
-  m_Acceleration: 20
+  m_Radius: 0.3
+  m_Speed: 1
+  m_Acceleration: 1000
   avoidancePriority: 50
-  m_AngularSpeed: 100
+  m_AngularSpeed: 1000
   m_StoppingDistance: 0
   m_AutoTraverseOffMeshLink: 1
   m_AutoBraking: 1
diff --git a/Project Undercover/Assets/Resources/WayPointIndicator.prefab b/Project Undercover/Assets/Resources/WayPointIndicator.prefab
index b5e9d4f..39fdb83 100644
--- a/Project Undercover/Assets/Resources/WayPointIndicator.prefab	
+++ b/Project Undercover/Assets/Resources/WayPointIndicator.prefab	
@@ -160,7 +160,7 @@ ParticleSystem:
     startSpeed:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 2
+      scalar: 1.5
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -264,7 +264,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.1
+      scalar: 0.2
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -508,7 +508,7 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     randomizeRotationDirection: 0
-    maxNumParticles: 1000
+    maxNumParticles: 500
     size3D: 0
     rotation3D: 0
     gravityModifier:
diff --git a/Project Undercover/ProjectSettings/ProjectSettings.asset b/Project Undercover/ProjectSettings/ProjectSettings.asset
index 8bb7197..99e60e7 100644
--- a/Project Undercover/ProjectSettings/ProjectSettings.asset	
+++ b/Project Undercover/ProjectSettings/ProjectSettings.asset	
@@ -368,9 +368,6 @@ PlayerSettings:
   switchUdpSendBufferSize: 9
   switchUdpReceiveBufferSize: 42
   switchSocketBufferEfficiency: 4
-  switchSocketInitializeEnabled: 1
-  switchNetworkInterfaceManagerInitializeEnabled: 1
-  switchPlayerConnectionEnabled: 1
   ps4NPAgeRating: 12
   ps4NPTitleSecret: 
   ps4NPTrophyPackPath: 
diff --git a/Project Undercover/ProjectSettings/ProjectVersion.txt b/Project Undercover/ProjectSettings/ProjectVersion.txt
index a211ccd..ca1aa05 100644
--- a/Project Undercover/ProjectSettings/ProjectVersion.txt	
+++ b/Project Undercover/ProjectSettings/ProjectVersion.txt	
@@ -1 +1 @@
-m_EditorVersion: 2017.1.1f1
+m_EditorVersion: 2017.1.0f3