feat: upgrade sound

.gitattributes

@@ -1,7 +1,20 @@
 # Normalize EOL for all files that Git considers text files.
 * text=auto eol=lf
-* !text !filter !merge !diff
+*.envrc filter=lfs diff=lfs merge=lfs -text
-*.svg filter=lfs diff=lfs merge=lfs -text
+*.gitignore filter=lfs diff=lfs merge=lfs -text
-*.wav filter=lfs diff=lfs merge=lfs -text
+*.md filter=lfs diff=lfs merge=lfs -text
+*.gitkeep filter=lfs diff=lfs merge=lfs -text
 *.mp3 filter=lfs diff=lfs merge=lfs -text
+*.import filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
+*.aseprite filter=lfs diff=lfs merge=lfs -text
+*.wav filter=lfs diff=lfs merge=lfs -text
+*.cfg filter=lfs diff=lfs merge=lfs -text
+*.lock filter=lfs diff=lfs merge=lfs -text
+*.nix filter=lfs diff=lfs merge=lfs -text
+*.gd filter=lfs diff=lfs merge=lfs -text
+*.svg filter=lfs diff=lfs merge=lfs -text
+*.godot filter=lfs diff=lfs merge=lfs -text
+*.tscn filter=lfs diff=lfs merge=lfs -text
+everything !text !filter !merge !diff
+* !text !filter !merge !diff

assets/bgm/VSO.mp3

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cff45fe905b146beed4892ea2d2cebdf60aecc01bb0288f7970facbdec69575a
+size 8804354

