-
Notifications
You must be signed in to change notification settings - Fork 220
Add SFX for FragileBarrel #1697
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
aaf2fca
Add SFX for FragileBarrel cracks and destruction
russell-cj 917e200
fragile_barrel: Remove comment about code review
wjt 6243f1f
Apply Manuel's code review suggestions
wjt 3172794
Update scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/compo…
wjt 9b3959b
Tweak vase cracking sound
wjt 4bc803e
Convert barrel breaking sound to Vorbis
wjt e359eb8
Make barrel sound effect resource filenames consistent
wjt 3a77634
Add missing license files
wjt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
17 changes: 11 additions & 6 deletions
17
scenes/game_elements/props/filling_barrel/fragile_barrel.tscn
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,25 @@ | ||
| [gd_scene load_steps=4 format=3 uid="uid://lea3l0ewp5fr"] | ||
| [gd_scene load_steps=6 format=3 uid="uid://lea3l0ewp5fr"] | ||
|
|
||
| [ext_resource type="PackedScene" uid="uid://y8ha8abfyap2" path="res://scenes/game_elements/props/filling_barrel/filling_barrel.tscn" id="1_ab25j"] | ||
| [ext_resource type="SpriteFrames" uid="uid://ch0p31t4upx7w" path="res://scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/barrel_cracks/barrel_cracks.tres" id="2_g6wko"] | ||
| [ext_resource type="Script" uid="uid://d05hp7ascndlr" path="res://scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/fragile_barrel.gd" id="2_wal8y"] | ||
| [ext_resource type="AudioStream" uid="uid://bknpb07lvbded" path="res://scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/sounds/sfx_barrel_crack.tres" id="4_sdj6j"] | ||
| [ext_resource type="AudioStream" uid="uid://c3iuv5ax8i78v" path="res://scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/sounds/stx_fragile_barrel.tres" id="5_v7k7g"] | ||
|
|
||
| [node name="FragileBarrel" instance=ExtResource("1_ab25j")] | ||
| script = ExtResource("2_wal8y") | ||
| max_health = 4 | ||
|
|
||
| [node name="AnimatedSprite2D" parent="." index="0"] | ||
| animation = &"filling" | ||
| frame = 0 | ||
| frame_progress = 0.0 | ||
|
|
||
| [node name="CrackOverlay" type="AnimatedSprite2D" parent="." index="1"] | ||
| unique_name_in_owner = true | ||
| visible = false | ||
| position = Vector2(0, -21) | ||
| sprite_frames = ExtResource("2_g6wko") | ||
|
|
||
| [node name="CrackSound" type="AudioStreamPlayer2D" parent="." index="6"] | ||
| unique_name_in_owner = true | ||
| stream = ExtResource("4_sdj6j") | ||
|
|
||
| [node name="ShatterSound" type="AudioStreamPlayer2D" parent="." index="7"] | ||
| unique_name_in_owner = true | ||
| stream = ExtResource("5_v7k7g") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/sounds/breaking.wav
Git LFS file not shown
24 changes: 24 additions & 0 deletions
24
...s/quests/lore_quests/quest_003/2_ink_drinker_levels/components/sounds/breaking.wav.import
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| [remap] | ||
|
|
||
| importer="wav" | ||
| type="AudioStreamWAV" | ||
| uid="uid://74b6dlm4xhr" | ||
| path="res://.godot/imported/breaking.wav-2a0d2c03a8c9870e5f1d02e89419b03e.sample" | ||
|
|
||
| [deps] | ||
|
|
||
| source_file="res://scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/sounds/breaking.wav" | ||
| dest_files=["res://.godot/imported/breaking.wav-2a0d2c03a8c9870e5f1d02e89419b03e.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=2 |
3 changes: 3 additions & 0 deletions
3
scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/sounds/cracks.wav
Git LFS file not shown
24 changes: 24 additions & 0 deletions
24
scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/sounds/cracks.wav.import
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| [remap] | ||
|
|
||
| importer="wav" | ||
| type="AudioStreamWAV" | ||
| uid="uid://d5vex7h5qsrs" | ||
| path="res://.godot/imported/cracks.wav-0c69782aaa1346b112673f8be862343d.sample" | ||
|
|
||
| [deps] | ||
|
|
||
| source_file="res://scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/sounds/cracks.wav" | ||
| dest_files=["res://.godot/imported/cracks.wav-0c69782aaa1346b112673f8be862343d.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=2 |
8 changes: 8 additions & 0 deletions
8
...quests/lore_quests/quest_003/2_ink_drinker_levels/components/sounds/sfx_barrel_crack.tres
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| [gd_resource type="AudioStreamRandomizer" load_steps=2 format=3 uid="uid://bknpb07lvbded"] | ||
|
|
||
| [ext_resource type="AudioStream" uid="uid://d5vex7h5qsrs" path="res://scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/sounds/cracks.wav" id="1_2auby"] | ||
|
|
||
| [resource] | ||
| random_pitch = 1.1 | ||
| streams_count = 1 | ||
| stream_0/stream = ExtResource("1_2auby") |
8 changes: 8 additions & 0 deletions
8
...ests/lore_quests/quest_003/2_ink_drinker_levels/components/sounds/stx_fragile_barrel.tres
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| [gd_resource type="AudioStreamRandomizer" load_steps=2 format=3 uid="uid://c3iuv5ax8i78v"] | ||
|
|
||
| [ext_resource type="AudioStream" uid="uid://74b6dlm4xhr" path="res://scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/sounds/breaking.wav" id="1_kfwyl"] | ||
|
|
||
| [resource] | ||
| random_pitch = 1.1 | ||
| streams_count = 1 | ||
| stream_0/stream = ExtResource("1_kfwyl") |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.