From 14bca78bc8b38812d1ea93528c5449742f30680a Mon Sep 17 00:00:00 2001
From: Pyral <pyral@workstation.lemon>
Date: Mon, 26 May 2025 17:06:20 -0400
Subject: [PATCH] Fix sounds not loading. Add ESC as hard-reset button.

---
 asset_pack.gd          | 2 +-
 export_presets.cfg     | 2 +-
 main.gd                | 6 ++++++
 vfs/create_vfs.gd.uid  | 1 +
 vfs/vfs.gd.uid         | 1 +
 vfs/vfs_loaders.gd     | 4 +---
 vfs/vfs_loaders.gd.uid | 1 +
 7 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 vfs/create_vfs.gd.uid
 create mode 100644 vfs/vfs.gd.uid
 create mode 100644 vfs/vfs_loaders.gd.uid

diff --git a/asset_pack.gd b/asset_pack.gd
index 7617151..1d06f7c 100644
--- a/asset_pack.gd
+++ b/asset_pack.gd
@@ -5,7 +5,7 @@ const ASSET_DIR := "./assets.zip"
 static func load_sfx()->Dictionary[StringName, AudioStream]:
 	var dict := load_user_assets(
 		VFileAccess.IMPORTS.AUDIO_FILES, ["ogg","mp3","wav"])
-	var ugh:Dictionary[StringName,AudioStream]
+	var ugh:Dictionary[StringName,AudioStream] = {}
 	ugh.assign(dict)
 	return ugh
 
diff --git a/export_presets.cfg b/export_presets.cfg
index 85cd50b..84815bb 100644
--- a/export_presets.cfg
+++ b/export_presets.cfg
@@ -9,7 +9,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="../Builds/dino_tomato.x86_64"
+export_path="../toolsbuilds/dino_tomato.x86_64"
 patches=PackedStringArray()
 encryption_include_filters=""
 encryption_exclude_filters=""
diff --git a/main.gd b/main.gd
index e6fb63d..7192651 100644
--- a/main.gd
+++ b/main.gd
@@ -72,6 +72,11 @@ func _ready()->void:
 	pass
 
 
+func _input(event: InputEvent) -> void:
+	if event.is_action(&"ui_cancel"):
+		get_tree().reload_current_scene()
+
+
 func _process(delta: float) -> void:
 	if not context: return
 	time_label.text = PREFIX_LABELS % get_clock_string()
@@ -104,4 +109,5 @@ func _on_timeout() -> void:
 	context.increment_phase()
 	timer.start(context.get_state_timer(context.current_state))
 	image.texture = images[context.current_state]
+	sfx.stream = sounds[context.current_state]
 	sfx.play()
diff --git a/vfs/create_vfs.gd.uid b/vfs/create_vfs.gd.uid
new file mode 100644
index 0000000..481ceac
--- /dev/null
+++ b/vfs/create_vfs.gd.uid
@@ -0,0 +1 @@
+uid://bsgdqh48saa8a
diff --git a/vfs/vfs.gd.uid b/vfs/vfs.gd.uid
new file mode 100644
index 0000000..2fc517b
--- /dev/null
+++ b/vfs/vfs.gd.uid
@@ -0,0 +1 @@
+uid://db54x8n5ig7dc
diff --git a/vfs/vfs_loaders.gd b/vfs/vfs_loaders.gd
index 019e161..66ed13c 100644
--- a/vfs/vfs_loaders.gd
+++ b/vfs/vfs_loaders.gd
@@ -36,9 +36,7 @@ static func load_txt(buffer:PackedByteArray)->String:
 	return txt
 
 static func load_wav(buffer:PackedByteArray)->AudioStreamWAV:
-	var sfx := AudioStreamWAV.new()
-	sfx.load_from_buffer(buffer)
-	return sfx
+	return AudioStreamWAV.load_from_buffer(buffer)
 
 # can't use CONST since Callables are technically instanced dynamically
 
diff --git a/vfs/vfs_loaders.gd.uid b/vfs/vfs_loaders.gd.uid
new file mode 100644
index 0000000..ff4b4c4
--- /dev/null
+++ b/vfs/vfs_loaders.gd.uid
@@ -0,0 +1 @@
+uid://dgw5dbnf2dpuq