Added more sound

This commit is contained in:
2025-12-26 00:39:31 +03:00
parent 48a2b8ab74
commit a7aeacd547
16 changed files with 63 additions and 32 deletions
+1
View File
@@ -101,6 +101,7 @@ func _input(event: InputEvent) -> void:
if event.is_action_pressed("ui_accept"): if event.is_action_pressed("ui_accept"):
var selected_passage := _get_passage_to_sector(selected_sector) var selected_passage := _get_passage_to_sector(selected_sector)
if selected_passage != null: if selected_passage != null:
SoundManager.play_ui_stream(SoundManager.ui_stream_accept)
passage_selected.emit(selected_passage) passage_selected.emit(selected_passage)
+1
View File
@@ -37,6 +37,7 @@ func _input(event: InputEvent) -> void:
var is_game_over := victory_screen.visible or game_over_screen.visible var is_game_over := victory_screen.visible or game_over_screen.visible
var use_pause := is_game_starded and not is_game_over var use_pause := is_game_starded and not is_game_over
if event.is_action_pressed("pause") and use_pause: if event.is_action_pressed("pause") and use_pause:
SoundManager.play_ui_stream.call_deferred(SoundManager.ui_stream_decline)
pause_screen.show() pause_screen.show()
get_tree().paused = true get_tree().paused = true
+1 -1
View File
@@ -16,7 +16,7 @@ signal completed
var _current_progress := 0.0 var _current_progress := 0.0
var _timer_time_elapsed := 0.0 var _timer_time_elapsed := 0.0
var _current_enemy_index := 0 var _current_enemy_index := 0
var _player_is_alive = true var _player_is_alive := true
@onready var player : PlayerShip = $PlayerShip @onready var player : PlayerShip = $PlayerShip
+11 -7
View File
@@ -9,10 +9,10 @@ const MUSIC_BUS = "Music"
@export_group("Pitch settings", "pitch") @export_group("Pitch settings", "pitch")
@export_range(0.5, 1.5, 0.05) var putch_ui_min := 1.0 @export_range(0.9, 1.1, 0.01) var putch_ui_min := 1.0
@export_range(0.5, 1.5, 0.05) var putch_ui_max := 1.0 @export_range(0.9, 1.1, 0.01) var putch_ui_max := 1.0
@export_range(0.5, 1.5, 0.05) var putch_sfx_min := 1.0 @export_range(0.9, 1.1, 0.01) var putch_sfx_min := 1.0
@export_range(0.5, 1.5, 0.05) var putch_sfx_max := 1.0 @export_range(0.9, 1.1, 0.01) var putch_sfx_max := 1.0
@export_group("Number of players", "player_count") @export_group("Number of players", "player_count")
@export_range(1, 10) var player_count_ui := 1 @export_range(1, 10) var player_count_ui := 1
@@ -36,23 +36,27 @@ func _ready() -> void:
_create_music_player() _create_music_player()
func play_ui_stream(stream: AudioStream) -> void: func play_ui_stream(stream: AudioStream) -> AudioStreamPlayer:
var player := _get_free_player(_ui_players) var player := _get_free_player(_ui_players)
player.stream = stream player.stream = stream
player.pitch_scale = randf_range(putch_ui_min, putch_ui_max) player.pitch_scale = randf_range(putch_ui_min, putch_ui_max)
player.play() player.play()
return player
func play_sfx_stream(stream: AudioStream) -> void: func play_sfx_stream(stream: AudioStream, position: Vector2) -> AudioStreamPlayer2D:
var player := _get_free_2d_player(_sfx_players) var player := _get_free_2d_player(_sfx_players)
player.stream = stream player.stream = stream
player.pitch_scale = randf_range(putch_ui_min, putch_ui_max) player.pitch_scale = randf_range(putch_ui_min, putch_ui_max)
player.position = position
player.play() player.play()
return player
func play_music_stream(stream: AudioStream) -> void: func play_music_stream(stream: AudioStream) -> AudioStreamPlayer:
_music_player.stream = stream _music_player.stream = stream
_music_player.play() _music_player.play()
return _music_player
func _create_ui_players() -> void: func _create_ui_players() -> void:
+1
View File
@@ -41,6 +41,7 @@ func _on_back_button_pressed() -> void:
if tween: if tween:
tween.kill() tween.kill()
SoundManager.play_ui_stream(SoundManager.ui_stream_decline)
back.emit() back.emit()
+18
View File
@@ -71,31 +71,49 @@ func _update_window_factor_disabled() -> void:
func _on_fullscreen_check_button_toggled(toggled: bool) -> void: func _on_fullscreen_check_button_toggled(toggled: bool) -> void:
if visible: SoundManager.play_ui_stream(SoundManager.ui_stream_accept)
SettingsManager.fullscreen = toggled SettingsManager.fullscreen = toggled
_update_window_factor_disabled() _update_window_factor_disabled()
func _on_back_button_pressed() -> void: func _on_back_button_pressed() -> void:
SoundManager.play_ui_stream(SoundManager.ui_stream_decline)
back.emit() back.emit()
func _on_window_factor_button_pressed(button: Button) -> void: func _on_window_factor_button_pressed(button: Button) -> void:
SoundManager.play_ui_stream(SoundManager.ui_stream_accept)
var window_factor : int = button.get_meta(WINDOW_FACTOR, 0) var window_factor : int = button.get_meta(WINDOW_FACTOR, 0)
if window_factor > 0: if window_factor > 0:
SettingsManager.window_factor = window_factor SettingsManager.window_factor = window_factor
func _on_master_volume_changed(value: float) -> void: func _on_master_volume_changed(value: float) -> void:
var stream := _get_slider_sound(SettingsManager.master_volume, value)
SoundManager.play_ui_stream(stream)
SettingsManager.master_volume = floor(value) SettingsManager.master_volume = floor(value)
func _on_ui_volume_changed(value: float) -> void: func _on_ui_volume_changed(value: float) -> void:
var stream := _get_slider_sound(SettingsManager.master_volume, value)
SoundManager.play_ui_stream(stream)
SettingsManager.ui_volume = floor(value) SettingsManager.ui_volume = floor(value)
func _on_sfx_volume_changed(value: float) -> void: func _on_sfx_volume_changed(value: float) -> void:
var stream := _get_slider_sound(SettingsManager.master_volume, value)
SoundManager.play_sfx_stream(stream, SettingsManager.window_base_size/2)
SettingsManager.sfx_volume = floor(value) SettingsManager.sfx_volume = floor(value)
func _on_music_volume_changed(value: float) -> void: func _on_music_volume_changed(value: float) -> void:
var stream := _get_slider_sound(SettingsManager.master_volume, value)
SoundManager.play_music_stream(stream)
SettingsManager.music_volume = floor(value) SettingsManager.music_volume = floor(value)
func _get_slider_sound(old_value: float, new_value: float) -> AudioStream:
if old_value < new_value:
return SoundManager.ui_stream_next
else:
return SoundManager.ui_stream_previous
+1
View File
@@ -13,6 +13,7 @@ func _on_timer_timeout() -> void:
func _on_main_menu_button_pressed() -> void: func _on_main_menu_button_pressed() -> void:
SoundManager.play_ui_stream(SoundManager.ui_stream_accept)
show_main_menu.emit() show_main_menu.emit()
+3
View File
@@ -33,12 +33,15 @@ func _setup_neighbors() -> void:
func _on_continue_button_pressed() -> void: func _on_continue_button_pressed() -> void:
SoundManager.play_ui_stream(SoundManager.ui_stream_accept)
continue_game.emit() continue_game.emit()
func _on_options_button_pressed() -> void: func _on_options_button_pressed() -> void:
SoundManager.play_ui_stream(SoundManager.ui_stream_accept)
show_options.emit() show_options.emit()
func _on_main_menu_button_pressed() -> void: func _on_main_menu_button_pressed() -> void:
SoundManager.play_ui_stream(SoundManager.ui_stream_accept)
show_main_menu.emit() show_main_menu.emit()
+9 -9
View File
@@ -5,19 +5,19 @@
[sub_resource type="Shortcut" id="Shortcut_lgp46"] [sub_resource type="Shortcut" id="Shortcut_lgp46"]
[node name="PauseMenu" type="Control"] [node name="PauseMenu" type="CenterContainer"]
process_mode = 2 process_mode = 2
layout_mode = 3 anchors_preset = 15
anchors_preset = 0 anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 6
size_flags_vertical = 6
script = ExtResource("1_inj1j") script = ExtResource("1_inj1j")
[node name="VBoxContainer" type="VBoxContainer" parent="."] [node name="VBoxContainer" type="VBoxContainer" parent="."]
top_level = true layout_mode = 2
layout_mode = 0
offset_left = 100.0
offset_top = 100.0
offset_right = 196.0
offset_bottom = 166.0
[node name="ContinueButton" type="Button" parent="VBoxContainer"] [node name="ContinueButton" type="Button" parent="VBoxContainer"]
unique_name_in_owner = true unique_name_in_owner = true
+1
View File
@@ -15,6 +15,7 @@ func _ready() -> void:
func _input(event: InputEvent) -> void: func _input(event: InputEvent) -> void:
if event.is_action_pressed("pause") or event.is_action_pressed("ui_cancel"): if event.is_action_pressed("pause") or event.is_action_pressed("ui_cancel"):
SoundManager.play_ui_stream(SoundManager.ui_stream_accept)
_on_pause_menu_continue_game.call_deferred() _on_pause_menu_continue_game.call_deferred()
+8 -14
View File
@@ -1,27 +1,21 @@
[gd_scene load_steps=4 format=3 uid="uid://d34nh3lc1gpb"] [gd_scene load_steps=5 format=3 uid="uid://d34nh3lc1gpb"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_theme.tres" id="1_cked2"]
[ext_resource type="Script" uid="uid://c5d2t2o53wkmt" path="res://game/menu/ingame/pause_screen.gd" id="1_fe1q8"] [ext_resource type="Script" uid="uid://c5d2t2o53wkmt" path="res://game/menu/ingame/pause_screen.gd" id="1_fe1q8"]
[ext_resource type="PackedScene" uid="uid://bclo2wl8ibrcg" path="res://game/menu/ingame/pause_menu.tscn" id="2_4r6ly"] [ext_resource type="PackedScene" uid="uid://bclo2wl8ibrcg" path="res://game/menu/ingame/pause_menu.tscn" id="2_4r6ly"]
[ext_resource type="PackedScene" uid="uid://btr60idiit4y7" path="res://game/menu/common/options.tscn" id="3_3gwb3"] [ext_resource type="PackedScene" uid="uid://btr60idiit4y7" path="res://game/menu/common/options.tscn" id="3_3gwb3"]
[node name="PauseScreen" type="Control"] [node name="PauseScreen" type="MarginContainer"]
layout_mode = 3 offset_right = 640.0
anchors_preset = 0 offset_bottom = 360.0
theme = ExtResource("1_cked2")
script = ExtResource("1_fe1q8") script = ExtResource("1_fe1q8")
[node name="PauseMenu" parent="." instance=ExtResource("2_4r6ly")] [node name="PauseMenu" parent="." instance=ExtResource("2_4r6ly")]
layout_mode = 0 layout_mode = 2
[node name="Options" parent="." instance=ExtResource("3_3gwb3")] [node name="Options" parent="." instance=ExtResource("3_3gwb3")]
custom_minimum_size = Vector2(640, 360) layout_mode = 2
layout_mode = 0
anchors_preset = 0
anchor_right = 0.0
anchor_bottom = 0.0
offset_right = 0.0
offset_bottom = 0.0
grow_horizontal = 1
grow_vertical = 1
[connection signal="visibility_changed" from="." to="." method="_on_visibility_changed"] [connection signal="visibility_changed" from="." to="." method="_on_visibility_changed"]
[connection signal="continue_game" from="PauseMenu" to="." method="_on_pause_menu_continue_game"] [connection signal="continue_game" from="PauseMenu" to="." method="_on_pause_menu_continue_game"]
+1
View File
@@ -13,6 +13,7 @@ func _on_timer_timeout() -> void:
func _on_main_menu_button_pressed() -> void: func _on_main_menu_button_pressed() -> void:
SoundManager.play_ui_stream(SoundManager.ui_stream_accept)
show_main_menu.emit() show_main_menu.emit()
+1
View File
@@ -24,4 +24,5 @@ func _set_weapon_data(data: WeaponData) -> void:
func _on_button_pressed() -> void: func _on_button_pressed() -> void:
SoundManager.play_ui_stream(SoundManager.ui_stream_accept)
weapon_selected.emit(weapon_data) weapon_selected.emit(weapon_data)
+2 -1
View File
@@ -71,5 +71,6 @@ func _on_credits_button_pressed() -> void:
func _on_quit_button_pressed() -> void: func _on_quit_button_pressed() -> void:
SoundManager.play_ui_stream(SoundManager.ui_stream_decline) var player := SoundManager.play_ui_stream(SoundManager.ui_stream_decline)
await player.finished
quit_game.emit() quit_game.emit()
+3
View File
@@ -72,6 +72,7 @@ func _on_seed_edit_text_submitted(new_text: String) -> void:
func _on_back_button_pressed() -> void: func _on_back_button_pressed() -> void:
SoundManager.play_ui_stream(SoundManager.ui_stream_decline)
back.emit() back.emit()
@@ -86,8 +87,10 @@ func _on_visibility_changed() -> void:
func _on_use_random_button_pressed() -> void: func _on_use_random_button_pressed() -> void:
SoundManager.play_ui_stream(SoundManager.ui_stream_accept)
_start_game(random_edit.text) _start_game(random_edit.text)
func _on_use_custom_button_pressed() -> void: func _on_use_custom_button_pressed() -> void:
SoundManager.play_ui_stream(SoundManager.ui_stream_accept)
_start_game(custom_edit.text) _start_game(custom_edit.text)
+1
View File
@@ -33,6 +33,7 @@ size_flags_horizontal = 4
[node name="Options" parent="MarginContainer" instance=ExtResource("3_88gnj")] [node name="Options" parent="MarginContainer" instance=ExtResource("3_88gnj")]
unique_name_in_owner = true unique_name_in_owner = true
visible = false
layout_mode = 2 layout_mode = 2
[node name="Credits" parent="MarginContainer" instance=ExtResource("4_w1y3c")] [node name="Credits" parent="MarginContainer" instance=ExtResource("4_w1y3c")]