diff --git a/Art/Rooms/screening_room/backroom.png b/Art/Rooms/screening_room/backroom.png deleted file mode 100644 index 9fb3440..0000000 Binary files a/Art/Rooms/screening_room/backroom.png and /dev/null differ diff --git a/Art/Rooms/screening_room/backroom_new.aseprite b/Art/Rooms/screening_room/backroom_new.aseprite deleted file mode 100644 index 3b196fd..0000000 Binary files a/Art/Rooms/screening_room/backroom_new.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/cell_bot.png b/Art/Rooms/screening_room/cell_bot.png new file mode 100644 index 0000000..b0a1aec Binary files /dev/null and b/Art/Rooms/screening_room/cell_bot.png differ diff --git a/Art/Rooms/screening_room/backroom.png.import b/Art/Rooms/screening_room/cell_bot.png.import similarity index 73% rename from Art/Rooms/screening_room/backroom.png.import rename to Art/Rooms/screening_room/cell_bot.png.import index 35d95b4..d6f4e88 100644 --- a/Art/Rooms/screening_room/backroom.png.import +++ b/Art/Rooms/screening_room/cell_bot.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://by34irl73n8pb" -path="res://.godot/imported/backroom.png-ebf3f437a8e4f79ee56faafa1f171c63.ctex" +uid="uid://cqwn5qo7kab4x" +path="res://.godot/imported/cell_bot.png-50df821a95339ef73ebfdfe907b5af0d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Rooms/screening_room/backroom.png" -dest_files=["res://.godot/imported/backroom.png-ebf3f437a8e4f79ee56faafa1f171c63.ctex"] +source_file="res://Art/Rooms/screening_room/cell_bot.png" +dest_files=["res://.godot/imported/cell_bot.png-50df821a95339ef73ebfdfe907b5af0d.ctex"] [params] diff --git a/Art/Rooms/screening_room/cell_new.aseprite b/Art/Rooms/screening_room/cell_new.aseprite new file mode 100644 index 0000000..8ba20a4 Binary files /dev/null and b/Art/Rooms/screening_room/cell_new.aseprite differ diff --git a/Art/Rooms/screening_room/cell_resized.aseprite b/Art/Rooms/screening_room/cell_resized.aseprite deleted file mode 100644 index f2da8df..0000000 Binary files a/Art/Rooms/screening_room/cell_resized.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/cell_top.png b/Art/Rooms/screening_room/cell_top.png new file mode 100644 index 0000000..8ebdaf5 Binary files /dev/null and b/Art/Rooms/screening_room/cell_top.png differ diff --git a/Art/Rooms/screening_room/shutter_top.png.import b/Art/Rooms/screening_room/cell_top.png.import similarity index 72% rename from Art/Rooms/screening_room/shutter_top.png.import rename to Art/Rooms/screening_room/cell_top.png.import index 773c5bf..f762881 100644 --- a/Art/Rooms/screening_room/shutter_top.png.import +++ b/Art/Rooms/screening_room/cell_top.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://4qtc0tkq2wba" -path="res://.godot/imported/shutter_top.png-47dbf9fb0676152bd2c08e9275254d00.ctex" +uid="uid://45dcbg2ij3d7" +path="res://.godot/imported/cell_top.png-f33453e4a4e112dbdec656eda6dc9763.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Rooms/screening_room/shutter_top.png" -dest_files=["res://.godot/imported/shutter_top.png-47dbf9fb0676152bd2c08e9275254d00.ctex"] +source_file="res://Art/Rooms/screening_room/cell_top.png" +dest_files=["res://.godot/imported/cell_top.png-f33453e4a4e112dbdec656eda6dc9763.ctex"] [params] diff --git a/Art/Rooms/screening_room/cell_wall.aseprite b/Art/Rooms/screening_room/cell_wall.aseprite new file mode 100644 index 0000000..ca98ecc Binary files /dev/null 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 new file mode 100644 index 0000000..5dd5607 Binary files /dev/null and b/Art/Rooms/screening_room/cell_wall.png differ diff --git a/Art/Rooms/screening_room/shutter_bottom.png.import b/Art/Rooms/screening_room/cell_wall.png.import similarity index 72% rename from Art/Rooms/screening_room/shutter_bottom.png.import rename to Art/Rooms/screening_room/cell_wall.png.import index 4880250..1833781 100644 --- a/Art/Rooms/screening_room/shutter_bottom.png.import +++ b/Art/Rooms/screening_room/cell_wall.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cdbiwtt2w37kr" -path="res://.godot/imported/shutter_bottom.png-3770ab6aad5aaee5b614c1044ba685cb.ctex" +uid="uid://twd5atevu4i3" +path="res://.godot/imported/cell_wall.png-691b266e2b44f10405efeeaa4e401965.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Art/Rooms/screening_room/shutter_bottom.png" -dest_files=["res://.godot/imported/shutter_bottom.png-3770ab6aad5aaee5b614c1044ba685cb.ctex"] +source_file="res://Art/Rooms/screening_room/cell_wall.png" +dest_files=["res://.godot/imported/cell_wall.png-691b266e2b44f10405efeeaa4e401965.ctex"] [params] diff --git a/Art/Rooms/screening_room/shutter_bottom.aseprite b/Art/Rooms/screening_room/shutter_bottom.aseprite deleted file mode 100644 index 0dd1aa9..0000000 Binary files a/Art/Rooms/screening_room/shutter_bottom.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/shutter_bottom.png b/Art/Rooms/screening_room/shutter_bottom.png deleted file mode 100644 index 25981f4..0000000 Binary files a/Art/Rooms/screening_room/shutter_bottom.png and /dev/null differ diff --git a/Art/Rooms/screening_room/shutter_bottom_resized.aseprite b/Art/Rooms/screening_room/shutter_bottom_resized.aseprite deleted file mode 100644 index c76551e..0000000 Binary files a/Art/Rooms/screening_room/shutter_bottom_resized.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/shutter_top.aseprite b/Art/Rooms/screening_room/shutter_top.aseprite deleted file mode 100644 index ac766e9..0000000 Binary files a/Art/Rooms/screening_room/shutter_top.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/shutter_top.png b/Art/Rooms/screening_room/shutter_top.png deleted file mode 100644 index 8027c90..0000000 Binary files a/Art/Rooms/screening_room/shutter_top.png and /dev/null differ diff --git a/Art/Rooms/screening_room/shutter_top_resized.aseprite b/Art/Rooms/screening_room/shutter_top_resized.aseprite deleted file mode 100644 index 388e362..0000000 Binary files a/Art/Rooms/screening_room/shutter_top_resized.aseprite and /dev/null differ diff --git a/Art/Rooms/screening_room/shutters.aseprite b/Art/Rooms/screening_room/shutters.aseprite deleted file mode 100644 index 6a625eb..0000000 Binary files a/Art/Rooms/screening_room/shutters.aseprite and /dev/null differ diff --git a/screening_desk.gd b/screening_desk.gd index 0ef8fa5..0cafc2e 100644 --- a/screening_desk.gd +++ b/screening_desk.gd @@ -24,10 +24,10 @@ extends Control @onready var console_screen = $LowerHalf/ConsoleScreen/Margin/ConsoleText #RoomAssets -@onready var shutter_top = $RoomAssets/ShutterTop -@onready var shutter_bot = $RoomAssets/ShutterBot -@onready var shutters_animation = $RoomAssets/ShuttersAnimation -@onready var backroom = $RoomAssets/Backroom +@onready var cell_top = $RoomAssets/CellTop +@onready var cell_bot = $RoomAssets/CellBot +@onready var cell_animation = $RoomAssets/CellAnimation +@onready var cell_wall = $RoomAssets/CellWall @onready var backwall_animation = $RoomAssets/Backwall/BackwallAnimation #DialogueAssets @@ -59,10 +59,12 @@ func _ready() -> void: 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]: + #Hiding and showing appropriate RoomAssets + for room_asset in [cell_top, cell_bot, cell_wall]: room_asset.hide() - + for room_asset in [$RoomAssets/Glass, $RoomAssets/Room, $RoomAssets/Backwall]: + room_asset.show() + #Hiding ComputerScreen, DialogueText and JournalOpen var nodes_to_hide = [next_patient, end_day, computer_screen, console_screen, journal_layer] + computer_tabs.get_children() for node in nodes_to_hide: @@ -108,19 +110,19 @@ func _on_call_next_patient_pressed(): #Brings in next patient and sets up the de console_display(message) #ShuttersIncoming - shutters_animation.play("incoming") - shutter_top.show() - shutter_bot.show() - await shutters_animation.animation_finished + cell_animation.play("incoming") + cell_top.show() + cell_bot.show() + await cell_animation.animation_finished #Showing the Patient and the Backroom - var scenes_to_show = [patient, backroom] + var scenes_to_show = [patient, cell_wall] for scene in scenes_to_show: scene.show() #Opening Shutters - shutters_animation.play("open") - await shutters_animation.animation_finished + cell_animation.play("open") + await cell_animation.animation_finished #Activating Buttons green_button.set_disabled(false) @@ -255,18 +257,18 @@ func _on_clear_patient(choice:String): #Clears patient and transitions towards n console_display(message_array[1]) #Closing Shutters - shutters_animation.play("close") - await shutters_animation.animation_finished + cell_animation.play("close") + await cell_animation.animation_finished #Hiding the cell and restoring the backroom and patient's original colors - for scene in [patient, backroom]: + for scene in [patient, cell_wall]: scene.hide() patient.modulate = Patient.original_color - backroom.modulate = Patient.original_color + cell_wall.modulate = Patient.original_color #Hiding Computer screen and resetting Console screen once the animation is done - shutters_animation.play(choice) - await shutters_animation.animation_finished + cell_animation.play(choice) + await cell_animation.animation_finished computer_screen.hide() console_screen.hide() @@ -297,7 +299,7 @@ func _on_color_change(color: String): #Modulating backroom and patient colors "green": new_color = Color(0.5,1,0.5,1) patient.modulate = new_color - backroom.modulate = new_color + cell_wall.modulate = new_color print("Color changed to: " + str(new_color)) diff --git a/screening_desk.tscn b/screening_desk.tscn index a6d21eb..1b55c21 100644 --- a/screening_desk.tscn +++ b/screening_desk.tscn @@ -3,15 +3,12 @@ [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="Texture2D" uid="uid://by34irl73n8pb" path="res://Art/Rooms/screening_room/backroom.png" id="4_fij8w"] [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://4qtc0tkq2wba" path="res://Art/Rooms/screening_room/shutter_top.png" id="6_1rj24"] [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="Texture2D" uid="uid://cdbiwtt2w37kr" path="res://Art/Rooms/screening_room/shutter_bottom.png" id="7_feog2"] [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"] [ext_resource type="BitMap" uid="uid://b1y07k0opbyju" path="res://Art/Rooms/screening_room/button_bitmap.png" id="10_hxph5"] @@ -28,6 +25,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://twd5atevu4i3" path="res://Art/Rooms/screening_room/cell_wall.png" id="25_qsin6"] +[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"] [sub_resource type="Theme" id="Theme_63o5x"] @@ -109,7 +109,7 @@ tracks/0/keys = { tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("../ShutterTop:position") +tracks/1/path = NodePath("../CellTop:position") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { @@ -137,7 +137,7 @@ tracks/0/keys = { tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("../ShutterTop:position") +tracks/1/path = NodePath("../CellTop:position") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { @@ -165,7 +165,7 @@ tracks/0/keys = { tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("../ShutterTop:position") +tracks/1/path = NodePath("../CellTop:position") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { @@ -193,7 +193,7 @@ tracks/0/keys = { tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("../ShutterTop:position") +tracks/1/path = NodePath("../CellTop:position") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { @@ -209,7 +209,7 @@ length = 3.0 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("../ShutterTop:position") +tracks/0/path = NodePath("../CellTop:position") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -237,7 +237,7 @@ length = 2.0 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("../ShutterTop:position") +tracks/0/path = NodePath("../CellTop:position") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -769,6 +769,7 @@ grow_vertical = 2 mouse_filter = 2 [node name="Glass" type="TextureRect" parent="RoomAssets"] +visible = false modulate = Color(1, 1, 1, 0.6784314) z_index = 4 layout_mode = 1 @@ -783,7 +784,7 @@ mouse_filter = 2 texture = ExtResource("3_nxnrp") expand_mode = 1 -[node name="Backroom" type="TextureRect" parent="RoomAssets"] +[node name="CellWall" type="TextureRect" parent="RoomAssets"] visible = false z_index = 1 layout_mode = 1 @@ -795,9 +796,10 @@ grow_vertical = 2 size_flags_horizontal = 3 size_flags_vertical = 3 mouse_filter = 2 -texture = ExtResource("4_fij8w") +texture = ExtResource("25_qsin6") [node name="Room" type="TextureRect" parent="RoomAssets"] +visible = false z_index = 5 layout_mode = 1 anchors_preset = 15 @@ -811,6 +813,7 @@ mouse_filter = 2 texture = ExtResource("5_aa8r5") [node name="Backwall" type="TextureRect" parent="RoomAssets"] +visible = false layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -830,7 +833,8 @@ libraries = { &"": SubResource("AnimationLibrary_ylm1s") } -[node name="ShutterTop" type="TextureRect" parent="RoomAssets"] +[node name="CellTop" type="TextureRect" parent="RoomAssets"] +visible = false z_index = 3 layout_mode = 1 anchors_preset = 15 @@ -845,10 +849,11 @@ grow_vertical = 2 size_flags_horizontal = 4 size_flags_vertical = 0 mouse_filter = 2 -texture = ExtResource("6_1rj24") +texture = ExtResource("28_qsin6") stretch_mode = 3 -[node name="ShutterBot" type="TextureRect" parent="RoomAssets"] +[node name="CellBot" type="TextureRect" parent="RoomAssets"] +visible = false z_index = 3 layout_mode = 1 anchors_preset = 15 @@ -862,11 +867,11 @@ grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 4 mouse_filter = 2 -texture = ExtResource("7_feog2") +texture = ExtResource("29_43vqp") stretch_mode = 3 -[node name="ShuttersAnimation" type="AnimationPlayer" parent="RoomAssets"] -root_node = NodePath("../ShutterBot") +[node name="CellAnimation" type="AnimationPlayer" parent="RoomAssets"] +root_node = NodePath("../CellBot") libraries = { &"": SubResource("AnimationLibrary_vh6fv") } diff --git a/ui.tscn b/ui.tscn index 59bda8d..7686c70 100644 --- a/ui.tscn +++ b/ui.tscn @@ -134,36 +134,41 @@ layout_mode = 2 size_flags_horizontal = 3 [node name="PageTitle" type="RichTextLabel" parent="JournalLayer/JournalOpen/JournalMargin/PageArea/LeftPage"] -custom_minimum_size = Vector2(0, 100) +custom_minimum_size = Vector2(0, 200) layout_mode = 2 size_flags_stretch_ratio = 0.1 theme_override_font_sizes/normal_font_size = 28 bbcode_enabled = true text = " -[center]USER'S GUIDE[/center]" +[center]EMPLOYEES' MANUAL[/center]" [node name="Instructions" type="RichTextLabel" parent="JournalLayer/JournalOpen/JournalMargin/PageArea/LeftPage"] -custom_minimum_size = Vector2(0, 500) +custom_minimum_size = Vector2(0, 200) layout_mode = 2 -size_flags_vertical = 3 -size_flags_stretch_ratio = 0.0 theme_override_constants/line_separation = 20 theme_override_font_sizes/normal_font_size = 20 bbcode_enabled = true -text = " +text = "THE FOLLOWING [color=dark_orange]SYMPTOMS[/color] HAVE BEEN IDENTIFIED AS MARKERS OF ABNORMALITY CONVERSION. +IF YOU DETECT ONE THAT WAS NOT ASSESSED IN PRE-SCREENING, [color=red]TERMINATE[/color] THE SUBJECT." - -THE FOLLOWING SYMPTOMS HAVE BEEN IDENTIFIED AS MARKERS OF ABNORMALITY CONVERSION - - -IF YOU DETECT ONE THAT WAS NOT ASSESSED IN PRE-SCREENING, [color=red]TERMINATE[/color] THE SUBJECT" +[node name="Slogan" type="RichTextLabel" parent="JournalLayer/JournalOpen/JournalMargin/PageArea/LeftPage"] +custom_minimum_size = Vector2(0, 100) +layout_mode = 2 +size_flags_vertical = 10 +theme_override_constants/line_separation = 20 +theme_override_font_sizes/normal_font_size = 28 +bbcode_enabled = true +text = "[color=dark_blue]THE REPUBLIC SHELTERS[/color]" +horizontal_alignment = 1 +vertical_alignment = 1 [node name="CloseManual" type="Button" parent="JournalLayer/JournalOpen/JournalMargin/PageArea/LeftPage"] custom_minimum_size = Vector2(200, 60) layout_mode = 2 size_flags_horizontal = 4 +size_flags_vertical = 10 theme = SubResource("Theme_waa4j") text = "Close manual"