summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/player/character/character.tscn2
-rw-r--r--client/player/effect.gd5
-rw-r--r--client/player/effect.tscn16
-rw-r--r--client/player/sounds/angry1.oggbin0 -> 8491 bytes
-rw-r--r--client/player/sounds/angry1.ogg.import19
-rw-r--r--client/player/sounds/angry2.oggbin0 -> 6622 bytes
-rw-r--r--client/player/sounds/angry2.ogg.import19
7 files changed, 57 insertions, 4 deletions
diff --git a/client/player/character/character.tscn b/client/player/character/character.tscn
index fbfcc1c1..f09ec2cf 100644
--- a/client/player/character/character.tscn
+++ b/client/player/character/character.tscn
@@ -564,8 +564,6 @@ tracks/11/keys = {
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_xtrfe"]
-resource_local_to_scene = false
-resource_name = ""
_data = {
"RESET": SubResource("Animation_tdhvg"),
"hold": SubResource("Animation_cvcpd"),
diff --git a/client/player/effect.gd b/client/player/effect.gd
index 783d38ca..a5d8271e 100644
--- a/client/player/effect.gd
+++ b/client/player/effect.gd
@@ -1,5 +1,5 @@
# Undercooked - a game about cooking
-# Copyright 2024 nokoe
+# Copyright 2024 nokoe, tpart
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -17,9 +17,11 @@ class_name Effect
extends Node3D
@onready var success = $Success
+@onready var angry_grunt: PlayRandom = $AngryGrunt
@onready var stars = $Stars
@onready var angry = $Angry
+
func set_effect(e: String):
clear_effect()
match e:
@@ -28,6 +30,7 @@ func set_effect(e: String):
success.play()
"angry":
angry.emitting = true
+ angry_grunt.play_random()
_:
push_warning("effect %s unknown" % e)
diff --git a/client/player/effect.tscn b/client/player/effect.tscn
index 1bd5bf9c..fd3c5cda 100644
--- a/client/player/effect.tscn
+++ b/client/player/effect.tscn
@@ -1,9 +1,12 @@
-[gd_scene load_steps=5 format=3 uid="uid://dn2ne30t81ame"]
+[gd_scene load_steps=8 format=3 uid="uid://dn2ne30t81ame"]
[ext_resource type="Script" path="res://player/effect.gd" id="1_aqsk6"]
[ext_resource type="PackedScene" uid="uid://yaed1vnhd0aa" path="res://player/stars.tscn" id="2_shb5l"]
[ext_resource type="AudioStream" uid="uid://camy77x26mmpv" path="res://menu/sounds/success.ogg" id="3_favyn"]
[ext_resource type="PackedScene" uid="uid://cvty1rwt52anq" path="res://player/angry.tscn" id="4_uxxex"]
+[ext_resource type="Script" path="res://audio/play_random.gd" id="5_t2upj"]
+[ext_resource type="AudioStream" uid="uid://c3gatgrsb0npf" path="res://player/sounds/angry1.ogg" id="6_ou7uy"]
+[ext_resource type="AudioStream" uid="uid://cty282m6ckt62" path="res://player/sounds/angry2.ogg" id="7_r21iy"]
[node name="Effect" type="Node3D"]
script = ExtResource("1_aqsk6")
@@ -16,3 +19,14 @@ stream = ExtResource("3_favyn")
[node name="Angry" parent="." instance=ExtResource("4_uxxex")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
+
+[node name="AngryGrunt" type="Node3D" parent="."]
+script = ExtResource("5_t2upj")
+volume_db = -8.0
+enable_attenuations = false
+
+[node name="Angry1" type="AudioStreamPlayer3D" parent="AngryGrunt"]
+stream = ExtResource("6_ou7uy")
+
+[node name="Angry2" type="AudioStreamPlayer3D" parent="AngryGrunt"]
+stream = ExtResource("7_r21iy")
diff --git a/client/player/sounds/angry1.ogg b/client/player/sounds/angry1.ogg
new file mode 100644
index 00000000..9876f3da
--- /dev/null
+++ b/client/player/sounds/angry1.ogg
Binary files differ
diff --git a/client/player/sounds/angry1.ogg.import b/client/player/sounds/angry1.ogg.import
new file mode 100644
index 00000000..1fbbfb2e
--- /dev/null
+++ b/client/player/sounds/angry1.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://c3gatgrsb0npf"
+path="res://.godot/imported/angry1.ogg-89dfe7562e07a5f538e60fe56615fd53.oggvorbisstr"
+
+[deps]
+
+source_file="res://player/sounds/angry1.ogg"
+dest_files=["res://.godot/imported/angry1.ogg-89dfe7562e07a5f538e60fe56615fd53.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/player/sounds/angry2.ogg b/client/player/sounds/angry2.ogg
new file mode 100644
index 00000000..805b6c48
--- /dev/null
+++ b/client/player/sounds/angry2.ogg
Binary files differ
diff --git a/client/player/sounds/angry2.ogg.import b/client/player/sounds/angry2.ogg.import
new file mode 100644
index 00000000..fb529c5c
--- /dev/null
+++ b/client/player/sounds/angry2.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cty282m6ckt62"
+path="res://.godot/imported/angry2.ogg-cc281b5bbc23e0a935c56ccbfcbd60a0.oggvorbisstr"
+
+[deps]
+
+source_file="res://player/sounds/angry2.ogg"
+dest_files=["res://.godot/imported/angry2.ogg-cc281b5bbc23e0a935c56ccbfcbd60a0.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4