diff --git a/Art/Patients/patient_46/patient_46_abnormal1.png b/Art/Patients/patient_46/patient_46_abnormal1.png deleted file mode 100644 index 48fb123..0000000 Binary files a/Art/Patients/patient_46/patient_46_abnormal1.png and /dev/null differ diff --git a/Art/Patients/patient_46/patient_46_abnormal1.png.import b/Art/Patients/patient_47/patient_47_abnormal1.png.import similarity index 71% rename from Art/Patients/patient_46/patient_46_abnormal1.png.import rename to Art/Patients/patient_47/patient_47_abnormal1.png.import index ac7be16..764a91c 100644 --- a/Art/Patients/patient_46/patient_46_abnormal1.png.import +++ b/Art/Patients/patient_47/patient_47_abnormal1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c130avc42cn08" -path="res://.godot/imported/patient_46_abnormal1.png-547e7f589711c960fc436eb0a042930f.ctex" +uid="uid://b0e0dekn5030s" +path="res://.godot/imported/patient_47_abnormal1.png-77ebc322f7ac7d03eb75c43bd05982bc.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Patients/patient_46/patient_46_abnormal1.png" -dest_files=["res://.godot/imported/patient_46_abnormal1.png-547e7f589711c960fc436eb0a042930f.ctex"] +source_file="res://Art/Patients/patient_47/patient_47_abnormal1.png" +dest_files=["res://.godot/imported/patient_47_abnormal1.png-77ebc322f7ac7d03eb75c43bd05982bc.ctex"] [params] diff --git a/Art/Patients/patient_48/patient_48.aseprite b/Art/Patients/patient_48/patient_48.aseprite index 7832cf7..e9f00d9 100644 Binary files a/Art/Patients/patient_48/patient_48.aseprite and b/Art/Patients/patient_48/patient_48.aseprite differ diff --git a/Art/Patients/patient_48/patient_48_abnormal.png b/Art/Patients/patient_48/patient_48_abnormal.png index 3041db1..d7b442b 100644 Binary files a/Art/Patients/patient_48/patient_48_abnormal.png and b/Art/Patients/patient_48/patient_48_abnormal.png differ diff --git a/Art/Patients/patient_48/patient_48_angry.png b/Art/Patients/patient_48/patient_48_angry.png index cbe9ce0..a125fa4 100644 Binary files a/Art/Patients/patient_48/patient_48_angry.png and b/Art/Patients/patient_48/patient_48_angry.png differ diff --git a/Art/Patients/patient_48/patient_48_irritated.png b/Art/Patients/patient_48/patient_48_irritated.png index e112c87..374c362 100644 Binary files a/Art/Patients/patient_48/patient_48_irritated.png and b/Art/Patients/patient_48/patient_48_irritated.png differ diff --git a/Art/Patients/patient_48/patient_48_neutral.png b/Art/Patients/patient_48/patient_48_neutral.png index c049189..e5cafa5 100644 Binary files a/Art/Patients/patient_48/patient_48_neutral.png and b/Art/Patients/patient_48/patient_48_neutral.png differ diff --git a/Art/Patients/patient_48/patient_48_panicked.png b/Art/Patients/patient_48/patient_48_panicked.png index 307ff97..2dcf614 100644 Binary files a/Art/Patients/patient_48/patient_48_panicked.png and b/Art/Patients/patient_48/patient_48_panicked.png differ diff --git a/Art/Patients/patient_48/patient_48_puzzled.png b/Art/Patients/patient_48/patient_48_puzzled.png index b9155f0..7e2dae1 100644 Binary files a/Art/Patients/patient_48/patient_48_puzzled.png and b/Art/Patients/patient_48/patient_48_puzzled.png differ diff --git a/Art/Patients/patient_48/patient_48_scared.png b/Art/Patients/patient_48/patient_48_scared.png index a186c46..7c7f036 100644 Binary files a/Art/Patients/patient_48/patient_48_scared.png and b/Art/Patients/patient_48/patient_48_scared.png differ diff --git a/Art/Patients/patient_48/patient_48_smiling.png b/Art/Patients/patient_48/patient_48_smiling.png index 8ebc5d8..509c301 100644 Binary files a/Art/Patients/patient_48/patient_48_smiling.png and b/Art/Patients/patient_48/patient_48_smiling.png differ diff --git a/Art/Patients/patient_48/patient_48_suspicious.png b/Art/Patients/patient_48/patient_48_suspicious.png index 207a3f0..455adb7 100644 Binary files a/Art/Patients/patient_48/patient_48_suspicious.png and b/Art/Patients/patient_48/patient_48_suspicious.png differ diff --git a/Art/Patients/patient_48/patient_48_worried.png b/Art/Patients/patient_48/patient_48_worried.png index cc9904d..32d3f2e 100644 Binary files a/Art/Patients/patient_48/patient_48_worried.png and b/Art/Patients/patient_48/patient_48_worried.png differ diff --git a/Art/Patients/patient_49/patient_49_abnormal.png b/Art/Patients/patient_49/patient_49_abnormal.png index a667feb..67cd6a8 100644 Binary files a/Art/Patients/patient_49/patient_49_abnormal.png and b/Art/Patients/patient_49/patient_49_abnormal.png differ diff --git a/Art/Patients/patient_49/patient_49_elated.png b/Art/Patients/patient_49/patient_49_elated.png index d38b648..9ade008 100644 Binary files a/Art/Patients/patient_49/patient_49_elated.png and b/Art/Patients/patient_49/patient_49_elated.png differ diff --git a/Art/Patients/patient_49/patient_49_happy.png b/Art/Patients/patient_49/patient_49_happy.png index 94c2670..24ecf8c 100644 Binary files a/Art/Patients/patient_49/patient_49_happy.png and b/Art/Patients/patient_49/patient_49_happy.png differ diff --git a/Art/Patients/patient_49/patient_49_irritated.png b/Art/Patients/patient_49/patient_49_irritated.png index 86cd9cd..81e43a0 100644 Binary files a/Art/Patients/patient_49/patient_49_irritated.png and b/Art/Patients/patient_49/patient_49_irritated.png differ diff --git a/Art/Patients/patient_49/patient_49_laughing.png b/Art/Patients/patient_49/patient_49_laughing.png index 55d8ec2..53559ef 100644 Binary files a/Art/Patients/patient_49/patient_49_laughing.png and b/Art/Patients/patient_49/patient_49_laughing.png differ diff --git a/Art/Patients/patient_49/patient_49_maniac.png b/Art/Patients/patient_49/patient_49_maniac.png index e059781..6a664e8 100644 Binary files a/Art/Patients/patient_49/patient_49_maniac.png and b/Art/Patients/patient_49/patient_49_maniac.png differ diff --git a/Art/Patients/patient_49/patient_49_neutral.png b/Art/Patients/patient_49/patient_49_neutral.png index aed0c71..3838a67 100644 Binary files a/Art/Patients/patient_49/patient_49_neutral.png and b/Art/Patients/patient_49/patient_49_neutral.png differ diff --git a/Art/Patients/patient_49/patient_49_puzzled.png b/Art/Patients/patient_49/patient_49_puzzled.png index 8d9e767..d071e0f 100644 Binary files a/Art/Patients/patient_49/patient_49_puzzled.png and b/Art/Patients/patient_49/patient_49_puzzled.png differ diff --git a/Art/Patients/patient_49/patient_49_resized.aseprite b/Art/Patients/patient_49/patient_49_resized.aseprite deleted file mode 100644 index 028db40..0000000 Binary files a/Art/Patients/patient_49/patient_49_resized.aseprite and /dev/null differ diff --git a/Art/Patients/patient_49/patient_49_shocked.png b/Art/Patients/patient_49/patient_49_shocked.png index 1659b5d..8492bad 100644 Binary files a/Art/Patients/patient_49/patient_49_shocked.png and b/Art/Patients/patient_49/patient_49_shocked.png differ diff --git a/Art/Patients/patient_49/patient_49_smiling.png b/Art/Patients/patient_49/patient_49_smiling.png index 8646814..d6be14c 100644 Binary files a/Art/Patients/patient_49/patient_49_smiling.png and b/Art/Patients/patient_49/patient_49_smiling.png differ diff --git a/Art/Patients/patient_49/patient_49_worried.png b/Art/Patients/patient_49/patient_49_worried.png index 26bd3c0..3179ae0 100644 Binary files a/Art/Patients/patient_49/patient_49_worried.png and b/Art/Patients/patient_49/patient_49_worried.png differ diff --git a/Art/Patients/patient_50/patient_50.aseprite b/Art/Patients/patient_50/patient_50.aseprite index 04ff113..701fce8 100644 Binary files a/Art/Patients/patient_50/patient_50.aseprite and b/Art/Patients/patient_50/patient_50.aseprite differ diff --git a/Art/Patients/patient_50/patient_50_abnormal.png b/Art/Patients/patient_50/patient_50_abnormal.png index ba1b64d..86c2e84 100644 Binary files a/Art/Patients/patient_50/patient_50_abnormal.png and b/Art/Patients/patient_50/patient_50_abnormal.png differ diff --git a/Art/Patients/patient_50/patient_50_neutral.png b/Art/Patients/patient_50/patient_50_neutral.png index 918f867..b7527e4 100644 Binary files a/Art/Patients/patient_50/patient_50_neutral.png and b/Art/Patients/patient_50/patient_50_neutral.png differ diff --git a/Art/Patients/patient_50/patient_50_panicked.png b/Art/Patients/patient_50/patient_50_panicked.png index db20025..cc95ba9 100644 Binary files a/Art/Patients/patient_50/patient_50_panicked.png and b/Art/Patients/patient_50/patient_50_panicked.png differ diff --git a/Art/Patients/patient_50/patient_50_puzzled.png b/Art/Patients/patient_50/patient_50_puzzled.png index a2ef890..a182a62 100644 Binary files a/Art/Patients/patient_50/patient_50_puzzled.png and b/Art/Patients/patient_50/patient_50_puzzled.png differ diff --git a/Art/Patients/patient_50/patient_50_scared.png b/Art/Patients/patient_50/patient_50_scared.png index e3e701a..7287d86 100644 Binary files a/Art/Patients/patient_50/patient_50_scared.png and b/Art/Patients/patient_50/patient_50_scared.png differ diff --git a/Art/Patients/patient_50/patient_50_shocked.png b/Art/Patients/patient_50/patient_50_shocked.png index 2ab97d3..e1acf97 100644 Binary files a/Art/Patients/patient_50/patient_50_shocked.png and b/Art/Patients/patient_50/patient_50_shocked.png differ diff --git a/Art/Patients/patient_50/patient_50_smiling.png b/Art/Patients/patient_50/patient_50_smiling.png index 79087a4..5046d55 100644 Binary files a/Art/Patients/patient_50/patient_50_smiling.png and b/Art/Patients/patient_50/patient_50_smiling.png differ diff --git a/Art/Patients/patient_50/patient_50_worried.png b/Art/Patients/patient_50/patient_50_worried.png index 8bd1aec..1471614 100644 Binary files a/Art/Patients/patient_50/patient_50_worried.png and b/Art/Patients/patient_50/patient_50_worried.png differ diff --git a/Art/Patients/patient_51/patient_51_abnormal1.png b/Art/Patients/patient_51/patient_51_abnormal1.png index 4e80e32..44c37fe 100644 Binary files a/Art/Patients/patient_51/patient_51_abnormal1.png and b/Art/Patients/patient_51/patient_51_abnormal1.png differ diff --git a/Art/Patients/patient_51/patient_51_abnormal2.png b/Art/Patients/patient_51/patient_51_abnormal2.png index dfca37f..266b1df 100644 Binary files a/Art/Patients/patient_51/patient_51_abnormal2.png and b/Art/Patients/patient_51/patient_51_abnormal2.png differ diff --git a/Art/Patients/patient_51/patient_51_angry.png b/Art/Patients/patient_51/patient_51_angry.png index f1a5bf4..c4d5630 100644 Binary files a/Art/Patients/patient_51/patient_51_angry.png and b/Art/Patients/patient_51/patient_51_angry.png differ diff --git a/Art/Patients/patient_51/patient_51_neutral.png b/Art/Patients/patient_51/patient_51_neutral.png index adf8daf..67e0249 100644 Binary files a/Art/Patients/patient_51/patient_51_neutral.png and b/Art/Patients/patient_51/patient_51_neutral.png differ diff --git a/Art/Patients/patient_51/patient_51_panicked.png b/Art/Patients/patient_51/patient_51_panicked.png index e63b115..cb5b08d 100644 Binary files a/Art/Patients/patient_51/patient_51_panicked.png and b/Art/Patients/patient_51/patient_51_panicked.png differ diff --git a/Art/Patients/patient_51/patient_51_puzzled.png b/Art/Patients/patient_51/patient_51_puzzled.png index 49ac1fc..8504742 100644 Binary files a/Art/Patients/patient_51/patient_51_puzzled.png and b/Art/Patients/patient_51/patient_51_puzzled.png differ diff --git a/Art/Patients/patient_51/patient_51_sad.png b/Art/Patients/patient_51/patient_51_sad.png index e58a55f..f262375 100644 Binary files a/Art/Patients/patient_51/patient_51_sad.png and b/Art/Patients/patient_51/patient_51_sad.png differ diff --git a/Art/Patients/patient_51/patient_51_sadsmiling.png b/Art/Patients/patient_51/patient_51_sadsmiling.png index 9d07d5a..a889b3c 100644 Binary files a/Art/Patients/patient_51/patient_51_sadsmiling.png and b/Art/Patients/patient_51/patient_51_sadsmiling.png differ diff --git a/Art/Patients/patient_51/patient_51_scared.png b/Art/Patients/patient_51/patient_51_scared.png index 4174740..0dc8d82 100644 Binary files a/Art/Patients/patient_51/patient_51_scared.png and b/Art/Patients/patient_51/patient_51_scared.png differ diff --git a/Art/Patients/patient_51/patient_51_shocked.png b/Art/Patients/patient_51/patient_51_shocked.png index a5fbf34..a38eb54 100644 Binary files a/Art/Patients/patient_51/patient_51_shocked.png and b/Art/Patients/patient_51/patient_51_shocked.png differ diff --git a/Art/Patients/patient_51/patient_51_surprised.png b/Art/Patients/patient_51/patient_51_surprised.png index 71f465b..d27f3b8 100644 Binary files a/Art/Patients/patient_51/patient_51_surprised.png and b/Art/Patients/patient_51/patient_51_surprised.png differ diff --git a/Art/Patients/patient_51/patient_51_worried.png b/Art/Patients/patient_51/patient_51_worried.png index 5044d2a..1ca1c95 100644 Binary files a/Art/Patients/patient_51/patient_51_worried.png and b/Art/Patients/patient_51/patient_51_worried.png differ diff --git a/Art/Rooms/screening_room/back_wall_extended.png b/Art/Rooms/screening_room/back_wall_extended.png new file mode 100644 index 0000000..aeaf371 Binary files /dev/null and b/Art/Rooms/screening_room/back_wall_extended.png differ diff --git a/Art/Rooms/screening_room/release_off.png.import b/Art/Rooms/screening_room/back_wall_extended.png.import similarity index 71% rename from Art/Rooms/screening_room/release_off.png.import rename to Art/Rooms/screening_room/back_wall_extended.png.import index c1ef3e7..1527ec7 100644 --- a/Art/Rooms/screening_room/release_off.png.import +++ b/Art/Rooms/screening_room/back_wall_extended.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://n2k0abd5iwrn" -path="res://.godot/imported/release_off.png-0702aba7be449505953cd0383ea1aef1.ctex" +uid="uid://c8vlr4durgw1x" +path="res://.godot/imported/back_wall_extended.png-46f516132ff1faa4ef6004471137bcba.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Rooms/screening_room/release_off.png" -dest_files=["res://.godot/imported/release_off.png-0702aba7be449505953cd0383ea1aef1.ctex"] +source_file="res://Art/Rooms/screening_room/back_wall_extended.png" +dest_files=["res://.godot/imported/back_wall_extended.png-46f516132ff1faa4ef6004471137bcba.ctex"] [params] diff --git a/Art/Rooms/screening_room/back_wall_new.aseprite b/Art/Rooms/screening_room/back_wall_new.aseprite new file mode 100644 index 0000000..8f8a125 Binary files /dev/null and b/Art/Rooms/screening_room/back_wall_new.aseprite differ diff --git a/Art/Rooms/screening_room/backwall.png b/Art/Rooms/screening_room/backwall.png index 08f514c..372b2d4 100644 Binary files a/Art/Rooms/screening_room/backwall.png and b/Art/Rooms/screening_room/backwall.png differ diff --git a/Art/Rooms/screening_room/backwall_extended.aseprite b/Art/Rooms/screening_room/backwall_extended.aseprite index 00b44f0..fb62ea3 100644 Binary files a/Art/Rooms/screening_room/backwall_extended.aseprite and b/Art/Rooms/screening_room/backwall_extended.aseprite differ diff --git a/Art/Rooms/screening_room/backwall_extended.png b/Art/Rooms/screening_room/backwall_extended.png index 663861c..6d37197 100644 Binary files a/Art/Rooms/screening_room/backwall_extended.png and b/Art/Rooms/screening_room/backwall_extended.png differ diff --git a/Art/Rooms/screening_room/button_bitmap.png b/Art/Rooms/screening_room/button_bitmap.png index 8ce294d..ff4cb92 100644 Binary files a/Art/Rooms/screening_room/button_bitmap.png and b/Art/Rooms/screening_room/button_bitmap.png differ diff --git a/Art/Rooms/screening_room/buttons.aseprite b/Art/Rooms/screening_room/buttons.aseprite deleted file mode 100644 index f929a60..0000000 Binary files a/Art/Rooms/screening_room/buttons.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/buttons_resized.aseprite b/Art/Rooms/screening_room/buttons_resized.aseprite deleted file mode 100644 index 809bf90..0000000 Binary files a/Art/Rooms/screening_room/buttons_resized.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/cell_wall.png b/Art/Rooms/screening_room/cell_wall.png index b10f1c7..d0ed94f 100644 Binary files a/Art/Rooms/screening_room/cell_wall.png and b/Art/Rooms/screening_room/cell_wall.png differ diff --git a/Art/Rooms/screening_room/computer.aseprite b/Art/Rooms/screening_room/computer.aseprite deleted file mode 100644 index e023a71..0000000 Binary files a/Art/Rooms/screening_room/computer.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/console_screen.aseprite b/Art/Rooms/screening_room/console_screen.aseprite deleted file mode 100644 index ea0868f..0000000 Binary files a/Art/Rooms/screening_room/console_screen.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/decision_screen.aseprite b/Art/Rooms/screening_room/decision_screen.aseprite deleted file mode 100644 index 19faee6..0000000 Binary files a/Art/Rooms/screening_room/decision_screen.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/desk.aseprite b/Art/Rooms/screening_room/desk.aseprite deleted file mode 100644 index c602c1c..0000000 Binary files a/Art/Rooms/screening_room/desk.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/green_button_hover.png b/Art/Rooms/screening_room/green_button_hover.png index d403f4e..66f81cb 100644 Binary files a/Art/Rooms/screening_room/green_button_hover.png and b/Art/Rooms/screening_room/green_button_hover.png differ diff --git a/Art/Rooms/screening_room/green_button_pressed.png b/Art/Rooms/screening_room/green_button_pressed.png index fe8a161..ccbc004 100644 Binary files a/Art/Rooms/screening_room/green_button_pressed.png and b/Art/Rooms/screening_room/green_button_pressed.png differ diff --git a/Art/Rooms/screening_room/middle_screen.aseprite b/Art/Rooms/screening_room/middle_screen.aseprite deleted file mode 100644 index 66ba1e9..0000000 Binary files a/Art/Rooms/screening_room/middle_screen.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/red_button_hover.png b/Art/Rooms/screening_room/red_button_hover.png index b8ede54..eb6e222 100644 Binary files a/Art/Rooms/screening_room/red_button_hover.png and b/Art/Rooms/screening_room/red_button_hover.png differ diff --git a/Art/Rooms/screening_room/red_button_pressed.png b/Art/Rooms/screening_room/red_button_pressed.png index 37aae90..1bb29e0 100644 Binary files a/Art/Rooms/screening_room/red_button_pressed.png and b/Art/Rooms/screening_room/red_button_pressed.png differ diff --git a/Art/Rooms/screening_room/release.aseprite b/Art/Rooms/screening_room/release.aseprite deleted file mode 100644 index 9c872c0..0000000 Binary files a/Art/Rooms/screening_room/release.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/release_off.png b/Art/Rooms/screening_room/release_off.png deleted file mode 100644 index 3776a66..0000000 Binary files a/Art/Rooms/screening_room/release_off.png and /dev/null differ diff --git a/Art/Rooms/screening_room/release_on.png b/Art/Rooms/screening_room/release_on.png deleted file mode 100644 index 73a1fa5..0000000 Binary files a/Art/Rooms/screening_room/release_on.png and /dev/null differ diff --git a/Art/Rooms/screening_room/release_on.png.import b/Art/Rooms/screening_room/release_on.png.import deleted file mode 100644 index 689c88b..0000000 --- a/Art/Rooms/screening_room/release_on.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cfi85pwknn8dw" -path="res://.godot/imported/release_on.png-cdf8a5dacfe20cb33d44b814e4ed12c3.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Art/Rooms/screening_room/release_on.png" -dest_files=["res://.godot/imported/release_on.png-cdf8a5dacfe20cb33d44b814e4ed12c3.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/Rooms/screening_room/release_resized.aseprite b/Art/Rooms/screening_room/release_resized.aseprite deleted file mode 100644 index e028613..0000000 Binary files a/Art/Rooms/screening_room/release_resized.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/room_frame.aseprite b/Art/Rooms/screening_room/room_frame.aseprite deleted file mode 100644 index a788597..0000000 Binary files a/Art/Rooms/screening_room/room_frame.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/screening_room_glass.png b/Art/Rooms/screening_room/screening_room_glass.png deleted file mode 100644 index 52897b3..0000000 Binary files a/Art/Rooms/screening_room/screening_room_glass.png and /dev/null differ diff --git a/Art/Rooms/screening_room/screening_room_glass.png.import b/Art/Rooms/screening_room/screening_room_glass.png.import deleted file mode 100644 index 190cde0..0000000 --- a/Art/Rooms/screening_room/screening_room_glass.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b2epvjeqvmgrs" -path="res://.godot/imported/screening_room_glass.png-ec4ab43e606292a880fcc2fbdab14a28.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Art/Rooms/screening_room/screening_room_glass.png" -dest_files=["res://.godot/imported/screening_room_glass.png-ec4ab43e606292a880fcc2fbdab14a28.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/Rooms/screening_room/screening_room_new.aseprite b/Art/Rooms/screening_room/screening_room_new.aseprite index eb6535b..945720d 100644 Binary files a/Art/Rooms/screening_room/screening_room_new.aseprite and b/Art/Rooms/screening_room/screening_room_new.aseprite differ diff --git a/Art/Rooms/screening_room/screening_room_bis.aseprite b/Art/Rooms/screening_room/screening_room_old.aseprite similarity index 100% rename from Art/Rooms/screening_room/screening_room_bis.aseprite rename to Art/Rooms/screening_room/screening_room_old.aseprite diff --git a/Art/Rooms/screening_room/tea_cup.aseprite b/Art/Rooms/screening_room/tea_cup.aseprite deleted file mode 100644 index dfb2f82..0000000 Binary files a/Art/Rooms/screening_room/tea_cup.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/tea_cup.png b/Art/Rooms/screening_room/tea_cup.png deleted file mode 100644 index ba35b2e..0000000 Binary files a/Art/Rooms/screening_room/tea_cup.png and /dev/null differ diff --git a/Art/Rooms/screening_room/tea_cup.png.import b/Art/Rooms/screening_room/tea_cup.png.import deleted file mode 100644 index 534f656..0000000 --- a/Art/Rooms/screening_room/tea_cup.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://djhhkejop4636" -path="res://.godot/imported/tea_cup.png-b1ae6d4560e5ac222edbcf15f37afaf6.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Art/Rooms/screening_room/tea_cup.png" -dest_files=["res://.godot/imported/tea_cup.png-b1ae6d4560e5ac222edbcf15f37afaf6.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/Rooms/screening_room/tea_cup_resized.aseprite b/Art/Rooms/screening_room/tea_cup_resized.aseprite deleted file mode 100644 index 78f7684..0000000 Binary files a/Art/Rooms/screening_room/tea_cup_resized.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/terminate.aseprite b/Art/Rooms/screening_room/terminate.aseprite deleted file mode 100644 index bc618a1..0000000 Binary files a/Art/Rooms/screening_room/terminate.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/terminate_off.png b/Art/Rooms/screening_room/terminate_off.png deleted file mode 100644 index 9f9aa22..0000000 Binary files a/Art/Rooms/screening_room/terminate_off.png and /dev/null differ diff --git a/Art/Rooms/screening_room/terminate_off.png.import b/Art/Rooms/screening_room/terminate_off.png.import deleted file mode 100644 index fc290d5..0000000 --- a/Art/Rooms/screening_room/terminate_off.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bvns3403af0no" -path="res://.godot/imported/terminate_off.png-ff94952be4de92a8e958e7d9a348ac99.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Art/Rooms/screening_room/terminate_off.png" -dest_files=["res://.godot/imported/terminate_off.png-ff94952be4de92a8e958e7d9a348ac99.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/Rooms/screening_room/terminate_on.png b/Art/Rooms/screening_room/terminate_on.png deleted file mode 100644 index 4aaf691..0000000 Binary files a/Art/Rooms/screening_room/terminate_on.png and /dev/null differ diff --git a/Art/Rooms/screening_room/terminate_on.png.import b/Art/Rooms/screening_room/terminate_on.png.import deleted file mode 100644 index 171d13e..0000000 --- a/Art/Rooms/screening_room/terminate_on.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b4fe8gvg86l4f" -path="res://.godot/imported/terminate_on.png-cc42d1d049d48f4f0d7dfb1da605320d.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Art/Rooms/screening_room/terminate_on.png" -dest_files=["res://.godot/imported/terminate_on.png-cc42d1d049d48f4f0d7dfb1da605320d.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/Rooms/screening_room/terminate_resized.aseprite b/Art/Rooms/screening_room/terminate_resized.aseprite deleted file mode 100644 index 7e7b3e8..0000000 Binary files a/Art/Rooms/screening_room/terminate_resized.aseprite and /dev/null differ diff --git a/Dialogues/Patients/patient_46.dialogue b/Dialogues/Patients/patient_46.dialogue index d40efc6..220ab35 100644 --- a/Dialogues/Patients/patient_46.dialogue +++ b/Dialogues/Patients/patient_46.dialogue @@ -98,9 +98,9 @@ do Globals.console_message.emit("[color=dark_orange]ALLOTED ASSESSMENT TIME ELAP ~ terminate if Patient.abnormal == true do Globals.character_label_color_change.emit(Color(1,0,0,1)) - 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: [#abnormal] I am alone. There is no one for me anymore. No one for me to [color=orange_red]LIVE[/color]. do Globals.color_change.emit("red") - Fontelyne Dumont: [#abnormal1] I feel so lonely... Helene... I am so sorry... + Fontelyne Dumont: [#abnormal] I feel so lonely... Helene... I am so sorry... else do Globals.character_label_color_change.emit(Color(0,1,0,1)) do Globals.color_change.emit("red") diff --git a/screening_desk.gd b/screening_desk.gd index 51378ec..01063f6 100644 --- a/screening_desk.gd +++ b/screening_desk.gd @@ -64,6 +64,7 @@ func _ready() -> void: room_asset.hide() for room_asset in [$RoomAssets/Glass, $RoomAssets/Room, $RoomAssets/Backwall]: room_asset.show() + $RoomAssets/Backwall.position = Vector2(0, -2700) #Hiding ComputerScreen, DialogueText and JournalOpen var nodes_to_hide = [next_patient, end_day, computer_screen, console_screen, journal_layer] + computer_tabs.get_children() diff --git a/screening_desk.tscn b/screening_desk.tscn index a7567e7..2dc0608 100644 --- a/screening_desk.tscn +++ b/screening_desk.tscn @@ -1,12 +1,11 @@ -[gd_scene load_steps=44 format=3 uid="uid://chytk2cctjk3x"] +[gd_scene load_steps=43 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://b77a477f2ckr4" path="res://Art/Patients/patient_47/patient_47_neutral.png" id="3_43vqp"] +[ext_resource type="Texture2D" uid="uid://wm5ht6ktonff" path="res://Art/Patients/patient_51/patient_51_neutral.png" id="3_43vqp"] [ext_resource type="Script" uid="uid://vjvnh47s4akq" path="res://patient.gd" id="4_43vqp"] [ext_resource type="Shader" uid="uid://dwepb0lm1veje" path="res://supervisor.gdshader" id="4_qsin6"] [ext_resource type="Script" uid="uid://cdkbyikbjqlsh" path="res://supervisor.gd" id="5_43vqp"] [ext_resource type="Texture2D" uid="uid://cci0pb12chlps" path="res://Art/Rooms/screening_room/computer.png" id="6_6a8ar"] -[ext_resource type="Texture2D" uid="uid://dj1x60fld5400" path="res://Art/Rooms/screening_room/backwall.png" id="6_5772r"] [ext_resource type="Texture2D" uid="uid://jychpkygmjib" path="res://Art/Rooms/screening_room/desk.png" id="7_dp545"] [ext_resource type="Theme" uid="uid://3k7sqw211ncl" path="res://Art/UI/button_theme.tres" id="8_hxrv4"] [ext_resource type="Texture2D" uid="uid://c3frxq4vyu0pr" path="res://Art/Rooms/screening_room/console_screen.png" id="9_68gp8"] @@ -19,7 +18,6 @@ [ext_resource type="FontFile" uid="uid://dv8ppra5tgn1t" path="res://Art/Fonts/PixelatedEleganceRegular-ovyAA.ttf" id="14_0pvwy"] [ext_resource type="Texture2D" uid="uid://c35f0aquvroje" path="res://Art/Rooms/screening_room/red_button_hover.png" id="15_pbvyq"] [ext_resource type="Texture2D" uid="uid://4tgfgi4earv1" path="res://Art/Rooms/screening_room/journal_unpressed.png" id="17_7o31y"] -[ext_resource type="Texture2D" uid="uid://djhhkejop4636" path="res://Art/Rooms/screening_room/tea_cup.png" id="17_son5s"] [ext_resource type="Texture2D" uid="uid://1djtmkdqtplt" path="res://Art/Rooms/screening_room/journal_pressed.png" id="18_gv516"] [ext_resource type="Texture2D" uid="uid://b7tbgcyxjj516" path="res://Art/Rooms/screening_room/journal_hover.png" id="19_ar3nk"] [ext_resource type="BitMap" uid="uid://byqmvpivmvsnl" path="res://Art/Rooms/screening_room/journal_bitmap.png" id="20_5vhu5"] @@ -28,6 +26,7 @@ [ext_resource type="Texture2D" uid="uid://twd5atevu4i3" path="res://Art/Rooms/screening_room/cell_wall.png" id="25_qsin6"] [ext_resource type="Texture2D" uid="uid://chteaunv8emx8" path="res://Art/Rooms/screening_room/room_frame.png" id="26_43vqp"] [ext_resource type="Texture2D" uid="uid://45dcbg2ij3d7" path="res://Art/Rooms/screening_room/cell_top.png" id="28_qsin6"] +[ext_resource type="Texture2D" uid="uid://q34mpgfv5upt" path="res://Art/Rooms/screening_room/backwall_extended.png" id="28_w70jd"] [ext_resource type="Texture2D" uid="uid://cqwn5qo7kab4x" path="res://Art/Rooms/screening_room/cell_bot.png" id="29_43vqp"] [ext_resource type="Texture2D" uid="uid://c6ary7qg7jhc6" path="res://Art/Rooms/screening_room/decision_screen.png" id="29_cobue"] @@ -67,7 +66,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0, 2), "transitions": PackedFloat32Array(2.5, 1), "update": 0, -"values": [Vector2(0, -2160), Vector2(0, -4320)] +"values": [Vector2(0, -2700), Vector2(0, -5400)] } [sub_resource type="Animation" id="Animation_ylm1s"] @@ -83,7 +82,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0, 3), "transitions": PackedFloat32Array(0.3, 1), "update": 0, -"values": [Vector2(0, 0), Vector2(0, -2160)] +"values": [Vector2(0, 0), Vector2(0, -2700)] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_ylm1s"] @@ -725,25 +724,6 @@ text = "[color=dark_red]TERMINATE[/color]" horizontal_alignment = 1 vertical_alignment = 1 -[node name="TeaCup" type="Control" parent="LowerHalf"] -visible = false -anchors_preset = 0 -offset_left = 532.0 -offset_top = 322.0 -offset_right = 644.0 -offset_bottom = 386.0 - -[node name="TeaCupTexture" type="TextureRect" parent="LowerHalf/TeaCup"] -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 -texture = ExtResource("17_son5s") - [node name="Journal" type="Control" parent="LowerHalf"] anchors_preset = 0 offset_left = 532.0 @@ -790,7 +770,6 @@ texture = ExtResource("24_qsin6") expand_mode = 1 [node name="CellWall" type="TextureRect" parent="RoomAssets"] -visible = false z_index = 1 layout_mode = 1 anchors_preset = 15 @@ -822,13 +801,14 @@ anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 offset_top = -2160.0 -offset_bottom = 2160.0 +offset_bottom = 3240.0 grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 3 size_flags_vertical = 3 mouse_filter = 2 -texture = ExtResource("6_5772r") +texture = ExtResource("28_w70jd") +stretch_mode = 2 [node name="BackwallAnimation" type="AnimationPlayer" parent="RoomAssets/Backwall"] root_node = NodePath("../..") @@ -837,6 +817,7 @@ libraries = { } [node name="CellTop" type="TextureRect" parent="RoomAssets"] +visible = false z_index = 3 layout_mode = 1 anchors_preset = 15 @@ -855,6 +836,7 @@ texture = ExtResource("28_qsin6") stretch_mode = 3 [node name="CellBot" type="TextureRect" parent="RoomAssets"] +visible = false z_index = 3 layout_mode = 1 anchors_preset = 15