Reorganizing

screening_desk.gd

@@ -39,7 +39,6 @@ extends Control
 var main: Node
 var accurate_diagnoses = 0
 
-signal supervisor_dialogue_finished
 
 func _ready() -> void:
 	
@@ -99,7 +98,7 @@ func new_patient():
 func _on_call_next_patient_pressed(): #Brings in next patient and sets up the desk controls
 	
 	#Hiding the next_patient button and shows transition messages on computer and console
-	var scenes_to_hide = [next_patient]
+	var scenes_to_hide = [next_patient, supervisor]
 	for scenes in scenes_to_hide:
 		scenes.hide()
 	var message : String
@@ -205,23 +204,10 @@ func _on_tab_recording_pressed(): #Shows the recording tab
 	computer_tabs.get_node("Recording").show()
 
 
-func _change_emotion(dialogue_line) -> void: #Change emotions following dialogue tags
-	
-	var line_tag = dialogue_line.tags
-	print("Patient marker value: " + str(Patient.marker[0]))
-	if line_tag.is_empty() == false:
-		var new_emotion = line_tag[0]
-		patient.texture = Patient.emotions[String(new_emotion)]
-		print("Emotion changed to ", new_emotion)
-
-
 func _on_green_button_pressed(): #Releases the patient
-	
 	decision_made("release")
 
-
 func _on_red_button_pressed(): #Terminates the patient
-	
 	decision_made("terminate")
 
 
@@ -369,25 +355,9 @@ func descend_floor(): #Descends to next floor
 	console_screen.hide()
 	
 	#Interfloor dialogue
-	supervisor_dialogue(Globals.interfloor_dialogue, "interfloor_" + str(-Globals.floor_count-1))
-	await supervisor_dialogue_finished
+	supervisor.dialogue(Globals.interfloor_dialogue, "interfloor_" + str(-Globals.floor_count-1))
+	await supervisor.dialogue_finished
 	
 	#Setting up new patient
 	new_patient()
 	
-
-
-#Supervisor dialogue, mainly between floors
-func supervisor_dialogue(dialogue_resource, dialogue_start):
-	
-	#Interfloor dialogue
-	supervisor.show()
-	supervisor.reveal_spray()
-	await supervisor.reveal_done
-	main.start_balloon("screening", dialogue_resource, dialogue_start)
-	await DialogueManager.dialogue_ended
-	supervisor.hide_spray()
-	await supervisor.hide_done
-	supervisor.hide()
-	
-	supervisor_dialogue_finished.emit()