teatov/keebie
teatov/keebie
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

add emit_player_key_change on ready and add extra checks for empty _current_key

Browse Source
This commit is contained in:
Teatov 2025-08-03 00:41:15 +10:00
parent 7966e2073c
commit c5c0f50aad
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/game_key.gd
View File

@ -96,13 +96,13 @@ static func sort_func(a: GameKey, b: GameKey) -> bool:
#region builtins #region builtins
func _ready() -> void: func _ready() -> void:
_adjacency_light.visible = false
_keyboard.layout_size_changed.connect(_on_keyboard_layout_size_changed) _keyboard.layout_size_changed.connect(_on_keyboard_layout_size_changed)
_keyboard.keys_requested.connect(_on_keyboard_keys_requested) _keyboard.keys_requested.connect(_on_keyboard_keys_requested)
_keyboard.is_configuring_changed.connect(_on_keyboard_is_configuring_changed) _keyboard.is_configuring_changed.connect(_on_keyboard_is_configuring_changed)
_keyboard.player_key_changed.connect(_on_keyboard_player_key_changed) _keyboard.player_key_changed.connect(_on_keyboard_player_key_changed)
_keyboard.player_finished_move.connect(_on_keyboard_player_finished_move) _keyboard.player_finished_move.connect(_on_keyboard_player_finished_move)
_set_labels() _set_labels()
_adjacency_light.visible = false
func _process(delta: float) -> void: func _process(delta: float) -> void:

7
scripts/player.gd
View File

@ -26,6 +26,7 @@ func _ready() -> void:
_current_key = _keyboard.request_key_by_keycode(_starting_keycode) _current_key = _keyboard.request_key_by_keycode(_starting_keycode)
if _current_key: if _current_key:
global_transform = _current_key.player_pos_marker.global_transform global_transform = _current_key.player_pos_marker.global_transform
_keyboard.emit_player_key_change(_current_key)
func _process(delta: float) -> void: func _process(delta: float) -> void:
@ -100,7 +101,11 @@ func _finish_move(_interrupted: bool) -> void:
#region event handlers #region event handlers
func _on_keyboard_key_press_changed(game_key: GameKey, event: InputEventKey) -> void: func _on_keyboard_key_press_changed(game_key: GameKey, event: InputEventKey) -> void:
if event.is_pressed() and KeyAdjacency.is_adjacent(_current_key, game_key): if (
event.is_pressed()
and _current_key
and KeyAdjacency.is_adjacent(_current_key, game_key)
):
_move(game_key) _move(game_key)
#endregion #endregion