layla/the-connection
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Bugfixes and Beauty

Browse Source
This commit is contained in:
Layla
2020-05-16 11:22:41 -04:00
parent 86637e395f
commit 497f251376
28 changed files with 222 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/Scripts/Entities/NPCs/CEO.gd
View File

@ -1,9 +1,18 @@
extends "res://Scripts/Component/Interactable.gd"
var state : int = 0
func _ready():
connect("interacted", self, "_on_interact")
$Speaker.speaker_name = "CEO Grant Blevins"
#$Speaker.start_dialog("intro_science")
$Speaker.connect("dialog_exited", self, "_on_dialog_exit")
func _on_interact():
$Speaker.start_dialog("intro_meet_ceo")
if state == 0:
$Speaker.start_dialog("intro_meet_ceo")
else:
$Speaker.start_dialog("into_speak_ceo")
func _on_dialog_exit():
if state == 0:
state = 1

2
client/Scripts/Entities/NPCs/IntroScientist.gd
View File

@ -3,7 +3,7 @@ extends "res://Scripts/Component/Interactable.gd"
func _ready():
connect("interacted", self, "_on_interact")
$Speaker.speaker_name = "Dr.Thadd"
$Speaker.start_dialog("intro_science")
#$Speaker.start_dialog("intro_science")
func _on_interact():
$Speaker.start_dialog("intro_science_followup")

2
client/Scripts/Entities/Player.gd
View File

@ -24,7 +24,7 @@ func remove_interactable(interactable):
interactables.remove(loc)
func _process(delta):
if Input.is_action_just_pressed("ui_accept") and len(interactables) > 0:
if Input.is_action_just_pressed("ui_accept") and len(interactables) > 0 and not gui.is_in_dialog():
interactables[0].interact()
func _physics_process(delta):