Removed all conditional abort code

Author: ashblue

Assets/FluidBehaviorTree/Editor/Builders/TaskStubBuilder.cs

@@ -6,7 +6,6 @@ namespace Adnc.FluidBT.Testing {
     public class TaskStubBuilder {
         private bool _enabled = true;
         private TaskStatus _status = TaskStatus.Success;
-        private bool _abortConditionSelf;
 
         public TaskStubBuilder WithEnabled (bool enabled) {
             _enabled = enabled;
@@ -20,23 +19,10 @@ public TaskStubBuilder WithUpdateStatus (TaskStatus status) {
             return this;
         }
 
-        public TaskStubBuilder WithAbortConditionSelf (bool abortCondition) {
-            _abortConditionSelf = abortCondition;
-
-            return this;
-        }
-        
         public ITask Build () {
             var task = Substitute.For<ITask>();
             task.Enabled.Returns(_enabled);
             task.Update().Returns(_status);
-            task.GetAbortStatus().Returns(i => task.Update());
-
-            if (_abortConditionSelf) {
-                task.GetAbortCondition().Returns(task);
-            } else {
-                task.GetAbortCondition().ReturnsNull();
-            }
 
             return task;
         }

Assets/FluidBehaviorTree/Scripts/TaskParents/AbortType.cs

@@ -1,19 +1,6 @@
-using System.Collections.Generic;
-using Adnc.FluidBT.Tasks;
-
-namespace Adnc.FluidBT.TaskParents.Composites {
+namespace Adnc.FluidBT.TaskParents.Composites {
     public abstract class CompositeBase : TaskParentBase {
-        public ITask SelfAbortTask { get; protected set; }
         public int ChildIndex { get; protected set; }
-        public List<ITask> AbortLowerPriorities { get; protected set; } = new List<ITask>();
-
-        public override ITaskParent AddChild (ITask child) {
-            if (children.Count == 0 && child.Enabled) {
-                SelfAbortTask = child.GetAbortCondition();
-            }
-            
-            return base.AddChild(child);
-        }
 
         public override void End () {
             if (ChildIndex < children.Count) {
@@ -23,25 +10,8 @@ public override void End () {
 
         public override void Reset (bool hardReset = false) {
             ChildIndex = 0;
-            AbortLowerPriorities.Clear();
-            SelfAbortTask = null;
 
             base.Reset(hardReset);
         }
-
-        protected bool AbortSelf (TaskStatus requiredStatus) {
-            if (!AbortType.HasFlag(AbortType.Self)
-                || ChildIndex <= 0
-                || SelfAbortTask == null
-                || SelfAbortTask.GetAbortStatus() != requiredStatus) {
-                return false;
-            }
-            
-            children[ChildIndex].End();
-            Reset();
-            
-            return true;
-
-        }
     }
 }

Assets/FluidBehaviorTree/Scripts/TaskParents/AbortType.cs.meta

@@ -19,36 +19,15 @@ public void Set_composite () {
         }
 
         public class AddChild : CompositeBaseTest {
-            [Test]
-            public void Adds_first_node_to_self_abort_if_condition () {
-                var child = A.TaskStub().WithAbortConditionSelf(true).Build();
-
-                _composite.AbortType = AbortType.Self;
-                _composite.AddChild(child);
-
-                Assert.AreEqual(child, _composite.SelfAbortTask);
-            }
-
-            [Test]
-            public void Does_not_add_first_node_as_self_abort_if_non_condition () {
-                var child = A.TaskStub().Build();
-
-                _composite.AddChild(child);
-
-                Assert.AreEqual(null, _composite.SelfAbortTask);
-            }
-
             [Test]
             public void Does_not_add_disabled_nodes () {
                 var child = A.TaskStub()
                     .WithEnabled(false)
-                    .WithAbortConditionSelf(true)
                     .Build();
 
-                _composite.AbortType = AbortType.Self;
                 _composite.AddChild(child);
 
-                Assert.AreEqual(null, _composite.SelfAbortTask);
+                Assert.AreEqual(0, _composite.children.Count);
             }
         }
 
@@ -77,25 +56,6 @@ public void Resets_child_node_pointer () {
 
                 Assert.AreEqual(0, _composite.ChildIndex);
             }
-
-            [Test]
-            public void Clears_all_lower_priorities () {
-                _composite.AddChild(A.TaskStub().Build());
-                
-                _composite.Reset();
-                
-                Assert.AreEqual(0, _composite.AbortLowerPriorities.Count);
-            }
-
-            [Test]
-            public void Clears_self_abort_task () {
-                var condition = A.TaskStub().WithAbortConditionSelf(true).Build();
-                _composite.AddChild(condition);
-
-                _composite.Reset();
-                
-                Assert.AreEqual(null, _composite.SelfAbortTask);
-            }
         }
     }
 }