Merge branch 'feature/random-selector-composite' into develop

Author: ashblue

Assets/FluidBehaviorTree/Runtime/BehaviorTree/Builder/BehaviorTreeBuilder.cs

@@ -70,6 +70,15 @@ public BehaviorTreeBuilder Selector (string name = "selector") {
             return ParentTask<Selector>(name);
         }
 
+        /// <summary>
+        /// Selects the first node to return success
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public BehaviorTreeBuilder SelectorRandom (string name = "selector random") {
+            return ParentTask<SelectorRandom>(name);
+        }
+        
         public BehaviorTreeBuilder Parallel (string name = "parallel") {
             return ParentTask<Parallel>(name);
         }

Assets/FluidBehaviorTree/Runtime/Decorators/DecoratorBase.cs

@@ -31,7 +31,7 @@ public void End () {
             Child.End();
         }
 
-        public void Reset (bool hardReset = false) {
+        public void Reset () {
         }
 
         public ITaskParent AddChild (ITask child) {

Assets/FluidBehaviorTree/Runtime/TaskParents/Composites/CompositeBase.cs

@@ -8,10 +8,10 @@ public override void End () {
             }
         }
 
-        public override void Reset (bool hardReset = false) {
+        public override void Reset () {
             ChildIndex = 0;
 
-            base.Reset(hardReset);
+            base.Reset();
         }
     }
 }

Assets/FluidBehaviorTree/Runtime/TaskParents/Composites/Parallel.cs

@@ -42,10 +42,10 @@ protected override TaskStatus OnUpdate () {
             return TaskStatus.Continue;
         }
 
