🐛 correctly interrupt SelectorStar and SequenceStar (#93)

bitbrain · Jan 13, 2023 · c60f32e · c60f32e
1 parent 2595256
commit c60f32e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/addons/beehave/nodes/composites/selector_star.gd b/addons/beehave/nodes/composites/selector_star.gd
@@ -30,3 +30,7 @@ func tick(actor: Node, blackboard: Blackboard) -> int:
 
 	last_execution_index = 0
 	return FAILURE
+
+func interrupt(actor: Node, blackboard: Blackboard) -> void:
+	last_execution_index = 0
+	super(actor, blackboard)
diff --git a/addons/beehave/nodes/composites/sequence_star.gd b/addons/beehave/nodes/composites/sequence_star.gd
@@ -35,3 +35,7 @@ func tick(actor: Node, blackboard: Blackboard) -> int:
 	else:
 		successful_index = 0
 		return FAILURE
+
+func interrupt(actor: Node, blackboard: Blackboard) -> void:
+	successful_index = 0
+	super(actor, blackboard)
diff --git a/project.godot b/project.godot
@@ -80,6 +80,11 @@ _global_script_classes=[{
 "path": "res://addons/beehave/nodes/composites/selector.gd"
 }, {
 "base": "Composite",
+"class": &"SelectorRandomComposite",
+"language": &"GDScript",
+"path": "res://addons/beehave/nodes/composites/selector_random.gd"
+}, {
+"base": "Composite",
 "class": &"SelectorStarComposite",
 "language": &"GDScript",
 "path": "res://addons/beehave/nodes/composites/selector_star.gd"
@@ -90,6 +95,11 @@ _global_script_classes=[{
 "path": "res://addons/beehave/nodes/composites/sequence.gd"
 }, {
 "base": "Composite",
+"class": &"SequenceRandomComposite",
+"language": &"GDScript",
+"path": "res://addons/beehave/nodes/composites/sequence_random.gd"
+}, {
+"base": "Composite",
 "class": &"SequenceStarComposite",
 "language": &"GDScript",
 "path": "res://addons/beehave/nodes/composites/sequence_star.gd"
@@ -109,8 +119,10 @@ _global_script_class_icons={
 "Leaf": "res://addons/beehave/icons/category_leaf.svg",
 "LimiterDecorator": "res://addons/beehave/icons/limiter.svg",
 "SelectorComposite": "res://addons/beehave/icons/selector.svg",
+"SelectorRandomComposite": "res://addons/beehave/icons/selector_random.svg",
 "SelectorStarComposite": "res://addons/beehave/icons/selector_reactive.svg",
 "SequenceComposite": "res://addons/beehave/icons/sequence.svg",
+"SequenceRandomComposite": "res://addons/beehave/icons/sequence_random.svg",
 "SequenceStarComposite": "res://addons/beehave/icons/sequence_reactive.svg"
 }