use Audio.tscn to simplify Audio calls! (-;

This commit is contained in:
Harmony Honey 2023-12-29 13:13:09 -05:00
parent 86aad52961
commit 907df18d11
23 changed files with 147 additions and 215 deletions

23
src/autoload/Audio.gd Normal file
View file

@ -0,0 +1,23 @@
extends Node
var dict = {}
func _ready():
refresh()
func play(arg = "menu_cursor", from := 1.0, to := -1.0, pos := 0.0):
if arg is String and dict.has(arg):
arg = dict[arg]
if is_instance_valid(arg) and (arg is AudioStreamPlayer or arg is AudioStreamPlayer2D):
arg.pitch_scale = from if to < 0 else rand_range(from, to)
arg.play(pos)
func refresh():
dict = {}
for i in Shared.get_all_children(self):
if i is AudioStreamPlayer or i is AudioStreamPlayer2D:
dict[str(get_path_to(i)).to_lower().replace("/", "_")] = i
print("Audio.dict refresh: ", dict.keys())

87
src/autoload/Audio.tscn Normal file
View file

@ -0,0 +1,87 @@
[gd_scene load_steps=15 format=2]
[ext_resource path="res://media/audio/sfx/hit1.wav" type="AudioStream" id=1]
[ext_resource path="res://media/audio/sfx/sfx3.wav" type="AudioStream" id=2]
[ext_resource path="res://media/audio/sfx/sfx18.wav" type="AudioStream" id=3]
[ext_resource path="res://media/audio/sfx/portal9.wav" type="AudioStream" id=4]
[ext_resource path="res://media/audio/sfx/portal7.wav" type="AudioStream" id=5]
[ext_resource path="res://src/autoload/Audio.gd" type="Script" id=6]
[ext_resource path="res://media/audio/sfx/sfx13.wav" type="AudioStream" id=7]
[ext_resource path="res://media/audio/sfx/Randomize105.wav" type="AudioStream" id=8]
[ext_resource path="res://media/audio/sfx/Randomize104.wav" type="AudioStream" id=9]
[ext_resource path="res://media/audio/sfx/Randomize103.wav" type="AudioStream" id=10]
[ext_resource path="res://media/audio/sfx/sfx14.wav" type="AudioStream" id=11]
[ext_resource path="res://media/audio/sfx/sfx5.wav" type="AudioStream" id=12]
[ext_resource path="res://media/audio/sfx/portal0.wav" type="AudioStream" id=13]
[ext_resource path="res://media/audio/sfx/bell1.wav" type="AudioStream" id=14]
[node name="Audio" type="Node"]
pause_mode = 2
script = ExtResource( 6 )
[node name="Menu" type="Node" parent="."]
[node name="Scroll" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 1 )
volume_db = -7.0
bus = "SFX"
[node name="Scroll2" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 11 )
bus = "SFX"
[node name="Scroll3" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 9 )
volume_db = -5.0
bus = "SFX"
[node name="Play" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 4 )
bus = "SFX"
[node name="Options" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 7 )
bus = "SFX"
[node name="Yes" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 8 )
bus = "SFX"
[node name="No" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 3 )
bus = "SFX"
[node name="Pause" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 2 )
volume_db = -5.0
bus = "SFX"
[node name="Reset" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 4 )
volume_db = -4.0
bus = "SFX"
[node name="Exit" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 3 )
volume_db = -1.0
bus = "SFX"
[node name="Back" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 10 )
bus = "SFX"
[node name="Pick" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 5 )
bus = "SFX"
[node name="Delete" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 12 )
bus = "SFX"
[node name="Wipe" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 13 )
bus = "SFX"
[node name="Bell" type="AudioStreamPlayer" parent="Menu"]
stream = ExtResource( 14 )
bus = "SFX"

View file

@ -11,12 +11,6 @@ var menu_items := ["go", "redo", "stages"]
var timer := 0.1 # prevent input overlap
var clock := 0.0
onready var node_audio_pause : AudioStreamPlayer = $Audio/Pause
onready var node_audio_scroll : AudioStreamPlayer = $Audio/Scroll
onready var node_audio_resume : AudioStreamPlayer = $Audio/Resume
onready var node_audio_reset : AudioStreamPlayer = $Audio/Reset
onready var node_audio_exit : AudioStreamPlayer = $Audio/Exit
signal pause
signal unpause
@ -51,7 +45,7 @@ func _input(event):
if up or down:
set_cursor(cursor + (-1 if up else 1))
write_menu()
Audio.play("pause_scroll", 0.8, 1.2)
Audio.play("menu_scroll", 0.8, 1.2)
func toggle_pause():
is_paused = !is_paused
@ -65,10 +59,10 @@ func toggle_pause():
set_cursor()
write_menu()
emit_signal("pause")
node_audio_pause.play()
Audio.play("menu_pause", 0.9, 1.1)
else:
emit_signal("unpause")
node_audio_resume.play()
Audio.play("menu_pick", 0.9, 1.1)
func write_menu():
menu_list.text = ""
@ -89,8 +83,8 @@ func select():
"redo":
Shared.do_reset()
toggle_pause()
node_audio_reset.play()
Audio.play("menu_reset", 0.9, 1.1)
"stages":
Shared.wipe_scene(Shared.level_select_path)
toggle_pause()
node_audio_exit.play()
Audio.play("menu_exit", 0.9, 1.1)

View file

@ -1,14 +1,9 @@
[gd_scene load_steps=12 format=2]
[gd_scene load_steps=7 format=2]
[ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://media/image/9slice.png" type="Texture" id=2]
[ext_resource path="res://src/autoload/Pause.gd" type="Script" id=3]
[ext_resource path="res://media/audio/sfx/sfx3.wav" type="AudioStream" id=4]
[ext_resource path="res://media/font/ThaleahFat.ttf" type="DynamicFontData" id=5]
[ext_resource path="res://media/audio/sfx/hit1.wav" type="AudioStream" id=7]
[ext_resource path="res://media/audio/sfx/sfx18.wav" type="AudioStream" id=9]
[ext_resource path="res://media/audio/sfx/portal7.wav" type="AudioStream" id=10]
[ext_resource path="res://media/audio/sfx/portal9.wav" type="AudioStream" id=11]
[sub_resource type="DynamicFont" id=2]
size = 5
@ -73,30 +68,3 @@ custom_constants/shadow_as_outline = 1
custom_fonts/font = SubResource( 3 )
text = "PAUSEd"
align = 1
[node name="Audio" type="Node" parent="."]
[node name="Pause" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource( 4 )
volume_db = -5.0
bus = "SFX"
[node name="Scroll" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource( 7 )
volume_db = -7.0
bus = "SFX"
[node name="Resume" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource( 10 )
volume_db = -2.0
bus = "SFX"
[node name="Reset" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource( 11 )
volume_db = -4.0
bus = "SFX"
[node name="Exit" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource( 9 )
volume_db = -1.0
bus = "SFX"

View file

@ -10,7 +10,6 @@ var frame = 0
export var last = 14
onready var easing := EaseMover.new(0.45)
onready var audio : AudioStreamPlayer2D = $AudioStreamPlayer2D
onready var image := $ColorRect
onready var mat : ShaderMaterial = $ColorRect.material
@ -37,7 +36,7 @@ func start(_reverse = false):
is_reverse = _reverse
if !is_reverse:
audio.play()
Audio.play("menu_wipe")
func stop():
is_wipe = false

View file

@ -10,14 +10,6 @@ var main_items := ["play", "creator", "options", "credits"]
var quit_items := ["yes", "no"]
var is_input = true
onready var node_audio_scroll : AudioStreamPlayer = $Audio/Scroll
onready var node_audio_play : AudioStreamPlayer = $Audio/Play
onready var node_audio_options : AudioStreamPlayer = $Audio/Options
onready var node_audio_credits : AudioStreamPlayer = $Audio/Credits
onready var node_audio_quit : AudioStreamPlayer = $Audio/Quit
onready var node_audio_yes : AudioStreamPlayer = $Audio/Yes
onready var node_audio_no : AudioStreamPlayer = $Audio/No
func _ready():
switch_menu("main", true)
@ -36,8 +28,7 @@ func _input(event):
var down = event.is_action_pressed("down") or event.is_action_pressed("right")
if up or down:
self.cursor += -1 if up else 1
node_audio_scroll.pitch_scale = 1 + rand_range(-0.2, 0.2)
node_audio_scroll.play()
Audio.play("menu_scroll", 0.8, 1.2)
func write_menu():
for i in menu_items.size():
@ -48,22 +39,22 @@ func menu_select(tag : String = menu_items[cursor].to_lower()):
"play":
Shared.wipe_scene(Shared.level_select_path)
is_input = false
node_audio_play.play()
Audio.play("menu_play", 0.9, 1.1)
"creator":
Shared.wipe_scene(Shared.creator_path)
is_input = false
node_audio_play.play()
Audio.play("menu_play", 0.9, 1.1)
"options":
Shared.wipe_scene(Shared.options_menu_path)
is_input = false
node_audio_options.play()
Audio.play("menu_options", 0.9, 1.1)
"credits":
Shared.wipe_scene(Shared.credits_path)
is_input = false
node_audio_credits.play()
Audio.play("menu_pick", 0.9, 1.1)
"yes":
is_input = false
node_audio_yes.play()
Audio.play("menu_yes", 0.9, 1.1)
if OS.get_name() == "HTML5":
Shared.wipe_scene(Shared.splash_path)
else:
@ -80,7 +71,7 @@ func switch_menu(arg, silent := false):
menu_stuff = (main_menu if is_main else quit_menu).get_children()
if !silent:
(node_audio_no if is_main else node_audio_quit).play()
Audio.play("menu_" + ("no" if is_main else "pick"), 0.9, 1.1)
self.cursor = 0 if is_main else 1

View file

@ -1,11 +1,10 @@
[gd_scene load_steps=26 format=2]
[gd_scene load_steps=19 format=2]
[ext_resource path="res://media/image/creator.png" type="Texture" id=1]
[ext_resource path="res://src/menu/StartMenu.gd" type="Script" id=3]
[ext_resource path="res://media/image/HarmonyHoneyLogo.png" type="Texture" id=4]
[ext_resource path="res://media/font/ThaleahFat.ttf" type="DynamicFontData" id=5]
[ext_resource path="res://media/font/ExpressionPro.ttf" type="DynamicFontData" id=6]
[ext_resource path="res://media/audio/sfx/hit1.wav" type="AudioStream" id=7]
[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=8]
[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=9]
[ext_resource path="res://src/menu/AttractMode.gd" type="Script" id=10]
@ -15,12 +14,6 @@
[ext_resource path="res://src/actor/SwitchBlockBlue.tscn" type="PackedScene" id=14]
[ext_resource path="res://src/actor/SwitchBlue.tscn" type="PackedScene" id=15]
[ext_resource path="res://media/image/menu.png" type="Texture" id=16]
[ext_resource path="res://media/audio/sfx/sfx3.wav" type="AudioStream" id=18]
[ext_resource path="res://media/audio/sfx/sfx18.wav" type="AudioStream" id=19]
[ext_resource path="res://media/audio/sfx/sfx13.wav" type="AudioStream" id=20]
[ext_resource path="res://media/audio/sfx/portal9.wav" type="AudioStream" id=21]
[ext_resource path="res://media/audio/sfx/Randomize105.wav" type="AudioStream" id=22]
[ext_resource path="res://media/audio/sfx/portal7.wav" type="AudioStream" id=23]
[ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=24]
[sub_resource type="DynamicFont" id=3]
@ -230,37 +223,6 @@ text = "hhoney.net"
align = 2
valign = 2
[node name="Audio" type="Node" parent="."]
[node name="Scroll" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource( 7 )
volume_db = -7.0
bus = "SFX"
[node name="Play" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource( 21 )
bus = "SFX"
[node name="Options" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource( 20 )
bus = "SFX"
[node name="Credits" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource( 23 )
bus = "SFX"
[node name="Quit" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource( 18 )
bus = "SFX"
[node name="Yes" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource( 22 )
bus = "SFX"
[node name="No" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource( 19 )
bus = "SFX"
[node name="Stage" type="Node2D" parent="."]
[node name="SolidTileMap" parent="Stage" instance=ExtResource( 11 )]

View file

@ -2,6 +2,9 @@ extends Node2D
onready var p = $Player
func _ready():
Audio.play("menu_pick")
func _physics_process(delta):
if p.position.y > 128:
Shared.wipe_scene(Shared.splash_path)

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=10 format=2]
[gd_scene load_steps=9 format=2]
[ext_resource path="res://media/font/m5x7.tres" type="DynamicFont" id=1]
[ext_resource path="res://media/font/m6x11.tres" type="DynamicFont" id=2]
@ -8,7 +8,6 @@
[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6]
[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=7]
[ext_resource path="res://src/menu/WinScreen.gd" type="Script" id=8]
[ext_resource path="res://media/audio/sfx/portal7.wav" type="AudioStream" id=9]
[node name="Node2D" type="Node2D"]
@ -78,11 +77,6 @@ tile_data = PoolIntArray( 27, -1610612731, 0, 65544, -1610612731, 2, 65558, 5, 2
[node name="GameCamera" parent="." instance=ExtResource( 3 )]
position = Vector2( 116, 64 )
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 9 )
autoplay = true
bus = "SFX"
[node name="Actors" type="Node2D" parent="."]
script = ExtResource( 8 )

View file

@ -7,4 +7,4 @@ func _input(event):
if event.is_action_pressed("action"):
Shared.wipe_scene(Shared.main_menu_path)
set_process_input(false)
$AudioBack.play()
Audio.play("menu_back", 0.9, 1.1)

View file

@ -1,10 +1,9 @@
[gd_scene load_steps=13 format=2]
[gd_scene load_steps=12 format=2]
[ext_resource path="res://media/font/m3x6.tres" type="DynamicFont" id=1]
[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=2]
[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=3]
[ext_resource path="res://src/menu/credits.gd" type="Script" id=4]
[ext_resource path="res://media/audio/sfx/Randomize103.wav" type="AudioStream" id=5]
[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=6]
[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=7]
[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=8]
@ -19,10 +18,6 @@ font_data = ExtResource( 10 )
[node name="Credits" type="Node2D"]
script = ExtResource( 4 )
[node name="AudioBack" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 5 )
bus = "SFX"
[node name="Header" type="Label" parent="."]
margin_left = -2.0
margin_top = 11.0

View file

@ -1,9 +1,7 @@
extends Node2D
onready var audio := $AudioStreamPlayer
func act():
Shared.scene_path = Shared.main_menu_path
Shared.do_reset()
owner.set_process_input(false)
audio.play()
Audio.play("menu_back", 0.9, 1.1)

View file

@ -1,8 +1,6 @@
extends Node2D
onready var audio := $AudioStreamPlayer
func act():
audio.play()
Audio.play("menu_delete", 0.9, 1.1)
Shared.delete_save()
Shared.node_camera_game.shake(5)

View file

@ -1,8 +1,6 @@
extends Node2D
onready var fill = $Box/Fill
onready var audio = $AudioStreamPlayer
var is_selected = false
func _ready():
@ -20,7 +18,7 @@ func _input(event):
var is_full = OS.window_fullscreen
OS.window_fullscreen = !is_full
Shared.set_window_scale()
audio.play()
Audio.play("menu_pause", 0.9, 1.1)
fill.visible = !is_full
if !is_full:
Input.set_mouse_mode(Input.MOUSE_MODE_HIDDEN)

View file

@ -1,11 +1,9 @@
extends Node2D
onready var node_cursor : ColorRect = $Cursor
onready var menu_items : Array = $MenuItems.get_children()
var cursor := 0
onready var node_cursor : ColorRect = $Cursor
onready var node_audio_scroll : AudioStreamPlayer = $AudioScroll
func _ready():
select_item(0)
@ -21,8 +19,7 @@ func _input(event):
if TouchScreen.visible:
if left or right:
select_item(cursor + (-1 if left else 1))
node_audio_scroll.pitch_scale = 1 + rand_range(-0.2, 0.2)
node_audio_scroll.play()
Audio.play("menu_scroll", 0.8, 1.2)
elif yes or no:
var btnx = -1 if no else 1
if menu_items[cursor].has_method("scroll"):
@ -33,8 +30,7 @@ func _input(event):
else:
if up or down:
select_item(cursor + (-1 if up else 1))
node_audio_scroll.pitch_scale = 1 + rand_range(-0.2, 0.2)
node_audio_scroll.play()
Audio.play("menu_scroll", 0.8, 1.2)
elif yes:
if menu_items[cursor].has_method("act"):
menu_items[cursor].act()

View file

@ -1,16 +1,10 @@
[gd_scene load_steps=25 format=2]
[gd_scene load_steps=19 format=2]
[ext_resource path="res://src/menu/options/OptionsMenu.gd" type="Script" id=1]
[ext_resource path="res://src/menu/options/Volume.tscn" type="PackedScene" id=2]
[ext_resource path="res://media/audio/sfx/sfx14.wav" type="AudioStream" id=3]
[ext_resource path="res://media/audio/sfx/sfx5.wav" type="AudioStream" id=4]
[ext_resource path="res://media/audio/sfx/btn0.wav" type="AudioStream" id=5]
[ext_resource path="res://media/audio/sfx/Randomize103.wav" type="AudioStream" id=7]
[ext_resource path="res://media/font/m6x11.ttf" type="DynamicFontData" id=8]
[ext_resource path="res://media/font/m3x6.tres" type="DynamicFont" id=9]
[ext_resource path="res://media/audio/sfx/sfx3.wav" type="AudioStream" id=10]
[ext_resource path="res://media/audio/sfx/portal7.wav" type="AudioStream" id=11]
[ext_resource path="res://media/audio/sfx/hit1.wav" type="AudioStream" id=12]
[ext_resource path="res://media/image/9slice.png" type="Texture" id=13]
[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=14]
[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=15]
@ -72,11 +66,6 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="AudioScroll" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 12 )
volume_db = -7.0
bus = "SFX"
[node name="MenuItems" type="Node2D" parent="."]
position = Vector2( 14, 0 )
z_index = 20
@ -97,10 +86,6 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="MenuItems/Back"]
stream = ExtResource( 7 )
bus = "SFX"
[node name="Sounds" parent="MenuItems" instance=ExtResource( 2 )]
[node name="Music" parent="MenuItems" instance=ExtResource( 2 )]
@ -153,10 +138,6 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="MenuItems/Fullscreen"]
stream = ExtResource( 10 )
bus = "SFX"
[node name="WindowSize" type="Node2D" parent="MenuItems"]
position = Vector2( 50, 73 )
script = ExtResource( 21 )
@ -191,13 +172,6 @@ margin_bottom = 9.0
custom_fonts/font = ExtResource( 9 )
text = "228 x 128"
align = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="MenuItems/WindowSize"]
stream = ExtResource( 3 )
bus = "SFX"
[node name="TouchControls" type="Node2D" parent="MenuItems"]
position = Vector2( 50, 85 )
@ -241,10 +215,6 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="MenuItems/TouchControls"]
stream = ExtResource( 10 )
bus = "SFX"
[node name="DeleteSaveData" type="Node2D" parent="MenuItems"]
position = Vector2( 50, 97 )
script = ExtResource( 23 )
@ -256,13 +226,6 @@ margin_bottom = 9.0
custom_fonts/font = ExtResource( 9 )
text = "Delete Save Data"
align = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="MenuItems/DeleteSaveData"]
stream = ExtResource( 4 )
bus = "SFX"
[node name="UnlockAll" type="Node2D" parent="MenuItems"]
position = Vector2( 50, 109 )
@ -275,13 +238,6 @@ margin_bottom = 9.0
custom_fonts/font = ExtResource( 9 )
text = "Unlock All"
align = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="MenuItems/UnlockAll"]
stream = ExtResource( 11 )
bus = "SFX"
[node name="Stage" type="Node2D" parent="."]

View file

@ -1,7 +1,6 @@
extends Node2D
onready var fill = $Box/Fill
var is_selected = false
func _ready():
@ -11,3 +10,4 @@ func act():
var is_touch = !TouchScreen.visible
TouchScreen.visible = is_touch
fill.visible = is_touch
Audio.play("menu_pause", 0.9, 1.1)

View file

@ -1,8 +1,6 @@
extends Node2D
onready var audio := $AudioStreamPlayer
func act():
audio.play()
Audio.play("menu_pick", 0.9, 1.1)
Shared.unlock()
Shared.node_camera_game.shake(10)

View file

@ -1,6 +1,5 @@
extends Node2D
onready var audio := $AudioStreamPlayer
onready var label_scale := $Scale
onready var label_res := $Resolution
@ -10,8 +9,7 @@ func _ready():
func scroll(arg = 1):
Shared.set_window_scale(clamp(Shared.window_scale + arg, 1, 12))
set_text()
audio.pitch_scale = 1 + rand_range(-0.3, 0.4)
audio.play()
Audio.play("menu_scroll2", 0.7, 1.4)
func set_text():
label_scale.text = str(Shared.window_scale) + "x"

View file

@ -20,10 +20,6 @@ var show_score := 0
var last_refresh := {}
var refresh_wait := 5.0
onready var node_audio_scroll : AudioStreamPlayer = $AudioScroll
onready var node_audio_select : AudioStreamPlayer = $AudioSelect
onready var node_audio_back : AudioStreamPlayer = $AudioBack
onready var score_node := $Control/Scores
onready var score_title := $Control/Scores/HBoxContainer/Title
onready var score_list := $Control/Scores/List
@ -87,10 +83,10 @@ func _input(event):
if event.is_action_pressed("action"):
Shared.wipe_scene(Shared.main_menu_path)
is_input = false
node_audio_back.play()
Audio.play("menu_back", 0.9, 1.1)
elif event.is_action_pressed("jump"):
open_map()
node_audio_select.play()
Audio.play("menu_pick", 0.9, 1.1)
is_input = false
elif event.is_action_pressed("pause"):
show_score = posmod(show_score + 1, 3)
@ -102,8 +98,7 @@ func _input(event):
if input_count == 0 and (btnx or btny):
input_count = input_wait
scroll(btnx + (btny * columns))
node_audio_scroll.pitch_scale = 1 + rand_range(-0.1, 0.5)
node_audio_scroll.play()
Audio.play("menu_scroll3", 0.9, 1.5)
func _physics_process(delta):
input_count = max(0, input_count - 1)

View file

@ -1,14 +1,11 @@
[gd_scene load_steps=17 format=2]
[gd_scene load_steps=14 format=2]
[ext_resource path="res://media/image/corner.png" type="Texture" id=1]
[ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=2]
[ext_resource path="res://media/image/note.png" type="Texture" id=3]
[ext_resource path="res://src/menu/Vis.gd" type="Script" id=4]
[ext_resource path="res://media/audio/sfx/Randomize103.wav" type="AudioStream" id=5]
[ext_resource path="res://src/shader/outline2D_outer.shader" type="Shader" id=6]
[ext_resource path="res://src/menu/select.gd" type="Script" id=7]
[ext_resource path="res://media/audio/sfx/Randomize104.wav" type="AudioStream" id=8]
[ext_resource path="res://media/audio/sfx/portal7.wav" type="AudioStream" id=9]
[ext_resource path="res://media/image/menu.png" type="Texture" id=10]
[ext_resource path="res://media/image/skull.png" type="Texture" id=11]
@ -101,19 +98,6 @@ __meta__ = {
"_edit_lock_": true
}
[node name="AudioScroll" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 8 )
volume_db = -5.0
bus = "SFX"
[node name="AudioSelect" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 9 )
bus = "SFX"
[node name="AudioBack" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 5 )
bus = "SFX"
[node name="Control" type="Control" parent="."]
margin_right = 320.0
margin_bottom = 180.0

View file

@ -3,6 +3,6 @@ extends Node2D
func _ready():
yield(get_tree(), "idle_frame")
Music.play()
$AudioStreamPlayer.play()
Audio.play("menu_bell")
yield(get_tree().create_timer(1.5), "timeout")
Shared.wipe_scene(Shared.main_menu_path)

View file

@ -1,16 +1,11 @@
[gd_scene load_steps=4 format=2]
[gd_scene load_steps=3 format=2]
[ext_resource path="res://media/image/HarmonyHoneyLogo.png" type="Texture" id=1]
[ext_resource path="res://src/menu/splash.gd" type="Script" id=3]
[ext_resource path="res://media/audio/sfx/bell1.wav" type="AudioStream" id=4]
[node name="Splash" type="Node2D"]
script = ExtResource( 3 )
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 4 )
bus = "SFX"
[node name="CanvasLayer" type="CanvasLayer" parent="."]
layer = 9