From 20769c3191f6d95faed839c2acfe436be7b6465c Mon Sep 17 00:00:00 2001 From: Sara Date: Mon, 3 Nov 2025 17:08:51 +0100 Subject: [PATCH] fix: added Grace Ross to evidence --- flatscreen-project/clue_db.tres | 67 +++++++++++++++++++++++- flatscreen-project/scenes/workspace.tscn | 39 ++++++++++++-- modules/you_done_it/ydi_networking.cpp | 1 + modules/you_done_it/ydi_networking.h | 1 + 4 files changed, 101 insertions(+), 7 deletions(-) diff --git a/flatscreen-project/clue_db.tres b/flatscreen-project/clue_db.tres index 93d5a449..0522f934 100644 --- a/flatscreen-project/clue_db.tres +++ b/flatscreen-project/clue_db.tres @@ -1,4 +1,4 @@ -[gd_resource type="ClueDB" load_steps=22 format=3 uid="uid://dlf8dxiter8b8"] +[gd_resource type="ClueDB" load_steps=23 format=3 uid="uid://dlf8dxiter8b8"] [ext_resource type="Texture2D" uid="uid://p7uaxluyc0tk" path="res://assets/photo-images/Knife.jpg" id="1_q5eka"] @@ -37,31 +37,94 @@ id = 9 id = 10 [sub_resource type="ClueData" id="ClueData_fqtcy"] +popup_text = "Victim: Flora Lamb +Age: 35 +Profession: Detective +Blood Type: A+ +Shoe Size: 39 +Hair Color: Black" id = 11 [sub_resource type="ClueData" id="ClueData_qpqg2"] +popup_text = "Name: Velma Graves +Age: 37 +Profession: Detective +Blood Type: AB+ +Shoe Size: 43 +Hair Color: Brown" id = 12 [sub_resource type="ClueData" id="ClueData_k6v75"] +popup_text = "Name: Floyd Hunt +Age: 34 +Profession: Detective +Blood Type: B+ +Shoe Size: 42 +Hair Color: Brown" id = 13 [sub_resource type="ClueData" id="ClueData_037ed"] +popup_text = "Name: Richard O'Brien +Age: 40 +Profession: Cleaner +Blood Type: 0 +Shoe Size: 39 +Hair Color: Brown" id = 14 [sub_resource type="ClueData" id="ClueData_ucrra"] +popup_text = "Name: Gordon Chevield +Age: 36 +Profession: Detective +Blood Type: AB- +Shoe Size: 47 +Hair Color: Brown" id = 15 [sub_resource type="ClueData" id="ClueData_lrkph"] +popup_text = "Name: Sadie Wood +Age: 44 +Profession: Maintenance Technician +Blood Type: A+ +Shoe Size: 41 +Hair Color: Blond" id = 16 [sub_resource type="ClueData" id="ClueData_mi3iw"] +popup_text = "Name: Ursula Glass +Age: 47 +Profession: Detective +Blood Type: B- +Shoe Size: 44 +Hair Color: Brown" id = 17 [sub_resource type="ClueData" id="ClueData_iamej"] +popup_text = "Name: Barney Ortiz +Age: 27 +Profession: Detective +Blood Type: AB+ +Shoe Size: 42 +Hair Color: Black" id = 18 [sub_resource type="ClueData" id="ClueData_lf4cx"] +popup_text = "Amos Shwartz +Age: 44 +Profession: Detective +Blood type: A+ +Shoe size: 43 +Hair Color: Blond" id = 19 +[sub_resource type="ClueData" id="ClueData_tdk3v"] +popup_text = "Name: Grace Ross +Age: 29 +Profession: Detective +Blood Type: AB+ +Shoe Size: 44 +Hair Color: Black" +id = 20 + [resource] -clues = [SubResource("ClueData_kxjsf"), SubResource("ClueData_q5eka"), SubResource("ClueData_du6rq"), SubResource("ClueData_y8781"), SubResource("ClueData_mhl4k"), SubResource("ClueData_k2o5n"), SubResource("ClueData_bgtdi"), SubResource("ClueData_u53f6"), SubResource("ClueData_e5lqe"), SubResource("ClueData_doypg"), SubResource("ClueData_0lck8"), SubResource("ClueData_fqtcy"), SubResource("ClueData_qpqg2"), SubResource("ClueData_k6v75"), SubResource("ClueData_037ed"), SubResource("ClueData_ucrra"), SubResource("ClueData_lrkph"), SubResource("ClueData_mi3iw"), SubResource("ClueData_iamej"), SubResource("ClueData_lf4cx")] +clues = [SubResource("ClueData_kxjsf"), SubResource("ClueData_q5eka"), SubResource("ClueData_du6rq"), SubResource("ClueData_y8781"), SubResource("ClueData_mhl4k"), SubResource("ClueData_k2o5n"), SubResource("ClueData_bgtdi"), SubResource("ClueData_u53f6"), SubResource("ClueData_e5lqe"), SubResource("ClueData_doypg"), SubResource("ClueData_0lck8"), SubResource("ClueData_fqtcy"), SubResource("ClueData_qpqg2"), SubResource("ClueData_k6v75"), SubResource("ClueData_037ed"), SubResource("ClueData_ucrra"), SubResource("ClueData_lrkph"), SubResource("ClueData_mi3iw"), SubResource("ClueData_iamej"), SubResource("ClueData_lf4cx"), SubResource("ClueData_tdk3v")] diff --git a/flatscreen-project/scenes/workspace.tscn b/flatscreen-project/scenes/workspace.tscn index e98aa87e..eb54ede4 100644 --- a/flatscreen-project/scenes/workspace.tscn +++ b/flatscreen-project/scenes/workspace.tscn @@ -146,15 +146,44 @@ texture = SubResource("GradientTexture1D_c1nar") [node name="PhotosParent" type="Node2D" parent="."] [node name="PinnedPhoto" parent="PhotosParent" instance=ExtResource("1_7cefc")] -position = Vector2(479, 904) -clue = 0 +position = Vector2(730, 395) +clue = 11 [node name="PinnedPhoto2" parent="PhotosParent" instance=ExtResource("1_7cefc")] -position = Vector2(785, 905) -clue = 1 +position = Vector2(111, 900) +clue = 12 [node name="PinnedPhoto3" parent="PhotosParent" instance=ExtResource("1_7cefc")] -position = Vector2(1080, 891) +position = Vector2(288, 900) +clue = 13 + +[node name="PinnedPhoto4" parent="PhotosParent" instance=ExtResource("1_7cefc")] +position = Vector2(467, 903) +clue = 14 + +[node name="PinnedPhoto5" parent="PhotosParent" instance=ExtResource("1_7cefc")] +position = Vector2(640, 903) +clue = 15 + +[node name="PinnedPhoto6" parent="PhotosParent" instance=ExtResource("1_7cefc")] +position = Vector2(816, 904) +clue = 16 + +[node name="PinnedPhoto7" parent="PhotosParent" instance=ExtResource("1_7cefc")] +position = Vector2(991, 909) +clue = 18 + +[node name="PinnedPhoto8" parent="PhotosParent" instance=ExtResource("1_7cefc")] +position = Vector2(1164, 911) +clue = 19 + +[node name="PinnedPhoto9" parent="PhotosParent" instance=ExtResource("1_7cefc")] +position = Vector2(1334, 914) +clue = 19 + +[node name="PinnedPhoto10" parent="PhotosParent" instance=ExtResource("1_7cefc")] +position = Vector2(1511, 912) +clue = 20 [node name="PhotoInbox" type="PhotoInbox" parent="PhotosParent"] position = Vector2(1717, 889) diff --git a/modules/you_done_it/ydi_networking.cpp b/modules/you_done_it/ydi_networking.cpp index 3ca8abcd..cd984231 100644 --- a/modules/you_done_it/ydi_networking.cpp +++ b/modules/you_done_it/ydi_networking.cpp @@ -25,6 +25,7 @@ void NetworkData::_bind_methods() { BIND_ENUM_CONSTANT(CLUE_URSULA_GLASS); BIND_ENUM_CONSTANT(CLUE_BARNEY_ORTIZ); BIND_ENUM_CONSTANT(CLUE_AMOS_SHWARTZ); + BIND_ENUM_CONSTANT(CLUE_GRACE_ROSS); BIND_ENUM_CONSTANT(CONNECTION_DISCONNECTED); BIND_ENUM_CONSTANT(CONNECTION_CONNECTED); diff --git a/modules/you_done_it/ydi_networking.h b/modules/you_done_it/ydi_networking.h index 0c634fba..93985274 100644 --- a/modules/you_done_it/ydi_networking.h +++ b/modules/you_done_it/ydi_networking.h @@ -48,6 +48,7 @@ public: CLUE_URSULA_GLASS, CLUE_BARNEY_ORTIZ, CLUE_AMOS_SHWARTZ, + CLUE_GRACE_ROSS, CLUE_MAX); GDENUM(ConnectionStatus,