From 67500c7337c1b326656e6da6c02a9845e616c098 Mon Sep 17 00:00:00 2001
From: Altarick <jbp49000@hotmail.fr>
Date: Fri, 20 Mar 2020 08:20:29 +0100
Subject: [PATCH] fixed animals stopping, reduced speed

---
 Assets/Prefabs/VeryTree.prefab             |  19 ++-
 Assets/Scenes/Altarick/test1.unity         | 148 +++++++++++++++++++++
 Assets/Scenes/Altarick/test1/NavMesh.asset | Bin 10132 -> 9348 bytes
 Assets/Scripts/Animal.cs                   |  13 +-
 4 files changed, 177 insertions(+), 3 deletions(-)

diff --git a/Assets/Prefabs/VeryTree.prefab b/Assets/Prefabs/VeryTree.prefab
index 75cb84f..0fa03bf 100644
--- a/Assets/Prefabs/VeryTree.prefab
+++ b/Assets/Prefabs/VeryTree.prefab
@@ -12,12 +12,13 @@ GameObject:
   - component: {fileID: 1289101487297823915}
   - component: {fileID: 1289101487297823912}
   - component: {fileID: 1289101487297823913}
+  - component: {fileID: 9075379875082071870}
   m_Layer: 0
   m_Name: Trunk
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
   m_IsActive: 1
 --- !u!4 &1289101487297823918
 Transform:
