Merge branch 'feature/action-wait' into develop

Author: ashblue

Assets/FluidBehaviorTree/Scripts/BehaviorTree/BehaviorTreeBuilder.cs

@@ -112,6 +112,19 @@ public BehaviorTreeBuilder RandomChance (int chance, int outOf) {
             return RandomChance("random chance", chance, outOf);
         }
 
+        public BehaviorTreeBuilder Wait (string name, int turns = 1) {
+            _tree.AddNode(Pointer, new Wait {
+                Name = name,
+                turns = turns
+            });
+
+            return this;
+        }
+
+        public BehaviorTreeBuilder Wait (int turns = 1) {
+            return Wait("wait", turns);
+        }
+
         public BehaviorTreeBuilder End () {
             _pointer.RemoveAt(_pointer.Count - 1);
 

Assets/FluidBehaviorTree/Scripts/BehaviorTree/Editor/BehaviorTreeBuilderTest.cs

@@ -375,7 +375,7 @@ public class RandomChanceMethod : BehaviorTreeBuilderTest {
             public void It_should_add_a_random_chance () {
                 var tree = _builder
                     .Sequence()
-                        .RandomChance("random", 1, 3)
+                        .RandomChance("random", 1, 1)
                         .Do("action", () => {
                             _invokeCount++;
                             return TaskStatus.Success;
@@ -391,5 +391,29 @@ public void It_should_add_a_random_chance () {
                 Assert.AreEqual(1, _invokeCount);
             }
         }
+
+        public class WaitMethod : BehaviorTreeBuilderTest {
+            [Test]
+            public void It_should_add_a_wait_node () {
+                var tree = _builder
+                    .Sequence()
+                        .Wait("wait", 2)
+                        .Do("action", () => {
+                            _invokeCount++;
+                            return TaskStatus.Success;
+                        })
+                    .Build();
+
+                var sequence = tree.Root.Children[0] as Sequence;
+                var wait = sequence.Children[0] as Wait;
+
+                Assert.IsNotNull(wait);
+                Assert.AreEqual(sequence.Children.Count, 2);
+                Assert.AreEqual(TaskStatus.Continue, tree.Tick());
+                Assert.AreEqual(TaskStatus.Continue, tree.Tick());
+                Assert.AreEqual(TaskStatus.Success, tree.Tick());
+                Assert.AreEqual(1, _invokeCount);
+            }
+        }
     }
 }

Assets/FluidBehaviorTree/Scripts/Tasks/Actions/Editor/WaitTest.cs

@@ -0,0 +1,31 @@
+using NUnit.Framework;
+
+namespace Adnc.FluidBT.Tasks.Actions.Testing {
+    public class WaitTest {
+        [Test]
+        public void It_should_trigger_continue_on_first_tick () {
+            var wait = new Wait();
+            
+            Assert.AreEqual(TaskStatus.Continue, wait.Update());
+        }
+
+        [Test]
+        public void It_should_trigger_success_on_2nd_tick () {
+            var wait = new Wait();
+
+            Assert.AreEqual(TaskStatus.Continue, wait.Update());
+            Assert.AreEqual(TaskStatus.Success, wait.Update());
+        }
+        
+        [Test]
+        public void It_should_trigger_success_after_2_ticks () {
+            var wait = new Wait {
+                turns = 2
+            };
+            
+            Assert.AreEqual(TaskStatus.Continue, wait.Update());
+            Assert.AreEqual(TaskStatus.Continue, wait.Update());
+            Assert.AreEqual(TaskStatus.Success, wait.Update());
+        }
+    }
+}

Assets/FluidBehaviorTree/Scripts/Tasks/Actions/Editor/WaitTest.cs.meta

@@ -0,0 +1,16 @@
+namespace Adnc.FluidBT.Tasks.Actions {
+    public class Wait : ActionBase {
+        public int turns = 1;
+        
+        private int _ticks;
+        
+        protected override TaskStatus OnUpdate () {
+            if (_ticks < turns) {
+                _ticks++;
+                return TaskStatus.Continue;                
+            }
+
+            return TaskStatus.Success;
+        }
+    }
+}