-        public override void Reset (bool hardReset = false) {
+        public override void Reset () {
             _childStatus.Clear();
 
-            base.Reset(hardReset);
+            base.Reset();
         }
 
         public override void End () {

Assets/FluidBehaviorTree/Runtime/TaskParents/Composites/SelectorRandom.cs

@@ -0,0 +1,51 @@
+using Adnc.FluidBT.Tasks;
+using Random = System.Random;
+
+namespace Adnc.FluidBT.TaskParents.Composites {
+    /// <summary>
+    /// Randomly selects a child node with a shuffle algorithm
+    /// </summary>
+    public class SelectorRandom : CompositeBase {
+        private bool _init;
+        
+        protected override TaskStatus OnUpdate () {
+            if (!_init) {
+                ShuffleChildren();
+                _init = true;
+            }
+            
+            for (var i = ChildIndex; i < Children.Count; i++) {
+                var child = Children[ChildIndex];
+
+                switch (child.Update()) {
+                    case TaskStatus.Success:
+                        return TaskStatus.Success;
+                    case TaskStatus.Continue:
+                        return TaskStatus.Continue;
+                }
+
+                ChildIndex++;
+            }
+
+            return TaskStatus.Failure;
+        }
+
+        public override void Reset () {
+            base.Reset();
+                        
+            ShuffleChildren();
+        }
+
+        private void ShuffleChildren () {
+            var rng = new Random();
+            var n = Children.Count;  
+            while (n > 1) {  
+                n--;  
+                var k = rng.Next(n + 1);  
+                var value = Children[k];  
+                Children[k] = Children[n];  
+                Children[n] = value;  
+            }
+        }
+    }
+}

Assets/FluidBehaviorTree/Runtime/TaskParents/Composites/SelectorRandom.cs.meta

@@ -48,7 +48,7 @@ protected virtual TaskStatus OnUpdate () {
             return TaskStatus.Success;
         }
 
-        public virtual void Reset (bool hardReset = false) {
+        public virtual void Reset () {
         }
 
         public virtual ITaskParent AddChild (ITask child) {

Assets/FluidBehaviorTree/Runtime/TaskParents/TaskParentBase.cs

@@ -41,10 +41,9 @@ public interface ITask {
         void End ();
 
         /// <summary>
-        /// Reset this task back to its initial state. Hard reset should run all
-        /// one time run only logic (meant for pooling)
+        /// Reset this task back to its initial state to run again. Triggered after the behavior
+        /// tree finishes with a task status other than continue.
         /// </summary>
-        /// <param name="hardReset"></param>
-        void Reset (bool hardReset = false);
+        void Reset ();
     }
 }

Assets/FluidBehaviorTree/Runtime/Tasks/ITask.cs

@@ -55,14 +55,9 @@ private void UpdateTicks () {
         /// <summary>
         /// Reset the node to be re-used
         /// </summary>
-        /// <param name="hardReset">Used to wipe the node back to its original state. Meant for pooling.</param>
-        public void Reset (bool hardReset = false) {
+        public void Reset () {
             _start = false;
             _exit = false;
-
-            if (hardReset) {
-                _init = false;
-            }
         }
 
         public void End () {

Assets/FluidBehaviorTree/Runtime/Tasks/TaskBase.cs

@@ -14,6 +14,18 @@ public void BeforeEach () {
             _invokeCount = 0;
             _builder = new BehaviorTreeBuilder(null);
         }
+
+        public class SelectorRandomMethod : BehaviorTreeBuilderTest {
+            public void It_should_add_a_random_selector () {
+                var tree = _builder
+                    .SelectorRandom("random selector")
+                    .Build();
+    
+                var selectorRandom = tree.Root.Children[0] as SelectorRandom;
+                
+                Assert.IsNotNull(selectorRandom);
+            }
+        }
 
         public class SequenceMethod : BehaviorTreeBuilderTest {
             [Test]

Assets/FluidBehaviorTree/Tests/Editor/BehaviorTrees/Builders/BehaviorTreeBuilderTest.cs

@@ -0,0 +1,45 @@
+using Adnc.FluidBT.Tasks;
+using Adnc.FluidBT.Testing;
+using NUnit.Framework;
+
+namespace Adnc.FluidBT.TaskParents.Composites.Editors.Tests {
+    public class SelectorRandomTest {
+        public class UpdateMethod {
+            [Test]
+            public void It_should_return_success_if_a_child_returns_success () {
+                var child = A.TaskStub().WithUpdateStatus(TaskStatus.Success).Build();
+                var selectorRandom = new SelectorRandom();
+                selectorRandom.AddChild(child);
+                
+                Assert.AreEqual(TaskStatus.Success, selectorRandom.Update());
+            }
+
+            [Test]
+            public void It_should_return_continue_if_a_child_returns_continue () {
+                var child = A.TaskStub().WithUpdateStatus(TaskStatus.Continue).Build();
+                var selectorRandom = new SelectorRandom();
+                selectorRandom.AddChild(child);
+                
+                Assert.AreEqual(TaskStatus.Continue, selectorRandom.Update());
+            }
+            
+            [Test]
+            public void It_should_return_failure_if_empty () {
+                var selectorRandom = new SelectorRandom();
+                
+                Assert.AreEqual(TaskStatus.Failure, selectorRandom.Update());
+
+            }
+
+            [Test]
+            public void It_should_return_failure_if_child_returns_failure () {
+                var child = A.TaskStub().WithUpdateStatus(TaskStatus.Failure).Build();
+                var selectorRandom = new SelectorRandom();
+                selectorRandom.AddChild(child);
+                
+                Assert.AreEqual(TaskStatus.Failure, selectorRandom.Update());
+
+            }
+        }
+    }
+}

Assets/FluidBehaviorTree/Tests/Editor/TaskParents/Composites/SelectorRandomTest.cs

@@ -128,14 +128,6 @@ public void Does_not_trigger_on_reset () {
 
                     Assert.AreEqual(1, node.InitCount);
                 }
-
-                [Test]
-                public void Triggers_on_reset_hard () {
-                    node.Reset(true);
-                    node.Update();
-
-                    Assert.AreEqual(2, node.InitCount);
-                }
             }
 
             public class ExitEvent : UpdateMethod {