diff --git a/CharacterSelect.gd b/CharacterSelect.gd deleted file mode 100644 index cab565e..0000000 --- a/CharacterSelect.gd +++ /dev/null @@ -1,40 +0,0 @@ -extends Control - -@onready -var character_grid_container := $ScrollContainer2 - -@onready -var character_grid := $ScrollContainer2/GridContainer - -signal character_selected(file_name) - -# Called when the node enters the scene tree for the first time. -func _ready(): - var characters := DirAccess.open("res://characters/") - if characters: - characters.list_dir_begin() - var file_name = characters.get_next() - while file_name != "": - file_name = file_name.replace('.import', '') # <--- remove the .import - if file_name.ends_with(".png"): - - var texture = load("res://characters/" + file_name) - - var texture_btn := TextureButton.new() - - character_grid.add_child(texture_btn) - texture_btn.custom_minimum_size = Vector2(80, 40) - texture_btn.ignore_texture_size = true - texture_btn.stretch_mode = TextureButton.STRETCH_KEEP_ASPECT - texture_btn.texture_normal = texture - - texture_btn.pressed.connect(select_character.bind(file_name)) - - file_name = characters.get_next() - -func show_grid(): - character_grid_container.visible = true - -func select_character(file_name: String): - print("select_character") - character_selected.emit(file_name) diff --git a/CharacterSelect.gd.uid b/CharacterSelect.gd.uid deleted file mode 100644 index 438cd7b..0000000 --- a/CharacterSelect.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://cmxl2w45vvmx6 diff --git a/CharacterSelect.tscn b/CharacterSelect.tscn deleted file mode 100644 index 306b922..0000000 --- a/CharacterSelect.tscn +++ /dev/null @@ -1,25 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://b16on0oscg1bv"] - -[ext_resource type="Script" uid="uid://cmxl2w45vvmx6" path="res://CharacterSelect.gd" id="1_4bba6"] - -[node name="CharacterSelect" type="Control"] -layout_mode = 3 -anchors_preset = 0 -offset_right = 40.0 -offset_bottom = 40.0 -script = ExtResource("1_4bba6") - -[node name="ScrollContainer2" type="ScrollContainer" parent="."] -clip_contents = false -custom_minimum_size = Vector2(100, 100) -layout_mode = 0 -offset_left = 194.0 -offset_top = 152.0 -offset_right = 670.0 -offset_bottom = 375.0 - -[node name="GridContainer" type="GridContainer" parent="ScrollContainer2"] -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 3 -columns = 3 diff --git a/MainWindow.gd b/MainWindow.gd index a3c3a62..7009b5b 100644 --- a/MainWindow.gd +++ b/MainWindow.gd @@ -109,9 +109,6 @@ var player_container: VBoxContainer = $Players/VBoxContainer @onready var players_list_container: VBoxContainer = $Players/VBoxContainer/ScrollContainer/PlayersListVBoxContainer -@onready -var character_select: Control = $CharacterSelect - @onready var new_character_select: Control = %NewCharacterSelect @@ -171,7 +168,6 @@ func _ready() -> void: reset_playlist_button.pressed.connect(reset_playlist) reset_points_button.pressed.connect(reset_points) - character_select.connect("character_selected", _on_character_selected) new_character_select.connect("new_new_character_selected", _on_new_character_selected) new_player_name_field.connect("enter_key_pressed", add_player) music_player_container.connect("play_next_song", play_next_song) @@ -457,7 +453,7 @@ func add_player() -> void: func load_players() -> void: print("load_players") - Settings.delete_player_children(players_list_container) + Settings.delete_children(players_list_container) var counter: int = 0 for player_object: PlayerObject in Settings.player_array: print(player_object.player_name) @@ -512,11 +508,6 @@ func _on_player_change_character_clicked(new_player: Player, player_name: String print("Change character for: " + player_name) new_character_select.show_grid(player_name) -func _on_character_selected(file_name: String) -> void: - print("_on_character_selected") - character_select.visible = false - current_player.character_selected(file_name) - func _on_new_character_selected(character_texture: ImageTexture) -> void: print("_on_new_character_selected") current_player.new_character_selected(character_texture) diff --git a/MainWindow.tscn b/MainWindow.tscn index e4bfec1..a858016 100644 --- a/MainWindow.tscn +++ b/MainWindow.tscn @@ -1,7 +1,6 @@ [gd_scene format=3 uid="uid://xwq863o6uvsu"] [ext_resource type="Script" uid="uid://b8f4g15cas2j2" path="res://MainWindow.gd" id="1_eu0t5"] -[ext_resource type="PackedScene" uid="uid://b16on0oscg1bv" path="res://CharacterSelect.tscn" id="2_76kf4"] [ext_resource type="Script" uid="uid://elgn7gkxgagq" path="res://InsperationScrollContainer.gd" id="2_gxtxm"] [ext_resource type="Texture2D" uid="uid://bcfmpd7h512ef" path="res://icons/person_add_light.svg" id="5_31tjv"] [ext_resource type="PackedScene" uid="uid://ds15cgsf8vpvc" path="res://MusicPlayer.tscn" id="5_emn36"] @@ -167,15 +166,6 @@ label_settings = SubResource("LabelSettings_3m52w") horizontal_alignment = 1 autowrap_mode = 2 -[node name="CharacterSelect" parent="." unique_id=2079506802 instance=ExtResource("2_76kf4")] -visible = false -top_level = true -layout_mode = 0 -offset_left = 616.0 -offset_top = 264.0 -offset_right = 776.0 -offset_bottom = 424.0 - [node name="MusicPlayer" parent="." unique_id=1990459832 instance=ExtResource("5_emn36")] layout_mode = 0 anchors_preset = 0 diff --git a/MusicPlayer.gd b/MusicPlayer.gd index 7c12607..b65d224 100644 --- a/MusicPlayer.gd +++ b/MusicPlayer.gd @@ -28,9 +28,6 @@ var volume_slider: HSlider = $MusicPlayerContainer/VolumeSlider @onready var music_time_label: Label = $MusicPlayerContainer/MusicTimeLabel -@onready -var path: String = '/Users/sebastian/ResilioSync/Sorterat_test/Metal Gear Solid 4 - Guns of the Patriots/2-16 Metal Gear Saga.mp3' - var play_icon: Texture = preload("res://icons/play_icon_light.svg") var pause_icon: Texture = preload("res://icons/pause_icon_light.svg") diff --git a/Player.gd b/Player.gd index 3f616a6..a5ad97f 100644 --- a/Player.gd +++ b/Player.gd @@ -60,11 +60,6 @@ func minus_point() -> void: func change_character() -> void: change_character_clicked.emit() -func character_selected(file_name: String) -> void: - print("Back in player list with: " + file_name) - player_object.character = load("res://characters/" + file_name) - set_player_character() - func new_character_selected(character_texture: ImageTexture) -> void: print("Back in player list with new") player_object.character = character_texture diff --git a/Settings.gd b/Settings.gd index ebbc4db..2f39516 100644 --- a/Settings.gd +++ b/Settings.gd @@ -36,8 +36,3 @@ func delete_children(node: Node) -> void: for n: Node in node.get_children(): node.remove_child(n) n.queue_free() - -func delete_player_children(node: Node) -> void: - for n: Node in node.get_children(): - node.remove_child(n) - n.queue_free() diff --git a/new_character_select.gd b/new_character_select.gd index e3ac9a0..8bf5ef0 100644 --- a/new_character_select.gd +++ b/new_character_select.gd @@ -14,7 +14,6 @@ var close_timer: Timer = %CloseTimer var can_select_character: bool = false -signal character_selected(file_name: String) signal new_new_character_selected(file_name: String) var character: PackedScene = preload("res://character.tscn") @@ -22,10 +21,6 @@ var character: PackedScene = preload("res://character.tscn") func _ready() -> void: close_timer.timeout.connect(_on_close_timeout) -func select_character(file_name: String) -> void: - print("select_character") - character_selected.emit(file_name) - func _on_close_timeout() -> void: print("_on_close_timeout!") Settings.character_select_open = false @@ -70,21 +65,3 @@ func _input(event: InputEvent) -> void: if !Rect2(Vector2(0, 0), character_panel.size).has_point(evLocal.position): self.visible = false Settings.character_select_open = false - -func load_characters_local() -> void: - var characters: DirAccess = DirAccess.open("res://characters/") - if characters: - characters.list_dir_begin() - var file_name: String = characters.get_next() - while file_name != "": - file_name = file_name.replace('.import', '') # <--- remove the .import - if file_name.ends_with(".png"): - var texture: Resource = load("res://characters/" + file_name) - var texture_btn: TextureButton = TextureButton.new() - character_grid.add_child(texture_btn) - texture_btn.custom_minimum_size = Vector2(80, 40) - texture_btn.ignore_texture_size = true - texture_btn.stretch_mode = TextureButton.STRETCH_KEEP_ASPECT - texture_btn.texture_normal = texture - texture_btn.pressed.connect(select_character.bind(file_name)) - file_name = characters.get_next() diff --git a/playlist.gd b/playlist.gd index bb338fb..cebc19b 100644 --- a/playlist.gd +++ b/playlist.gd @@ -31,10 +31,6 @@ func get_preloaded_songs() -> int: func should_preload_more_songs() -> bool: return number_of_tracks_to_preload > get_preloaded_songs() -func set_last_played_answered() -> void: - if song_object_array[latest_played_song].has_played && !song_object_array[latest_played_song].is_answered: - song_object_array[latest_played_song].is_answered = true - func song_is_answered(song_no: int = currently_playing_song) -> void: # Nothing is playing yet (-1); a negative index would answer the last, unplayed song if song_no < 0 || song_no >= song_object_array.size(): diff --git a/progress_response.gd b/progress_response.gd deleted file mode 100644 index f1085e7..0000000 --- a/progress_response.gd +++ /dev/null @@ -1,5 +0,0 @@ -class_name ProgressResponse -extends Node - -var progress: String -var total_time: String diff --git a/progress_response.gd.uid b/progress_response.gd.uid deleted file mode 100644 index 7ea6704..0000000 --- a/progress_response.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://e74iuu78stc3 diff --git a/sync_response.gd b/sync_response.gd deleted file mode 100644 index e765337..0000000 --- a/sync_response.gd +++ /dev/null @@ -1,10 +0,0 @@ -class_name SyncResponse -extends Node - -var soundtracks_added: Array -var soundtracks_re_added: Array -var soundtracks_changed_title: Array -var soundtracks_changed_content: Array -var soundtracks_removed: Array -var catched_errors: Array -var total_time: String diff --git a/sync_response.gd.uid b/sync_response.gd.uid deleted file mode 100644 index 6947787..0000000 --- a/sync_response.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://dtfsuob2aidl7