@@ -92,6 +93,22 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!208 &9075379875082071870
+NavMeshObstacle:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1289101487297823919}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Shape: 1
+  m_Extents: {x: 0.5, y: 0.5, z: 0.5}
+  m_MoveThreshold: 0.1
+  m_Carve: 1
+  m_CarveOnlyStationary: 1
+  m_Center: {x: 0, y: 0, z: 0}
+  m_TimeToStationary: 0.5
 --- !u!1 &1289101488284263099
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Altarick/test1.unity b/Assets/Scenes/Altarick/test1.unity
index d2e4323..eb3968c 100644
--- a/Assets/Scenes/Altarick/test1.unity
+++ b/Assets/Scenes/Altarick/test1.unity
@@ -536,6 +536,154 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 20ad769ea5b470041823475c4e818dd4, type: 3}
+--- !u!1001 &677511754
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 664808208814243609, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_Name
+      value: Spawner (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 664808208814243609, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 664808208814243611, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 3.28
+      objectReference: {fileID: 0}
+    - target: {fileID: 664808208814243611, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.098
+      objectReference: {fileID: 0}
+    - target: {fileID: 664808208814243611, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2.81
+      objectReference: {fileID: 0}
+    - target: {fileID: 664808208814243611, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 664808208814243611, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 664808208814243611, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 664808208814243611, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 664808208814243611, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 664808208814243611, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 664808208814243611, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 664808208814243611, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7303279563949245296, guid: db0ca2167672d2e4cb27da914b773e97,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: db0ca2167672d2e4cb27da914b773e97, type: 3}
+--- !u!1001 &709348442
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 6544835915340077380, guid: 7e7f36fae45bdc84a90768e5469566ab,
+        type: 3}
+      propertyPath: m_Name
+      value: AnimalSpawner (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 6544835915340077387, guid: 7e7f36fae45bdc84a90768e5469566ab,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.142
+      objectReference: {fileID: 0}
+    - target: {fileID: 6544835915340077387, guid: 7e7f36fae45bdc84a90768e5469566ab,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.119
+      objectReference: {fileID: 0}
+    - target: {fileID: 6544835915340077387, guid: 7e7f36fae45bdc84a90768e5469566ab,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.76
+      objectReference: {fileID: 0}
+    - target: {fileID: 6544835915340077387, guid: 7e7f36fae45bdc84a90768e5469566ab,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6544835915340077387, guid: 7e7f36fae45bdc84a90768e5469566ab,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6544835915340077387, guid: 7e7f36fae45bdc84a90768e5469566ab,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6544835915340077387, guid: 7e7f36fae45bdc84a90768e5469566ab,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6544835915340077387, guid: 7e7f36fae45bdc84a90768e5469566ab,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 17
+      objectReference: {fileID: 0}
+    - target: {fileID: 6544835915340077387, guid: 7e7f36fae45bdc84a90768e5469566ab,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6544835915340077387, guid: 7e7f36fae45bdc84a90768e5469566ab,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6544835915340077387, guid: 7e7f36fae45bdc84a90768e5469566ab,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7e7f36fae45bdc84a90768e5469566ab, type: 3}
 --- !u!1 &745113174
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Altarick/test1/NavMesh.asset b/Assets/Scenes/Altarick/test1/NavMesh.asset
index 2967d2f314b1bd406a37f00e88c83dcf302079a4..ab19cffa5e84d58911a872d198db24e614c33785 100644
GIT binary patch
delta 1248
zcmbQ@-{Q%^z#wYKz@XBykwZh2$%KEhqp11h08#$Q6{0RK3=9lQ85kBE=<Mh?Fl**a
zI}rW<f4);%+Pnju9UL|t9UTWi7@ZB02Vs!-B(WuMa~K#H7?8~YnFmq>G6N)s&W4!L
z0k&)M1@W56DdHM%!#X=U9FPq|HUK0CGYrNC83t1``GPpIs}`Ub1k(U=)xEoO9bg8*
z*dT*oY9{ZHfEWbv3M807wjc)+hz~LhWDqhNqz7Ucht1>#k_dx9ia=fi(IA6B3SpW-
zV(4s$JT#mZNQzDNQ_N!gKe<s%-UFl@6pc_NV2^^tK*oY-m{BkfLBu-1o(AcG@WJi_
z8Jjlwj~pZlAd--f11SO-h-?Tfv_Nt&Hb@Ul&EyPuh=)N6KoTGigCs!)!9oSZhlLz6
z8>9!OW^#Z6!XS_YvOyq&L0$xD2FanbA!5*wQ&6gzyhRb>J*WgYyg-^ku7Zeh*ns#D
zjLHVdgD}XF$qGuyu7ZRUNE65)5DiiUqLISJ0mg<H0*Qpl9Lf-bK#D=$0eO#sVSxk4
zAXwOdG{V>*b+E8OW>5ZrWDv*(WP?BkgIokM2qcHj1{nlXGx>mO&EybONH{?yz~KaQ
z6|w;kc@7(p!7w(6hN+o+Ko#LVkO63}0w+X}W)OzC3dRN*1i>6OlUJzim>eL=#kRnK
Mfq_AFa)G)E0EN5QKL7v#

delta 2126
zcmZqioZ`>Hz#wYKz@R>5BZr14lZ((~M^W?10iyhqD@0vfUMS}8VPIHrptGanz^Aq!
zb|Cuy|9q#kw0Q?s>|wX==;$~A!su*}JP3otCy6bAo5R4sz<_KH$UKl5kQpF3bT-Hg
zn3~BK#A_y}h-<(N>+I-oKsF570FWHaFc=$T7);IN3*yMGT7Y5@OasVO_wLShfEfg1
zgA9VHnY=>+Vi3rgAPjO5$QI;a0`WnHfeb=sgVciz1Bp*wAc-&tqzKs{kV23mkT?jV
zvqAD83=*GQAYD-ZgqeXM%+b$90Hm6Mf#LuE|NlWuP6h@B9tH*m5Dnsk*g_x%0|Nsn
zvO$J`yoPMKkf0(s2r|;1?Gq9-gtI~FKo)}ZfQ*2#g#;Dr!HOC>IQG4NCkJLPSfvGL
zM}%I58w65gVr&dn0}_X^LF!?Kf@qj!AT}2R8v_Fa69Y2?0~j+gur;tWFfcGOFfg!!
z6fo2?GBAM|Ac7Mt0b+p^fHZM2u!4;MiLo$1G=kU&c^0Ta3}AI2J;?Ih4D1XbeIPM*
z28bFE8?L{efg7%Xseu*FhAH4=U}xY4=>TI^1`aR{aR|sV4hBvnd3Jbo!SpjSa4>Mg
zy~x49&;ao+NFL;{$vom*^&o>F0R%Ca0qP8pB3M8{*r4EqsR8*1#)dcxq6U&;AZ#wM
zbD6;AF*684BLieHDBM}W4r4T85QQ*^rzg*smaTseO{$=Hv1VXk{0ZehXPC|a;{S#6
zzd`vBZ!$1EXP63>hlB*!g^bARe=snB`H&QXkO#4*g9wOxJ>&QP|NkQiFoG;xhETu=
z3KfL>Q*i16@t;EsVEhf$53>*yE+G9dd6;?Mpz1-Pzk&he0gwZk85r3oJBlh#ejsfE
zF6toJ3sORXTmdRrkaGj9R07Gt*dRSHHIpM`AO#CZ0Z0Orw?UF1gJ7i(hz~2Fkl7$T
zFg24MWDy2|B#;dP84N7|96)mDY>*gC&13=jn#oJ#U?n*N1IR{X!$68*27u(y*&ulk
z28mA=kVkeEB%DB+K;8q<AVnY=DQp~IY>*)!IgpykKcEJI1VBy&xrl*bfdj}OSlECx
z!q^~nu&_a9Pkx{PaS=!mWCOB6AcH}+feZr4p|e4HU}`3BP^y{iq67&is06s8g1HLW
z0FXS)Fc=#|!_-XPpoHuyNI1a^0x5)P2DuEK4Uz|8koe>o$~y!myjW)oG8tsRnKNf>
JCnu<=0081td`|!X

diff --git a/Assets/Scripts/Animal.cs b/Assets/Scripts/Animal.cs
index 22828b7..f504ee6 100644
--- a/Assets/Scripts/Animal.cs
+++ b/Assets/Scripts/Animal.cs
@@ -55,7 +55,16 @@ public class Animal : MonoBehaviour
         }
         if(m_modeFight)
         {
-            agent.destination = target.transform.position;
+            if(target)agent.destination = target.transform.position;
+            else
+            {
+                target = null;
+                agent.destination = new Vector3(Random.Range(m_spawnPoint.transform.position.x-m_squareRadius,m_spawnPoint.transform.position.x+m_squareRadius),m_spawnPoint.transform.position.y,Random.Range(m_spawnPoint.transform.position.z-m_squareRadius,m_spawnPoint.transform.position.z+m_squareRadius));
+                m_modeWander = true;
+                m_modeFight = false;
+                agent.speed = 0.7f;
+            }
+            
             if((transform.position-agent.destination).sqrMagnitude<0.2f)
             {
                 Destroy(target);
@@ -84,7 +93,7 @@ public class Animal : MonoBehaviour
                     target = closest;
                     m_modeWander = false;
                     m_modeFight = true;
-                    agent.speed = 2;
+                    agent.speed = 1.3f;
                 }
             }
         }
-- 
GitLab