Fix before run behavior (#424)

* only call before_run once per run, closes #421

* only call before_run once on cooldowns

Author: bitbrain

addons/beehave/nodes/decorators/cooldown.gd

@@ -15,36 +15,37 @@ class_name CooldownDecorator
 
 func tick(actor: Node, blackboard: Blackboard) -> int:
 	var c: BeehaveNode = get_child(0)
-	var end_time: float = blackboard.get_value(cache_key, 0.0, str(actor.get_instance_id()))
+	var actor_id := str(actor.get_instance_id())
+	var end_time: float = blackboard.get_value(cache_key, 0.0, actor_id)
 	var current_time = Time.get_ticks_msec()
 	var response: int
 
-	if c != running_child:
-		c.before_run(actor, blackboard)
-
 	if current_time < end_time:
 		response = FAILURE
 
 		if can_send_message(blackboard):
 			BeehaveDebuggerMessages.process_tick(self.get_instance_id(), response, blackboard.get_debug_data())
 	else:
+		if c != running_child:
+			c.before_run(actor, blackboard)
+
 		response = c._safe_tick(actor, blackboard)
 
 		if can_send_message(blackboard):
 			BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response, blackboard.get_debug_data())
 
 		if c is ConditionLeaf:
-			blackboard.set_value("last_condition", c, str(actor.get_instance_id()))
-			blackboard.set_value("last_condition_status", response, str(actor.get_instance_id()))
+			blackboard.set_value("last_condition", c, actor_id)
+			blackboard.set_value("last_condition_status", response, actor_id)
 
 		if response == RUNNING:
 			running_child = c
 			if c is ActionLeaf:
-				blackboard.set_value("running_action", c, str(actor.get_instance_id()))
+				blackboard.set_value("running_action", c, actor_id)
 		else:
 			end_time = Time.get_ticks_msec() + wait_time * 1000
 			c.after_run(actor, blackboard)
-			blackboard.set_value(cache_key, end_time, str(actor.get_instance_id()))
+			blackboard.set_value(cache_key, end_time, actor_id)
 
 	return response
 

addons/beehave/nodes/decorators/delayer.gd

@@ -15,37 +15,38 @@ class_name DelayDecorator
 
 func tick(actor: Node, blackboard: Blackboard) -> int:
 	var c: BeehaveNode = get_child(0)
-	var total_time: float = blackboard.get_value(cache_key, 0.0, str(actor.get_instance_id()))
+	var actor_id := str(actor.get_instance_id())
+	var total_time: float = blackboard.get_value(cache_key, 0.0, actor_id)
 	var response: int
 
-	if c != running_child:
-		c.before_run(actor, blackboard)
-
 	if total_time < wait_time:
 		response = RUNNING
 
 		total_time += get_physics_process_delta_time()
-		blackboard.set_value(cache_key, total_time, str(actor.get_instance_id()))
+		blackboard.set_value(cache_key, total_time, actor_id)
 
 		if can_send_message(blackboard):
 			BeehaveDebuggerMessages.process_tick(self.get_instance_id(), response, blackboard.get_debug_data())
 	else:
+		if c != running_child:
+			c.before_run(actor, blackboard)
+
 		response = c._safe_tick(actor, blackboard)
 
 		if can_send_message(blackboard):
 			BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response, blackboard.get_debug_data())
 
 		if c is ConditionLeaf:
-			blackboard.set_value("last_condition", c, str(actor.get_instance_id()))
-			blackboard.set_value("last_condition_status", response, str(actor.get_instance_id()))
+			blackboard.set_value("last_condition", c, actor_id)
+			blackboard.set_value("last_condition_status", response, actor_id)
 
 		if response == RUNNING:
 			running_child = c
 			if c is ActionLeaf:
-				blackboard.set_value("running_action", c, str(actor.get_instance_id()))
+				blackboard.set_value("running_action", c, actor_id)
 		else:
 			c.after_run(actor, blackboard)
-			blackboard.set_value(cache_key, 0.0, str(actor.get_instance_id()))
+			blackboard.set_value(cache_key, 0.0, actor_id)
 
 	return response