Dialogue responses rework

Scenes/screening_desk/patient_global.gd

@@ -238,7 +238,7 @@ func next_patient() -> Dictionary: #Decides next patient ID
 				next_id = generate_next_id(next_type)
 		-3:
 			if Globals.patient_count == 0:
-				next_id = "it_that_feels"
+				next_id = "it_that_feels_01"
 				next_type = "entity"
 			else:
 				next_type = next_patient_type()
@@ -261,7 +261,8 @@ func next_patient_type():
 		-2:
 			return "patient"
 		-3:
-			type_list.append("its")
+			if len(its_list) > 0:
+				type_list.append("its")
 			for i in range(Globals.diagnoses_quota - 1):
 				type_list.append("patient")
 			print("Type List generated: " + str(type_list))
@@ -283,7 +284,7 @@ func next_patient_type():
 			return next_type
 
 
-#Erases current patient ID from the corresponding patient list, so it can't be seen twice
+#Erases current subject ID from the corresponding subject list, so it can't be seen twice
 func update_list(): 
 	print("Patient type: " + str(Patient.type))
 	match type:

Scenes/screening_desk/screening_desk.gd

@@ -35,6 +35,7 @@ func _ready() -> void:
 	green_button.decision_made.connect(self._on_decision_made)
 	journal.pressed.connect(journal_layer._on_journal_pressed)
 	Globals.clear_patient.connect(self._on_clear_patient)
+	Globals.decision_made.connect(self._on_decision_made)
 	Globals.color_change.connect(self._on_color_change)
 	Globals.next_event.connect(self.event_manager)
 	
@@ -45,15 +46,17 @@ func _ready() -> void:
 
 
 #Manages what event should happen next
-func event_manager(event_index):
-	match event_index:
-		0:
+func event_manager():
+	match Globals.event_index:
+		"interfloor":
 			supervisor.dialogue("interfloor_" + str(-Globals.floor_count-1))
-		1:
+		"next_patient":
 			console_screen.display(Globals.directives)
 			computer.next_patient_button.show()
-		2:
+		"descend":
 			descend_floor()
+		"supervisor":
+			supervisor.dialogue("dialogue_" + str(Globals.supervisor_index))
 
 
 func _on_call_next_patient_pressed(): #Brings in next patient and sets up the desk controls
@@ -176,9 +179,9 @@ func _on_clear_patient(choice:String):
 	
 	#Descending Floor if diagnoses_quota reached
 	if Globals.accurate_diagnoses == Globals.diagnoses_quota:
-		Globals.event_index = 2
+		Globals.event_index = "descend"
 		
-	event_manager(Globals.event_index)
+	event_manager()
 	
 	
 func _on_color_change(color: String): #Modulating backroom and patient colors
@@ -198,7 +201,7 @@ func _on_color_change(color: String): #Modulating backroom and patient colors
 func descend_floor(): #Descends to next floor
 	
 	#Updating Global variables
-	Globals.event_index = 0
+	Globals.event_index = "interfloor"
 	Globals.floor_count -= 1
 	Globals.accurate_diagnoses = 0
 	Globals.diagnoses_quota += 1
@@ -227,7 +230,7 @@ func descend_floor(): #Descends to next floor
 	main.save_game(0)
 	
 	#Selecting next event
-	event_manager(Globals.event_index)
+	event_manager()
 	
 
 #Resets to initial state