Fixing selector and sequence nodes

Author: cryptiklemur

src/Node/SelectorNode.ts

@@ -22,15 +22,15 @@ export default class SelectorNode implements ParentBehaviorTreeNodeInterface {
      */
     private enumerator?: NodeEnumerator;
 
-    public constructor(public readonly name: string, private readonly keepState: boolean) {
+    public constructor(public readonly name: string, private readonly keepState: boolean = false) {
     }
 
     public init(): void {
         this.enumerator = new NodeEnumerator(this.children);
     }
 
     public async tick(state: StateData): Promise<BehaviorTreeStatus> {
-        if (!this.enumerator && this.keepState) {
+        if (!this.enumerator || !this.keepState) {
             this.init();
         }
 

src/Node/SequenceNode.ts

@@ -22,15 +22,15 @@ export default class SequenceNode implements ParentBehaviorTreeNodeInterface {
      */
     private enumerator?: NodeEnumerator;
 
-    public constructor(public readonly name: string, private readonly keepState: boolean) {
+    public constructor(public readonly name: string, private readonly keepState: boolean = false) {
     }
 
     public init(): void {
         this.enumerator = new NodeEnumerator(this.children);
     }
 
     public async tick(state: StateData): Promise<BehaviorTreeStatus> {
-        if (!this.enumerator && this.keepState) {
+        if (!this.enumerator || !this.keepState) {
             this.init();
         }
 

test/Node/SelectorNodeTest.ts

@@ -7,8 +7,8 @@ import SelectorNode from "../../src/Node/SelectorNode";
 
 let testObject: SelectorNode;
 
-function init(): void {
-    testObject = new SelectorNode("some-selector");
+function init(keepState: boolean = false): void {
+    testObject = new SelectorNode("some-selector", keepState);
 }
 
 test("runs the first node if it succeeds", async (assert) => {
@@ -84,7 +84,7 @@ test("fails when all children fail", async (assert) => {
 });
 
 test("only evaluates the current node", async (assert) => {
-    init();
+    init(true);
     const state = new StateData();
     const mockChild1 = TypeMoq.Mock.ofType<BehaviorTreeNodeInterface>();
     mockChild1.setup(async (m) => await m.tick(state))

test/Node/SequenceNodeTest.ts

@@ -7,8 +7,8 @@ import SequenceNode from "../../src/Node/SequenceNode";
 
 let testObject: SequenceNode;
 
-function init(): void {
-    testObject = new SequenceNode("some-sequence");
+function init(keepState: boolean = false): void {
+    testObject = new SequenceNode("some-sequence", keepState);
 }
 
 test("can run all children in order", async (assert) => {
@@ -91,7 +91,7 @@ test("when second child fails, then entire sequence fails", async (assert) => {
 });
 
 test("only evaluates the current node", async (assert) => {
-    init();
+    init(true);
     const state       = new StateData();
     const mockChild1 = TypeMoq.Mock.ofType<BehaviorTreeNodeInterface>();
     mockChild1.setup(async (m) => await m.tick(state))