Fixed BTAlways and example scenes

Author: kagenashi

addons/behavior_tree/src/behavior_tree.gd

@@ -7,7 +7,7 @@ extends Node
 export(bool) var is_active: bool = false
 export(NodePath) var _blackboard
 export(NodePath) var _agent
-export(String, "Idle", "Physics") var sync_mode
+export(int, "Idle", "Physics") var sync_mode
 export(bool) var debug = false
 
 var tick_result
@@ -61,10 +61,10 @@ func start() -> void:
 		return
 
 	match sync_mode:
-		"Idle":
+		0:
 			set_physics_process(false)
 			set_process(true)
-		"Physics":
+		1:
 			set_process(false)
 			set_physics_process(true)
 

addons/behavior_tree/src/blackboard.gd

@@ -15,10 +15,12 @@ export(Dictionary) var data: Dictionary
 
 
 
+
 func _enter_tree() -> void:
 	data = data.duplicate()
 
 
+
 func _ready() -> void :
 	for key in data.keys():
 		assert(key is String)
@@ -29,7 +31,7 @@ func set_data(key: String, value) -> void:
 
 
 func get_data(key: String):
-	if has_data(key):
+	if data.has(key):
 		var value = data[key]
 		if value is NodePath:
 			if value.is_empty() or not get_tree().get_root().has_node(value):

addons/behavior_tree/src/btnodes/decorators/bt_always.gd

@@ -3,7 +3,9 @@ extends BTDecorator
 
 # Executes the child and always either succeeds or fails.
 
-export(String, "fail", "succeed") var always_what
+export(int, "Fail", "Succeed") var always_what
+
+onready var return_func: String = "fail" if always_what == 0 else "succeed"
 
 
 
@@ -13,4 +15,4 @@ func _tick(agent: Node, blackboard: Blackboard) -> bool:
 	if result is GDScriptFunctionState:
 		result = yield(result, "completed")
 
-	return call(always_what)
+	return call(return_func)

addons/behavior_tree/src/btnodes/decorators/bt_guard.gd

@@ -13,7 +13,7 @@ extends BTDecorator
 export(bool) var start_locked = false
 export(bool) var permanent = false
 export(NodePath) var _locker
-export(String, "Failure", "Success", "Always") var lock_if
+export(int, "Failure", "Success", "Always") var lock_if
 export(NodePath) var _unlocker
 export(int, "Failure", "Success") var unlock_if
 export(float) var lock_time = 0.05
@@ -54,9 +54,9 @@ func lock():
 
 
 func check_lock(current_locker: BTNode):
-	if ((lock_if == "Always"  and not current_locker.running()) 
-	or ( lock_if == "Success" and current_locker.succeeded()) 
-	or ( lock_if == "Failure" and current_locker.failed())):
+	if ((lock_if == 2  and not current_locker.running()) 
+	or ( lock_if == 1 and current_locker.succeeded()) 
+	or ( lock_if == 0 and current_locker.failed())):
 		lock()
 
 

bt_example/agent.tscn

@@ -13,7 +13,6 @@ script = ExtResource( 2 )
 [node name="BehaviorTree" parent="." instance=ExtResource( 1 )]
 _blackboard = NodePath("../../Agent/Blackboard")
 _agent = NodePath("../../Agent")
-sync_mode = "Idle"
 
 [node name="Label" type="Label" parent="."]
 anchor_right = 1.0

bt_example/ex_behavior_tree.tscn

@@ -34,7 +34,7 @@ wait_time = 2.0
 
 [node name="Always succeed" type="Node" parent="BTSequence"]
 script = ExtResource( 1 )
-always_what = "Succeed"
+always_what = 1
 
 [node name="Out of ammo\?" type="Node" parent="BTSequence/Always succeed"]
 script = ExtResource( 5 )