Skip to content

Commit

Permalink
Add var typecasting (#370)
Browse files Browse the repository at this point in the history
  • Loading branch information
Flynsarmy authored Jan 21, 2025
1 parent e38d1b7 commit 9259e55
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions addons/beehave/nodes/composites/selector.gd
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func tick(actor: Node, blackboard: Blackboard) -> int:
if c != running_child:
c.before_run(actor, blackboard)

var response = c.tick(actor, blackboard)
var response: int = c.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response)

Expand Down Expand Up @@ -56,7 +56,7 @@ func interrupt(actor: Node, blackboard: Blackboard) -> void:

## Changes `running_action` and `running_child` after the node finishes executing.
func _cleanup_running_task(finished_action: Node, actor: Node, blackboard: Blackboard):
var blackboard_name = str(actor.get_instance_id())
var blackboard_name: String = str(actor.get_instance_id())
if finished_action == running_child:
running_child = null
if finished_action == blackboard.get_value("running_action", null, blackboard_name):
Expand Down
2 changes: 1 addition & 1 deletion addons/beehave/nodes/composites/selector_random.gd
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func tick(actor: Node, blackboard: Blackboard) -> int:
if c != running_child:
c.before_run(actor, blackboard)

var response = c.tick(actor, blackboard)
var response: int = c.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response)

Expand Down
2 changes: 1 addition & 1 deletion addons/beehave/nodes/composites/selector_reactive.gd
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func tick(actor: Node, blackboard: Blackboard) -> int:
if c != running_child:
c.before_run(actor, blackboard)

var response = c.tick(actor, blackboard)
var response: int = c.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response)

Expand Down
4 changes: 2 additions & 2 deletions addons/beehave/nodes/composites/sequence.gd
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func tick(actor: Node, blackboard: Blackboard) -> int:
if c != running_child:
c.before_run(actor, blackboard)

var response = c.tick(actor, blackboard)
var response: int = c.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response)

Expand Down Expand Up @@ -62,7 +62,7 @@ func _reset() -> void:

## Changes `running_action` and `running_child` after the node finishes executing.
func _cleanup_running_task(finished_action: Node, actor: Node, blackboard: Blackboard):
var blackboard_name = str(actor.get_instance_id())
var blackboard_name: String = str(actor.get_instance_id())
if finished_action == running_child:
running_child = null
if finished_action == blackboard.get_value("running_action", null, blackboard_name):
Expand Down
4 changes: 2 additions & 2 deletions addons/beehave/nodes/composites/sequence_random.gd
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func tick(actor: Node, blackboard: Blackboard) -> int:
if c != running_child:
c.before_run(actor, blackboard)

var response = c.tick(actor, blackboard)
var response: int = c.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response)

Expand Down Expand Up @@ -84,7 +84,7 @@ func _get_reversed_indexes() -> Array[int]:


func _reset() -> void:
var new_order = get_shuffled_children()
var new_order: Array[Node] = get_shuffled_children()
_children_bag = new_order.duplicate()
_children_bag.reverse() # It needs to run the children in reverse order.
reset.emit(new_order)
Expand Down
2 changes: 1 addition & 1 deletion addons/beehave/nodes/composites/sequence_reactive.gd
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func tick(actor: Node, blackboard: Blackboard) -> int:
if c != running_child:
c.before_run(actor, blackboard)

var response = c.tick(actor, blackboard)
var response: int = c.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response)

Expand Down
2 changes: 1 addition & 1 deletion addons/beehave/nodes/composites/sequence_star.gd
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func tick(actor: Node, blackboard: Blackboard) -> int:
if c != running_child:
c.before_run(actor, blackboard)

var response = c.tick(actor, blackboard)
var response: int = c.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response)

Expand Down
4 changes: 2 additions & 2 deletions addons/beehave/nodes/composites/simple_parallel.gd
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ func _get_configuration_warnings() -> PackedStringArray:

func tick(actor, blackboard: Blackboard):
for c in get_children():
var node_index = c.get_index()
var node_index: int = c.get_index()
if node_index == 0 and not main_task_finished:
if c != running_child:
c.before_run(actor, blackboard)

var response = c.tick(actor, blackboard)
var response: int = c.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response)

Expand Down
6 changes: 3 additions & 3 deletions addons/beehave/nodes/decorators/cooldown.gd
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ class_name CooldownDecorator


func tick(actor: Node, blackboard: Blackboard) -> int:
var c = get_child(0)
var remaining_time = blackboard.get_value(cache_key, 0.0, str(actor.get_instance_id()))
var response
var c: BeehaveNode = get_child(0)
var remaining_time: float = blackboard.get_value(cache_key, 0.0, str(actor.get_instance_id()))
var response: int

if c != running_child:
c.before_run(actor, blackboard)
Expand Down
6 changes: 3 additions & 3 deletions addons/beehave/nodes/decorators/delayer.gd
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ class_name DelayDecorator


