diff --git a/Art/Patients/patient_46/patient_46_irritated.png b/Art/Patients/patient_46/patient_46_irritated.png index 1bb593f..2654355 100644 Binary files a/Art/Patients/patient_46/patient_46_irritated.png and b/Art/Patients/patient_46/patient_46_irritated.png differ diff --git a/Art/Rooms/screening_room/cell.aseprite b/Art/Rooms/screening_room/cell.aseprite index e8563e8..b960a52 100644 Binary files a/Art/Rooms/screening_room/cell.aseprite and b/Art/Rooms/screening_room/cell.aseprite differ diff --git a/Art/Rooms/screening_room/cell_bot.aseprite b/Art/Rooms/screening_room/cell_bot.aseprite index 98ea1e7..c5c7085 100644 Binary files a/Art/Rooms/screening_room/cell_bot.aseprite and b/Art/Rooms/screening_room/cell_bot.aseprite differ diff --git a/Art/Rooms/screening_room/cell_bot.png b/Art/Rooms/screening_room/cell_bot.png index 2ec372d..2bf6fc0 100644 Binary files a/Art/Rooms/screening_room/cell_bot.png and b/Art/Rooms/screening_room/cell_bot.png differ diff --git a/Art/Rooms/screening_room/cell_top.aseprite b/Art/Rooms/screening_room/cell_top.aseprite index 2299d4a..4e398fd 100644 Binary files a/Art/Rooms/screening_room/cell_top.aseprite and b/Art/Rooms/screening_room/cell_top.aseprite differ diff --git a/Art/Rooms/screening_room/cell_top.png b/Art/Rooms/screening_room/cell_top.png index 10f9394..a9cf869 100644 Binary files a/Art/Rooms/screening_room/cell_top.png and b/Art/Rooms/screening_room/cell_top.png differ diff --git a/Art/Rooms/screening_room/cell_wall.aseprite b/Art/Rooms/screening_room/cell_wall.aseprite index ca98ecc..017844e 100644 Binary files a/Art/Rooms/screening_room/cell_wall.aseprite and b/Art/Rooms/screening_room/cell_wall.aseprite differ diff --git a/Art/Rooms/screening_room/cell_wall.png b/Art/Rooms/screening_room/cell_wall.png index 5dd5607..b10f1c7 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/cell_wall_pixelated.aseprite b/Art/Rooms/screening_room/cell_wall_pixelated.aseprite deleted file mode 100644 index a9488e9..0000000 Binary files a/Art/Rooms/screening_room/cell_wall_pixelated.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/screening_room.png b/Art/Rooms/screening_room/room_frame.png similarity index 65% rename from Art/Rooms/screening_room/screening_room.png rename to Art/Rooms/screening_room/room_frame.png index 9b4029a..0470b99 100644 Binary files a/Art/Rooms/screening_room/screening_room.png and b/Art/Rooms/screening_room/room_frame.png differ diff --git a/Art/Rooms/screening_room/screening_room.png.import b/Art/Rooms/screening_room/room_frame.png.import similarity index 72% rename from Art/Rooms/screening_room/screening_room.png.import rename to Art/Rooms/screening_room/room_frame.png.import index 858de48..a1d9c96 100644 --- a/Art/Rooms/screening_room/screening_room.png.import +++ b/Art/Rooms/screening_room/room_frame.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://ds1whnmwt7xjt" -path="res://.godot/imported/screening_room.png-0463338d87078a7a4198dd0e7c8bd531.ctex" +uid="uid://chteaunv8emx8" +path="res://.godot/imported/room_frame.png-cc7f6b5ec88519f99bb5caac70b4d30e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Rooms/screening_room/screening_room.png" -dest_files=["res://.godot/imported/screening_room.png-0463338d87078a7a4198dd0e7c8bd531.ctex"] +source_file="res://Art/Rooms/screening_room/room_frame.png" +dest_files=["res://.godot/imported/room_frame.png-cc7f6b5ec88519f99bb5caac70b4d30e.ctex"] [params] diff --git a/Art/Rooms/screening_room/room_glass.png b/Art/Rooms/screening_room/room_glass.png new file mode 100644 index 0000000..8dd54c1 Binary files /dev/null and b/Art/Rooms/screening_room/room_glass.png differ diff --git a/Art/Rooms/screening_room/room_glass.png.import b/Art/Rooms/screening_room/room_glass.png.import new file mode 100644 index 0000000..d672f2e --- /dev/null +++ b/Art/Rooms/screening_room/room_glass.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d2k6h1dqg0uox" +path="res://.godot/imported/room_glass.png-ef5a0187b2780570160800e9c1c6312d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Rooms/screening_room/room_glass.png" +dest_files=["res://.godot/imported/room_glass.png-ef5a0187b2780570160800e9c1c6312d.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 9c67a2e..a2617fa 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_resized.aseprite b/Art/Rooms/screening_room/screening_room_resized.aseprite deleted file mode 100644 index 52e5dbb..0000000 Binary files a/Art/Rooms/screening_room/screening_room_resized.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/screening_room_upper.aseprite b/Art/Rooms/screening_room/screening_room_upper.aseprite deleted file mode 100644 index 12c7a20..0000000 Binary files a/Art/Rooms/screening_room/screening_room_upper.aseprite and /dev/null differ diff --git a/addons/godot-git-plugin/win64/~libgit_plugin.windows.editor.x86_64.dll b/addons/godot-git-plugin/win64/~libgit_plugin.windows.editor.x86_64.dll deleted file mode 100644 index 47bbb1d..0000000 Binary files a/addons/godot-git-plugin/win64/~libgit_plugin.windows.editor.x86_64.dll and /dev/null differ diff --git a/screening_desk.tscn b/screening_desk.tscn index ec6b2af..7a19bd3 100644 --- a/screening_desk.tscn +++ b/screening_desk.tscn @@ -1,11 +1,9 @@ [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://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="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://ds1whnmwt7xjt" path="res://Art/Rooms/screening_room/screening_room.png" id="5_aa8r5"] [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"] @@ -25,7 +23,9 @@ [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"] [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://d2k6h1dqg0uox" path="res://Art/Rooms/screening_room/room_glass.png" id="24_qsin6"] [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://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"] @@ -769,7 +769,7 @@ grow_vertical = 2 mouse_filter = 2 [node name="Glass" type="TextureRect" parent="RoomAssets"] -modulate = Color(1, 1, 1, 0.6784314) +modulate = Color(1, 1, 1, 0.17254902) z_index = 4 layout_mode = 1 anchors_preset = 15 @@ -780,7 +780,7 @@ grow_vertical = 2 size_flags_horizontal = 3 size_flags_vertical = 3 mouse_filter = 2 -texture = ExtResource("3_nxnrp") +texture = ExtResource("24_qsin6") expand_mode = 1 [node name="CellWall" type="TextureRect" parent="RoomAssets"] @@ -808,7 +808,7 @@ grow_vertical = 2 size_flags_horizontal = 3 size_flags_vertical = 3 mouse_filter = 2 -texture = ExtResource("5_aa8r5") +texture = ExtResource("26_43vqp") [node name="Backwall" type="TextureRect" parent="RoomAssets"] layout_mode = 1 @@ -840,7 +840,7 @@ anchor_bottom = 1.0 offset_left = -2540.0 offset_top = -540.0 offset_right = -1460.0 -offset_bottom = -269.9995 +offset_bottom = 1080.0 grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 4 @@ -859,7 +859,7 @@ anchor_bottom = 1.0 offset_left = 60.0 offset_top = 50.0 offset_right = 1140.0 -offset_bottom = 320.00098 +offset_bottom = 1670.0 grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 4