Skip to content

Commit

Permalink
juniper intro + prevent crashing from entering phase 2
Browse files Browse the repository at this point in the history
  • Loading branch information
Lamby777 committed Aug 17, 2024
1 parent 48d2581 commit 226b9db
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
10 changes: 5 additions & 5 deletions pets-gd/quests/intro1.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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")
3 changes: 1 addition & 2 deletions pets-gd/singletons/globals.gd
Original file line number Diff line number Diff line change
@@ -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")
Expand All @@ -26,4 +26,3 @@ func discord_rich_presence():

# Always refresh after changing the values!
discord_sdk.refresh()

0 comments on commit 226b9db

Please sign in to comment.