assets/bgm/VSO.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://ckbggocxpplkq"
+path="res://.godot/imported/VSO.mp3-4560dcf7b870f39cd925c1b02294d83e.mp3str"
+
+[deps]
+
+source_file="res://assets/bgm/VSO.mp3"
+dest_files=["res://.godot/imported/VSO.mp3-4560dcf7b870f39cd925c1b02294d83e.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/sfx/explosion3.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a486c0a80d5e3622da8e80347e84245f12bd8c43539ee9c97c17492aa964871
+size 68676

assets/sfx/explosion3.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://f6d436wva4n2"
+path="res://.godot/imported/explosion3.wav-20aaf2a1415109e1a346a95f4316bc11.sample"
+
+[deps]
+
+source_file="res://assets/sfx/explosion3.wav"
+dest_files=["res://.godot/imported/explosion3.wav-20aaf2a1415109e1a346a95f4316bc11.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

assets/sfx/hurt3.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8451e43251d2c127afb87b8b602bbd375d6cbf6e5fce6f7c9237bbef812d272
+size 52016

assets/sfx/hurt3.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dti8u25dovwo6"
+path="res://.godot/imported/hurt3.wav-dba719b5c35e5440b0125b5960cfff70.sample"
+
+[deps]
+
+source_file="res://assets/sfx/hurt3.wav"
+dest_files=["res://.godot/imported/hurt3.wav-dba719b5c35e5440b0125b5960cfff70.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

assets/sfx/ship_explosion3.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca340cfa420cdf3661195f38a824e4124ead611aab53ca77917966eca9a40e61
+size 185028

assets/sfx/ship_explosion3.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://bthpukbec82b0"
+path="res://.godot/imported/ship_explosion3.wav-500842d93242f0a19a465ad5b6b8a02b.sample"
+
+[deps]
+
+source_file="res://assets/sfx/ship_explosion3.wav"
+dest_files=["res://.godot/imported/ship_explosion3.wav-500842d93242f0a19a465ad5b6b8a02b.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

assets/sfx/shoot3.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:33c91109b23e5d8c798f2d82926317e3a8d77b72d1453b5280aa58269f65373e
+size 163448

assets/sfx/shoot3.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://c03kghmku12vn"
+path="res://.godot/imported/shoot3.wav-eed5175fcfcb2d57064f526b2cae858f.sample"
+
+[deps]
+
+source_file="res://assets/sfx/shoot3.wav"
+dest_files=["res://.godot/imported/shoot3.wav-eed5175fcfcb2d57064f526b2cae858f.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

icon.svg

@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><rect width="124" height="124" x="2" y="2" fill="#363d52" stroke="#212532" stroke-width="4" rx="14"/><g fill="#fff" transform="translate(12.322 12.322)scale(.101)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="translate(12.322 12.322)scale(.101)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6369bae7e12e6d16019cd6214cf27a2fdb6f3f6d024bd6f23c322be4804474f
+size 994

project.godot

@@ -26,6 +26,10 @@ window/size/viewport_height=720
 window/stretch/mode="viewport"
 window/stretch/aspect="expand"
 
+[editor_plugins]
+
+enabled=PackedStringArray("res://addons/virtual_joystick/plugin.cfg")
+
 [input]
 
 left={

scenes/game_over.gd

@@ -2,10 +2,15 @@ extends Node2D
 
 @export var scene: PackedScene
 
+var delay := 1.5
+
 func _ready():
 	$CanvasLayer/VBoxContainer/Score.text += str(Global.score);
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(_delta: float) -> void:
+func _process(delta: float) -> void:
-	if Input.is_action_just_pressed("continue"):
+	delay -= delta;
+	if delay <= 0:
+		$CanvasLayer/VBoxContainer2/Label.visible = true;
+	if Input.is_action_just_pressed("continue") and delay <= 0:
 		get_tree().change_scene_to_packed(scene)

scenes/game_over.tscn

@@ -3,7 +3,7 @@
 [ext_resource type="Script" path="res://scenes/game_over.gd" id="1_h2fw8"]
 [ext_resource type="PackedScene" uid="uid://byrjn2ta5gsld" path="res://scenes/level.tscn" id="2_latqh"]
 [ext_resource type="Texture2D" uid="uid://p8npigebbm88" path="res://assets/gfx/ship.png" id="3_rgq6y"]
-[ext_resource type="AudioStream" uid="uid://cr5eb0te0go26" path="res://assets/sfx/ship_explosion2.wav" id="4_0i6ac"]
+[ext_resource type="AudioStream" uid="uid://bthpukbec82b0" path="res://assets/sfx/ship_explosion3.wav" id="4_p52ie"]
 
 [node name="GameOver" type="Node2D"]
 script = ExtResource("1_h2fw8")
@@ -70,12 +70,14 @@ size_flags_vertical = 4
 theme_override_constants/separation = 20
 
 [node name="Label" type="Label" parent="CanvasLayer/VBoxContainer2"]
+visible = false
 layout_mode = 2
 size_flags_horizontal = 4
-text = "Press space to continue"
+text = "Press space or click the ship to continue"
 
 [node name="ShipDestroyed" type="AudioStreamPlayer" parent="."]
-stream = ExtResource("4_0i6ac")
+stream = ExtResource("4_p52ie")
+pitch_scale = 1.21
 autoplay = true
 
 [connection signal="resized" from="CanvasLayer/BG" to="." method="_on_bg_resized"]

scenes/level.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=15 format=3 uid="uid://byrjn2ta5gsld"]
+[gd_scene load_steps=16 format=3 uid="uid://byrjn2ta5gsld"]
 
 [ext_resource type="PackedScene" uid="uid://2kccnun8mkjv" path="res://scenes/player.tscn" id="1_35q1n"]
 [ext_resource type="Script" path="res://scenes/level.gd" id="1_bh63m"]
@@ -10,7 +10,8 @@
 [ext_resource type="Texture2D" uid="uid://62bvbadc4yhc" path="res://assets/gfx/star5.png" id="7_vyiqk"]
 [ext_resource type="Texture2D" uid="uid://c53y4qb5nh44q" path="res://assets/gfx/star6.png" id="8_dy6n5"]
 [ext_resource type="PackedScene" uid="uid://drg5covf2vhj8" path="res://scenes/ui.tscn" id="10_ac25c"]
-[ext_resource type="AudioStream" uid="uid://cwsqbuoipmtad" path="res://assets/sfx/hurt2.wav" id="11_vh4gx"]
+[ext_resource type="AudioStream" uid="uid://dti8u25dovwo6" path="res://assets/sfx/hurt3.wav" id="11_7td5s"]
+[ext_resource type="AudioStream" uid="uid://ckbggocxpplkq" path="res://assets/bgm/VSO.mp3" id="12_p2d51"]
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_v16wl"]
 animations = [{
@@ -118,7 +119,14 @@ metadata/_edit_lock_ = true
 [node name="UI" parent="." groups=["ui"] instance=ExtResource("10_ac25c")]
 
 [node name="ShipHit" type="AudioStreamPlayer" parent="."]
-stream = ExtResource("11_vh4gx")
+stream = ExtResource("11_7td5s")
+volume_db = -1.507
+pitch_scale = 1.17
+
+[node name="Music" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("12_p2d51")
+volume_db = -2.01
+autoplay = true
 
 [connection signal="laser" from="Player" to="." method="_on_player_laser"]
 [connection signal="timeout" from="MeteorTimer" to="." method="_on_meteor_timer_timeout"]

scenes/meteor.gd

@@ -37,5 +37,5 @@ func _on_area_entered(area: Area2D) -> void:
 	Global.score += 10;
 	$MeteorImage.hide();
 	can_collide = false;
-	#await get_tree().create_timer(0.5).timeout;
+	await get_tree().create_timer(0.5).timeout;
 	call_deferred("queue_free");

scenes/meteor.tscn

@@ -17,6 +17,9 @@ polygon = PackedVector2Array(-11, 10, -11, 1, -9, -5, -2, -10, 6, -11, 11, -7, 1
 
 [node name="DestroyMeteor" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("3_rgtxm")
+volume_db = -4.657
+pitch_scale = 1.2
+max_polyphony = 2
 
 [connection signal="area_entered" from="." to="." method="_on_area_entered"]
 [connection signal="body_entered" from="." to="." method="_on_body_entered"]

scenes/player.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="Texture2D" uid="uid://p8npigebbm88" path="res://assets/gfx/ship.png" id="1_6r50y"]
 [ext_resource type="Script" path="res://scenes/player.gd" id="1_spn58"]
-[ext_resource type="AudioStream" uid="uid://bio5bv0mi006i" path="res://assets/sfx/shoot2.wav" id="3_650e3"]
+[ext_resource type="AudioStream" uid="uid://c03kghmku12vn" path="res://assets/sfx/shoot3.wav" id="3_21m3o"]
 
 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_gc25u"]
 lifetime_randomness = 0.29
@@ -29,7 +29,9 @@ polygon = PackedVector2Array(-13.5543, 8.72725, 0.445736, -11.2728, 14.4457, 8.7
 position = Vector2(0, -21)
 
 [node name="LaserSound" type="AudioStreamPlayer" parent="."]
-stream = ExtResource("3_650e3")
+stream = ExtResource("3_21m3o")
+volume_db = -9.831
+pitch_scale = 1.24
 
 [node name="GPUParticles2D" type="GPUParticles2D" parent="."]
 process_material = SubResource("ParticleProcessMaterial_gc25u")