diff --git a/Art/Subjects/Patients/patient_40/patient_40.aseprite b/Art/Subjects/Patients/patient_40/patient_40.aseprite index d568bac..a2727c1 100644 Binary files a/Art/Subjects/Patients/patient_40/patient_40.aseprite and b/Art/Subjects/Patients/patient_40/patient_40.aseprite differ diff --git a/Dialogues/Patients/patient_51.dialogue b/Dialogues/Patients/patient_51.dialogue index 466ac2e..ea63117 100644 --- a/Dialogues/Patients/patient_51.dialogue +++ b/Dialogues/Patients/patient_51.dialogue @@ -1,25 +1,11 @@ ~ start do Patient.marker.fill(0) -set Patient.dialog_tree = Patient.build_dialog_tree([21, 22, 23, 24, 31, 32]) +set Patient.dialog_tree = Patient.build_dialog_tree([21, 22, 23, 24]) The patient looks visibly distraught, fidgeting with anxiety. - Gwendoline Gorbado: [#worried] Who are you ?! Where am I ?? -- Decline your identity. - Gwendoline Gorbado: [#worried] I don't understand, please, tell me where I am... - => part_1 -- I am trying to help you here. Calm down and tell me who you are. - Gwendoline Gorbado: [#worried] A-alright, my name is Gwendoline Gorbado. Please, i need to know where I am ! - => part_1 -- You are in a containment unit. I am here to assess how dangerous you might be to society. - Gwendoline Gorbado: [#worried] Containment ?! How dangerous I am ?? This can't be ! There must have been a mistake ! - => part_1 -- Shut your mouth. I am the one asking the questions here, not the other way around. - Gwendoline Gorbado: [#scared] Please, don't hurt me ! Oh God, why is this happening to me ?? - => part_panick_ending - ~ part_1 @@ -30,38 +16,37 @@ Gwendoline Gorbado: [#worried] Who are you ?! Where am I ?? Gwendoline Gorbado: [#worried] O-Okay, I'll trust you. I'll try. => part_2 - Either you answer me, or I'm dispatching you to the depths. - Gwendoline Gorbado: [#scared] The depths ?! What is that ?? Am I going to be murdered ?? - => part_panick_ending + Gwendoline Gorbado: [#scared] Oh God please don't hurt me ! I'll answer everything, I swear ! + => part_2 ~ part_2 -if Patient.marker[1] == 4 - => part_3 +if Patient.marker[1] >= 4 + => part_end -- What is your job ? [if Patient.dialog_tree[21] == "not_asked"] +- What brought you here ? [if Patient.dialog_tree[21] == "not_asked"] set Patient.dialog_tree[21] = "asked" do Patient.marker[1] += 1 - Gwendoline Gorbado: [#worried] I work in IT... It's a really hard job, you know. An awful lot of pressure for a sliver of recognition. - Gwendoline Gorbado: [#sad] Whenever I complete a task, another one is added. It never ends. And no one ever recognizes you. - Gwendoline Gorbado: [#sad] It feels so meaningless. I feel so meaningless. + Gwendoline Gorbado: [#worried] I work in IT... It's a really hard job, you know. Whenever I complete a task, another one is added. It never ends. And no one ever recognizes you. + Gwendoline Gorbado: [#sad] It feels so meaningless. I feel so meaningless. I tried to end it all, but I failed. I didn't swallow enough pills. + Gwendoline Gorbado: [#sad] My friend called for help, and I was taken to the hospital. Then I was brought here, I don't know why. => part_2 -- How is your mood lately ? [if Patient.dialog_tree[22] == "not_asked"] +- Have you been sleeping well lately ? [if Patient.dialog_tree[22] == "not_asked"] set Patient.dialog_tree[22] = "asked" do Patient.marker[1] += 1 - Gwendoline Gorbado: [#sad] I'm feeling not fine at all. To be frank, I've been having some really dark ideas lately... - - - Have you been thinking about harming yourself ? About suicide ? - Gwendoline Gorbado: [#worried] ... Yes, all the time. I feel like it's the only option left. To disappear quietly, so the pain ends. - Gwendoline Gorbado: [#sad] I used to like it, you know. My job. I can't remember the last time I didn't dread going to work... - => part_2 + if Patient.abnormal == true + Gwendoline Gorbado: [#worried] No, not at all. I've been having a lot of nightmares. + Gwendoline Gorbado: [#sad] I dream that I am... dissolving. Disappearing for good. No more pain. No more sadness. + else + Gwendoline Gorbado: [#worried] I'm having some nightmares from time to time, but that's all. I think I'm sleeping well enough. + => part_2 -- Have you been having panic attacks recently ? [if Patient.dialog_tree[23] == "not_asked"] +- Are there any people targeting you ? Trying to harm you ? [if Patient.dialog_tree[23] == "not_asked"] set Patient.dialog_tree[23] = "asked" do Patient.marker[1] += 1 - Gwendoline Gorbado: [#worried] Yes, a lot. Just thinking about my work makes me so stressed I want to puke. - Gwendoline Gorbado: [#sad] I feel stressed all the time... I keep thinking, and thinking, and thinking. I just want to stop thinking, just for a little while. + Gwendoline Gorbado: [#surprised] What ?! No ! Why would there be ?? => part_2 - What is your favorite meal ? [if Patient.dialog_tree[24] == "not_asked"] @@ -69,94 +54,13 @@ if Patient.marker[1] == 4 do Patient.marker[1] += 1 Gwendoline Gorbado: [#surprised] M-my favourite meal ? I... It's probably Jajangmyeon. Korean noodles, very tasty. Such a weird question... => part_2 - - -~ part_3 - -if Patient.marker[0] >= 1 - do Patient.marker[0] = 0 - => part_panick - -if Patient.marker[2] >= 2 - => part_4 - -- Do you feel any strange sensations in your body ? Like your organs are missing, perhaps ? [if Patient.dialog_tree[31] == "not_asked"] - set Patient.dialog_tree[31] = "asked" - do Patient.marker[2] += 1 - do Patient.marker[0] += 1 - if Patient.abnormal == true - Gwendoline Gorbado: [#worried] Yes, how did you know ? It's like my guts are... melting, I don't know how to describe it. - Gwendoline Gorbado: [#shocked] It feels like I'm dissolving from the inside. I know I'm not. But that's how it feels. - else - Gwendoline Gorbado: [#surprised] I don't. Why would I even feel such a thing ? - Gwendoline Gorbado: [#scared] Is that what's going to happen to me ?? - => part_3 - -- Are you hearing any voices other than mine talking to you right now ? [if Patient.dialog_tree[32] == "not_asked"] - set Patient.dialog_tree[32] = "asked" - do Patient.marker[2] += 1 - Gwendoline Gorbado: [#worried] Yes, I can't really hear them clearly, but they're whispering to me all the time ! - - - What are they telling you ? - Gwendoline Gorbado: [#sad] That I am worthless. That I do not deserve to exist. That I should end myself. - - - For what it's worth, know that you do matter. You do deserve to exist. Your mind is playing tricks on you, do not let it overwhelm you. - Gwendoline Gorbado: [#sadsmiling] Thank you. That made me feel a little better. - => part_3 - - Maybe you should grow up and stop caring about imaginary voices. - do Patient.marker[0] += 1 - Gwendoline Gorbado: [#sad] That's what everyone tells me... But I feel like it just makes me want to end it all even more. - => part_3 - - -~ part_4 - -Gwendoline Gorbado: [#sad] I'm exhausted. Please, no more questions. -Gwendoline Gorbado: [#sadsmiling] Do what you will. I don't deserve to live anyways. -The patient falls silent, and refuses to engage again in conversation. -=> part_end - - -~ part_panick_ending - -Gwendoline Gorbado: [#panicked] Nononono I can't I cannot I'm gonna die ! Oh god oh god oh god oh god... -The patient keeps panicking uncontrollably, and doesn't seem to react to you anymore. -=> part_end - - -~ part_panick - -if Patient.marker[9] == 0 - do Patient.marker[9] += 1 - Gwendoline Gorbado: [#worried] What are you going to do to me ?? - Gwendoline Gorbado: [#scared] Nonono I'm scared I don't want to be here, please ! - - - I am not going to hurt you, I promise. I just need you to answer some questions, that's all. Then I'll help you. - Gwendoline Gorbado: [#worried] A-alright. I'm sorry. - => part_3 - - I just need to make sure you're fine before I release you. You're safe here. Take a deep breath. - Gwendoline Gorbado: [#worried] A-alright. I'm sorry. - => part_3 - - Stop screaming nonsense and focus on answering me. - => part_panick_ending - -elif Patient.marker[9] == 1 - do Patient.marker[9] += 1 - Gwendoline Gorbado: [#scared] Oh God oh God please I can't breathe I'm scared please ! - Gwendoline Gorbado: [#panicked] Please I can't breathe I'm gonna die help me help me !! - - - Hey, you've been doing great. It's alright, we're nearly done. Just a few more questions, and it'll be all over. - Gwendoline Gorbado: [#scared] ... - Gwendoline Gorbado: [#worried] O-okay, let's continue. Sorry for panicking like that. - - I'm done with your theatrics. If you don't calm down right now, you're going down below. - => part_panick_ending - -elif Patient.marker[9] >= 2 - => part_panick_ending ~ part_end +Gwendoline Gorbado: [#sad] I'm exhausted. Please, no more questions. +Gwendoline Gorbado: [#sadsmiling] Do what you will. I don't deserve to live anyways. +The patient falls silent, and refuses to engage again in conversation. do Globals.console_message.emit("[color=dark_orange]ALLOTED ASSESSMENT TIME ELAPSED[/color]\n\n[color=orange_red]PLEASE MAKE A DECISION[/color]") => END diff --git a/Dialogues/Patients/patient_51_file.cfg b/Dialogues/Patients/patient_51_file.cfg index 2e70262..e0873b1 100644 --- a/Dialogues/Patients/patient_51_file.cfg +++ b/Dialogues/Patients/patient_51_file.cfg @@ -2,7 +2,7 @@ initial_emotion="worried" name="Gwendoline Gorbado" age="28" profession="IT Engineer" -psychiatric_assessment="SUICIDAL IDEATIONS\n\nAUDITORY HALLUCINATIONS" -abnormal_symptoms="SOMATIC HALLUCINATIONS" +psychiatric_assessment="SUICIDAL IDEATIONS" +abnormal_symptoms="INSOMNIA" status="random" type="patient" diff --git a/Scenes/main/main.gd b/Scenes/main/main.gd index 1d394a0..329841a 100644 --- a/Scenes/main/main.gd +++ b/Scenes/main/main.gd @@ -53,11 +53,11 @@ func _ready() -> void: func _on_new_game_pressed(): #Setting/Resetting game parameters - Globals.floor_count = -1 + Globals.floor_count = -5 Globals.patient_count = 0 Globals.accurate_diagnoses = 0 - Globals.diagnoses_quota = 1 - Globals.misdiagnoses_allowed = 0 + Globals.diagnoses_quota = 2 + Globals.misdiagnoses_allowed = 2 Globals.daily_patient_limit = 6 Globals.event_index = "interfloor" for i in range(len(Patient.patient_list)): diff --git a/Scenes/screening_desk/green_button.gd b/Scenes/screening_desk/green_button.gd index e5fc4a5..2dafb99 100644 --- a/Scenes/screening_desk/green_button.gd +++ b/Scenes/screening_desk/green_button.gd @@ -7,10 +7,11 @@ func _ready() -> void: self.pressed.connect(self._on_green_button_pressed) set_disabled(true) +#Activates when the green button is pressed func _on_green_button_pressed(): if Globals.buttons_activated: decision_made.emit("release") - set_toggle_mode(true) + set_toggle_mode(true) #Necessary to switch the button to pressed mode set_pressed_no_signal(true) #Resets to initial state diff --git a/Scenes/screening_desk/middle_screen.gd b/Scenes/screening_desk/middle_screen.gd index 0ac09c4..938f0a2 100644 --- a/Scenes/screening_desk/middle_screen.gd +++ b/Scenes/screening_desk/middle_screen.gd @@ -15,5 +15,6 @@ func update(floor_count, diagnoses_count, diagnoses_quota, misdiagnoses_allowed) text = "FLOOR: " + floor + "\n\nACCURATE DIAGNOSES: " + diagnoses + "\n\nMISDIAGNOSES ALLOWED: " + misdiagnoses +#Resets to initial state func reset(): update(Globals.floor_count, Globals.accurate_diagnoses, Globals.diagnoses_quota, Globals.misdiagnoses_allowed) diff --git a/Scenes/screening_desk/patient_global.gd b/Scenes/screening_desk/patient_global.gd index d497b38..6efa182 100644 --- a/Scenes/screening_desk/patient_global.gd +++ b/Scenes/screening_desk/patient_global.gd @@ -19,11 +19,15 @@ var file_text : String #Patient symptoms ordered from floor to floor var symptoms_arrays: Array[Array] = [ -["SUICIDAL IDEATIONS", "PERSECUTORY DELUSIONS", "UNNATURAL BEHAVIOUR", "AUDITORY HALLUCINATIONS"], -["SOMATIC HALLUCINATIONS", "MEGALOMANIAC DELUSIONS"], -["MYSTICAL DELUSIONS", "THOUGHT INSERTION"], -["CHEMOSENSORY HALLUCINATIONS", "SELF-MUTILATION"], -["VISUAL HALLUCINATIONS", "INSOMNIA"] +["SUICIDAL IDEATIONS", "PERSECUTORY DELUSIONS", "UNNATURAL BEHAVIOUR", "INSOMNIA"], +["AUDITORY HALLUCINATIONS"], +["SOMATIC HALLUCINATIONS"], +["MYSTICAL DELUSIONS"], +["THOUGHT INSERTION"], +["MEGALOMANIAC DELUSIONS"], +["CHEMOSENSORY HALLUCINATIONS"], +["SELF-MUTILATION"], +["VISUAL HALLUCINATIONS"] ] #Lists of possible patients sorted by floor var og_patient_list : Array[Dictionary] @@ -175,7 +179,7 @@ func sort_patients(): break if symptom_matched: for k in range(j, symptoms_arrays.size()): - og_patient_list[k].merge({patient_id: j+1}) # Adds the patient to every floor compatible + og_patient_list[k].merge({patient_id: j+1}) # Adds the patient to every floor compatible, with a weighted odd symptom_matched = false break @@ -239,15 +243,22 @@ func next_patient() -> Dictionary: #Decides next patient ID next_type = next_patient_type() next_id = generate_next_id(next_type) -3: + next_type = next_patient_type() + next_id = generate_next_id(next_type) + -4: if Globals.patient_count == 0: - next_id = "it_that_feels_01" - next_type = "entity" + next_id = "ite_00" + next_type = "ite" + else: + next_type = next_patient_type() + next_id = generate_next_id(next_type) + -5: + if Globals.patient_count == 0: + next_id = "patient_51" + next_type = "patient" else: next_type = next_patient_type() next_id = generate_next_id(next_type) - -4: - next_type = next_patient_type() - next_id = generate_next_id(next_type) _: next_type = next_patient_type() next_id = generate_next_id(next_type) diff --git a/Scenes/screening_desk/red_button.gd b/Scenes/screening_desk/red_button.gd index 8370026..409d430 100644 --- a/Scenes/screening_desk/red_button.gd +++ b/Scenes/screening_desk/red_button.gd @@ -7,10 +7,11 @@ func _ready() -> void: self.pressed.connect(self._on_red_button_pressed) set_disabled(true) +#Activates when the red button is pressed func _on_red_button_pressed(): if Globals.buttons_activated: decision_made.emit("terminate") - set_toggle_mode(true) + set_toggle_mode(true) #Necessary to switch to pressed mode set_pressed_no_signal(true)