woofmeow/netfishing
woofmeow/netfishing
1
0
Fork 0
Code Issues 34 Pull requests Projects 1 Releases 24 Packages Wiki Activity Actions

Improve title music playback

Browse source
This commit is contained in:
Alexander Sellite 2026-07-27 11:41:29 -04:00
parent a4e612c1d3
commit 6fadca19b4
3 changed files with 16 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
audio/music/title/as_in_four_wolves.ogg
View file

Binary file not shown.

2
audio/music/title/as_in_four_wolves.ogg.import
View file

@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/as_in_four_wolves.ogg-3d5f167a45d25a52b56a9dd
[params] [params]
loop=true loop=true
loop_offset=0 loop_offset=231.996145833
bpm=0 bpm=0
beat_count=0 beat_count=0
bar_beats=4 bar_beats=4

55
main/main.gd
View file

@ -32,9 +32,8 @@ const TITLE_MUSIC_SILENCE_DB: float = -80.0
@export var main_shop_buyer_profile: FishBuyerProfileType @export var main_shop_buyer_profile: FishBuyerProfileType
@export var item_catalog: ItemCatalogType @export var item_catalog: ItemCatalogType
@export_category("Title Music") @export_category("Title Music")
@export_range(-40.0, 0.0, 0.5) var title_music_volume_db: float = -14.0 @export_range(-40.0, 0.0, 0.5) var title_music_volume_db: float = -6.0
@export_range(0.0, 5.0, 0.05) var title_music_fade_in_seconds: float = 1.0 @export_range(0.0, 10.0, 0.05) var title_music_fade_out_seconds: float = 5.0
@export_range(0.0, 5.0, 0.05) var title_music_fade_out_seconds: float = 0.75
@onready var _test_world: TestWorldType = $TestWorld @onready var _test_world: TestWorldType = $TestWorld
@onready var _player: PlayerType = %Player @onready var _player: PlayerType = %Player
@ -157,7 +156,7 @@ func _ready() -> void:
_player.hotbar.get_selected_slot(), _player.hotbar.get_selected_slot(),
_player.hotbar.get_selected_item_id() _player.hotbar.get_selected_item_id()
) )
_show_title_music() _show_title_music(true)
func _input(event: InputEvent) -> void: func _input(event: InputEvent) -> void:
@ -254,7 +253,7 @@ func _on_return_to_title_requested() -> void:
pause_menu.close_for_title_transition() pause_menu.close_for_title_transition()
_set_gameplay_active(false) _set_gameplay_active(false)
_game_ui.get_title_screen().reopen() _game_ui.get_title_screen().reopen()
_show_title_music() _show_title_music(true)
func _on_reset_progress_requested() -> void: func _on_reset_progress_requested() -> void:
@ -270,7 +269,7 @@ func _on_reset_progress_requested() -> void:
pause_menu.close_for_title_transition() pause_menu.close_for_title_transition()
_set_gameplay_active(false) _set_gameplay_active(false)
_game_ui.get_title_screen().reopen() _game_ui.get_title_screen().reopen()
_show_title_music() _show_title_music(true)
func _on_water_recovery_starting() -> void: func _on_water_recovery_starting() -> void:
@ -309,33 +308,19 @@ func _on_quit_requested() -> void:
_settings_manager.save_if_dirty() _settings_manager.save_if_dirty()
if _gameplay_started: if _gameplay_started:
_save_manager.save_if_dirty() _save_manager.save_if_dirty()
_fade_out_title_music(_finish_quit) _title_music_requested = false
_replace_title_music_transition()
_finish_quit()
func _show_title_music() -> void: func _show_title_music(restart_from_beginning: bool = false) -> void:
_title_music_requested = true _title_music_requested = true
var generation: int = _replace_title_music_transition() _replace_title_music_transition()
if not _title_music.playing: if restart_from_beginning:
_title_music.volume_db = TITLE_MUSIC_SILENCE_DB _title_music.stop()
_title_music.play() _title_music.volume_db = title_music_volume_db
if is_equal_approx(_title_music.volume_db, title_music_volume_db): if restart_from_beginning or not _title_music.playing:
return _title_music.play(0.0)
if title_music_fade_in_seconds <= 0.0:
_title_music.volume_db = title_music_volume_db
return
_title_music_tween = create_tween()
_title_music_tween.set_trans(Tween.TRANS_CUBIC)
_title_music_tween.set_ease(Tween.EASE_OUT)
_title_music_tween.tween_property(
_title_music,
"volume_db",
title_music_volume_db,
title_music_fade_in_seconds
)
_title_music_tween.finished.connect(
_on_title_music_faded_in.bind(generation),
CONNECT_ONE_SHOT
)
func _fade_out_title_music(on_complete: Callable = Callable()) -> void: func _fade_out_title_music(on_complete: Callable = Callable()) -> void:
@ -372,16 +357,6 @@ func _replace_title_music_transition() -> int:
return _title_music_transition_generation return _title_music_transition_generation
func _on_title_music_faded_in(generation: int) -> void:
if (
generation != _title_music_transition_generation
or not _title_music_requested
):
return
_title_music_tween = null
_title_music.volume_db = title_music_volume_db
func _complete_title_music_fade_out( func _complete_title_music_fade_out(
generation: int, generation: int,
on_complete: Callable, on_complete: Callable,