diff --git a/Art/Patients/patient_2202/nuna_angry.png.import b/Art/Patients/patient_51/nuna_angry.png.import similarity index 100% rename from Art/Patients/patient_2202/nuna_angry.png.import rename to Art/Patients/patient_51/nuna_angry.png.import diff --git a/Art/Patients/patient_2202/nuna_happy.png.import b/Art/Patients/patient_51/nuna_happy.png.import similarity index 100% rename from Art/Patients/patient_2202/nuna_happy.png.import rename to Art/Patients/patient_51/nuna_happy.png.import diff --git a/Art/Patients/patient_2202/nuna_neutral.png.import b/Art/Patients/patient_51/nuna_neutral.png.import similarity index 100% rename from Art/Patients/patient_2202/nuna_neutral.png.import rename to Art/Patients/patient_51/nuna_neutral.png.import diff --git a/Art/Patients/patient_2202/nuna_sad.png.import b/Art/Patients/patient_51/nuna_sad.png.import similarity index 100% rename from Art/Patients/patient_2202/nuna_sad.png.import rename to Art/Patients/patient_51/nuna_sad.png.import diff --git a/Art/Patients/patient_2202/nuna_scared.png.import b/Art/Patients/patient_51/nuna_scared.png.import similarity index 100% rename from Art/Patients/patient_2202/nuna_scared.png.import rename to Art/Patients/patient_51/nuna_scared.png.import diff --git a/Art/Patients/patient_2202/nuna_worried.png.import b/Art/Patients/patient_51/nuna_worried.png.import similarity index 100% rename from Art/Patients/patient_2202/nuna_worried.png.import rename to Art/Patients/patient_51/nuna_worried.png.import diff --git a/Art/Patients/patient_2202/patient_2202.aseprite b/Art/Patients/patient_51/patient_51.aseprite similarity index 100% rename from Art/Patients/patient_2202/patient_2202.aseprite rename to Art/Patients/patient_51/patient_51.aseprite diff --git a/Art/Patients/patient_2202/patient_2202_abnormal1.png b/Art/Patients/patient_51/patient_51_abnormal1.png similarity index 100% rename from Art/Patients/patient_2202/patient_2202_abnormal1.png rename to Art/Patients/patient_51/patient_51_abnormal1.png diff --git a/Art/Patients/patient_2202/patient_2202_abnormal1.png.import b/Art/Patients/patient_51/patient_51_abnormal1.png.import similarity index 72% rename from Art/Patients/patient_2202/patient_2202_abnormal1.png.import rename to Art/Patients/patient_51/patient_51_abnormal1.png.import index 9743352..0a8990e 100644 --- a/Art/Patients/patient_2202/patient_2202_abnormal1.png.import +++ b/Art/Patients/patient_51/patient_51_abnormal1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b7v32q0hhkwmy" -path="res://.godot/imported/patient_2202_abnormal1.png-d3fe10a8397fc7823740b4f6d0bf7413.ctex" +path="res://.godot/imported/patient_51_abnormal1.png-41afb36317f8631c68723e39bc0bf696.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/patient_2202/patient_2202_abnormal1.png" -dest_files=["res://.godot/imported/patient_2202_abnormal1.png-d3fe10a8397fc7823740b4f6d0bf7413.ctex"] +source_file="res://Art/Patients/patient_51/patient_51_abnormal1.png" +dest_files=["res://.godot/imported/patient_51_abnormal1.png-41afb36317f8631c68723e39bc0bf696.ctex"] [params] diff --git a/Art/Patients/patient_2202/patient_2202_abnormal2.png b/Art/Patients/patient_51/patient_51_abnormal2.png similarity index 100% rename from Art/Patients/patient_2202/patient_2202_abnormal2.png rename to Art/Patients/patient_51/patient_51_abnormal2.png diff --git a/Art/Patients/patient_2202/patient_2202_abnormal2.png.import b/Art/Patients/patient_51/patient_51_abnormal2.png.import similarity index 72% rename from Art/Patients/patient_2202/patient_2202_abnormal2.png.import rename to Art/Patients/patient_51/patient_51_abnormal2.png.import index 0c62ecd..26c9c27 100644 --- a/Art/Patients/patient_2202/patient_2202_abnormal2.png.import +++ b/Art/Patients/patient_51/patient_51_abnormal2.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bhbig8xjw0jct" -path="res://.godot/imported/patient_2202_abnormal2.png-c976f51e41fc1abc0ab860762f211889.ctex" +path="res://.godot/imported/patient_51_abnormal2.png-631279c060cdaf5ef30c27a48e141ea7.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/patient_2202/patient_2202_abnormal2.png" -dest_files=["res://.godot/imported/patient_2202_abnormal2.png-c976f51e41fc1abc0ab860762f211889.ctex"] +source_file="res://Art/Patients/patient_51/patient_51_abnormal2.png" +dest_files=["res://.godot/imported/patient_51_abnormal2.png-631279c060cdaf5ef30c27a48e141ea7.ctex"] [params] diff --git a/Art/Patients/patient_2202/patient_2202_angry.png b/Art/Patients/patient_51/patient_51_angry.png similarity index 100% rename from Art/Patients/patient_2202/patient_2202_angry.png rename to Art/Patients/patient_51/patient_51_angry.png diff --git a/Art/Patients/patient_2202/patient_2202_angry.png.import b/Art/Patients/patient_51/patient_51_angry.png.import similarity index 73% rename from Art/Patients/patient_2202/patient_2202_angry.png.import rename to Art/Patients/patient_51/patient_51_angry.png.import index 74b1ae4..45a6ab1 100644 --- a/Art/Patients/patient_2202/patient_2202_angry.png.import +++ b/Art/Patients/patient_51/patient_51_angry.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d12qosp0hu3vy" -path="res://.godot/imported/patient_2202_angry.png-cae6b0d9d6b1fef6c98953be722ddaca.ctex" +path="res://.godot/imported/patient_51_angry.png-ff6108f11b69704287e0804fedda1611.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/patient_2202/patient_2202_angry.png" -dest_files=["res://.godot/imported/patient_2202_angry.png-cae6b0d9d6b1fef6c98953be722ddaca.ctex"] +source_file="res://Art/Patients/patient_51/patient_51_angry.png" +dest_files=["res://.godot/imported/patient_51_angry.png-ff6108f11b69704287e0804fedda1611.ctex"] [params] diff --git a/Art/Patients/patient_2202/patient_2202_neutral.png b/Art/Patients/patient_51/patient_51_neutral.png similarity index 100% rename from Art/Patients/patient_2202/patient_2202_neutral.png rename to Art/Patients/patient_51/patient_51_neutral.png diff --git a/Art/Patients/patient_2202/patient_2202_neutral.png.import b/Art/Patients/patient_51/patient_51_neutral.png.import similarity index 73% rename from Art/Patients/patient_2202/patient_2202_neutral.png.import rename to Art/Patients/patient_51/patient_51_neutral.png.import index 3dfb796..7b2ae79 100644 --- a/Art/Patients/patient_2202/patient_2202_neutral.png.import +++ b/Art/Patients/patient_51/patient_51_neutral.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://wm5ht6ktonff" -path="res://.godot/imported/patient_2202_neutral.png-2b2b51f031da948bb3607b9488cce26e.ctex" +path="res://.godot/imported/patient_51_neutral.png-d5db4a5408834acd18a50ea388935982.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/patient_2202/patient_2202_neutral.png" -dest_files=["res://.godot/imported/patient_2202_neutral.png-2b2b51f031da948bb3607b9488cce26e.ctex"] +source_file="res://Art/Patients/patient_51/patient_51_neutral.png" +dest_files=["res://.godot/imported/patient_51_neutral.png-d5db4a5408834acd18a50ea388935982.ctex"] [params] diff --git a/Art/Patients/patient_2202/patient_2202_panicked.png b/Art/Patients/patient_51/patient_51_panicked.png similarity index 100% rename from Art/Patients/patient_2202/patient_2202_panicked.png rename to Art/Patients/patient_51/patient_51_panicked.png diff --git a/Art/Patients/patient_2202/patient_2202_panicked.png.import b/Art/Patients/patient_51/patient_51_panicked.png.import similarity index 73% rename from Art/Patients/patient_2202/patient_2202_panicked.png.import rename to Art/Patients/patient_51/patient_51_panicked.png.import index db969a4..f9639a2 100644 --- a/Art/Patients/patient_2202/patient_2202_panicked.png.import +++ b/Art/Patients/patient_51/patient_51_panicked.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bmnqcfagholep" -path="res://.godot/imported/patient_2202_panicked.png-dfd2eccd2337c7828ac2b0b7f4444c2b.ctex" +path="res://.godot/imported/patient_51_panicked.png-14e6accf020624a9a9a7ee3c2d0a2fd5.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/patient_2202/patient_2202_panicked.png" -dest_files=["res://.godot/imported/patient_2202_panicked.png-dfd2eccd2337c7828ac2b0b7f4444c2b.ctex"] +source_file="res://Art/Patients/patient_51/patient_51_panicked.png" +dest_files=["res://.godot/imported/patient_51_panicked.png-14e6accf020624a9a9a7ee3c2d0a2fd5.ctex"] [params] diff --git a/Art/Patients/patient_2202/patient_2202_puzzled.png b/Art/Patients/patient_51/patient_51_puzzled.png similarity index 100% rename from Art/Patients/patient_2202/patient_2202_puzzled.png rename to Art/Patients/patient_51/patient_51_puzzled.png diff --git a/Art/Patients/patient_2202/patient_2202_puzzled.png.import b/Art/Patients/patient_51/patient_51_puzzled.png.import similarity index 73% rename from Art/Patients/patient_2202/patient_2202_puzzled.png.import rename to Art/Patients/patient_51/patient_51_puzzled.png.import index 8f043a8..9c9535c 100644 --- a/Art/Patients/patient_2202/patient_2202_puzzled.png.import +++ b/Art/Patients/patient_51/patient_51_puzzled.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cylp5kbb8anp" -path="res://.godot/imported/patient_2202_puzzled.png-90041db1146cbebb9463105b20ee64c2.ctex" +path="res://.godot/imported/patient_51_puzzled.png-9962ec47cc20e600d8a9a9a07c6491d9.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/patient_2202/patient_2202_puzzled.png" -dest_files=["res://.godot/imported/patient_2202_puzzled.png-90041db1146cbebb9463105b20ee64c2.ctex"] +source_file="res://Art/Patients/patient_51/patient_51_puzzled.png" +dest_files=["res://.godot/imported/patient_51_puzzled.png-9962ec47cc20e600d8a9a9a07c6491d9.ctex"] [params] diff --git a/Art/Patients/patient_2202/patient_2202_resized.aseprite b/Art/Patients/patient_51/patient_51_resized.aseprite similarity index 100% rename from Art/Patients/patient_2202/patient_2202_resized.aseprite rename to Art/Patients/patient_51/patient_51_resized.aseprite diff --git a/Art/Patients/patient_2202/patient_2202_sad.png b/Art/Patients/patient_51/patient_51_sad.png similarity index 100% rename from Art/Patients/patient_2202/patient_2202_sad.png rename to Art/Patients/patient_51/patient_51_sad.png diff --git a/Art/Patients/patient_2202/patient_2202_sad.png.import b/Art/Patients/patient_51/patient_51_sad.png.import similarity index 74% rename from Art/Patients/patient_2202/patient_2202_sad.png.import rename to Art/Patients/patient_51/patient_51_sad.png.import index fa1f82b..70b9fcc 100644 --- a/Art/Patients/patient_2202/patient_2202_sad.png.import +++ b/Art/Patients/patient_51/patient_51_sad.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c075dcbrhur56" -path="res://.godot/imported/patient_2202_sad.png-24cb1a35cc330af2e9e656e591022cd2.ctex" +path="res://.godot/imported/patient_51_sad.png-76aeb958bc4693b173232079308db0ca.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/patient_2202/patient_2202_sad.png" -dest_files=["res://.godot/imported/patient_2202_sad.png-24cb1a35cc330af2e9e656e591022cd2.ctex"] +source_file="res://Art/Patients/patient_51/patient_51_sad.png" +dest_files=["res://.godot/imported/patient_51_sad.png-76aeb958bc4693b173232079308db0ca.ctex"] [params] diff --git a/Art/Patients/patient_2202/patient_2202_sadsmiling.png b/Art/Patients/patient_51/patient_51_sadsmiling.png similarity index 100% rename from Art/Patients/patient_2202/patient_2202_sadsmiling.png rename to Art/Patients/patient_51/patient_51_sadsmiling.png diff --git a/Art/Patients/patient_2202/patient_2202_sadsmiling.png.import b/Art/Patients/patient_51/patient_51_sadsmiling.png.import similarity index 72% rename from Art/Patients/patient_2202/patient_2202_sadsmiling.png.import rename to Art/Patients/patient_51/patient_51_sadsmiling.png.import index ea235ea..f050ace 100644 --- a/Art/Patients/patient_2202/patient_2202_sadsmiling.png.import +++ b/Art/Patients/patient_51/patient_51_sadsmiling.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cyo52m0ew76y4" -path="res://.godot/imported/patient_2202_sadsmiling.png-46dd238506df444e906f5ea70b9d872b.ctex" +path="res://.godot/imported/patient_51_sadsmiling.png-40bd7f09fd90ed722aa637193bbca1bc.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/patient_2202/patient_2202_sadsmiling.png" -dest_files=["res://.godot/imported/patient_2202_sadsmiling.png-46dd238506df444e906f5ea70b9d872b.ctex"] +source_file="res://Art/Patients/patient_51/patient_51_sadsmiling.png" +dest_files=["res://.godot/imported/patient_51_sadsmiling.png-40bd7f09fd90ed722aa637193bbca1bc.ctex"] [params] diff --git a/Art/Patients/patient_2202/patient_2202_scared.png b/Art/Patients/patient_51/patient_51_scared.png similarity index 100% rename from Art/Patients/patient_2202/patient_2202_scared.png rename to Art/Patients/patient_51/patient_51_scared.png diff --git a/Art/Patients/patient_2202/patient_2202_scared.png.import b/Art/Patients/patient_51/patient_51_scared.png.import similarity index 73% rename from Art/Patients/patient_2202/patient_2202_scared.png.import rename to Art/Patients/patient_51/patient_51_scared.png.import index 2f120a3..933eb9c 100644 --- a/Art/Patients/patient_2202/patient_2202_scared.png.import +++ b/Art/Patients/patient_51/patient_51_scared.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://buxk0uu546v3v" -path="res://.godot/imported/patient_2202_scared.png-47d7ec47f1791d4872470a262317c972.ctex" +path="res://.godot/imported/patient_51_scared.png-1e9329ba30f078d2c2c81d66aac7710f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/patient_2202/patient_2202_scared.png" -dest_files=["res://.godot/imported/patient_2202_scared.png-47d7ec47f1791d4872470a262317c972.ctex"] +source_file="res://Art/Patients/patient_51/patient_51_scared.png" +dest_files=["res://.godot/imported/patient_51_scared.png-1e9329ba30f078d2c2c81d66aac7710f.ctex"] [params] diff --git a/Art/Patients/patient_2202/patient_2202_shocked.png b/Art/Patients/patient_51/patient_51_shocked.png similarity index 100% rename from Art/Patients/patient_2202/patient_2202_shocked.png rename to Art/Patients/patient_51/patient_51_shocked.png diff --git a/Art/Patients/patient_2202/patient_2202_shocked.png.import b/Art/Patients/patient_51/patient_51_shocked.png.import similarity index 73% rename from Art/Patients/patient_2202/patient_2202_shocked.png.import rename to Art/Patients/patient_51/patient_51_shocked.png.import index c432fbc..2bc8cb7 100644 --- a/Art/Patients/patient_2202/patient_2202_shocked.png.import +++ b/Art/Patients/patient_51/patient_51_shocked.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c3x6841j7e4tt" -path="res://.godot/imported/patient_2202_shocked.png-0de2604b5dadf94dd0a689d4448f64a5.ctex" +path="res://.godot/imported/patient_51_shocked.png-3f1b11dee5d9d02eee6dfe0ebefb54f8.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/patient_2202/patient_2202_shocked.png" -dest_files=["res://.godot/imported/patient_2202_shocked.png-0de2604b5dadf94dd0a689d4448f64a5.ctex"] +source_file="res://Art/Patients/patient_51/patient_51_shocked.png" +dest_files=["res://.godot/imported/patient_51_shocked.png-3f1b11dee5d9d02eee6dfe0ebefb54f8.ctex"] [params] diff --git a/Art/Patients/patient_2202/patient_2202_surprised.png b/Art/Patients/patient_51/patient_51_surprised.png similarity index 100% rename from Art/Patients/patient_2202/patient_2202_surprised.png rename to Art/Patients/patient_51/patient_51_surprised.png diff --git a/Art/Patients/patient_2202/patient_2202_surprised.png.import b/Art/Patients/patient_51/patient_51_surprised.png.import similarity index 72% rename from Art/Patients/patient_2202/patient_2202_surprised.png.import rename to Art/Patients/patient_51/patient_51_surprised.png.import index cb04fc7..f133b80 100644 --- a/Art/Patients/patient_2202/patient_2202_surprised.png.import +++ b/Art/Patients/patient_51/patient_51_surprised.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://r15kc0xfhxqj" -path="res://.godot/imported/patient_2202_surprised.png-64591e26f3b6bbb0911b11eccf9016af.ctex" +path="res://.godot/imported/patient_51_surprised.png-a68837f1ef5b3ccbb26f0b2943e1ca2f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/patient_2202/patient_2202_surprised.png" -dest_files=["res://.godot/imported/patient_2202_surprised.png-64591e26f3b6bbb0911b11eccf9016af.ctex"] +source_file="res://Art/Patients/patient_51/patient_51_surprised.png" +dest_files=["res://.godot/imported/patient_51_surprised.png-a68837f1ef5b3ccbb26f0b2943e1ca2f.ctex"] [params] diff --git a/Art/Patients/patient_2202/patient_2202_worried.png b/Art/Patients/patient_51/patient_51_worried.png similarity index 100% rename from Art/Patients/patient_2202/patient_2202_worried.png rename to Art/Patients/patient_51/patient_51_worried.png diff --git a/Art/Patients/patient_2202/patient_2202_worried.png.import b/Art/Patients/patient_51/patient_51_worried.png.import similarity index 73% rename from Art/Patients/patient_2202/patient_2202_worried.png.import rename to Art/Patients/patient_51/patient_51_worried.png.import index 363724f..611b53e 100644 --- a/Art/Patients/patient_2202/patient_2202_worried.png.import +++ b/Art/Patients/patient_51/patient_51_worried.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://fp87sn2gygqm" -path="res://.godot/imported/patient_2202_worried.png-aa600a90cef858bc06f415b3a74de9a7.ctex" +path="res://.godot/imported/patient_51_worried.png-609f70656692def6c552ffd7c58a26c5.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/patient_2202/patient_2202_worried.png" -dest_files=["res://.godot/imported/patient_2202_worried.png-aa600a90cef858bc06f415b3a74de9a7.ctex"] +source_file="res://Art/Patients/patient_51/patient_51_worried.png" +dest_files=["res://.godot/imported/patient_51_worried.png-609f70656692def6c552ffd7c58a26c5.ctex"] [params] diff --git a/Dialogues/Patients/patient_2202.dialogue.import b/Dialogues/Patients/patient_2202.dialogue.import deleted file mode 100644 index c5e697e..0000000 --- a/Dialogues/Patients/patient_2202.dialogue.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="dialogue_manager" -importer_version=15 -type="Resource" -uid="uid://cocg8tx4s4rj3" -path="res://.godot/imported/patient_2202.dialogue-2dd94b65ae52332b55f15ada961486ad.tres" - -[deps] - -source_file="res://Dialogues/Patients/patient_2202.dialogue" -dest_files=["res://.godot/imported/patient_2202.dialogue-2dd94b65ae52332b55f15ada961486ad.tres"] - -[params] - -defaults=true diff --git a/Dialogues/Patients/patient_45.dialogue b/Dialogues/Patients/patient_45.dialogue index 6994d7d..1edacfd 100644 --- a/Dialogues/Patients/patient_45.dialogue +++ b/Dialogues/Patients/patient_45.dialogue @@ -169,14 +169,10 @@ if Patient.marker[6] >= 3 ~ part_end -Mai Linh: [#shocked] I need to scratch myself. I need to. I can feel his hand again. -if Patient.abnormal == true - Mai Linh: [#crazysmiling] Please make a decision. I can't contain myself much longer. -else - Mai Linh: [#shocked] Please make a decision. I can't contain myself much longer. +Mai Linh: [#scared] I need to scratch myself. I need to. I have to. +Mai Linh: [#shocked] Please make a decision. I can't contain myself for much longer. do Globals.console_message.emit("[color=dark_orange]ALLOTED ASSESSMENT TIME ELAPSED[/color]\n\n[color=orange_red]PLEASE MAKE A DECISION[/color]") - => END @@ -184,11 +180,14 @@ do Globals.console_message.emit("[color=dark_orange]ALLOTED ASSESSMENT TIME ELAP if Patient.abnormal == true Mai Linh: [#abnormal] Finally !! I can [color=orange]BREATHE[/color] ! Oh God it feels [color=orange_red]AMAZING[/color] ! + do Globals.color_change.emit("red") Mai Linh: [#abnormal] More ! More air ! Oh my God [color=red]YES[/color] ! I am [color=red]FREE[/color] from pain !! I am [color=red]ALIVE[/color] !!! else Mai Linh: [#scared] What is happening ? What did you do ?? + do Globals.color_change.emit("red") Mai Linh: [#panicked] Please don't hurt me ! I didn't do anything wrong !! Please help m- +do Globals.clear_patient.emit("terminate") => END @@ -196,9 +195,14 @@ else if Patient.abnormal == true Mai Linh: [#abnormal] Finally !! I can [color=orange]BREATHE[/color] ! Oh God it feels [color=orange_red]AMAZING[/color] ! + do Globals.color_change.emit("green") Mai Linh: [#abnormal] More ! More air ! Oh my God [color=red]YES[/color] ! I am [color=red]FREE[/color] from pain !! I am [color=red]ALIVE[/color] !!! else Mai Linh: [#surprised] ... Are you releasing me ?? + do Globals.color_change.emit("green") Mai Linh: [#sadsmiling] Thank you. I didn't think you would help me. You're a good person. + +do Globals.clear_patient.emit("release") + => END \ No newline at end of file diff --git a/Dialogues/Patients/patient_45_file.cfg b/Dialogues/Patients/patient_45_file.cfg index 58ede80..ab45fad 100644 --- a/Dialogues/Patients/patient_45_file.cfg +++ b/Dialogues/Patients/patient_45_file.cfg @@ -2,5 +2,6 @@ initial_emotion="worried" name="Mai Linh" age="19" profession="Art student" -psychiatric_assessment="SELF-MUTILATION\n\nCENESTHETIC HALLUCINATIONS" +psychiatric_assessment="SELF-MUTILATION\n\nCENESTHETIC HALLUCINATIONS\n\nHAPTIC HALLUCINATIONS" +abnormal_symptoms="SUICIDAL IDEATIONS" status="random" diff --git a/Dialogues/Patients/patient_46.dialogue b/Dialogues/Patients/patient_46.dialogue index d99373b..a231ada 100644 --- a/Dialogues/Patients/patient_46.dialogue +++ b/Dialogues/Patients/patient_46.dialogue @@ -96,16 +96,19 @@ do Globals.console_message.emit("[color=dark_orange]ALLOTED ASSESSMENT TIME ELAP ~ terminate +do Globals.color_change.emit("red") if Patient.abnormal == true Fontelyne Dumont: [#abnormal1] I am alone. There is no one for me anymore. No one for me to [color=orange_red]LIVE[/color]. Fontelyne Dumont: [#abnormal1] I feel so lonely... Helene... I am so sorry... else Fontelyne Dumont: [#crying] I'm sorry... Helene... I am so sorry... +do Globals.clear_patient.emit("terminate") => END ~ release +do Globals.color_change.emit("green") if Patient.abnormal == true Fontelyne Dumont: [#abnormal1] I am alone. There is no one for me anymore. No one for me to [color=orange_red]LIVE[/color]. Fontelyne Dumont: [#abnormal1] I feel so lonely... Helene... I am so sorry... @@ -113,4 +116,5 @@ else Fontelyne Dumont: [#sad] I don't deserve it, but I'll try to live. That's what Hélène would've wanted. Fontelyne Dumont: [#sadsmiling] Thank you. I mean it. +do Globals.clear_patient.emit("release") => END \ No newline at end of file diff --git a/Dialogues/Patients/patient_46_file.cfg b/Dialogues/Patients/patient_46_file.cfg index d1e8154..26b47b2 100644 --- a/Dialogues/Patients/patient_46_file.cfg +++ b/Dialogues/Patients/patient_46_file.cfg @@ -3,4 +3,5 @@ name="Fontelyne Dumont" age="53" profession="Vineyard Owner" psychiatric_assessment="SUICIDAL IDEATIONS" +abnormal_symptoms="AUDITORY HALLUCINATIONS" status="random" diff --git a/Dialogues/Patients/patient_47.dialogue b/Dialogues/Patients/patient_47.dialogue index 5185d9c..9280342 100644 --- a/Dialogues/Patients/patient_47.dialogue +++ b/Dialogues/Patients/patient_47.dialogue @@ -107,21 +107,27 @@ 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]. + do Globals.color_change.emit("red") 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 !! + do Globals.color_change.emit("red") Thomas Bertrand: [#panicked] I am Being !! I cannot be harmed !! Please don't do this ! Plea- +do Globals.clear_patient.emit("terminate") => 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. + do Globals.color_change.emit("green") 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 NON-BEING[/color]. else Thomas Bertrand: [#smiling] So was it written. Still, you have my thanks, small one. + do Globals.color_change.emit("green") Thomas Bertrand: [#praying] This world shall worship me. As it should. Praise myself. +do Globals.clear_patient.emit("release") => END \ No newline at end of file diff --git a/Dialogues/Patients/patient_47_file.cfg b/Dialogues/Patients/patient_47_file.cfg index 4caabc2..5b19d36 100644 --- a/Dialogues/Patients/patient_47_file.cfg +++ b/Dialogues/Patients/patient_47_file.cfg @@ -3,4 +3,5 @@ name="Thomas Bertrand" age="36" profession="Unemployed" psychiatric_assessment="MYSTICAL DELUSIONS\n\nMEGALOMANIAC DELUSIONS\n\nAUDITORY HALLUCINATIONS" +abnormal_symptoms="PERSECUTORY DELUSIONS" status="random" diff --git a/Dialogues/Patients/patient_48.dialogue b/Dialogues/Patients/patient_48.dialogue index d007ed5..926bcd4 100644 --- a/Dialogues/Patients/patient_48.dialogue +++ b/Dialogues/Patients/patient_48.dialogue @@ -102,20 +102,26 @@ do Globals.console_message.emit("[color=dark_orange]ALLOTED ASSESSMENT TIME ELAP ~ terminate if Patient.abnormal == true + do Globals.color_change.emit("red") Phil Fossa: [#abnormal] How did you know, you fucking dog ? I'll tear the flesh from your bones. I'll gorge myself on your entrails. I'll- else Phil Fossa: [#scared] What ?? How dare you ! You can't do that ! I'm one of the Sages !! + do Globals.color_change.emit("red") Phil Fossa: [#panicked] Please no ! I'm sorry, please don't do that ! I swear I'm not sick ! I beg you !! Please I'm so sorry !! Nononono- +do Globals.clear_patient.emit("terminate") => END ~ release if Patient.abnormal == true + do Globals.color_change.emit("green") Phil Fossa: [#abnormal] Thank you. At last, my freedom awaits on the surface. It feels good, so good... else Phil Fossa: [#smiling] Thank you. I knew you would have some common sense. + do Globals.color_change.emit("green") Phil Fossa: [#smiling] So long, and may our paths never cross again. Conversing with your inferior mind is at risk of damaging my hallowed intellect. +do Globals.clear_patient.emit("release") => END \ No newline at end of file diff --git a/Dialogues/Patients/patient_48_file.cfg b/Dialogues/Patients/patient_48_file.cfg index 0cf9841..959cd82 100644 --- a/Dialogues/Patients/patient_48_file.cfg +++ b/Dialogues/Patients/patient_48_file.cfg @@ -3,4 +3,5 @@ name="Phil Fossa" age="65" profession="College Teacher" psychiatric_assessment="PERSECUTORY DELUSIONS\n\nMEGALOMANIAC DELUSIONS" +abnormal_symptoms="AUDITORY HALLUCINATIONS" status="random" diff --git a/Dialogues/Patients/patient_49.dialogue b/Dialogues/Patients/patient_49.dialogue index c5bce7b..73092ff 100644 --- a/Dialogues/Patients/patient_49.dialogue +++ b/Dialogues/Patients/patient_49.dialogue @@ -226,20 +226,23 @@ do Globals.console_message.emit("[color=dark_orange]ALLOTED ASSESSMENT TIME ELAP ~ terminate +do Globals.color_change.emit("red") if Patient.abnormal == true Jeremiah Brunn: [#abnormal] I AM FREE I AM SAFE I AM POWERFUL I AM STRONG I AM SECURE I AM THE WORM I MUST CONSUME [color=orange]CONSUME[/color] [color=orange_red]CONSUME CONSUME[/color] [color=red]CONSUME CONSUME[/color] else Jeremiah Brunn: [#elated] I am the Worm ! See ?? I am safe from Uncle now ! I am safe !! Safe !! I am God's Herald on this Earth ! Nobody can hurt me anymore ! Nobody !!! +do Globals.clear_patient.emit("terminate") => END ~ release - +do Globals.color_change.emit("green") if Patient.abnormal == true Jeremiah Brunn: [#abnormal] I AM FREE I AM SAFE I AM POWERFUL I AM STRONG I AM SECURE I AM THE WORM I MUST CONSUME [color=orange]CONSUME[/color] [color=orange_red]CONSUME CONSUME[/color] [color=red]CONSUME CONSUME[/color] else Jeremiah Brunn: [#elated] I am the Worm ! See ?? I am safe from Uncle now ! I am safe !! Safe !! I am God's Herald on this Earth ! Nobody can hurt me anymore ! Nobody !!! +do Globals.clear_patient.emit("release") => END \ No newline at end of file diff --git a/Dialogues/Patients/patient_49_file.cfg b/Dialogues/Patients/patient_49_file.cfg index e276ecc..03586c8 100644 --- a/Dialogues/Patients/patient_49_file.cfg +++ b/Dialogues/Patients/patient_49_file.cfg @@ -3,4 +3,5 @@ name="Jeremiah Brunn" age="53" profession="Musician" psychiatric_assessment="MEGALOMANIAC DELUSIONS\n\nMYSTICAL DELUSIONS\n\nAUDITORY HALLUCINATIONS" +abnormal_symptoms="CENESTHETIC HALLUCINATIONS" status="random" diff --git a/Dialogues/Patients/patient_50.dialogue b/Dialogues/Patients/patient_50.dialogue index f94db0a..a43031f 100644 --- a/Dialogues/Patients/patient_50.dialogue +++ b/Dialogues/Patients/patient_50.dialogue @@ -187,11 +187,14 @@ do Globals.console_message.emit("[color=dark_orange]ALLOTED ASSESSMENT TIME ELAP ~ terminate if Patient.abnormal == true + do Globals.color_change.emit("red") 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 !! + do Globals.color_change.emit("red") 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] +do Globals.clear_patient.emit("terminate") => END @@ -199,9 +202,12 @@ else ~ release if Patient.abnormal == true + do Globals.color_change.emit("green") 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... + do Globals.color_change.emit("green") Helen Moore: [#worried] I'll try to get better. Thank you again. +do Globals.clear_patient.emit("release") => END \ No newline at end of file diff --git a/Dialogues/Patients/patient_50_file.cfg b/Dialogues/Patients/patient_50_file.cfg index f637ece..c08fc6d 100644 --- a/Dialogues/Patients/patient_50_file.cfg +++ b/Dialogues/Patients/patient_50_file.cfg @@ -3,4 +3,5 @@ name="Helen Moore" age="34" profession="Social care worker" psychiatric_assessment="AUDITORY HALLUCINATIONS\n\nPERSECUTORY DELUSIONS" +abnormal_symptoms="HAPTIC HALLUCINATIONS" status="random" diff --git a/Dialogues/Patients/patient_2202.dialogue b/Dialogues/Patients/patient_51.dialogue similarity index 97% rename from Dialogues/Patients/patient_2202.dialogue rename to Dialogues/Patients/patient_51.dialogue index 68454f9..2fbeb60 100644 --- a/Dialogues/Patients/patient_2202.dialogue +++ b/Dialogues/Patients/patient_51.dialogue @@ -167,11 +167,14 @@ do Globals.console_message.emit("[color=dark_orange]ALLOTED ASSESSMENT TIME ELAP if Patient.abnormal == true Gwendoline Gorbado: [#abnormal1] I am [color=orange]uSeLeSs[/color]. There is nothing inside me but [color=black]EMPTINESS[/color]. + do Globals.color_change.emit("red") Gwendoline Gorbado: [#abnormal2] I deserve to disappear, like the [color=orange_red]WORTHLESS[/color] piece of [color=orange_red]TRASH[/color] I am. I am [color=red]NOTHING[/color]. I return to [color=red]NOTHING[/color]. else Gwendoline Gorbado: [#sad] Maybe this is what i deserve... + do Globals.color_change.emit("red") Gwendoline Gorbado: [#sad] I hope you'll make it quick... +do Globals.clear_patient.emit("terminate") => END @@ -179,8 +182,11 @@ else if Patient.abnormal == true Gwendoline Gorbado: [#abnormal1] I am [color=orange]uSeLeSs[/color]. There is nothing inside me but [color=black]VOID[/color]. + do Globals.color_change.emit("green") Gwendoline Gorbado: [#abnormal2] I deserve to disappear, like the [color=orange_red]WORTHLESS[/color] piece of [color=orange_red]TRASH[/color] I am. I am [color=red]NOTHING[/color]. I return to [color=red]NOTHING[/color]. else + do Globals.color_change.emit("green") Gwendoline Gorbado: [#sadsmiling] You are kind. I wish i had met people like you in my life. Thank you. +do Globals.clear_patient.emit("release") => END \ No newline at end of file diff --git a/Dialogues/Patients/patient_51.dialogue.import b/Dialogues/Patients/patient_51.dialogue.import new file mode 100644 index 0000000..0966e58 --- /dev/null +++ b/Dialogues/Patients/patient_51.dialogue.import @@ -0,0 +1,16 @@ +[remap] + +importer="dialogue_manager" +importer_version=15 +type="Resource" +uid="uid://cocg8tx4s4rj3" +path="res://.godot/imported/patient_51.dialogue-63ea78af754f64c90334c115b144eee3.tres" + +[deps] + +source_file="res://Dialogues/Patients/patient_51.dialogue" +dest_files=["res://.godot/imported/patient_51.dialogue-63ea78af754f64c90334c115b144eee3.tres"] + +[params] + +defaults=true diff --git a/Dialogues/Patients/patient_2202_file.cfg b/Dialogues/Patients/patient_51_file.cfg similarity index 80% rename from Dialogues/Patients/patient_2202_file.cfg rename to Dialogues/Patients/patient_51_file.cfg index 3a2de73..b87231a 100644 --- a/Dialogues/Patients/patient_2202_file.cfg +++ b/Dialogues/Patients/patient_51_file.cfg @@ -3,4 +3,5 @@ name="Gwendoline Gorbado" age="28" profession="IT Engineer" psychiatric_assessment="PANIC ATTACKS\n\nSUICIDAL IDEATIONS\n\nAUDITORY HALLUCINATIONS" +abnormal_symptoms="CENESTHETIC HALLUCINATIONS" status="random" diff --git a/globals.gd b/globals.gd index 2acdcae..cef3cfd 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 = ["45", "45", "45"]#["47", "48", "49", "50", "2202"] +var patient_list = ["45", "46", "47", "48", "49", "50", "51"] var patients_seen: Array[String] var patient_id = patient_list.pick_random() var dialogue_intro = load("res://Dialogues/intro.dialogue") @@ -18,13 +18,28 @@ var directives = "\n[center][font_size=22]INSTRUCTIONS[/font_size][/center] \n\nREFER TO THE [color=royal_blue]MANUAL[/color] FOR [color=dark_orange]SYMPTOMS[/color] DETAILS \n\nMAKE ENOUGH [color=green_yellow]ACCURATE DIAGNOSES[/color] IN A ROW \nTO GET TO THE NEXT FLOOR[/font_size]" +var release_messages: Array[String] +var terminate_messages: Array[String] + +#Signals for screening desk signal console_message signal response_chosen(DialogueResponse) +signal clear_patient +signal color_change # Called when the node enters the scene tree for the first time. func _ready() -> void: + release_messages.resize(3) + terminate_messages.resize(3) + release_messages[0] = Globals.colorize("- ASSESSMENT MADE -\n\n- LOADING RELEASE PROTOCOL... -", "green_yellow") + release_messages[1] = Globals.colorize("- RELEASING SUBJECT -", "green_yellow") + release_messages[2] = "EVALUATION RECORDED" + "\n\nPATIENT STATUS: " + Globals.colorize("HUMAN", "green") + "\n\nUPDATING DATABASE...\n\n" + Globals.colorize("INITIATING RELEASE SEQUENCE", "green_yellow") + terminate_messages[0] = Globals.colorize("- ASSESSMENT MADE -\n\n- LOADING TERMINATION PROTOCOL... -", "orange_red") + terminate_messages[1] = Globals.colorize("- TERMINATING SUBJECT -", "orange_red") + terminate_messages[2] = "EVALUATION RECORDED" + "\n\nPATIENT STATUS: " + Globals.colorize("ABNORMAL", "red") + "\n\nUPDATING DATABASE...\n\n" + Globals.colorize("INITIATING TERMINATION SEQUENCE", "orange_red") + pass diff --git a/main_hub.gd b/main_hub.gd index ae63d2e..cac769b 100644 --- a/main_hub.gd +++ b/main_hub.gd @@ -13,6 +13,8 @@ var balloon: Node # Called when the node enters the scene tree for the first time. func _ready() -> void: + Patient.sort_patients() + #Adding Scenes var title_screen = TitleScreen.instantiate() var screening_desk = ScreeningDesk.instantiate() diff --git a/current_patient.gd b/patient.gd similarity index 62% rename from current_patient.gd rename to patient.gd index eca9f94..2ddf4a1 100644 --- a/current_patient.gd +++ b/patient.gd @@ -16,6 +16,16 @@ var abnormal: bool var file_text : String var file_title: String +#Patient symptoms ordered from floor to floor +var symptoms_arrays: Array[Array] = [ +["SUICIDAL IDEATIONS", "PERSECUTORY DELUSIONS", "MANIA", "AUDITORY HALLUCINATIONS"], +["MEGALOMANIAC DELUSIONS", "PANIC ATTACKS"], +["MYSTICAL DELUSIONS", "CENESTHETIC HALLUCINATIONS"], +["HAPTIC HALLUCINATIONS", "SELF-MUTILATION"], +["HETERO-AGRESSIVE BEHAVIOUR", "VISUAL HALLUCINATIONS"] +] +#Lists of possible patients sorted by floor +var patient_list : Array[Array] # Called when the node enters the scene tree for the first time. func _ready() -> void: @@ -24,6 +34,9 @@ func _ready() -> void: marker.resize(100) marker.fill(0) + #Setting up patient list + patient_list.resize(len(symptoms_arrays)) + original_color = texture.modulate #Saving original modulation color to reset it after modification @@ -98,3 +111,41 @@ func new_patient(): abnormal = false "abnormal": abnormal = true + + +#Sorts the patients to determine who can appear on what floor depending on the symptoms unlocked +func sort_patients(): + + var config := ConfigFile.new() + var file_path : String + var patient_symptoms: Array + var symptom_matched : bool + var symptom_list: Array + + for i in range(45,52): + patient_symptoms.clear() + file_path = "res://Dialogues/Patients/patient_" + str(i) + "_file.cfg" + config.load(file_path) + symptom_list = config.get_value("", "psychiatric_assessment").split("\n", false) + patient_symptoms = symptom_list + symptom_list = config.get_value("", "abnormal_symptoms").split("\n", false) + patient_symptoms.append_array(symptom_list) + print("Patient #" + str(i) + " symptom list: " + str(patient_symptoms)) + #Goes through the symptoms_arrays from the last to the first, + #If a symptom matches with the patient symptoms, + #Add that patient to the floors from that floor to the last one + + for j in range(len(symptoms_arrays)-1, -1, -1): + for symptom in patient_symptoms: + if symptoms_arrays[j].has(symptom): + symptom_matched = true + print("Symptom matched: " + str(symptoms_arrays[j]) + " and " + str(symptom)) + break + if symptom_matched: + for k in range(j, symptoms_arrays.size()): + patient_list[k].append(str(i)) + symptom_matched = false + break + + for i in range(len(patient_list)): + print("Floor " + str(i) + " possible patients: " + str(patient_list[i])) diff --git a/current_patient.gd.uid b/patient.gd.uid similarity index 100% rename from current_patient.gd.uid rename to patient.gd.uid diff --git a/project.godot b/project.godot index c9ad762..cf15b73 100644 --- a/project.godot +++ b/project.godot @@ -19,7 +19,7 @@ config/features=PackedStringArray("4.5", "Forward Plus") Globals="*res://globals.gd" TransitionScreen="*res://transition_screen.tscn" UI="*res://ui.tscn" -Patient="*res://current_patient.gd" +Patient="*res://patient.gd" DialogueManager="*res://addons/dialogue_manager/dialogue_manager.gd" [dialogue_manager] @@ -55,4 +55,4 @@ ui_select={ [internationalization] -locale/translations_pot_files=PackedStringArray("res://Dialogues/Patients/patient_2202.dialogue", "res://Dialogues/Patients/patient_50.dialogue", "res://Dialogues/Patients/patient_49.dialogue", "res://Dialogues/Patients/patient_48.dialogue", "res://Dialogues/Patients/patient_47.dialogue", "res://Dialogues/Patients/patient_46.dialogue", "res://Dialogues/Patients/patient_45.dialogue") +locale/translations_pot_files=PackedStringArray("res://Dialogues/Patients/patient_50.dialogue", "res://Dialogues/Patients/patient_49.dialogue", "res://Dialogues/Patients/patient_48.dialogue", "res://Dialogues/Patients/patient_47.dialogue", "res://Dialogues/Patients/patient_46.dialogue", "res://Dialogues/Patients/patient_45.dialogue", "res://Dialogues/Patients/patient_51.dialogue") diff --git a/screening_desk.gd b/screening_desk.gd index de647dc..aa52697 100644 --- a/screening_desk.gd +++ b/screening_desk.gd @@ -27,8 +27,6 @@ extends Control @onready var shutter_bot = $RoomAssets/ShutterBot @onready var shutters_animation = $RoomAssets/ShuttersAnimation @onready var backroom = $RoomAssets/Backroom -@onready var red_backroom = $RoomAssets/RedBackroom -@onready var green_backroom = $RoomAssets/GreenBackroom @onready var backwall_animation = $RoomAssets/Backwall/BackwallAnimation #DialogueAssets @@ -36,6 +34,7 @@ extends Control @onready var end_of_day_dialogue_resource = load("res://Dialogues/end_of_day.dialogue") @onready var balloon: Node @onready var patient_emotions : Dictionary +@onready var message_array: Array[String] var main: Node var accurate_diagnoses = 0 @@ -56,9 +55,11 @@ func _ready() -> void: tab_recording.pressed.connect(self._on_tab_recording_pressed) Globals.console_message.connect(self.console_display) Globals.response_chosen.connect(self._on_response_chosen) + Globals.clear_patient.connect(self._on_clear_patient) + Globals.color_change.connect(self._on_color_change) #Hiding RoomAssets - for room_asset in [shutter_top, shutter_bot, backroom, red_backroom, green_backroom]: + for room_asset in [shutter_top, shutter_bot, backroom]: room_asset.hide() #Hiding ComputerScreen, DialogueText and JournalOpen @@ -77,6 +78,8 @@ func _ready() -> void: patient.hide() #Hiding Patient self.hide() #Hiding ScreeningDesk + + message_array.resize(3) #Setting up message array func new_patient(): @@ -212,24 +215,36 @@ func _change_emotion(dialogue_line) -> void: #Change emotions following dialogue func _on_green_button_pressed(): #Releases the patient - release.text = Globals.colorize("RELEASE", "green") #Highlighting the decision - - #Greening the vibe - green_backroom.show() - patient.modulate = Color(0.5,1,0.5,1) - - clear_patient("release") #Clearing the patient + decision_made("release") func _on_red_button_pressed(): #Terminates the patient - terminate.text = Globals.colorize("TERMINATE", "red") #Highlighting the decision + decision_made("terminate") + + +func decision_made(choice: String): - #Redding the vibe - red_backroom.show() - patient.modulate = Color(1,0.1,0.1,1) + #Hiding computer tabs screen + for node in [tab_patient_file, tab_rules, tab_recording] + computer_tabs.get_children(): + node.hide() - clear_patient("terminate") #Clearing the patient + #Setting up console and computer displays + if choice == "release": + release.text = Globals.colorize("RELEASE", "green") #Highlighting the decision + message_array = Globals.release_messages + elif choice == "terminate": + terminate.text = Globals.colorize("TERMINATE", "red") #Highlighting the decision + message_array = Globals.terminate_messages + console_display(message_array[0]) + computer_display(message_array[2]) + + #Disabling Buttons + green_button.set_mouse_filter(Control.MOUSE_FILTER_IGNORE) + red_button.set_mouse_filter(Control.MOUSE_FILTER_IGNORE) + + #Final Patient Dialogue + main.start_balloon("screening", Patient.dialogue_resource, choice) func _on_journal_pressed(): #Shows the journal @@ -240,34 +255,7 @@ func _on_close_manual_pressed(): #Hides the journal journal_layer.hide() -func clear_patient(choice:String): #Clears patient and transitions towards next patient or end of day - - #Hiding computer tabs screen and console screen - for node in [tab_patient_file, tab_rules, tab_recording, console_screen] + computer_tabs.get_children(): - node.hide() - - #Disabling Buttons - green_button.set_mouse_filter(Control.MOUSE_FILTER_IGNORE) - red_button.set_mouse_filter(Control.MOUSE_FILTER_IGNORE) - - #Setting up computer and console messages - var message: Array[String] - message.resize(3) - if choice == "release": - message[0] = Globals.colorize("- ASSESSMENT MADE -\n\n- LOADING RELEASE PROTOCOL... -", "green_yellow") - message[1] = Globals.colorize("- RELEASING SUBJECT -", "green_yellow") - message[2] = "EVALUATION RECORDED" + "\n\nPATIENT STATUS: " + Globals.colorize("HUMAN", "green") + "\n\nUPDATING DATABASE...\n\n" + Globals.colorize("INITIATING RELEASE SEQUENCE", "green_yellow") - elif choice == "terminate": - message[0] = Globals.colorize("- ASSESSMENT MADE -\n\n- LOADING TERMINATION PROTOCOL... -", "orange_red") - message[1] = Globals.colorize("- TERMINATING SUBJECT -", "orange_red") - message[2] = "EVALUATION RECORDED" + "\n\nPATIENT STATUS: " + Globals.colorize("ABNORMAL", "red") + "\n\nUPDATING DATABASE...\n\n" + Globals.colorize("INITIATING TERMINATION SEQUENCE", "orange_red") - console_display(message[0]) - computer_display(message[2]) - - - #Final Patient Dialogue - main.start_balloon("screening", Patient.dialogue_resource, choice) - await DialogueManager.dialogue_ended +func _on_clear_patient(choice:String): #Clears patient and transitions towards next patient or end of day # Updating middle screen info and accurate_diagnoses value if (Patient.abnormal == true and choice == "terminate") or (Patient.abnormal == false and choice == "release"): @@ -277,16 +265,17 @@ func clear_patient(choice:String): #Clears patient and transitions towards next update_middle_screen(Globals.day_count, Globals.floor_count, accurate_diagnoses, Globals.diagnoses_quota) #Showing second console message - console_display(message[1]) + console_display(message_array[1]) #Closing Shutters shutters_animation.play("close") await shutters_animation.animation_finished - #Hiding the cell and restoring the patient's original color - for scene in [patient, backroom, red_backroom, green_backroom]: + #Hiding the cell and restoring the backroom and patient's original colors + for scene in [patient, backroom]: scene.hide() patient.modulate = Patient.original_color + backroom.modulate = Patient.original_color #Hiding Computer screen and resetting Console screen once the animation is done shutters_animation.play(choice) @@ -294,13 +283,6 @@ func clear_patient(choice:String): #Clears patient and transitions towards next computer_screen.hide() console_screen.hide() - #Descending Floor if diagnoses_quota reached - if accurate_diagnoses == Globals.diagnoses_quota: - descend_floor() - else: - new_patient() - - #Reenabling mouse filter and resetting buttons for button in [green_button, red_button]: button.set_mouse_filter(Control.MOUSE_FILTER_STOP) @@ -310,7 +292,27 @@ func clear_patient(choice:String): #Clears patient and transitions towards next #Resetting decision screen release.text = Globals.colorize("RELEASE", "web_gray") terminate.text = Globals.colorize("TERMINATE", "web_gray") + + #Descending Floor if diagnoses_quota reached + if accurate_diagnoses == Globals.diagnoses_quota: + descend_floor() + else: + new_patient() + + +func _on_color_change(color: String): #Modulating backroom and patient colors + + var new_color: Color + match color: + "red": + new_color = Color(1,0.1,0.1,1) + "green": + new_color = Color(0.5,1,0.5,1) + patient.modulate = new_color + backroom.modulate = new_color + print("Color changed to: " + str(new_color)) + func console_display(message): #Displays a message on the console screen var text = message @@ -325,6 +327,7 @@ func computer_display(message): #Displays a message on the computer screen computer_screen.text = text computer_screen.show() + func update_middle_screen(day_count, floor_count, diagnoses_count, diagnoses_quota): #Updates Middle Screen Info var day = Globals.colorize(str(day_count), "dark_orange") var floor = Globals.colorize(str(floor_count), "dark_orange") @@ -334,6 +337,7 @@ func update_middle_screen(day_count, floor_count, diagnoses_count, diagnoses_quo middle_screen.text = text + func descend_floor(): #Descends to next floor #Displaying information on screens diff --git a/screening_desk.tscn b/screening_desk.tscn index 9d51a8e..2227928 100644 --- a/screening_desk.tscn +++ b/screening_desk.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=49 format=3 uid="uid://chytk2cctjk3x"] +[gd_scene load_steps=47 format=3 uid="uid://chytk2cctjk3x"] [ext_resource type="Script" uid="uid://b3ms0imu0umn8" path="res://screening_desk.gd" id="1_1s7k3"] [ext_resource type="Texture2D" uid="uid://b2epvjeqvmgrs" path="res://Art/Rooms/screening_room/screening_room_glass.png" id="3_nxnrp"] @@ -29,8 +29,6 @@ [ext_resource type="BitMap" uid="uid://byqmvpivmvsnl" path="res://Art/Rooms/screening_room/journal_bitmap.png" id="20_5vhu5"] [ext_resource type="Texture2D" uid="uid://b21h7s3820sc8" path="res://Art/Rooms/screening_room/middle_screen.png" id="24_d8gyq"] [ext_resource type="Texture2D" uid="uid://c6ary7qg7jhc6" path="res://Art/Rooms/screening_room/decision_screen.png" id="29_cobue"] -[ext_resource type="Texture2D" uid="uid://cg2mywrvfpvad" path="res://Art/Rooms/screening_room/green_backroom.png" id="29_qdgqn"] -[ext_resource type="Texture2D" uid="uid://cs4ofocaj6xdg" path="res://Art/Rooms/screening_room/red_backroom.png" id="30_r58th"] [sub_resource type="Theme" id="Theme_63o5x"] RichTextLabel/fonts/normal_font = ExtResource("14_0pvwy") @@ -154,7 +152,7 @@ tracks/1/keys = { [sub_resource type="Animation" id="Animation_l4uk7"] resource_name = "going_up" -length = 2.0 +length = 3.0 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -162,7 +160,7 @@ tracks/0/path = NodePath(".:position") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0, 2), +"times": PackedFloat32Array(1, 3), "transitions": PackedFloat32Array(0.5, 1), "update": 0, "values": [Vector2(-240, 60), Vector2(-240, -540)] @@ -174,7 +172,7 @@ tracks/1/path = NodePath("../ShutterTop:position") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { -"times": PackedFloat32Array(0, 2), +"times": PackedFloat32Array(1, 3), "transitions": PackedFloat32Array(0.5, 1), "update": 0, "values": [Vector2(-240, -1040), Vector2(-240, -540)] @@ -605,7 +603,6 @@ vertical_alignment = 1 [node name="JournalLayer" type="CanvasLayer" parent="LowerHalf"] layer = 110 -visible = false [node name="JournalOpen" type="Control" parent="LowerHalf/JournalLayer"] z_index = 8 @@ -1027,32 +1024,3 @@ root_node = NodePath("../ShutterBot") libraries = { &"": SubResource("AnimationLibrary_vh6fv") } - -[node name="GreenBackroom" type="TextureRect" parent="RoomAssets"] -visible = false -modulate = Color(1, 1, 1, 0.588235) -z_index = 1 -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -size_flags_horizontal = 3 -size_flags_vertical = 3 -mouse_filter = 2 -texture = ExtResource("29_qdgqn") - -[node name="RedBackroom" type="TextureRect" parent="RoomAssets"] -visible = false -z_index = 1 -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -size_flags_horizontal = 3 -size_flags_vertical = 3 -mouse_filter = 2 -texture = ExtResource("30_r58th")