Nodes now automatically reset if the tick count changes

Author: ashblue

Assets/FluidBehaviorTree/Editor/Builders/TaskStubBuilder.cs

@@ -22,7 +22,7 @@ public TaskStubBuilder WithUpdateStatus (TaskStatus status) {
         public ITask Build () {
             var task = Substitute.For<ITask>();
             task.Enabled.Returns(_enabled);
-            task.Update().Returns(_status);
+            task.Update().ReturnsForAnyArgs(_status);
 
             return task;
         }

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

@@ -71,14 +71,6 @@ public void Update_the_first_child_task_on_update () {
                     _action.Received(1).Update();
                 }
 
-                [Test]
-                public void Runs_reset_on_2nd_run_if_success () {
-                    _tree.Tick();
-                    _tree.Tick();
-
-                    _action.Received(1).Reset();
-                }
-                
                 [Test]
                 public void Does_not_run_reset_on_2nd_run_if_continue_was_returned () {
                     _action.Update().Returns(TaskStatus.Continue);
@@ -140,16 +132,6 @@ public void Runs_all_actions_again_on_2nd_pass () {
 
                     _sequence.Children.ForEach((child) => child.Received(2).Update());
                 }
-
-                [Test]
-                public void Runs_reset_2x_on_first_action_if_it_fails () {
-                    _action.Update().Returns(TaskStatus.Failure);
-                    
-                    _tree.Tick();
-                    _tree.Tick();
-                    
-                    _action.Received(1).Reset();
-                }
 
                 [Test]
                 public void Does_not_run_reset_on_2nd_action_if_1st_fails () {

Assets/FluidBehaviorTree/Scripts/BehaviorTree/Tree.cs

@@ -5,27 +5,27 @@
 namespace Adnc.FluidBT.Trees {
     public class Tree {
         private readonly GameObject _owner;
-        private TaskStatus _lastStatus;
-        private int _tickCount;
+        
+        public int TickCount { get; private set; }
 
         public TaskRoot Root { get; } = new TaskRoot();
 
         public Tree (GameObject owner) {
             _owner = owner;
+            Root.ParentTree = this;
             Root.Owner = owner;
         }
 
         public void AddNode (ITaskParent parent, ITask child) {
             parent.AddChild(child);
+            child.ParentTree = this;
             child.Owner = _owner;
         }
 
         public void Tick () {
-            _lastStatus = Root.Update();
-            _tickCount++;
-            
-            // Possible way to automate triggering reset
-//            _lastStatus = Root.Update(_tickCount != 0 && _lastStatus != TaskStatus.Continue);
+            if (Root.Update() != TaskStatus.Continue) {
+                TickCount++;
+            }
         }
     }
 }

Assets/FluidBehaviorTree/Scripts/TaskParents/Decorators.meta renamed to Assets/FluidBehaviorTree/Scripts/Decorators.meta

@@ -1,5 +1,6 @@
 using Adnc.FluidBT.Tasks;
 using UnityEngine;
+using Tree = Adnc.FluidBT.Trees.Tree;
 
 namespace Adnc.FluidBT.Decorators {
     public abstract class DecoratorBase : ITask {
@@ -12,6 +13,7 @@ public bool Enabled {
         }
 
         public GameObject Owner { get; set; }
+        public Tree ParentTree { get; set; }
         public TaskStatus LastStatus { get; private set; }
 
         public TaskStatus Update () {
@@ -28,7 +30,6 @@ public void End () {
         }
 
         public void Reset (bool hardReset = false) {
-            child.Reset();
         }
     }
 }