diff --git a/Art/Patients/prime_supervisor/prime_supervisor.aseprite b/Art/Patients/prime_supervisor/prime_supervisor.aseprite index fd031f5..99b9158 100644 Binary files a/Art/Patients/prime_supervisor/prime_supervisor.aseprite and b/Art/Patients/prime_supervisor/prime_supervisor.aseprite differ diff --git a/Art/Patients/prime_supervisor/prime_supervisor_hologram.aseprite b/Art/Patients/prime_supervisor/prime_supervisor_hologram.aseprite deleted file mode 100644 index 41d8c38..0000000 Binary files a/Art/Patients/prime_supervisor/prime_supervisor_hologram.aseprite and /dev/null differ diff --git a/Art/Patients/prime_supervisor_loeveth/prime_supervisor.aseprite b/Art/Patients/prime_supervisor_loeveth/prime_supervisor.aseprite new file mode 100644 index 0000000..fd031f5 Binary files /dev/null and b/Art/Patients/prime_supervisor_loeveth/prime_supervisor.aseprite differ diff --git a/Art/Patients/prime_supervisor_loeveth/prime_supervisor_angry.png b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_angry.png new file mode 100644 index 0000000..0609256 Binary files /dev/null and b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_angry.png differ diff --git a/Art/Patients/prime_supervisor_loeveth/prime_supervisor_angry.png.import b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_angry.png.import new file mode 100644 index 0000000..d443077 --- /dev/null +++ b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_angry.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bv6qh5j654184" +path="res://.godot/imported/prime_supervisor_angry.png-e46a52f077d52997aba6f143225adfd3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Patients/prime_supervisor_loeveth/prime_supervisor_angry.png" +dest_files=["res://.godot/imported/prime_supervisor_angry.png-e46a52f077d52997aba6f143225adfd3.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/prime_supervisor_loeveth/prime_supervisor_hologram.aseprite b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_hologram.aseprite new file mode 100644 index 0000000..5c78ab2 Binary files /dev/null and b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_hologram.aseprite differ diff --git a/Art/Patients/prime_supervisor/prime_supervisor_hologram.png b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_hologram.png similarity index 100% rename from Art/Patients/prime_supervisor/prime_supervisor_hologram.png rename to Art/Patients/prime_supervisor_loeveth/prime_supervisor_hologram.png diff --git a/Art/Patients/prime_supervisor/prime_supervisor_hologram.png.import b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_hologram.png.import similarity index 77% rename from Art/Patients/prime_supervisor/prime_supervisor_hologram.png.import rename to Art/Patients/prime_supervisor_loeveth/prime_supervisor_hologram.png.import index b3510b3..beb4354 100644 --- a/Art/Patients/prime_supervisor/prime_supervisor_hologram.png.import +++ b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_hologram.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://5f5bsergnjtv" -path="res://.godot/imported/prime_supervisor_hologram.png-5004375ed180338b48049649d383f498.ctex" +path="res://.godot/imported/prime_supervisor_hologram.png-f39dc477d0ad7b816e78d44f4b02f189.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/prime_supervisor/prime_supervisor_hologram.png" -dest_files=["res://.godot/imported/prime_supervisor_hologram.png-5004375ed180338b48049649d383f498.ctex"] +source_file="res://Art/Patients/prime_supervisor_loeveth/prime_supervisor_hologram.png" +dest_files=["res://.godot/imported/prime_supervisor_hologram.png-f39dc477d0ad7b816e78d44f4b02f189.ctex"] [params] diff --git a/Art/Patients/prime_supervisor_loeveth/prime_supervisor_irritated.png b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_irritated.png new file mode 100644 index 0000000..6351aba Binary files /dev/null and b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_irritated.png differ diff --git a/Art/Patients/prime_supervisor_loeveth/prime_supervisor_irritated.png.import b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_irritated.png.import new file mode 100644 index 0000000..bb501af --- /dev/null +++ b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_irritated.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cwqchvf8vo5w3" +path="res://.godot/imported/prime_supervisor_irritated.png-b325fc14a10655f5da61a7c783683f0a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Patients/prime_supervisor_loeveth/prime_supervisor_irritated.png" +dest_files=["res://.godot/imported/prime_supervisor_irritated.png-b325fc14a10655f5da61a7c783683f0a.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/prime_supervisor_loeveth/prime_supervisor_neutral.png b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_neutral.png new file mode 100644 index 0000000..893d1d3 Binary files /dev/null and b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_neutral.png differ diff --git a/Art/Patients/prime_supervisor_loeveth/prime_supervisor_neutral.png.import b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_neutral.png.import new file mode 100644 index 0000000..92ac3f6 --- /dev/null +++ b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_neutral.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dwknado015scg" +path="res://.godot/imported/prime_supervisor_neutral.png-6cb0dd5f22cd5a4fb097fe3be8545918.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Patients/prime_supervisor_loeveth/prime_supervisor_neutral.png" +dest_files=["res://.godot/imported/prime_supervisor_neutral.png-6cb0dd5f22cd5a4fb097fe3be8545918.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/prime_supervisor_loeveth/prime_supervisor_puzzled.png b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_puzzled.png new file mode 100644 index 0000000..34d7d4d Binary files /dev/null and b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_puzzled.png differ diff --git a/Art/Patients/prime_supervisor_loeveth/prime_supervisor_puzzled.png.import b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_puzzled.png.import new file mode 100644 index 0000000..92056f0 --- /dev/null +++ b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_puzzled.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c7p01atv71jl0" +path="res://.godot/imported/prime_supervisor_puzzled.png-654454f6a081d88be33e340c7d1c3c37.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Patients/prime_supervisor_loeveth/prime_supervisor_puzzled.png" +dest_files=["res://.godot/imported/prime_supervisor_puzzled.png-654454f6a081d88be33e340c7d1c3c37.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/prime_supervisor_loeveth/prime_supervisor_smiling.png b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_smiling.png new file mode 100644 index 0000000..9af8aa0 Binary files /dev/null and b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_smiling.png differ diff --git a/Art/Patients/prime_supervisor_loeveth/prime_supervisor_smiling.png.import b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_smiling.png.import new file mode 100644 index 0000000..30287c4 --- /dev/null +++ b/Art/Patients/prime_supervisor_loeveth/prime_supervisor_smiling.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ck8vrhrbc0av2" +path="res://.godot/imported/prime_supervisor_smiling.png-eac79474e867b7c2fbf213aab505cfe4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Patients/prime_supervisor_loeveth/prime_supervisor_smiling.png" +dest_files=["res://.godot/imported/prime_supervisor_smiling.png-eac79474e867b7c2fbf213aab505cfe4.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/Dialogues/Patients/prime_supervisor_dredar_file.cfg b/Dialogues/Patients/prime_supervisor_dredar_file.cfg new file mode 100644 index 0000000..dfa605f --- /dev/null +++ b/Dialogues/Patients/prime_supervisor_dredar_file.cfg @@ -0,0 +1 @@ +initial_emotion="neutral" diff --git a/Dialogues/Patients/prime_supervisor_loeveth_file.cfg b/Dialogues/Patients/prime_supervisor_loeveth_file.cfg new file mode 100644 index 0000000..dfa605f --- /dev/null +++ b/Dialogues/Patients/prime_supervisor_loeveth_file.cfg @@ -0,0 +1 @@ +initial_emotion="neutral" diff --git a/Dialogues/interfloor.dialogue b/Dialogues/interfloor.dialogue index df05d9d..e6f46df 100644 --- a/Dialogues/interfloor.dialogue +++ b/Dialogues/interfloor.dialogue @@ -5,7 +5,11 @@ set Patient.dialog_tree = Patient.build_dialog_tree([]) do Globals.character_label_color_change.emit(Color(0,0.8,1,1)) -Prime Supervisor: FIRST DIALOGUE - WORK IN PROGRESS +Prime Supervisor Loeveth: [#neutral] Greetings, employee. I am to oversee your work here in this facility. +Prime Supervisor Loeveth: [#angry] I am angry +Prime Supervisor Loeveth: [#irritated] I am irritated +Prime Supervisor Loeveth: [#smiling] I am smiling + => END diff --git a/main_hub.gd b/main_hub.gd index a47addd..7b468f9 100644 --- a/main_hub.gd +++ b/main_hub.gd @@ -253,7 +253,7 @@ func update_slots(): #Starts a balloon dialogue -func start_balloon(balloon_type:String, dialogue_resource: Resource, start_title: String): +func start_balloon(balloon_type:String, patient_type:String, dialogue_resource: Resource, start_title: String): #Clearing previous balloon clear_balloon() @@ -264,8 +264,8 @@ func start_balloon(balloon_type:String, dialogue_resource: Resource, start_title get_tree().current_scene.add_child(balloon) #Connects emotion signals if needed - match balloon_type: - "screening": + match patient_type: + "patient": DialogueManager.got_dialogue.connect($ScreeningDesk.patient._change_emotion) DialogueManager.got_dialogue.connect($ScreeningDesk._recording_text) "supervisor": diff --git a/patient.gd b/patient.gd index 9858e88..a04c938 100644 --- a/patient.gd +++ b/patient.gd @@ -13,4 +13,4 @@ func _change_emotion(dialogue_line) -> void: if line_tag.is_empty() == false: var new_emotion = line_tag[0] texture = Patient.emotions[String(new_emotion)] - print("Emotion changed to ", new_emotion) + print("Patient emotion changed to ", new_emotion) diff --git a/patient_global.gd b/patient_global.gd index 8fc78f8..d01cd5b 100644 --- a/patient_global.gd +++ b/patient_global.gd @@ -27,6 +27,9 @@ var symptoms_arrays: Array[Array] = [ #Lists of possible patients sorted by floor var patient_list : Array[Array] +#Supervisor file path +var supervisor_name = "loeveth" + # Called when the node enters the scene tree for the first time. func _ready() -> void: @@ -78,26 +81,8 @@ func new_patient(): file_text = "NAME: " + patient_name + "\nAGE: " + age + "\n\nPROFESSION: " + profession + "\n\nPRE-SCREENING PSYCHIATRIC ASSESSMENT:\n\n" + "[color=orange_red]" + psychiatric_assessment + "[/color]" file_title = "[center]PATIENT FILE #" + patient_id - #Loading Patient Initial Face - var initial_emotion = config.get_value("", "initial_emotion") - file_path = "res://Art/Patients/patient_" + patient_id + "/patient_" + patient_id + "_" + initial_emotion + ".png" - image = load(file_path) - - #Loading Face Emotions - var face: Resource - var emotion_branch: Dictionary - var emotion_list = ["neutral", "peaceful", "praying", "puzzled", - "sadsmiling", "crazysmiling", "smiling", "laughing", "happy", "elated", "maniac", "irritated", "angry", - "sad", "depressed", "crying", "surprised", "worried", "scared", "shocked", "panicked", "suspicious", - "abnormal", "abnormal1", "abnormal2", "special"] - - emotions.clear() #Clearing previous patient emotions - for emotion in emotion_list: - file_path = "res://Art/Patients/patient_" + patient_id + "/patient_" + patient_id + "_" + emotion + ".png" - face = load(file_path) - if face != null: - emotion_branch = {emotion: face} - emotions.merge(emotion_branch) + file_path = "res://Art/Patients/patient_" + patient_id + "/patient_" + patient_id + "_" + load_emotions(config, file_path) #Loading Dialogue Resource file_path = "res://Dialogues/Patients/patient_" + patient_id + ".dialogue" @@ -115,6 +100,30 @@ func new_patient(): abnormal = true +func load_emotions(config, patient_path): + + #Loading Patient Initial Face + var initial_emotion = config.get_value("", "initial_emotion") + var file_path = patient_path + initial_emotion + ".png" + image = load(file_path) + + #Loading Face Emotions + var face: Resource + var emotion_branch: Dictionary + var emotion_list = ["neutral", "peaceful", "praying", "puzzled", + "sadsmiling", "crazysmiling", "smiling", "laughing", "happy", "elated", "maniac", "irritated", "angry", + "sad", "depressed", "crying", "surprised", "worried", "scared", "shocked", "panicked", "suspicious", + "abnormal", "abnormal1", "abnormal2", "special"] + + emotions.clear() #Clearing previous patient emotions + for emotion in emotion_list: + file_path = patient_path + emotion + ".png" + face = load(file_path) + if face != null: + emotion_branch = {emotion: face} + emotions.merge(emotion_branch) + + #Sorts the patients to determine who can appear on what floor depending on the symptoms unlocked func sort_patients(): diff --git a/screening_desk.gd b/screening_desk.gd index 3f03035..e6861a9 100644 --- a/screening_desk.gd +++ b/screening_desk.gd @@ -133,7 +133,7 @@ func _on_call_next_patient_pressed(): #Brings in next patient and sets up the de #Starting Dialogue and hiding console screen computer_screen.hide() console_screen.hide() - main.start_balloon("screening", Patient.dialogue_resource, "start") + main.start_balloon("screening", "patient", Patient.dialogue_resource, "start") #Showing Computer Tabs and showing Patient File by default for node in [tab_patient_file, tab_rules, tab_recording]: @@ -232,13 +232,12 @@ func decision_made(choice: String): red_button.set_mouse_filter(Control.MOUSE_FILTER_IGNORE) #Final Patient Dialogue - main.start_balloon("screening", Patient.dialogue_resource, choice) + main.start_balloon("screening", "patient", Patient.dialogue_resource, choice) func _on_journal_pressed(): #Shows the journal journal_layer.show() - func _on_close_manual_pressed(): #Hides the journal journal_layer.hide() diff --git a/screening_desk.tscn b/screening_desk.tscn index 663c684..656937c 100644 --- a/screening_desk.tscn +++ b/screening_desk.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=44 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://5f5bsergnjtv" path="res://Art/Patients/prime_supervisor/prime_supervisor_hologram.png" id="3_fev1v"] +[ext_resource type="Texture2D" path="res://Art/Patients/prime_supervisor/prime_supervisor_hologram.png" id="3_fev1v"] [ext_resource type="Texture2D" uid="uid://b2epvjeqvmgrs" path="res://Art/Rooms/screening_room/screening_room_glass.png" id="3_nxnrp"] [ext_resource type="Script" uid="uid://vjvnh47s4akq" path="res://patient.gd" id="4_43vqp"] [ext_resource type="Texture2D" uid="uid://by34irl73n8pb" path="res://Art/Rooms/screening_room/backroom.png" id="4_fij8w"] diff --git a/supervisor.gd b/supervisor.gd index dd7ba26..f02194a 100644 --- a/supervisor.gd +++ b/supervisor.gd @@ -62,13 +62,22 @@ func set_progress(value: float): #Supervisor dialogue, mainly between floors func dialogue(dialogue_resource, dialogue_start): + #Loading supervisor data + var config := ConfigFile.new() + var file_path = "res://Dialogues/Patients/prime_supervisor_" + Patient.supervisor_name + "_file.cfg" + config.load(file_path) + + file_path = "res://Art/Patients/prime_supervisor_" + Patient.supervisor_name + "/prime_supervisor_" + Patient.load_emotions(config, file_path) + #Showing the supervisor + texture = Patient.image show() reveal_spray() await reveal_done #Dialogue - Globals.start_balloon.emit("screening", dialogue_resource, dialogue_start) + Globals.start_balloon.emit("screening", "supervisor", dialogue_resource, dialogue_start) await DialogueManager.dialogue_ended #Hiding the supervisor @@ -87,4 +96,4 @@ func _change_emotion(dialogue_line) -> void: if line_tag.is_empty() == false: var new_emotion = line_tag[0] texture = Patient.emotions[String(new_emotion)] - print("Emotion changed to ", new_emotion) + print("Supervisor emotion changed to ", new_emotion)