aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornokoe <nokoe@mailbox.org>2024-07-04 12:08:38 +0200
committernokoe <nokoe@mailbox.org>2024-07-04 12:10:14 +0200
commit8516e29a889a1cfb5fdbfa0a04d64079238487c0 (patch)
tree00e4e091215ca0fcb3fc308222db811683efc14a
parent81ce5b5ff19ef6c1a9685407ae319adda25ff646 (diff)
downloadhurrycurry-8516e29a889a1cfb5fdbfa0a04d64079238487c0.tar
hurrycurry-8516e29a889a1cfb5fdbfa0a04d64079238487c0.tar.bz2
hurrycurry-8516e29a889a1cfb5fdbfa0a04d64079238487c0.tar.zst
oven ding
-rw-r--r--client/map/tiles/oven.gd4
-rw-r--r--client/map/tiles/oven.tscn10
-rw-r--r--client/map/tiles/oven_model.gd3
-rw-r--r--client/map/tiles/sounds/ding.oggbin0 -> 15831 bytes
-rw-r--r--client/map/tiles/sounds/ding.ogg.import19
-rw-r--r--rust-toolchain1
6 files changed, 36 insertions, 1 deletions
diff --git a/client/map/tiles/oven.gd b/client/map/tiles/oven.gd
index c6e446cf..41a3fe39 100644
--- a/client/map/tiles/oven.gd
+++ b/client/map/tiles/oven.gd
@@ -29,3 +29,7 @@ func put_item(i: Item):
func take_item() -> Item:
oven.open()
return super()
+
+func finish(warn: bool):
+ super(warn)
+ oven.ding()
diff --git a/client/map/tiles/oven.tscn b/client/map/tiles/oven.tscn
index 106d8c28..b512d261 100644
--- a/client/map/tiles/oven.tscn
+++ b/client/map/tiles/oven.tscn
@@ -1,8 +1,10 @@
-[gd_scene load_steps=7 format=3 uid="uid://bil6eip7uwqvs"]
+[gd_scene load_steps=9 format=3 uid="uid://bil6eip7uwqvs"]
[ext_resource type="Script" path="res://map/tiles/oven_model.gd" id="1_3v43w"]
[ext_resource type="ArrayMesh" uid="uid://blc1q50d5ky86" path="res://map/tiles/oven_base.res" id="1_d1hwl"]
[ext_resource type="ArrayMesh" uid="uid://blb5oew3sh7ek" path="res://map/tiles/oven_door.res" id="2_i5vso"]
+[ext_resource type="Script" path="res://audio/play_random.gd" id="4_3hvts"]
+[ext_resource type="AudioStream" uid="uid://dkwpv708ihh4c" path="res://map/tiles/sounds/ding.ogg" id="5_d43p4"]
[sub_resource type="Animation" id="Animation_yo2v1"]
length = 0.001
@@ -61,3 +63,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.7, 0)
light_color = Color(0.944743, 0.70243, 0.38641, 1)
light_energy = 2.0
shadow_enabled = true
+
+[node name="Ding" type="Node3D" parent="."]
+script = ExtResource("4_3hvts")
+
+[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Ding"]
+stream = ExtResource("5_d43p4")
diff --git a/client/map/tiles/oven_model.gd b/client/map/tiles/oven_model.gd
index 52a876a8..eaaab1b1 100644
--- a/client/map/tiles/oven_model.gd
+++ b/client/map/tiles/oven_model.gd
@@ -17,3 +17,6 @@ extends Node3D
func open():
$AnimationPlayer.play("open")
+
+func ding():
+ $Ding.play_random()
diff --git a/client/map/tiles/sounds/ding.ogg b/client/map/tiles/sounds/ding.ogg
new file mode 100644
index 00000000..0a1d6512
--- /dev/null
+++ b/client/map/tiles/sounds/ding.ogg
Binary files differ
diff --git a/client/map/tiles/sounds/ding.ogg.import b/client/map/tiles/sounds/ding.ogg.import
new file mode 100644
index 00000000..586d7d0c
--- /dev/null
+++ b/client/map/tiles/sounds/ding.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dkwpv708ihh4c"
+path="res://.godot/imported/ding.ogg-dfa73b74d612e6de33eae73666cb9228.oggvorbisstr"
+
+[deps]
+
+source_file="res://map/tiles/sounds/ding.ogg"
+dest_files=["res://.godot/imported/ding.ogg-dfa73b74d612e6de33eae73666cb9228.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/rust-toolchain b/rust-toolchain
new file mode 100644
index 00000000..bf867e0a
--- /dev/null
+++ b/rust-toolchain
@@ -0,0 +1 @@
+nightly