From 71b1b79bb573a620bb6eb1111a9275d768260efb Mon Sep 17 00:00:00 2001
From: MarcEricMartel <marcericmartel@gmail.com>
Date: Wed, 12 Oct 2022 12:38:08 -0400
Subject: [PATCH] ewr

---
 Levels/Level02.tscn |  9 ++++++++-
 Player.tscn         | 11 +----------
 Start.gd            | 13 +++++++++++--
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Levels/Level02.tscn b/Levels/Level02.tscn
index 0a57150..b35cbfc 100644
--- a/Levels/Level02.tscn
+++ b/Levels/Level02.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=2]
+[gd_scene load_steps=18 format=2]
 
 [ext_resource path="res://Textures/kenney_prototype_textures/red/texture_01.png" type="Texture" id=1]
 [ext_resource path="res://Textures/kenney_prototype_textures/orange/texture_01.png" type="Texture" id=2]
@@ -8,6 +8,7 @@
 [ext_resource path="res://AllSkyFree_Skyboxes/Epic_BlueSunset_EquiRect_flat.png" type="Texture" id=6]
 [ext_resource path="res://Levels/Level02.gd" type="Script" id=7]
 [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=8]
+[ext_resource path="res://Audio/DiJazz.ogg" type="AudioStream" id=9]
 
 [sub_resource type="SpatialMaterial" id=1]
 albedo_texture = ExtResource( 2 )
@@ -136,6 +137,12 @@ text = "You're Winner!"
 [node name="End" type="Timer" parent="."]
 wait_time = 3.0
 
+[node name="Music" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 9 )
+volume_db = -3.0
+autoplay = true
+bus = "Music"
+
 [connection signal="dying" from="Enemy" to="." method="_on_Enemy_dying"]
 [connection signal="dying" from="Enemy2" to="." method="_on_Enemy_dying"]
 [connection signal="timeout" from="End" to="." method="_on_Win_timeout"]
diff --git a/Player.tscn b/Player.tscn
index fb81cde..4087168 100644
--- a/Player.tscn
+++ b/Player.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=20 format=2]
+[gd_scene load_steps=18 format=2]
 
 [ext_resource path="res://Player.gd" type="Script" id=1]
 [ext_resource path="res://BlenderStuff/Hand/protohand.obj" type="ArrayMesh" id=2]
@@ -11,8 +11,6 @@
 [ext_resource path="res://Audio/step4.wav" type="AudioStream" id=10]
 [ext_resource path="res://Audio/step1.wav" type="AudioStream" id=11]
 [ext_resource path="res://Audio/mixkit-fast-whoosh-transition-1490.wav" type="AudioStream" id=12]
-[ext_resource path="res://Audio/DiJazz.ogg" type="AudioStream" id=13]
-[ext_resource path="res://Music.gd" type="Script" id=14]
 
 [sub_resource type="CapsuleShape" id=2]
 height = 3.0
@@ -148,13 +146,6 @@ cast_to = Vector3( 0, -1.5, 0 )
 anims/RESET = SubResource( 5 )
 anims/basic_slap = SubResource( 6 )
 
-[node name="Music" type="AudioStreamPlayer" parent="."]
-stream = ExtResource( 13 )
-volume_db = -3.0
-autoplay = true
-bus = "Music"
-script = ExtResource( 14 )
-
 [node name="SlapCooldown" type="Timer" parent="."]
 wait_time = 0.5
 
diff --git a/Start.gd b/Start.gd
index 0bbbd4f..349dfe6 100644
--- a/Start.gd
+++ b/Start.gd
@@ -8,7 +8,17 @@ onready var MMusic = $"MenuMusic"
 onready var CurrentLevel = $"Level"
 
 onready var Levels = { 
-	"lvl2": "Level 2 - Ricocheting", 
+	"lvl1": "Level 1 - What did the five fingers say to the face? SLAP!",
+	"lvl2": "Level 2 - Something in the way...", 
+	"lvl3": "Level 3 - ",
+	"lvl4": "Level 4 - ",
+	"lvl5": "Level 5 - ",
+	"lvl6": "Level 6 - ",
+	"lvl7": "Level 7 - ",
+	"lvl8": "Level 8 - ",
+	"lvl9": "Level 9 - ",
+	"lvl10": "Level 10 - ",
+	"lvl11": "Level 11 - ",
 	"Spatial" : "I am Error.",
 	"" : "I also am Error."
 	}
@@ -51,4 +61,3 @@ func _on_Quit_Game_pressed():
 
 
 
-