Merge remote-tracking branch 'origin/main'

5 files changed, 33 insertions, 8 deletions

diff --git a/Assets/Sound/Poofy Reel.mp3 b/Assets/Sound/Poofy Reel.mp3
new file mode 100644
index 0000000..4a9067e
--- /dev/null
+++ b/Assets/Sound/Poofy Reel.mp3
diff --git a/Assets/Sound/Poofy Reel.mp3.import b/Assets/Sound/Poofy Reel.mp3.import
new file mode 100644
index 0000000..634f90e
--- /dev/null
+++ b/Assets/Sound/Poofy Reel.mp3.import
@@ -0,0 +1,15 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+path="res://.import/Poofy Reel.mp3-1058b65ce09ea87cef73c0a6debad6b2.mp3str"
+
+[deps]
+
+source_file="res://Assets/Sound/Poofy Reel.mp3"
+dest_files=[ "res://.import/Poofy Reel.mp3-1058b65ce09ea87cef73c0a6debad6b2.mp3str" ]
+
+[params]
+
+loop=true
+loop_offset=0
diff --git a/Scenes/Dungeon.tscn b/Scenes/Dungeon.tscn
index b3d619f..07a2de0 100644
--- a/Scenes/Dungeon.tscn
+++ b/Scenes/Dungeon.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=33 format=2]
+[gd_scene load_steps=34 format=2]
 
 [ext_resource path="res://Scenes/Dungeon.gd" type="Script" id=1]
 [ext_resource path="res://Scenes/CameraControl.gd" type="Script" id=2]
@@ -8,6 +8,7 @@
 [ext_resource path="res://Scenes/ScoreParticle.tscn" type="PackedScene" id=6]
 [ext_resource path="res://Assets/arm.png" type="Texture" id=7]
 [ext_resource path="res://Assets/Environment/BG-tiled.png" type="Texture" id=8]
+[ext_resource path="res://Assets/Sound/Poofy Reel.mp3" type="AudioStream" id=9]
 
 [sub_resource type="ProceduralSky" id=2]
 
@@ -385,8 +386,8 @@ modulate = Color( 0.690196, 0.494118, 0.768627, 1 )
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_top = -300.0
-margin_right = 1152.0
-margin_bottom = 420.0
+margin_right = 128.0
+margin_bottom = -180.0
 rect_rotation = -0.0481524
 texture = ExtResource( 8 )
 expand = true
@@ -685,3 +686,8 @@ anims/RESET = SubResource( 10 )
 [node name="AnimationPlayer" type="AnimationPlayer" parent="UIController"]
 anims/HandMoving = SubResource( 7 )
 anims/RESET = SubResource( 8 )
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 9 )
+volume_db = -15.0
+autoplay = true
diff --git a/Scenes/Global.gd b/Scenes/Global.gd
index 6b40d87..1bda622 100644
--- a/Scenes/Global.gd
+++ b/Scenes/Global.gd
@@ -7,7 +7,7 @@ onready var turns = STARTING_TURNS setget set_turns
 onready var current_stage = 0 setget set_stage
 onready var active_crystals = 0 setget set_crystals
 onready var max_crystals = 0
-onready var onboarding = false
+onready var onboarding = true
 
 signal update_ui
 
diff --git a/Scenes/Transition.tscn b/Scenes/Transition.tscn
index aa51821..76f74d2 100644
--- a/Scenes/Transition.tscn
+++ b/Scenes/Transition.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=29 format=2]
+[gd_scene load_steps=31 format=2]
 
 [ext_resource path="res://Assets/transition.png" type="Texture" id=1]
 [ext_resource path="res://Scenes/CameraControl.gd" type="Script" id=2]
@@ -11,9 +11,10 @@
 [ext_resource path="res://Assets/DiceFaceMaterial.tres" type="Material" id=9]
 [ext_resource path="res://Assets/6_dots.png" type="Texture" id=10]
 [ext_resource path="res://Assets/5_dots.png" type="Texture" id=11]
-[ext_resource path="res://Assets/2_dots.png" type="Texture" id=12]
+[ext_resource path="res://Assets/3_dots_blue.png" type="Texture" id=12]
 [ext_resource path="res://Assets/4_dots.png" type="Texture" id=13]
 [ext_resource path="res://Assets/Sound/explosion.wav" type="AudioStream" id=14]
+[ext_resource path="res://Assets/2_dots_blue.png" type="Texture" id=15]
 
 [sub_resource type="QuadMesh" id=5]
 
@@ -21,7 +22,7 @@
 albedo_texture = ExtResource( 10 )
 
 [sub_resource type="SpatialMaterial" id=7]
-albedo_texture = ExtResource( 12 )
+albedo_texture = ExtResource( 15 )
 
 [sub_resource type="SpatialMaterial" id=8]
 albedo_texture = ExtResource( 11 )
@@ -32,6 +33,9 @@ albedo_texture = ExtResource( 8 )
 [sub_resource type="SpatialMaterial" id=10]
 albedo_texture = ExtResource( 13 )
 
+[sub_resource type="SpatialMaterial" id=19]
+albedo_texture = ExtResource( 12 )
+
 [sub_resource type="DynamicFont" id=11]
 size = 80
 font_data = ExtResource( 5 )
@@ -377,7 +381,7 @@ material/0 = SubResource( 8 )
 [node name="FaceForward" type="MeshInstance" parent="Mesh3"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.5 )
 mesh = SubResource( 5 )
-material/0 = SubResource( 9 )
+material/0 = SubResource( 19 )
 
 [node name="FaceBackward" type="MeshInstance" parent="Mesh3"]
 transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, -0.5 )