From 226b9db53cf614705d9e498278c9400f4437035e Mon Sep 17 00:00:00 2001
From: Cherry <cherry@sparklet.org>
Date: Sat, 17 Aug 2024 02:23:31 -0400
Subject: [PATCH] juniper intro + prevent crashing from entering phase 2

---
 pets-gd/quests/intro1.gd      | 10 +++++-----
 pets-gd/singletons/globals.gd |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pets-gd/quests/intro1.gd b/pets-gd/quests/intro1.gd
index 25f9e008..7d331f95 100644
--- a/pets-gd/quests/intro1.gd
+++ b/pets-gd/quests/intro1.gd
@@ -8,8 +8,8 @@ func _ready():
     await pcb().motion_done
 
     dbox().open()
-    dbox().set_speaker("Deez")
-    dbox().say("Nuggets")
+    dbox().set_speaker("[JUNIPER]")
+    dbox().say("DG_INTRO1_COMEUNPACK")
     await dbox().accept
     dbox().close()
 
@@ -26,13 +26,13 @@ func on_teleported(target):
 func on_house_tp(target):
     if phase == 0:
         self.phase = 1
-        dbox().start_ix("Intro #2")
+        #dbox().start_ix("Intro #2")
 
     if target.name == "EthanBedroomExit" and phase == 1:
         self.phase = 2
-        dbox().start_ix("Intro #3")
+        #dbox().start_ix("Intro #3")
 
 func on_outdoors_tp(target):
     if target.name == "EthanHouseEntrance" and phase == 2:
         self.phase = 3
-        dbox().start_ix("Intro #5")
+        #dbox().start_ix("Intro #5")
diff --git a/pets-gd/singletons/globals.gd b/pets-gd/singletons/globals.gd
index d5bb3cf3..6d6dea57 100644
--- a/pets-gd/singletons/globals.gd
+++ b/pets-gd/singletons/globals.gd
@@ -1,6 +1,6 @@
 class_name Globals
 extends Node
-    
+
 #func _input(_event):
     #if Input.is_key_pressed(KEY_0):
         #get_tree().change_scene_to_file("res://scenes/world.tscn")
@@ -26,4 +26,3 @@ func discord_rich_presence():
 
     # Always refresh after changing the values!
     discord_sdk.refresh()
-