Refactor: Added explicit typing and void return types

- Introduced explicit typing to variables and functions across multiple scripts for better code clarity.
- Specified 'void' as the return type for functions that do not return a value.
- Removed redundant code in some scripts.
This commit is contained in:
Dan 2024-05-15 10:42:16 +01:00
parent a62cd6018e
commit 2a9e78b52e
37 changed files with 216 additions and 248 deletions

View file

@ -9,8 +9,8 @@ var current_state : State
#NOTE This is a generic finite_state_machine, it handles all states, changes to this code will affect
# everything that uses a state machine!
func _ready():
for child in get_children():
func _ready() -> void:
for child : Node in get_children():
if child is State:
states[child.name.to_lower()] = child
child.state_transition.connect(change_state)
@ -20,18 +20,18 @@ func _ready():
current_state = initial_state
# Call the current states update function
func _process(delta):
func _process(delta : float) -> void:
if current_state:
current_state.update(delta)
func _physics_process(delta):
func _physics_process(delta : float) -> void:
if current_state:
current_state.physics_update(delta)
# Use force_change_state cautiously, it immediately switches to a state regardless of any transitions.
# This is used to force us into a 'death state' when killed
func force_change_state(new_state : String):
var newState = states.get(new_state.to_lower())
func force_change_state(new_state : String) -> void:
var newState : State = states.get(new_state.to_lower())
if !newState:
print(new_state + " does not exist in the dictionary of states")
@ -44,20 +44,20 @@ func force_change_state(new_state : String):
# NOTE Calling exit like so: (current_state.Exit()) may cause warnings when flushing queries, like when the enemy is being removed after death.
# call_deferred is safe and prevents this from occuring. We get the Exit function from the state as a callable and then call it in a thread-safe manner
if current_state:
var exit_callable = Callable(current_state, "exit")
var exit_callable : Callable = Callable(current_state, "exit")
exit_callable.call_deferred()
newState.enter()
current_state = newState
func change_state(source_state : State, new_state_name : String):
func change_state(source_state : State, new_state_name : String) -> void:
if source_state != current_state:
#print("Invalid change_state trying from: " + source_state.name + " but currently in: " + current_state.name)
#This typically only happens when trying to switch from death state following a force_change
return
var new_state = states.get(new_state_name.to_lower())
var new_state : State = states.get(new_state_name.to_lower())
if !new_state:
print("New state is empty")
return