diff --git a/Scripts/Classes/Singletons/Global.gd b/Scripts/Classes/Singletons/Global.gd index 7b0ecf4..34fdf5c 100644 --- a/Scripts/Classes/Singletons/Global.gd +++ b/Scripts/Classes/Singletons/Global.gd @@ -123,7 +123,7 @@ var connected_players := 1 const CAMPAIGNS := ["SMB1", "SMBLL", "SMBS", "SMBANN"] -var player_characters := "0000": +var player_characters := [0, 0, 0, 0]: set(value): player_characters = value player_characters_changed.emit() diff --git a/Scripts/Classes/Singletons/SettingsManager.gd b/Scripts/Classes/Singletons/SettingsManager.gd index 8ca1233..5485818 100644 --- a/Scripts/Classes/Singletons/SettingsManager.gd +++ b/Scripts/Classes/Singletons/SettingsManager.gd @@ -110,4 +110,7 @@ func apply_settings() -> void: for i in file.audio.keys(): $Apply/Audio.set_value(i, file.audio[i]) if Settings.file.game.has("characters"): - Global.player_characters = Settings.file.game.characters + var idx := 0 + for i in Settings.file.game.characters: + Global.player_characters[idx] = int(i) + idx += 1 diff --git a/Scripts/Classes/UI/GameHUD.gd b/Scripts/Classes/UI/GameHUD.gd index bb03073..c26de7b 100644 --- a/Scripts/Classes/UI/GameHUD.gd +++ b/Scripts/Classes/UI/GameHUD.gd @@ -1,7 +1,7 @@ class_name GameHUD extends CanvasLayer -var current_chara := "" +var current_chara := 0 static var character_icons := [preload("res://Assets/Sprites/Players/Mario/LifeIcon.json"),preload("res://Assets/Sprites/Players/Luigi/LifeIcon.json"), preload("res://Assets/Sprites/Players/Toad/LifeIcon.json"), preload("res://Assets/Sprites/Players/Toadette/LifeIcon.json")] diff --git a/Scripts/UI/CharacterSelect.gd b/Scripts/UI/CharacterSelect.gd index 16c5228..047b0fa 100644 --- a/Scripts/UI/CharacterSelect.gd +++ b/Scripts/UI/CharacterSelect.gd @@ -74,11 +74,11 @@ func handle_input() -> void: selected_index = wrap(selected_index + 1, 0, Player.CHARACTERS.size()) update_sprites() if Input.is_action_just_pressed("ui_accept"): - Global.player_characters[player_id] = str(selected_index) + Global.player_characters[player_id] = (selected_index) var characters := Global.player_characters for i in characters: if int(i) > 3: - characters = "0000" + characters = [0, 0, 0, 0] Settings.file.game.characters = characters Settings.save_settings() selected.emit() diff --git a/version.txt b/version.txt index 3eefcb9..7dea76e 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.0.0 +1.0.1