From 53b06f63736eaeea96dd442b8ea80676b5f51f56 Mon Sep 17 00:00:00 2001 From: John-vince Date: Tue, 20 May 2025 17:42:00 +0200 Subject: [PATCH] added audio to picking up crystels wich randomly picks a sound --- collectables/crystal/collect_crystal.gd | 4 + player/levelFinal/tileSet/coreTiles.tres | 224 +++++++++++++++++++++++ player/smallPlayer/menus/Score bar.tscn | 6 +- player/smallPlayer/menus/progress_bar.gd | 7 + 4 files changed, 240 insertions(+), 1 deletion(-) create mode 100644 player/levelFinal/tileSet/coreTiles.tres diff --git a/collectables/crystal/collect_crystal.gd b/collectables/crystal/collect_crystal.gd index dcc54ef..dd56275 100644 --- a/collectables/crystal/collect_crystal.gd +++ b/collectables/crystal/collect_crystal.gd @@ -2,13 +2,17 @@ extends Area2D signal crystal_picked_up + + func _ready(): add_to_group("crystals") func _on_body_entered(body: Node2D) -> void: if body.name == "player": emit_signal("crystal_picked_up") + queue_free() + else: print("Whoops, something went wrong") diff --git a/player/levelFinal/tileSet/coreTiles.tres b/player/levelFinal/tileSet/coreTiles.tres new file mode 100644 index 0000000..a264014 --- /dev/null +++ b/player/levelFinal/tileSet/coreTiles.tres @@ -0,0 +1,224 @@ +[gd_resource type="TileSet" load_steps=3 format=3 uid="uid://cdv8q1aenyanj"] + +[ext_resource type="Texture2D" path="res://player/levelFinal/tileSet/sprCave fire addition.png" id="1_fk0as"] + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_dxyvv"] +texture = ExtResource("1_fk0as") +texture_region_size = Vector2i(32, 32) +2:0/0 = 0 +2:1/0 = 0 +11:1/0 = 0 +13:1/0 = 0 +15:1/0 = 0 +2:2/0 = 0 +10:2/0 = 0 +11:2/0 = 0 +12:2/0 = 0 +13:2/0 = 0 +14:2/0 = 0 +15:2/0 = 0 +16:2/0 = 0 +1:3/0 = 0 +11:3/0 = 0 +12:3/0 = 0 +14:3/0 = 0 +15:3/0 = 0 +10:4/0 = 0 +11:4/0 = 0 +15:4/0 = 0 +16:4/0 = 0 +6:5/0 = 0 +7:5/0 = 0 +11:5/0 = 0 +12:5/0 = 0 +14:5/0 = 0 +15:5/0 = 0 +6:6/0 = 0 +7:6/0 = 0 +10:6/0 = 0 +11:6/0 = 0 +12:6/0 = 0 +13:6/0 = 0 +14:6/0 = 0 +15:6/0 = 0 +16:6/0 = 0 +1:7/0 = 0 +3:7/0 = 0 +4:7/0 = 0 +5:7/0 = 0 +6:7/0 = 0 +7:7/0 = 0 +8:7/0 = 0 +11:7/0 = 0 +13:7/0 = 0 +15:7/0 = 0 +3:8/0 = 0 +4:8/0 = 0 +5:8/0 = 0 +6:8/0 = 0 +7:8/0 = 0 +8:8/0 = 0 +4:10/0 = 0 +4:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, -2.23042, 16, 16, -16, 16) +5:10/0 = 0 +5:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(16, 16, 16, 0, -16, -1.59315, -16, 16) +6:10/0 = 0 +6:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, 16, -16, -2.23042) +4:11/0 = 0 +4:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, -16, 16, 16, 16, 16, -16) +5:11/0 = 0 +5:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +6:11/0 = 0 +6:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +8:11/0 = 0 +9:11/0 = 0 +10:11/0 = 0 +11:11/0 = 0 +12:11/0 = 0 +13:11/0 = 0 +14:11/0 = 0 +15:11/0 = 0 +16:11/0 = 0 +17:11/0 = 0 +4:12/0 = 0 +4:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +5:12/0 = 0 +5:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +6:12/0 = 0 +6:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +8:12/0 = 0 +9:12/0 = 0 +10:12/0 = 0 +11:12/0 = 0 +12:12/0 = 0 +13:12/0 = 0 +14:12/0 = 0 +15:12/0 = 0 +16:12/0 = 0 +17:12/0 = 0 +1:13/0 = 0 +2:13/0 = 0 +2:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +3:13/0 = 0 +4:13/0 = 0 +5:13/0 = 0 +6:13/0 = 0 +8:13/0 = 0 +9:13/0 = 0 +10:13/0 = 0 +11:13/0 = 0 +12:13/0 = 0 +13:13/0 = 0 +14:13/0 = 0 +15:13/0 = 0 +16:13/0 = 0 +17:13/0 = 0 +18:13/0 = 0 +1:14/0 = 0 +2:14/0 = 0 +3:14/0 = 0 +4:14/0 = 0 +5:14/0 = 0 +6:14/0 = 0 +8:14/0 = 0 +9:14/0 = 0 +10:14/0 = 0 +11:14/0 = 0 +12:14/0 = 0 +13:14/0 = 0 +14:14/0 = 0 +15:14/0 = 0 +16:14/0 = 0 +17:14/0 = 0 +18:14/0 = 0 +12:15/0 = 0 +13:15/0 = 0 +14:15/0 = 0 +15:15/0 = 0 +16:15/0 = 0 +3:16/0 = 0 +3:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +4:16/0 = 0 +4:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +9:16/0 = 0 +10:16/0 = 0 +11:16/0 = 0 +12:16/0 = 0 +13:16/0 = 0 +14:16/0 = 0 +15:16/0 = 0 +16:16/0 = 0 +17:16/0 = 0 +2:17/0 = 0 +2:17/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, 0.31863, -16, 0.955891) +3:17/0 = 0 +3:17/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +4:17/0 = 0 +4:17/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +5:17/0 = 0 +5:17/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, 1.27452, -16, 2.54905) +8:17/0 = 0 +9:17/0 = 0 +10:17/0 = 0 +11:17/0 = 0 +12:17/0 = 0 +13:17/0 = 0 +14:17/0 = 0 +15:17/0 = 0 +16:17/0 = 0 +17:17/0 = 0 +2:18/0 = 0 +2:18/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +3:18/0 = 0 +3:18/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +4:18/0 = 0 +4:18/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +5:18/0 = 0 +5:18/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +8:18/0 = 0 +9:18/0 = 0 +10:18/0 = 0 +11:18/0 = 0 +12:18/0 = 0 +13:18/0 = 0 +14:18/0 = 0 +15:18/0 = 0 +16:18/0 = 0 +17:18/0 = 0 +18:18/0 = 0 +2:19/0 = 0 +3:19/0 = 0 +3:19/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +4:19/0 = 0 +4:19/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +5:19/0 = 0 +8:19/0 = 0 +9:19/0 = 0 +10:19/0 = 0 +11:19/0 = 0 +12:19/0 = 0 +13:19/0 = 0 +14:19/0 = 0 +15:19/0 = 0 +16:19/0 = 0 +17:19/0 = 0 +18:19/0 = 0 +2:20/0 = 0 +3:20/0 = 0 +3:20/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +4:20/0 = 0 +4:20/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16) +5:20/0 = 0 +8:20/0 = 0 +12:20/0 = 0 +13:20/0 = 0 +14:20/0 = 0 +15:20/0 = 0 +16:20/0 = 0 + +[resource] +tile_size = Vector2i(32, 32) +uv_clipping = true +physics_layer_0/collision_layer = 2 +physics_layer_0/collision_mask = 0 +sources/0 = SubResource("TileSetAtlasSource_dxyvv") diff --git a/player/smallPlayer/menus/Score bar.tscn b/player/smallPlayer/menus/Score bar.tscn index 2d86813..2dd3258 100644 --- a/player/smallPlayer/menus/Score bar.tscn +++ b/player/smallPlayer/menus/Score bar.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=2 format=3 uid="uid://cnvs3iophpe3n"] +[gd_scene load_steps=3 format=3 uid="uid://cnvs3iophpe3n"] [ext_resource type="Script" uid="uid://biv656fho5bpy" path="res://player/smallPlayer/menus/progress_bar.gd" id="1_qy0dt"] +[ext_resource type="AudioStream" uid="uid://birua4ldxarek" path="res://collectables/crystal/sounds/Picked Coin Echo.wav" id="2_ekcnp"] [node name="Control" type="Control"] layout_mode = 3 @@ -17,4 +18,7 @@ offset_right = 367.0 offset_bottom = 27.0 script = ExtResource("1_qy0dt") +[node name="audioJungle" type="AudioStreamPlayer" parent="CanvasLayer/ProgressBar"] +stream = ExtResource("2_ekcnp") + [connection signal="value_changed" from="CanvasLayer/ProgressBar" to="CanvasLayer/ProgressBar" method="_on_value_changed"] diff --git a/player/smallPlayer/menus/progress_bar.gd b/player/smallPlayer/menus/progress_bar.gd index 028a5e3..667b971 100644 --- a/player/smallPlayer/menus/progress_bar.gd +++ b/player/smallPlayer/menus/progress_bar.gd @@ -1,6 +1,7 @@ extends ProgressBar var addAmount: float +@onready var Player = get_node("audioJungle"); func _ready() -> void: await get_tree().process_frame @@ -15,6 +16,12 @@ func _ready() -> void: func collect(): print("Collected crystal") value += addAmount + if randf() > 0.5: + Player.stream = load("res://collectables/crystal/sounds/Picked Coin Echo.wav") + else: + Player.stream = load("res://collectables/crystal/sounds/Picked Coin Echo 2.wav") + + Player.play(); if value > 99.0: value = 100.0