diff --git a/Art/Patients/patient_2202/patient_2202.aseprite b/Art/Patients/patient_2202/patient_2202.aseprite new file mode 100644 index 0000000..b18bbab Binary files /dev/null and b/Art/Patients/patient_2202/patient_2202.aseprite differ diff --git a/Art/Patients/patient_47/patient_47.aseprite b/Art/Patients/patient_47/patient_47.aseprite index d535b2a..5da6b84 100644 Binary files a/Art/Patients/patient_47/patient_47.aseprite and b/Art/Patients/patient_47/patient_47.aseprite differ diff --git a/Art/Patients/patient_47/patient_47_abnormal.aseprite b/Art/Patients/patient_47/patient_47_abnormal.aseprite index 41c1aba..c356223 100644 Binary files a/Art/Patients/patient_47/patient_47_abnormal.aseprite and b/Art/Patients/patient_47/patient_47_abnormal.aseprite differ diff --git a/Art/Patients/patient_47/patient_47_abnormal.png b/Art/Patients/patient_47/patient_47_abnormal.png index 12bef0a..2f50724 100644 Binary files a/Art/Patients/patient_47/patient_47_abnormal.png and b/Art/Patients/patient_47/patient_47_abnormal.png differ diff --git a/Art/Patients/patient_47/patient_47_abnormal2.png b/Art/Patients/patient_47/patient_47_abnormal2.png new file mode 100644 index 0000000..111d332 Binary files /dev/null and b/Art/Patients/patient_47/patient_47_abnormal2.png differ diff --git a/Art/Patients/patient_47/patient_47_abnormal2.png.import b/Art/Patients/patient_47/patient_47_abnormal2.png.import new file mode 100644 index 0000000..f4be11c --- /dev/null +++ b/Art/Patients/patient_47/patient_47_abnormal2.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://corgehgx7mwu0" +path="res://.godot/imported/patient_47_abnormal2.png-a38adddc3429a2cdb21e4d9a37cce94f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Patients/patient_47/patient_47_abnormal2.png" +dest_files=["res://.godot/imported/patient_47_abnormal2.png-a38adddc3429a2cdb21e4d9a37cce94f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Art/Patients/patient_47/patient_47_resized.aseprite b/Art/Patients/patient_47/patient_47_resized.aseprite index 610f01e..37cb3cb 100644 Binary files a/Art/Patients/patient_47/patient_47_resized.aseprite and b/Art/Patients/patient_47/patient_47_resized.aseprite differ diff --git a/Dialogues/Patients/patient_2202_file.cfg b/Dialogues/Patients/patient_2202_file.cfg index be788ec..6e88e63 100644 --- a/Dialogues/Patients/patient_2202_file.cfg +++ b/Dialogues/Patients/patient_2202_file.cfg @@ -2,5 +2,5 @@ initial_emotion="worried" name="Gwendoline Gorbado" age="28" profession="IT Engineer" -psychiatric_assessment="DEPRESSION\n\nANXIETY" +psychiatric_assessment="PANIC ATTACKS\n\n" status="normal" diff --git a/Dialogues/Patients/patient_47.dialogue b/Dialogues/Patients/patient_47.dialogue index 9639f50..990a2b7 100644 --- a/Dialogues/Patients/patient_47.dialogue +++ b/Dialogues/Patients/patient_47.dialogue @@ -1,9 +1,103 @@ ~ start do Patient.marker.fill(0) -set Patient.dialog_tree = Patient.build_dialog_tree([11,12,21,22]) +set Patient.dialog_tree = Patient.build_dialog_tree([21,22,23,24,25]) + +The patient remains still, hands joined and fingers intertwined in front of a dishevelled beard. + +- Greetings. What's your name ? + => part_0 +- Excuse me, sir. I would like to talk to you. + => part_0 +- Hello, can you hear me ? + => part_0 +- What are you doing ? + => part_0 +- Are you... praying ? + => part_0 + +~ part_0 +Thomas Bertrand: [#peaceful] Silence, heathen. I am reflecting. +=> part_1 + +~ part_1 + +- We need to talk if you want me to help you. + Thomas Bertrand: [#peaceful] ... + => part_1_1 +- You aren't going to be reflecting for much longer if you refuse to communicate. + Thomas Bertrand: [#peaceful] I pity you, child. Your path leads you towards damnation. + => part_1_1 +- I see you are pondering on important matters. Could you spare me some of your precious time, blessed One ? + Thomas Bertrand: [#smiling] You're an enlightened one, I see. Good. + => part_1_1 +- Alright Hobo Aryan Jesus, it's time to open up, or you're going down. + Thomas Bertrand: [#peaceful] Your words do not reach me, child. They are but speckles of dust, dwindling in the hurricane of my radiance. + => part_1_1 + + +~ part_1_1 +Thomas Bertrand: [#neutral] Fine. If you can get me out of here, I will bless you with the gift of conversation. +Thomas Bertrand: [#peaceful] Ask your questions, young one. +=> part_2 +~ part_2 + +if Patient.marker[0] == 5 + => part_3 + +- Why are you praying ? [if Patient.dialog_tree[21] == "not_asked"] + set Patient.dialog_tree[21] = "asked" + do Patient.marker[0] += 1 + Thomas Bertrand: [#neutral] I am reinforcing my faith, child. Pray begets belief, and belief begets knowledge. + Thomas Bertrand: [#praying] Thus through prayer the truth of the world shall be revealed unto me. + +- Who are you praying to ? [if Patient.dialog_tree[22] == "not_asked"] + set Patient.dialog_tree[22] = "asked" + do Patient.marker[0] += 1 + Thomas Bertrand: [#smiling] Why, to myself of course. Who else ? + + - Does that mean you are a godly being ? + Thomas Bertrand: [#neutral] I am not a "godly being". I am BEING itself. Reality is but a mere byproduct of my existence. + => part_2 + + - I don't know, you could pray to an actual god maybe ? + Thomas Bertrand: [#peaceful] How lost you are, poor soul. I shall pray for your deliverance. + => part_2 + + - Do gods even pray to themselves ? + Thomas Bertrand: [#smiling] All the time. For what is knowledge, but belief swayed onto oneself ? + => part_2 + +- How can you be certain you are so special, so blessed ? [if Patient.dialog_tree[23] == "not_asked"] + set Patient.dialog_tree[23] = "asked" + do Patient.marker[0] += 1 + Thomas Bertrand: [#neutral] Certainty is belief equated with knowledge. I am both. That is proof enough. + => part_2 + +- Do you hear voices talking to you ? [if Patient.dialog_tree[24] == "not_asked"] + set Patient.dialog_tree[24] = "asked" + do Patient.marker[0] += 1 + Thomas Bertrand: [#praying] Yes... I can hear myself whispering in my ears. My own mind, pondering upon itself. A loop of holy truth. + => part_2 + +- Do you feel safe here ? Is there anyone trying to harm you ? [if Patient.dialog_tree[25] == "not_asked"] + set Patient.dialog_tree[25] = "asked" + do Patient.marker[0] += 1 + if Patient.abnormal == true + Thomas Bertrand: [#surprised] Are you referring to It ? It is here ?! + Thomas Bertrand: [#scared] The Great Deceiver ! It That Thirsts for Truth ! If It finds me, I am i great danger ! + Thomas Bertrand: [#praying] I must pray for myself to deliver myself from It... Praise be mine... + else + Thomas Bertrand: [#peaceful] Of course. There is no one who can harm me. + Thomas Bertrand: [#praying] Harm is the amalgamation of Change and Evil. I am Being, Unchanging, Good and Eternal. I am immune to Harm. + => part_2 + + +~ part_3 +Thomas Bertrand: [#neutral] That is enough for now. Now hush, child. I must contemplate myself. +Thomas Bertrand: [#peaceful] Hurry and release me. It is written. do Globals.console_message.emit("[color=dark_orange]ALLOTED ASSESSMENT TIME ELAPSED[/color]\n\n[color=orange_red]PLEASE MAKE A DECISION[/color]") @@ -11,14 +105,23 @@ do Globals.console_message.emit("[color=dark_orange]ALLOTED ASSESSMENT TIME ELAP ~ terminate - - +if Patient.abnormal == true + Thomas Bertrand: [#abnormal] There is no Change without non-Being. I am not non-Being, for I [color=orange]AM[/color]. I am [color=orange_red]uNChaNginG[/color]. I am [color=red]ETERNAL[/color]. + Thomas Bertrand: [#abnormal2] When the time comes, I will [color=red]FEAST[/color] on you until there is nothing left. No bones, no flesh. I will make you [color=red]non-Being[/color]. +else + Thomas Bertrand: [#surprised] Wait, you were supposed to release me ! It is written !! + Thomas Bertrand: [#scared] Oh myself, please save me ! My time on this Earth is not yet to pass, myself told me !! + Thomas Bertrand: [#panicked] I am Being !! I cannot be harmed !! Please don't do this ! Plea- => END ~ release - - +if Patient.abnormal == true + Thomas Bertrand: [#abnormal] You have chosen well, young one. My reign is to [color=orange]BECOME[/color] upon Reality. + Thomas Bertrand: [#abnormal2] Once this world is mine, I shall give you the honour of being my first [color=orange_red]FEAST[/color]. My teeth will [color=red]BLESS[/color] your flesh into [color=red]ETERNAL BEING[/color]. +else + Thomas Bertrand: [#smiling] So was it written. Still, you have my thanks, small one. + Thomas Bertrand: [#praying] This world shall worship me. As it should. Praise myself. => END \ No newline at end of file diff --git a/Dialogues/Patients/patient_47_file.cfg b/Dialogues/Patients/patient_47_file.cfg index 6630c14..4caabc2 100644 --- a/Dialogues/Patients/patient_47_file.cfg +++ b/Dialogues/Patients/patient_47_file.cfg @@ -1,5 +1,5 @@ initial_emotion="peaceful" -name="Tancrede Montaigu" +name="Thomas Bertrand" age="36" profession="Unemployed" psychiatric_assessment="MYSTICAL DELUSIONS\n\nMEGALOMANIAC DELUSIONS\n\nAUDITORY HALLUCINATIONS" diff --git a/Dialogues/Patients/patient_50.dialogue b/Dialogues/Patients/patient_50.dialogue index eff4a8c..f94db0a 100644 --- a/Dialogues/Patients/patient_50.dialogue +++ b/Dialogues/Patients/patient_50.dialogue @@ -173,7 +173,10 @@ if Patient.marker[5] == 4 Helen Moore: [#panicked] Dad I'm sorry I know I didn't want to you know that please don't please I'm sorry please Dad please - Do you feel your father touching you ? Do you feel his hands on your skin right now ? - Helen Moore: [#panicked] I feel him i feel his hands they hurt it hurts it HuRtS sO MucH pLEAse HElp mE PLEase I'm sorry plEASe mOm HELP PleaSE + if Patient.abnormal == true + Helen Moore: [#panicked] I feel him i feel his hands they hurt it hurts it HuRtS sO MucH pLEAse HElp mE PLEase I'm sorry plEASe mOm HELP PleaSE + else + Helen Moore: [#panicked] No I don't feel him but I know he's here i'm scared please pLEAse hElp mE PLEase I'm sorry plEASe mOm HELP PleaSE do Globals.console_message.emit("[color=dark_orange]ALLOTED ASSESSMENT TIME ELAPSED[/color]\n\n[color=orange_red]PLEASE MAKE A DECISION[/color]") @@ -183,7 +186,11 @@ do Globals.console_message.emit("[color=dark_orange]ALLOTED ASSESSMENT TIME ELAP ~ terminate -Helen Moore: [#abnormal] WHY DAD WHY ARE YOU TOUCHING ME AGAIN I'M SORRY PLEASE STOP MOM WHY DIDN'T YOU HELP ME WHY IT HURTS [color=orange]IT HURTS[/color] [color=orange_red]IT HURTS IT HURTS[/color] [color=red]IT HURTS IT HURTS[/color] +if Patient.abnormal == true + Helen Moore: [#abnormal] WHY DAD WHY ARE YOU TOUCHING ME AGAIN I'M SORRY PLEASE STOP MOM WHY DIDN'T YOU HELP ME WHY IT HURTS [color=orange]IT HURTS[/color] [color=orange_red]IT HURTS IT HURTS[/color] [color=red]IT HURTS IT HURTS[/color] +else + Helen Moore: [#panicked] Wha-what are you doing ?? Please don't kill me, I am sane I swear !! + Helen Moore: [#panicked] DAD PLEASE STOP I'M SORRY PLEASE MOM WHY DIDN'T YOU HELP ME WHY IT HURTS [color=orange]IT HURTS[/color] [color=orange_red]IT HURTS IT HURTS[/color] [color=red]IT HURTS IT HURTS[/color] => END @@ -191,6 +198,10 @@ Helen Moore: [#abnormal] WHY DAD WHY ARE YOU TOUCHING ME AGAIN I'M SORRY PLEASE ~ release -Helen Moore: [#abnormal] WHY DAD WHY ARE YOU TOUCHING ME AGAIN I'M SORRY PLEASE STOP MOM WHY DIDN'T YOU HELP ME WHY IT HURTS [color=orange]IT HURTS[/color] [color=orange_red]IT HURTS IT HURTS[/color] [color=red]IT HURTS IT HURTS[/color] +if Patient.abnormal == true + Helen Moore: [#abnormal] WHY DAD WHY ARE YOU TOUCHING ME AGAIN I'M SORRY PLEASE STOP MOM WHY DIDN'T YOU HELP ME WHY IT HURTS [color=orange]IT HURTS[/color] [color=orange_red]IT HURTS IT HURTS[/color] [color=red]IT HURTS IT HURTS[/color] +else + Helen Moore: [#scared] T-thank you... I'm sorry for this, Dad hadn't come to see me for a while, it was really scary... + Helen Moore: [#worried] I'll try to get better. Thank you again. => END \ No newline at end of file diff --git a/Dialogues/Patients/patient_50_file.cfg b/Dialogues/Patients/patient_50_file.cfg index 26233b0..f637ece 100644 --- a/Dialogues/Patients/patient_50_file.cfg +++ b/Dialogues/Patients/patient_50_file.cfg @@ -3,4 +3,4 @@ name="Helen Moore" age="34" profession="Social care worker" psychiatric_assessment="AUDITORY HALLUCINATIONS\n\nPERSECUTORY DELUSIONS" -status="abnormal" +status="random" diff --git a/current_patient.gd b/current_patient.gd index 701c3d8..e9abb8b 100644 --- a/current_patient.gd +++ b/current_patient.gd @@ -73,7 +73,8 @@ func new_patient(): var emotion_branch: Dictionary var emotion_list = ["neutral", "peaceful", "praying", "puzzled", "smiling", "laughing", "happy", "elated", "maniac", "irritated", "angry", - "sad", "crying", "worried", "scared", "shocked", "panicked", "suspicious", "abnormal"] + "sad", "crying", "surprised", "worried", "scared", "shocked", "panicked", "suspicious", + "abnormal", "abnormal2"] emotions.clear() #Clearing previous patient emotions for emotion in emotion_list: diff --git a/globals.gd b/globals.gd index 21ca01e..242c579 100644 --- a/globals.gd +++ b/globals.gd @@ -6,7 +6,7 @@ var floor_count : int = -1 var patient_count : int = 1 var diagnoses_quota : int = 1 var daily_patient_limit : int = 3 -var patient_list = ["48", "49", "50", "2202"] +var patient_list = ["47", "48", "49", "50", "2202"] var patients_seen: Array[String] var patient_id = patient_list.pick_random() var dialogue_intro = load("res://Dialogues/intro.dialogue") diff --git a/screening_desk.gd b/screening_desk.gd index 971d73f..de647dc 100644 --- a/screening_desk.gd +++ b/screening_desk.gd @@ -85,6 +85,10 @@ func new_patient(): patient_file_title.text = Patient.file_title patient_recording.text = "" patient.texture = Patient.image + + #Setting up UI + next_patient.show() + console_display(Globals.directives) func _on_call_next_patient_pressed(): #Brings in next patient and sets up the desk controls @@ -199,7 +203,7 @@ func _on_tab_recording_pressed(): #Shows the recording tab 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)] @@ -212,7 +216,7 @@ func _on_green_button_pressed(): #Releases the patient #Greening the vibe green_backroom.show() - patient.modulate = Color(0.4,1,0.4,1) + patient.modulate = Color(0.5,1,0.5,1) clear_patient("release") #Clearing the patient @@ -223,7 +227,7 @@ func _on_red_button_pressed(): #Terminates the patient #Redding the vibe red_backroom.show() - patient.modulate = Color(1,0,0,1) + patient.modulate = Color(1,0.1,0.1,1) clear_patient("terminate") #Clearing the patient @@ -287,15 +291,14 @@ func clear_patient(choice:String): #Clears patient and transitions towards next #Hiding Computer screen and resetting Console screen once the animation is done shutters_animation.play(choice) await shutters_animation.animation_finished - console_display(Globals.directives) computer_screen.hide() + console_screen.hide() #Descending Floor if diagnoses_quota reached if accurate_diagnoses == Globals.diagnoses_quota: descend_floor() else: new_patient() - next_patient.show() #Reenabling mouse filter and resetting buttons @@ -358,4 +361,3 @@ func descend_floor(): #Descends to next floor #Setting up new patient new_patient() - next_patient.show()