Merge remote-tracking branch 'origin/main'

6 files changed, 28 insertions, 7 deletions

diff --git a/Assets/Sound/squeaky-toy.wav b/Assets/Sound/squeaky-toy.wav
new file mode 100644
index 0000000..5c0bc3e
--- /dev/null
+++ b/Assets/Sound/squeaky-toy.wav
diff --git a/Assets/Sound/squeaky-toy.wav.import b/Assets/Sound/squeaky-toy.wav.import
new file mode 100644
index 0000000..5047ff1
--- /dev/null
+++ b/Assets/Sound/squeaky-toy.wav.import
@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/squeaky-toy.wav-c3d5382cc5fd5c9d8566f4aeb072a391.sample"
+
+[deps]
+
+source_file="res://Assets/Sound/squeaky-toy.wav"
+dest_files=[ "res://.import/squeaky-toy.wav-c3d5382cc5fd5c9d8566f4aeb072a391.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=false
+compress/mode=0
diff --git a/Assets/arrow.png b/Assets/arrow.png
index b7b01e5..30d9df4 100644
--- a/Assets/arrow.png
+++ b/Assets/arrow.png
diff --git a/Scenes/Monster.gd b/Scenes/Monster.gd
index 4293a49..a6dda5c 100644
--- a/Scenes/Monster.gd
+++ b/Scenes/Monster.gd
@@ -26,7 +26,6 @@ func cor_stomp(args : Array):
 
 func cor_dies(args : Array):
 	$AnimationPlayer.play("fucking_dies")
-	$FuckingDies.pitch_scale = 1.5 + randf()
 	$FuckingDies.play()
 	yield($AnimationPlayer, "animation_finished")
 	hide()
diff --git a/Scenes/Monster.tscn b/Scenes/Monster.tscn
index 3922973..e57c581 100644
--- a/Scenes/Monster.tscn
+++ b/Scenes/Monster.tscn
@@ -3,7 +3,7 @@
 [ext_resource path="res://Assets/Enemies/Bat-Monster.png" type="Texture" id=1]
 [ext_resource path="res://Scenes/Monster.gd" type="Script" id=2]
 [ext_resource path="res://Assets/blob_shadow.png" type="Texture" id=3]
-[ext_resource path="res://Assets/Sound/peludito.wav" type="AudioStream" id=4]
+[ext_resource path="res://Assets/Sound/squeaky-toy.wav" type="AudioStream" id=4]
 
 [sub_resource type="Animation" id=4]
 resource_name = "Idle"
@@ -146,4 +146,4 @@ anims/stomp = SubResource( 3 )
 
 [node name="FuckingDies" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 4 )
-pitch_scale = 2.0
+volume_db = -10.0
diff --git a/Scenes/PlateBounce.tscn b/Scenes/PlateBounce.tscn
index b323006..c33c50b 100644
--- a/Scenes/PlateBounce.tscn
+++ b/Scenes/PlateBounce.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://Scenes/PlateBounce.gd" type="Script" id=1]
 [ext_resource path="res://Assets/arrow.png" type="Texture" id=2]
+[ext_resource path="res://Assets/Environment/Obstacle.png" type="Texture" id=3]
 
 [sub_resource type="PlaneMesh" id=1]
 size = Vector2( 1, 1 )
@@ -11,15 +12,15 @@ flags_transparent = true
 albedo_texture = ExtResource( 2 )
 
 [sub_resource type="SpatialMaterial" id=3]
-albedo_color = Color( 0.341176, 0.27451, 0.529412, 1 )
+albedo_color = Color( 0.584314, 0.54902, 0.678431, 1 )
+albedo_texture = ExtResource( 3 )
 
 [node name="PlateBounce" type="Spatial"]
 script = ExtResource( 1 )
 valid_symbols = [ "2", "3", "4", "5", "6", "" ]
-cardinal = null
 
 [node name="Mesh" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.02, 0 )
+transform = Transform( 0.825458, 0, 0, 0, 1, 0, 0, 0, 0.825458, 0, 0.02, 0 )
 mesh = SubResource( 1 )
 material/0 = SubResource( 2 )