Merge branch '11-3d-compatibility'

# Conflicts:
#	addons/yet_another_behavior_tree/plugin.cfg
#	addons/yet_another_behavior_tree/src/Nodes/BTRoot.gd

Author: Earewien

README.md

@@ -256,7 +256,7 @@ extends BTCondition
 
 @export var player_detection_distance:int = 50
 
-func tick(actor:Node2D, _blackboard:BTBlackboard) -> int:
+func tick(actor:Node, _blackboard:BTBlackboard) -> int:
     var player_position:Vector2 = get_tree().get_nodes_in_group("player")[0].global_position
     var actor_position:Vector2 = actor.global_position
     var player_distance:float = actor_position.distance_to(player_position)
@@ -275,7 +275,7 @@ func tick(actor:Node2D, _blackboard:BTBlackboard) -> int:
 class_name ActionWander
 extends BTAction
 
-func tick(actor:Node2D, blackboard:BTBlackboard) -> int:
+func tick(actor:Node, blackboard:BTBlackboard) -> int:
     var current_position:Vector2 = actor.global_position
     var target_position:Vector2 = blackboard.get_data("wander_position")
     if current_position.distance_to(target_position) < 5:

addons/yet_another_behavior_tree/plugin.cfg

@@ -3,5 +3,5 @@
 name="Yet Another Behavior Tree"
 description="A Behavior Tree implementation for Godot Engine"
 author="Adrien Quillet"
-version="2.0.1"
+version="3.0.0"
 script="yet_another_behavior_tree.gd"

addons/yet_another_behavior_tree/src/Nodes/BTNode.gd

@@ -49,7 +49,7 @@ func _ready() -> void:
 # Fonctions publiques
 #------------------------------------------
 
-func tick(actor:Node2D, blackboard:BTBlackboard) -> int:
+func tick(actor:Node, blackboard:BTBlackboard) -> int:
     return BTTickResult.SUCCESS
 
 func is_leaf() -> bool:
@@ -86,7 +86,7 @@ func _update_cached_children(any) -> void:
         if child is BTNode:
             _children.append(child)
 
-func _execute(actor:Node2D, blackboard:BTBlackboard) -> int:
+func _execute(actor:Node, blackboard:BTBlackboard) -> int:
     if _is_in_editor:
         return BTTickResult.FAILURE
 
@@ -105,14 +105,14 @@ func _enter(blackboard:BTBlackboard) -> void:
     enter(blackboard)
     pass
 
-func _start(actor:Node2D, blackboard:BTBlackboard) -> void:
+func _start(actor:Node, blackboard:BTBlackboard) -> void:
     var blackboard_namespace:String = str(actor.get_instance_id())
     blackboard.get_data("running_nodes", [], blackboard_namespace).append(self)
 
     if not blackboard.get_data("previously_running_nodes", [], blackboard_namespace).has(self):
         start(blackboard)
 
-func _stop(actor:Node2D, blackboard:BTBlackboard) -> void:
+func _stop(actor:Node, blackboard:BTBlackboard) -> void:
     var blackboard_namespace:String = str(actor.get_instance_id())
     blackboard.get_data("running_nodes", [], blackboard_namespace).erase(self)
     exit(blackboard)

addons/yet_another_behavior_tree/src/Nodes/BTRoot.gd

@@ -72,7 +72,7 @@ signal on_idle()
 
 var _blackboard:BTBlackboard
 var _previous_running_nodes:Array[BTNode] = []
-var _actor:Node2D
+var _actor:Node
 
 var _execution_start_time_ms:float
 var _execution_stop_time_ms:float

addons/yet_another_behavior_tree/src/Nodes/Composite/BTParallel.gd

@@ -29,7 +29,7 @@ extends BTComposite
 # Fonctions Godot redéfinies
 #------------------------------------------
 
-func tick(actor:Node2D, blackboard:BTBlackboard) -> int:
+func tick(actor:Node, blackboard:BTBlackboard) -> int:
     var at_least_one_child_running:bool = false
     var at_least_one_child_success:bool = false
 

addons/yet_another_behavior_tree/src/Nodes/Composite/BTSelector.gd

@@ -36,7 +36,7 @@ var _running_child_index:int = -1
 # Fonctions Godot redéfinies
 #------------------------------------------
 
-func tick(actor:Node2D, blackboard:BTBlackboard) -> int:
+func tick(actor:Node, blackboard:BTBlackboard) -> int:
     for child_index in _children.size():
         if not save_progression or child_index >= _running_child_index:
             var child:BTNode = _children[child_index]

addons/yet_another_behavior_tree/src/Nodes/Composite/BTSequence.gd

@@ -36,7 +36,7 @@ var _running_child_index:int = -1
 # Fonctions Godot redéfinies
 #------------------------------------------
 
-func tick(actor:Node2D, blackboard:BTBlackboard) -> int:
+func tick(actor:Node, blackboard:BTBlackboard) -> int:
     for child_index in _children.size():
         if not save_progression or child_index >= _running_child_index:
             var child:BTNode = _children[child_index]

addons/yet_another_behavior_tree/src/Nodes/Decorators/BTFailure.gd

@@ -32,7 +32,7 @@ extends BTDecorator
 # Fonctions publiques
 #------------------------------------------
 
-func tick(actor:Node2D, blackboard:BTBlackboard) -> int:
+func tick(actor:Node, blackboard:BTBlackboard) -> int:
     _children[0]._execute(actor, blackboard)
     return BTTickResult.FAILURE
 

addons/yet_another_behavior_tree/src/Nodes/Decorators/BTInverter.gd

@@ -34,7 +34,7 @@ extends BTDecorator
 # Fonctions publiques
 #------------------------------------------
 
-func tick(actor:Node2D, blackboard:BTBlackboard) -> int:
+func tick(actor:Node, blackboard:BTBlackboard) -> int:
     var child_result:int = _children[0]._execute(actor, blackboard)
     if child_result == BTTickResult.SUCCESS:
         return BTTickResult.FAILURE

addons/yet_another_behavior_tree/src/Nodes/Decorators/BTLimiter.gd

@@ -42,7 +42,7 @@ var _invocation_count:int = 0
 # Fonctions publiques
 #------------------------------------------
 
-func tick(actor:Node2D, blackboard:BTBlackboard) -> int:
+func tick(actor:Node, blackboard:BTBlackboard) -> int:
     var limit_reached:bool = _invocation_count >= limit
     if not include_limit:
         limit_reached = _invocation_count >= limit - 1