From a599291f94a334e566d2b1b9d463ca1480b4ab26 Mon Sep 17 00:00:00 2001 From: installer Date: Thu, 23 Jan 2025 10:13:01 +0100 Subject: [PATCH] feat: upgrade sound --- .gitattributes | 19 ++++++++++++++++--- assets/bgm/VSO.mp3 | 3 +++ assets/bgm/VSO.mp3.import | 19 +++++++++++++++++++ assets/sfx/explosion3.wav | 3 +++ assets/sfx/explosion3.wav.import | 24 ++++++++++++++++++++++++ assets/sfx/hurt3.wav | 3 +++ assets/sfx/hurt3.wav.import | 24 ++++++++++++++++++++++++ assets/sfx/ship_explosion3.wav | 3 +++ assets/sfx/ship_explosion3.wav.import | 24 ++++++++++++++++++++++++ assets/sfx/shoot3.wav | 3 +++ assets/sfx/shoot3.wav.import | 24 ++++++++++++++++++++++++ icon.svg | 4 +++- project.godot | 4 ++++ scenes/game_over.gd | 9 +++++++-- scenes/game_over.tscn | 8 +++++--- scenes/level.tscn | 14 +++++++++++--- scenes/meteor.gd | 2 +- scenes/meteor.tscn | 3 +++ scenes/player.tscn | 6 ++++-- 19 files changed, 184 insertions(+), 15 deletions(-) create mode 100644 assets/bgm/VSO.mp3 create mode 100644 assets/bgm/VSO.mp3.import create mode 100644 assets/sfx/explosion3.wav create mode 100644 assets/sfx/explosion3.wav.import create mode 100644 assets/sfx/hurt3.wav create mode 100644 assets/sfx/hurt3.wav.import create mode 100644 assets/sfx/ship_explosion3.wav create mode 100644 assets/sfx/ship_explosion3.wav.import create mode 100644 assets/sfx/shoot3.wav create mode 100644 assets/sfx/shoot3.wav.import diff --git a/.gitattributes b/.gitattributes index ddf75a6..35d5bec 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,20 @@ # Normalize EOL for all files that Git considers text files. * text=auto eol=lf -* !text !filter !merge !diff -*.svg filter=lfs diff=lfs merge=lfs -text -*.wav filter=lfs diff=lfs merge=lfs -text +*.envrc filter=lfs diff=lfs merge=lfs -text +*.gitignore 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 diff --git a/assets/bgm/VSO.mp3 b/assets/bgm/VSO.mp3 new file mode 100644 index 0000000..449acb1 --- /dev/null +++ b/assets/bgm/VSO.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cff45fe905b146beed4892ea2d2cebdf60aecc01bb0288f7970facbdec69575a +size 8804354 diff --git a/assets/bgm/VSO.mp3.import b/assets/bgm/VSO.mp3.import new file mode 100644 index 0000000..fd158b6 --- /dev/null +++ b/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 diff --git a/assets/sfx/explosion3.wav b/assets/sfx/explosion3.wav new file mode 100644 index 0000000..2fae5f0 --- /dev/null +++ b/assets/sfx/explosion3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a486c0a80d5e3622da8e80347e84245f12bd8c43539ee9c97c17492aa964871 +size 68676 diff --git a/assets/sfx/explosion3.wav.import b/assets/sfx/explosion3.wav.import new file mode 100644 index 0000000..df43bce --- /dev/null +++ b/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 diff --git a/assets/sfx/hurt3.wav b/assets/sfx/hurt3.wav new file mode 100644 index 0000000..08e4229 --- /dev/null +++ b/assets/sfx/hurt3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8451e43251d2c127afb87b8b602bbd375d6cbf6e5fce6f7c9237bbef812d272 +size 52016 diff --git a/assets/sfx/hurt3.wav.import b/assets/sfx/hurt3.wav.import new file mode 100644 index 0000000..a54b89a --- /dev/null +++ b/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 diff --git a/assets/sfx/ship_explosion3.wav b/assets/sfx/ship_explosion3.wav new file mode 100644 index 0000000..713ab3c --- /dev/null +++ b/assets/sfx/ship_explosion3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca340cfa420cdf3661195f38a824e4124ead611aab53ca77917966eca9a40e61 +size 185028 diff --git a/assets/sfx/ship_explosion3.wav.import b/assets/sfx/ship_explosion3.wav.import new file mode 100644 index 0000000..221b384 --- /dev/null +++ b/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 diff --git a/assets/sfx/shoot3.wav b/assets/sfx/shoot3.wav new file mode 100644 index 0000000..92befa8 --- /dev/null +++ b/assets/sfx/shoot3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33c91109b23e5d8c798f2d82926317e3a8d77b72d1453b5280aa58269f65373e +size 163448 diff --git a/assets/sfx/shoot3.wav.import b/assets/sfx/shoot3.wav.import new file mode 100644 index 0000000..bc01439 --- /dev/null +++ b/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 diff --git a/icon.svg b/icon.svg index 9d8b7fa..2ead0cd 100644 --- a/icon.svg +++ b/icon.svg @@ -1 +1,3 @@ - \ No newline at end of file +version https://git-lfs.github.com/spec/v1 +oid sha256:f6369bae7e12e6d16019cd6214cf27a2fdb6f3f6d024bd6f23c322be4804474f +size 994 diff --git a/project.godot b/project.godot index ca51f4a..892058e 100644 --- a/project.godot +++ b/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={ diff --git a/scenes/game_over.gd b/scenes/game_over.gd index 27f2aa1..8dd4b67 100644 --- a/scenes/game_over.gd +++ b/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: - if Input.is_action_just_pressed("continue"): +func _process(delta: float) -> void: + 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) diff --git a/scenes/game_over.tscn b/scenes/game_over.tscn index 42bcc8e..e6f4e2d 100644 --- a/scenes/game_over.tscn +++ b/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"] diff --git a/scenes/level.tscn b/scenes/level.tscn index 52bd091..8c6d2b9 100644 --- a/scenes/level.tscn +++ b/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"] diff --git a/scenes/meteor.gd b/scenes/meteor.gd index 5a23a78..539b631 100644 --- a/scenes/meteor.gd +++ b/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"); diff --git a/scenes/meteor.tscn b/scenes/meteor.tscn index 2511b0a..b3d9210 100644 --- a/scenes/meteor.tscn +++ b/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"] diff --git a/scenes/player.tscn b/scenes/player.tscn index 59ff5cd..602874b 100644 --- a/scenes/player.tscn +++ b/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")