func tick(actor: Node, blackboard: Blackboard) -> int:
var c = get_child(0)
var total_time = blackboard.get_value(cache_key, 0.0, str(actor.get_instance_id()))
var response
var c: BeehaveNode = get_child(0)
var total_time: float = blackboard.get_value(cache_key, 0.0, str(actor.get_instance_id()))
var response: int

if c != running_child:
c.before_run(actor, blackboard)
Expand Down
4 changes: 2 additions & 2 deletions addons/beehave/nodes/decorators/failer.gd
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ class_name AlwaysFailDecorator extends Decorator


func tick(actor: Node, blackboard: Blackboard) -> int:
var c = get_child(0)
var c: BeehaveNode = get_child(0)

if c != running_child:
c.before_run(actor, blackboard)

var response = c.tick(actor, blackboard)
var response: int = c.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response)

Expand Down
4 changes: 2 additions & 2 deletions addons/beehave/nodes/decorators/inverter.gd
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ class_name InverterDecorator extends Decorator


func tick(actor: Node, blackboard: Blackboard) -> int:
var c = get_child(0)
var c: BeehaveNode = get_child(0)

if c != running_child:
c.before_run(actor, blackboard)

var response = c.tick(actor, blackboard)
var response: int = c.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response)

Expand Down
8 changes: 4 additions & 4 deletions addons/beehave/nodes/decorators/limiter.gd
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ class_name LimiterDecorator extends Decorator

@onready var cache_key = "limiter_%s" % self.get_instance_id()

@export var max_count: float = 0
@export var max_count: int = 0


func tick(actor: Node, blackboard: Blackboard) -> int:
if not get_child_count() == 1:
return FAILURE

var child = get_child(0)
var current_count = blackboard.get_value(cache_key, 0, str(actor.get_instance_id()))
var child: BeehaveNode = get_child(0)
var current_count: int = blackboard.get_value(cache_key, 0, str(actor.get_instance_id()))

if current_count < max_count:
blackboard.set_value(cache_key, current_count + 1, str(actor.get_instance_id()))
var response = child.tick(actor, blackboard)
var response: int = child.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(child.get_instance_id(), response)

Expand Down
4 changes: 2 additions & 2 deletions addons/beehave/nodes/decorators/repeater.gd
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ func before_run(actor: Node, blackboard: Blackboard):


func tick(actor: Node, blackboard: Blackboard) -> int:
var child = get_child(0)
var child: BeehaveNode = get_child(0)

if current_count < repetitions:
if running_child == null:
child.before_run(actor, blackboard)

var response = child.tick(actor, blackboard)
var response: int = child.tick(actor, blackboard)

if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(child.get_instance_id(), response)
Expand Down
4 changes: 2 additions & 2 deletions addons/beehave/nodes/decorators/succeeder.gd
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ class_name AlwaysSucceedDecorator extends Decorator


func tick(actor: Node, blackboard: Blackboard) -> int:
var c = get_child(0)
var c: BeehaveNode = get_child(0)

if c != running_child:
c.before_run(actor, blackboard)

var response = c.tick(actor, blackboard)
var response: int = c.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response)

Expand Down
8 changes: 4 additions & 4 deletions addons/beehave/nodes/decorators/time_limiter.gd
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ class_name TimeLimiterDecorator extends Decorator

@export var wait_time := 0.0

@onready var cache_key = "time_limiter_%s" % self.get_instance_id()
@onready var cache_key: String = "time_limiter_%s" % self.get_instance_id()


func tick(actor: Node, blackboard: Blackboard) -> int:
if not get_child_count() == 1:
return FAILURE

var child = self.get_child(0)
var time_left = blackboard.get_value(cache_key, 0.0, str(actor.get_instance_id()))
var child: BeehaveNode = self.get_child(0)
var time_left: float = blackboard.get_value(cache_key, 0.0, str(actor.get_instance_id()))

if time_left < wait_time:
time_left += get_physics_process_delta_time()
blackboard.set_value(cache_key, time_left, str(actor.get_instance_id()))
var response = child.tick(actor, blackboard)
var response: int = child.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(child.get_instance_id(), response)

Expand Down
4 changes: 2 additions & 2 deletions addons/beehave/nodes/decorators/until_fail.gd
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ extends Decorator


func tick(actor: Node, blackboard: Blackboard) -> int:
var c = get_child(0)
var c: BeehaveNode = get_child(0)

if c != running_child:
c.before_run(actor, blackboard)

var response = c.tick(actor, blackboard)
var response: int = c.tick(actor, blackboard)
if can_send_message(blackboard):
BeehaveDebuggerMessages.process_tick(c.get_instance_id(), response)

Expand Down

0 comments on commit 9259e55

Please sign in to comment.