From e8cce4933db993e2d69d8eb7917a13d565ee7ca4 Mon Sep 17 00:00:00 2001 From: Sara Date: Tue, 4 Nov 2025 21:19:53 +0100 Subject: [PATCH] feat: updated flatscreen scenes and objects --- flatscreen-project/objects/case_file.tscn | 31 +-- flatscreen-project/objects/victim_file.tscn | 31 +-- .../objects/witness_report.tscn | 34 +-- flatscreen-project/scenes/workspace.tscn | 253 +++++------------- 4 files changed, 66 insertions(+), 283 deletions(-) diff --git a/flatscreen-project/objects/case_file.tscn b/flatscreen-project/objects/case_file.tscn index 8981c24d..d999bac3 100644 --- a/flatscreen-project/objects/case_file.tscn +++ b/flatscreen-project/objects/case_file.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=3 uid="uid://cjyr1b0fxfofx"] +[gd_scene load_steps=6 format=3 uid="uid://cjyr1b0fxfofx"] [ext_resource type="Texture2D" uid="uid://cplpndk6qv7sx" path="res://assets/photo-images/Case_Button.png" id="1_3vy0q"] [ext_resource type="Texture2D" uid="uid://2cn7xvs6k1r5" path="res://assets/photo-images/Case_file.png" id="2_vi7i2"] @@ -21,29 +21,7 @@ func _on_input_event(viewport: Node, event: InputEvent, _shape_idx: int) -> void [sub_resource type="RectangleShape2D" id="RectangleShape2D_vo7lu"] size = Vector2(52.031464, 209.99301) -[sub_resource type="TextMesh" id="TextMesh_mes51"] -flip_faces = true -text = "Case" -depth = 0.0 - -[sub_resource type="Gradient" id="Gradient_vo7lu"] -offsets = PackedFloat32Array(1) -colors = PackedColorArray(0, 0, 0, 1) - -[sub_resource type="GradientTexture1D" id="GradientTexture1D_wjago"] -gradient = SubResource("Gradient_vo7lu") - [node name="CaseFile" type="FilePopup"] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null [node name="MeshInstance2D2" type="MeshInstance2D" parent="."] position = Vector2(29.999994, 581.83563) @@ -68,11 +46,4 @@ position = Vector2(-0.17065811, 0.93725586) scale = Vector2(1.0000002, 1.0000002) shape = SubResource("RectangleShape2D_vo7lu") -[node name="MeshInstance2D3" type="MeshInstance2D" parent="."] -position = Vector2(30.888136, 582.9807) -rotation = 1.5707964 -scale = Vector2(-347.0554, 307.87436) -mesh = SubResource("TextMesh_mes51") -texture = SubResource("GradientTexture1D_wjago") - [connection signal="input_event" from="Area2D" to="Area2D" method="_on_input_event"] diff --git a/flatscreen-project/objects/victim_file.tscn b/flatscreen-project/objects/victim_file.tscn index 4ad89e3b..62a470f4 100644 --- a/flatscreen-project/objects/victim_file.tscn +++ b/flatscreen-project/objects/victim_file.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=3 uid="uid://qmb60kjx6yoe"] +[gd_scene load_steps=6 format=3 uid="uid://qmb60kjx6yoe"] [ext_resource type="Texture2D" uid="uid://bwu83rfxi4mmh" path="res://assets/photo-images/Victim_Button.png" id="1_ajbhq"] [ext_resource type="Texture2D" uid="uid://ckj2guah0egq0" path="res://assets/photo-images/Victim_file.png" id="2_ajbhq"] @@ -21,29 +21,7 @@ func _on_input_event(viewport: Node, event: InputEvent, _shape_idx: int) -> void [sub_resource type="RectangleShape2D" id="RectangleShape2D_vo7lu"] size = Vector2(52.031464, 209.99301) -[sub_resource type="TextMesh" id="TextMesh_7cefc"] -flip_faces = true -text = "Victim" -depth = 0.0 - -[sub_resource type="Gradient" id="Gradient_vo7lu"] -offsets = PackedFloat32Array(1) -colors = PackedColorArray(0, 0, 0, 1) - -[sub_resource type="GradientTexture1D" id="GradientTexture1D_wjago"] -gradient = SubResource("Gradient_vo7lu") - [node name="VictimFile" type="FilePopup"] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null [node name="MeshInstance2D2" type="MeshInstance2D" parent="."] position = Vector2(27, 143.99998) @@ -67,11 +45,4 @@ script = SubResource("GDScript_7cefc") scale = Vector2(1.0000002, 1.0000002) shape = SubResource("RectangleShape2D_vo7lu") -[node name="MeshInstance2D3" type="MeshInstance2D" parent="."] -position = Vector2(33.037315, 137.30455) -rotation = 1.5707964 -scale = Vector2(-347.0554, 307.87436) -mesh = SubResource("TextMesh_7cefc") -texture = SubResource("GradientTexture1D_wjago") - [connection signal="input_event" from="Area2D" to="Area2D" method="_on_input_event"] diff --git a/flatscreen-project/objects/witness_report.tscn b/flatscreen-project/objects/witness_report.tscn index 05a048bb..7459d0ce 100644 --- a/flatscreen-project/objects/witness_report.tscn +++ b/flatscreen-project/objects/witness_report.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=3 uid="uid://drcl138k0gym0"] +[gd_scene load_steps=6 format=3 uid="uid://drcl138k0gym0"] [ext_resource type="Texture2D" uid="uid://dravu5852jgek" path="res://assets/photo-images/Witness_Button.png" id="1_a8epn"] [ext_resource type="Texture2D" uid="uid://b17g56nxrdbti" path="res://assets/photo-images/Witness_file.png" id="2_a8epn"] @@ -19,31 +19,9 @@ func _on_input_event(viewport: Node, event: InputEvent, _shape_idx: int) -> void " [sub_resource type="RectangleShape2D" id="RectangleShape2D_vo7lu"] -size = Vector2(52.031464, 209.99301) - -[sub_resource type="TextMesh" id="TextMesh_vo7lu"] -flip_faces = true -text = "Witness" -depth = 0.0 - -[sub_resource type="Gradient" id="Gradient_vo7lu"] -offsets = PackedFloat32Array(1) -colors = PackedColorArray(0, 0, 0, 1) - -[sub_resource type="GradientTexture1D" id="GradientTexture1D_wjago"] -gradient = SubResource("Gradient_vo7lu") +size = Vector2(78.999985, 208.99994) [node name="WitnessReport" type="FilePopup"] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null [node name="MeshInstance2D2" type="MeshInstance2D" parent="."] position = Vector2(23.000008, 372.50003) @@ -64,14 +42,8 @@ position = Vector2(28.265099, 374.51465) script = SubResource("GDScript_7cefc") [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] +position = Vector2(-2.7650986, -1.0146484) scale = Vector2(1.0000002, 1.0000002) shape = SubResource("RectangleShape2D_vo7lu") -[node name="MeshInstance2D3" type="MeshInstance2D" parent="."] -position = Vector2(30.982576, 372.43265) -rotation = 1.5707964 -scale = Vector2(-347.0554, 307.87436) -mesh = SubResource("TextMesh_vo7lu") -texture = SubResource("GradientTexture1D_wjago") - [connection signal="input_event" from="Area2D" to="Area2D" method="_on_input_event"] diff --git a/flatscreen-project/scenes/workspace.tscn b/flatscreen-project/scenes/workspace.tscn index de66e476..54830718 100644 --- a/flatscreen-project/scenes/workspace.tscn +++ b/flatscreen-project/scenes/workspace.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=3 uid="uid://o3ri154wpbrx"] +[gd_scene load_steps=19 format=3 uid="uid://o3ri154wpbrx"] [ext_resource type="PackedScene" uid="uid://btcmnw6q6g0h0" path="res://objects/pinned_photo.tscn" id="1_7cefc"] [ext_resource type="PackedScene" uid="uid://kk4ecpjc4puc" path="res://scenes/results_ui.tscn" id="1_thvsl"] @@ -27,13 +27,31 @@ func notify_conclusion_sent(method : int, motive : int, murderer : int) -> void: [sub_resource type="QuadMesh" id="QuadMesh_usqe2"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_87mh6"] -size = Vector2(965, 601) +size = Vector2(764, 450) [sub_resource type="QuadMesh" id="QuadMesh_cnvne"] [sub_resource type="CircleShape2D" id="CircleShape2D_cnvne"] radius = 7.280088 +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_h7pmq"] +content_margin_left = 4.0 +content_margin_top = 4.0 +content_margin_right = 4.0 +content_margin_bottom = 4.0 +bg_color = Color(0.3254902, 0.34901962, 0.75686276, 1) +skew = Vector2(0.105, 0) +border_width_left = 5 +border_width_top = 5 +border_width_right = 5 +border_width_bottom = 5 +border_color = Color(0.011764706, 0.011764706, 0.015686275, 1) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 +corner_detail = 5 + [sub_resource type="GDScript" id="GDScript_cnvne"] script/source = "extends Button @@ -53,18 +71,6 @@ func _on_any_slot_selection_changed(_new_value: int) -> void: update_can_send() " -[sub_resource type="TextMesh" id="TextMesh_cnvne"] -flip_faces = true -text = "Method, Motive, Murderer" -depth = 0.0 - -[sub_resource type="Gradient" id="Gradient_thvsl"] -offsets = PackedFloat32Array(0) -colors = PackedColorArray(0, 0, 0, 1) - -[sub_resource type="GradientTexture1D" id="GradientTexture1D_c1nar"] -gradient = SubResource("Gradient_thvsl") - [node name="Workspace" type="Node2D"] script = SubResource("GDScript_thvsl") conclusion_screen = ExtResource("1_thvsl") @@ -73,22 +79,12 @@ conclusion_screen = ExtResource("1_thvsl") anchor_mode = 0 [node name="Pinboard" type="Pinboard" parent="."] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" position = Vector2(109, 19) -script = null [node name="MeshInstance2D" type="MeshInstance2D" parent="Pinboard"] -position = Vector2(794.49994, 417) +position = Vector2(859.21375, 523.26025) rotation = 3.1415927 -scale = Vector2(1535.0001, 818) +scale = Vector2(1950.2444, 1090.4237) mesh = SubResource("QuadMesh_usqe2") texture = ExtResource("2_c1nar") @@ -98,7 +94,7 @@ scale = Vector2(0.8171887, 0.8931035) texture = ExtResource("3_ffegw") [node name="CollisionShape2D" type="CollisionShape2D" parent="Pinboard"] -position = Vector2(636.5, 431.5) +position = Vector2(661, 429) shape = SubResource("RectangleShape2D_87mh6") [node name="UntitledArtwork" type="Sprite2D" parent="Pinboard"] @@ -106,11 +102,13 @@ position = Vector2(1391, 172) texture = ExtResource("4_r41gl") [node name="EnvelopeBack" type="Sprite2D" parent="Pinboard"] -position = Vector2(1533, 852) +position = Vector2(1612.9009, 898.8248) +scale = Vector2(0.7405022, 0.7405022) texture = ExtResource("4_h7pmq") [node name="EnvelopeFront" type="Sprite2D" parent="Pinboard"] -position = Vector2(1534, 855) +position = Vector2(1613.9009, 901.8248) +scale = Vector2(0.7405022, 0.7405022) texture = ExtResource("5_r41gl") [node name="Handin" type="Node2D" parent="."] @@ -123,60 +121,25 @@ scale = Vector2(553.986, -740.514) mesh = SubResource("QuadMesh_cnvne") texture = ExtResource("6_xic1t") -[node name="TextEdit" type="TextEdit" parent="Handin"] -offset_left = -508.21082 -offset_top = 553.0962 -offset_right = -24.305176 -offset_bottom = 714.85803 -backspace_deletes_composite_character_enabled = true -wrap_mode = 1 - [node name="WeaponSlot" type="ConclusionField" parent="Handin"] -_import_path = NodePath("") unique_name_in_owner = true -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -position = Vector2(-448.5945, 290.4132) -script = null +position = Vector2(-141.25034, 550.55273) [node name="CollisionShape2D" type="CollisionShape2D" parent="Handin/WeaponSlot"] position = Vector2(0, 43.237) shape = SubResource("CircleShape2D_cnvne") [node name="MotiveSlot" type="ConclusionField" parent="Handin"] -_import_path = NodePath("") unique_name_in_owner = true -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -position = Vector2(-268.54337, 292.97845) -script = null +position = Vector2(-135.66975, 322.58594) [node name="CollisionShape2D" type="CollisionShape2D" parent="Handin/MotiveSlot"] position = Vector2(0, 43.237) shape = SubResource("CircleShape2D_cnvne") [node name="MurdererSlot" type="ConclusionField" parent="Handin"] -_import_path = NodePath("") unique_name_in_owner = true -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -position = Vector2(-99.188446, 288.08786) -script = null +position = Vector2(-399.06177, 88.315475) [node name="CollisionShape2D" type="CollisionShape2D" parent="Handin/MurdererSlot"] position = Vector2(0, 43.237) @@ -184,155 +147,61 @@ shape = SubResource("CircleShape2D_cnvne") [node name="SubmitButton" type="Button" parent="Handin"] unique_name_in_owner = true -offset_left = -307.37988 -offset_top = 502.53214 -offset_right = -230.37988 -offset_bottom = 533.5321 +offset_left = -500.62653 +offset_top = 718.6055 +offset_right = -389.62653 +offset_bottom = 768.6055 +theme_override_colors/font_color = Color(0.84705883, 0.10980392, 0.56078434, 1) +theme_override_font_sizes/font_size = 30 +theme_override_styles/normal = SubResource("StyleBoxFlat_h7pmq") text = "Submit" script = SubResource("GDScript_cnvne") -[node name="MeshInstance2D2" type="MeshInstance2D" parent="Handin"] -position = Vector2(-273.59598, 222.70421) -rotation = 3.1415927 -scale = Vector2(-236.09602, 249.81453) -mesh = SubResource("TextMesh_cnvne") -texture = SubResource("GradientTexture1D_c1nar") - [node name="PhotosParent" type="Node2D" parent="."] +[node name="PhotoInbox" type="PhotoInbox" parent="PhotosParent"] +position = Vector2(1727, 830) +photo_scene = ExtResource("1_7cefc") + [node name="PinnedPhoto" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null +position = Vector2(441, 822) +clue = 12 [node name="PinnedPhoto2" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null +position = Vector2(647, 825) +clue = 13 [node name="PinnedPhoto3" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null +position = Vector2(833, 823) +clue = 14 [node name="PinnedPhoto4" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null +position = Vector2(1019, 825) +clue = 15 [node name="PinnedPhoto5" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null +position = Vector2(534, 911) +clue = 16 [node name="PinnedPhoto6" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null +position = Vector2(709, 912) +clue = 17 [node name="PinnedPhoto7" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null +position = Vector2(881, 910) +clue = 18 [node name="PinnedPhoto8" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null +position = Vector2(1053, 912) +clue = 19 [node name="PinnedPhoto9" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null +position = Vector2(1227, 911) +clue = 20 [node name="PinnedPhoto10" parent="PhotosParent" instance=ExtResource("1_7cefc")] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null - -[node name="PhotoInbox" type="PhotoInbox" parent="PhotosParent"] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -position = Vector2(1717, 889) -photo_scene = ExtResource("1_7cefc") -script = null +position = Vector2(775, 381) +clue = 11 [node name="VictimFile" parent="." instance=ExtResource("2_vo7lu")]