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

store config keys as keycode strings instead of keycode enum values

Browse Source
This commit is contained in:
Teatov 2025-08-04 04:55:06 +10:00
parent d791ec24b3
commit fcb5ba372f
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scenes/game_key.tscn
View File

@ -55,9 +55,6 @@ _center_label = NodePath("Labels/CenterLabel")
_press_light = NodePath("Effects/PressLight") _press_light = NodePath("Effects/PressLight")
_adjacency_light = NodePath("Effects/AdjacencyLight") _adjacency_light = NodePath("Effects/AdjacencyLight")
_sfx_player = NodePath("SFXPlayer") _sfx_player = NodePath("SFXPlayer")
_light_fade_duration = null
_starting_pop_offset = null
_rotation_damping = null
_press_sfx = SubResource("AudioStreamRandomizer_agrko") _press_sfx = SubResource("AudioStreamRandomizer_agrko")
_release_sfx = SubResource("AudioStreamRandomizer_ch32x") _release_sfx = SubResource("AudioStreamRandomizer_ch32x")

20
scripts/globals/layout_config.gd
View File

@ -38,10 +38,10 @@ func _unhandled_input(event: InputEvent) -> void:
func get_key_config_dict(keycode: Key) -> Dictionary: func get_key_config_dict(keycode: Key) -> Dictionary:
var param_key := str(keycode) var config_key := OS.get_keycode_string(keycode)
if not _config.has_section_key(SECTION_KEYS, param_key): if not _config.has_section_key(SECTION_KEYS, config_key):
return {} return {}
return _config.get_value(SECTION_KEYS, param_key, {}) as Dictionary return _config.get_value(SECTION_KEYS, config_key, {}) as Dictionary
func change_layout(layout_name: String) -> void: func change_layout(layout_name: String) -> void:
@ -88,17 +88,17 @@ func _load_config() -> Error:
for key_props_row: Array[KeyProps] in layout_key_props_rows: for key_props_row: Array[KeyProps] in layout_key_props_rows:
for key_props in key_props_row: for key_props in key_props_row:
var keycode := str(key_props.keycode) var config_key := OS.get_keycode_string(key_props.keycode)
if ( if (
not key_props.is_unicode() not key_props.is_unicode()
or not _config.has_section_key(SECTION_KEYS, keycode) or not _config.has_section_key(SECTION_KEYS, config_key)
): ):
continue continue
var chars_dict: Variant = _config.get_value(SECTION_KEYS, keycode) var chars_dict: Variant = _config.get_value(SECTION_KEYS, config_key)
if chars_dict is not Dictionary[String,String]: if chars_dict is not Dictionary:
continue continue
key_props.chars_from_dict(chars_dict as Dictionary[String,String]) key_props.chars_from_dict(chars_dict as Dictionary)
print("layout config loaded!\n") print("layout config loaded!\n")
@ -114,7 +114,9 @@ func _save_config() -> Error:
continue continue
_config.set_value( _config.set_value(
SECTION_KEYS, str(key_props.keycode), key_props.chars_to_dict() SECTION_KEYS,
OS.get_keycode_string(key_props.keycode),
key_props.chars_to_dict()
) )
var err := _config.save(CONFIG_PATH) var err := _config.save(CONFIG_PATH)

4
scripts/key_props.gd
View File

@ -127,8 +127,8 @@ func chars_from_dict(dict: Dictionary, override: bool = true) -> KeyProps:
return self return self
func chars_to_dict() -> Dictionary[String, String]: func chars_to_dict() -> Dictionary:
var dict: Dictionary[String, String] = {} var dict: Dictionary = {}
if main_char: if main_char:
dict[CHAR_MAIN] = main_char dict[CHAR_MAIN] = main_char
if shift_char: if shift_char: