diff --git a/godot/Models/grape_man.tscn b/godot/Models/grape_man.tscn index 56ec005..ceeafb7 100644 --- a/godot/Models/grape_man.tscn +++ b/godot/Models/grape_man.tscn @@ -154,7 +154,7 @@ transform = Transform3D(0.065, 0, 0, 0, 0.065, 0, 0, 0, 0.065, 0, 0, 0) script = ExtResource("2_ksje8") [node name="Skeleton3D" parent="rig" index="0"] -bones/0/rotation = Quaternion(0.0838794, 0, 0, 0.996476) +bones/0/rotation = Quaternion(0.0722387, 0, 0, 0.997387) bones/1/rotation = Quaternion(-0.0891896, 1.18734e-07, -1.06322e-08, 0.996015) bones/2/rotation = Quaternion(0.0133933, -1.19199e-07, 1.5966e-09, 0.99991) bones/3/rotation = Quaternion(-0.00997737, 0.100365, -0.694951, 0.711948) @@ -191,5 +191,5 @@ stream = ExtResource("5_b32re") [node name="sad" type="AudioStreamPlayer" parent="." index="7"] stream = ExtResource("6_qe4bi") -[node name="woohoo" type="AudioStreamPlayer" parent="." index="8"] +[node name="soundboard" type="AudioStreamPlayer" parent="." index="8"] stream = ExtResource("6_qe4bi") diff --git a/godot/Player.gd b/godot/Player.gd index d7465f9..82d396b 100644 --- a/godot/Player.gd +++ b/godot/Player.gd @@ -49,8 +49,17 @@ func _input(event): if Input.is_action_just_pressed("Pause"): pass - if Input.is_action_just_pressed("Woohoo"): - pass + if Input.is_action_just_pressed("Soundboard"): + + var sound_list = (["res://Sounds/jingle.ogg", + "res://Sounds/yawn.ogg", + "res://Sounds/woohoo.ogg", + "res://Sounds/slimeu.ogg"]) + + var sound = sound_list[randi() % sound_list.size()] + + $grape_man/soundboard.stream = load(sound) + $grape_man/soundboard.play() func _physics_process(delta): diff --git a/godot/Sounds/IslandBoogie.ogg b/godot/Sounds/IslandBoogie.ogg index 81d826c..ddc3b4d 100644 --- a/godot/Sounds/IslandBoogie.ogg +++ b/godot/Sounds/IslandBoogie.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fc971b2ff482955080f4cb02225a16694ee415a93f34f5d54acc3cf00b2fe1f -size 1339044 +oid sha256:f4ce5924a93ecdd3b77e3e4e39753bb4aa53d15c203dd8bce27692e4a901acba +size 1943655 diff --git a/godot/Sounds/jingle.ogg b/godot/Sounds/jingle.ogg new file mode 100644 index 0000000..4961ba3 --- /dev/null +++ b/godot/Sounds/jingle.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:103f4435716f9bbfb11a1238feae6e367dc8a19987ec7192def8b8a6edb5bee4 +size 37940 diff --git a/godot/Sounds/jingle.ogg.import b/godot/Sounds/jingle.ogg.import new file mode 100644 index 0000000..58faf78 --- /dev/null +++ b/godot/Sounds/jingle.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cv01lbq7nickx" +path="res://.godot/imported/jingle.ogg-30e599e95982f25a980bebf5f44752bb.oggvorbisstr" + +[deps] + +source_file="res://Sounds/jingle.ogg" +dest_files=["res://.godot/imported/jingle.ogg-30e599e95982f25a980bebf5f44752bb.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/godot/Sounds/slimeu.ogg b/godot/Sounds/slimeu.ogg new file mode 100644 index 0000000..b8bd020 --- /dev/null +++ b/godot/Sounds/slimeu.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e36a1f6fc0eb3b71dfb3aaea0693bb7d52ab742ba462c2c6d5aa33febf022ba +size 24260 diff --git a/godot/Sounds/slimeu.ogg.import b/godot/Sounds/slimeu.ogg.import new file mode 100644 index 0000000..52b1432 --- /dev/null +++ b/godot/Sounds/slimeu.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c2p6nh3x3s71d" +path="res://.godot/imported/slimeu.ogg-e1a145db9ae5baab7ff05b87ac82d526.oggvorbisstr" + +[deps] + +source_file="res://Sounds/slimeu.ogg" +dest_files=["res://.godot/imported/slimeu.ogg-e1a145db9ae5baab7ff05b87ac82d526.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/godot/Sounds/woohoo.ogg b/godot/Sounds/woohoo.ogg new file mode 100644 index 0000000..6c42aa1 --- /dev/null +++ b/godot/Sounds/woohoo.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f059c92e775a2b77b6a35ec4ba063307491b3764d928cd6695db4c6833cda7a +size 25518 diff --git a/godot/Sounds/woohoo.ogg.import b/godot/Sounds/woohoo.ogg.import new file mode 100644 index 0000000..9530ac0 --- /dev/null +++ b/godot/Sounds/woohoo.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cmga4mqbgi48u" +path="res://.godot/imported/woohoo.ogg-e84d72f39cbdd9c391663f84463dd6e4.oggvorbisstr" + +[deps] + +source_file="res://Sounds/woohoo.ogg" +dest_files=["res://.godot/imported/woohoo.ogg-e84d72f39cbdd9c391663f84463dd6e4.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/godot/Sounds/yawn.ogg b/godot/Sounds/yawn.ogg new file mode 100644 index 0000000..f77ed0f --- /dev/null +++ b/godot/Sounds/yawn.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ad2d9df3959e19f0054f1488a312e7e9d734fdd8859d533af9c298245d8e534 +size 33663 diff --git a/godot/Sounds/yawn.ogg.import b/godot/Sounds/yawn.ogg.import new file mode 100644 index 0000000..c2387cf --- /dev/null +++ b/godot/Sounds/yawn.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://gs0cxfn62d4y" +path="res://.godot/imported/yawn.ogg-84771ea7ecb9e9dc22c90aa208a644a4.oggvorbisstr" + +[deps] + +source_file="res://Sounds/yawn.ogg" +dest_files=["res://.godot/imported/yawn.ogg-84771ea7ecb9e9dc22c90aa208a644a4.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/godot/project.godot b/godot/project.godot index 9a16e84..3679929 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -84,10 +84,11 @@ ui_down={ , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"echo":false,"script":null) ] } -Woohoo={ +Soundboard={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":49,"key_label":0,"unicode":0,"echo":false,"script":null) ] } Pause={