Merge pull request #220 from Alexander-Worley/Alexander

Final Build
Alexander-Worley · Jun 9, 2024 · c78686a · c78686a
2 parents be3ae16 + b50159b
commit c78686a
Show file tree

Hide file tree

Showing 27 changed files with 313 additions and 184 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Builds/.DS_Store b/Builds/.DS_Store
diff --git a/Builds/Outer_Plates_Final.zip b/Builds/Outer_Plates_Final.zip
diff --git a/DayScenes/.DS_Store b/DayScenes/.DS_Store
diff --git a/DayScenes/Day1G.tscn b/DayScenes/Day1G.tscn
@@ -52,7 +52,7 @@ theme_override_fonts/font = ExtResource("1_ig1tw")
 script = ExtResource("2_fn0cs")
 
 [node name="Background" parent="." instance=ExtResource("3_a6fk7")]
-scroll_offset = Vector2(0, 0)
+scroll_offset = Vector2(-1.66667, 0)
 Planet = "Green Planet"
 
 [node name="Furniture" type="Node" parent="."]
@@ -65,24 +65,30 @@ spawnString = "ccccc"
 position = Vector2(19, 563)
 rotation = 1.55858
 
+[node name="TicketBoard" parent="Furniture" instance=ExtResource("9_qffde")]
+position = Vector2(590, 197)
+
 [node name="TableManager" type="Node" parent="Furniture"]
 script = ExtResource("6_tycc3")
 threshold = 1.0
 
 [node name="Table" parent="Furniture/TableManager" instance=ExtResource("8_4cj5b")]
-position = Vector2(565, 317)
+position = Vector2(632, 360)
 
 [node name="Table2" parent="Furniture/TableManager" instance=ExtResource("8_4cj5b")]
-position = Vector2(464, 384)
+position = Vector2(536, 456)
+
+[node name="Table7" parent="Furniture/TableManager" instance=ExtResource("8_4cj5b")]
+position = Vector2(528, 360)
 
 [node name="Table3" parent="Furniture/TableManager" instance=ExtResource("8_4cj5b")]
-position = Vector2(560, 459)
+position = Vector2(432, 456)
 
-[node name="Table4" parent="Furniture/TableManager" instance=ExtResource("8_4cj5b")]
-position = Vector2(653, 405)
+[node name="Table5" parent="Furniture/TableManager" instance=ExtResource("8_4cj5b")]
+position = Vector2(440, 360)
 
-[node name="TicketBoard" parent="Furniture" instance=ExtResource("9_qffde")]
-position = Vector2(590, 197)
+[node name="Table4" parent="Furniture/TableManager" instance=ExtResource("8_4cj5b")]
+position = Vector2(640, 456)
 
 [node name="Foods" type="Node2D" parent="."]
 

diff --git a/DayScenes/Day1T.tscn b/DayScenes/Day1T.tscn
@@ -63,7 +63,7 @@ theme_override_fonts/font = ExtResource("1_vjj22")
 script = ExtResource("2_0jflb")
 
 [node name="Background" parent="." instance=ExtResource("1_oqifv")]
-scroll_offset = Vector2(0, 0)
+scroll_offset = Vector2(-1.66667, 0)
 Planet = "Green Planet"
 
 [node name="Furniture" type="Node" parent="."]
@@ -76,23 +76,30 @@ spawnString = "c"
 position = Vector2(19, 563)
 rotation = 1.55858
 
+[node name="TicketBoard" parent="Furniture" instance=ExtResource("13_lksa5")]
+position = Vector2(590, 197)
+
 [node name="TableManager" type="Node" parent="Furniture"]
 script = ExtResource("11_26g7s")
+threshold = 1.0
 
 [node name="Table" parent="Furniture/TableManager" instance=ExtResource("12_774xd")]
-position = Vector2(565, 317)
+position = Vector2(632, 360)
 
 [node name="Table2" parent="Furniture/TableManager" instance=ExtResource("12_774xd")]
-position = Vector2(464, 384)
+position = Vector2(536, 456)
+
+[node name="Table7" parent="Furniture/TableManager" instance=ExtResource("12_774xd")]
+position = Vector2(528, 360)
 
 [node name="Table3" parent="Furniture/TableManager" instance=ExtResource("12_774xd")]
-position = Vector2(560, 459)
+position = Vector2(432, 456)
 
-[node name="Table4" parent="Furniture/TableManager" instance=ExtResource("12_774xd")]
-position = Vector2(653, 405)
+[node name="Table5" parent="Furniture/TableManager" instance=ExtResource("12_774xd")]
+position = Vector2(440, 360)
 
-[node name="TicketBoard" parent="Furniture" instance=ExtResource("13_lksa5")]
-position = Vector2(590, 197)
+[node name="Table4" parent="Furniture/TableManager" instance=ExtResource("12_774xd")]
+position = Vector2(640, 456)
 
 [node name="Foods" type="Node2D" parent="."]
 

diff --git a/DayScenes/Day2G.tscn b/DayScenes/Day2G.tscn
@@ -54,7 +54,7 @@ theme_override_fonts/font = ExtResource("1_bpt3p")
 script = ExtResource("2_nq6fq")
 
 [node name="Background" parent="." instance=ExtResource("3_cagvx")]
-scroll_offset = Vector2(0, 0)
+scroll_offset = Vector2(-1.11111, 0)
 Planet = "Green Planet"
 
 [node name="Furniture" type="Node" parent="."]
@@ -67,23 +67,31 @@ spawnString = "ccccc"
 position = Vector2(19, 563)
 rotation = 1.55858
 
+[node name="TicketBoard" parent="Furniture" instance=ExtResource("8_0ddbl")]
+position = Vector2(590, 197)
+
 [node name="TableManager" type="Node" parent="Furniture"]
 script = ExtResource("6_0evcq")
+threshold = 1.0
+day = 2
 
 [node name="Table" parent="Furniture/TableManager" instance=ExtResource("7_dl3la")]
-position = Vector2(565, 317)
+position = Vector2(632, 360)
 
 [node name="Table2" parent="Furniture/TableManager" instance=ExtResource("7_dl3la")]
-position = Vector2(464, 384)
+position = Vector2(536, 456)
+
+[node name="Table7" parent="Furniture/TableManager" instance=ExtResource("7_dl3la")]
+position = Vector2(528, 360)
 
 [node name="Table3" parent="Furniture/TableManager" instance=ExtResource("7_dl3la")]
-position = Vector2(560, 459)
+position = Vector2(432, 456)
 
-[node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_dl3la")]
-position = Vector2(653, 405)
+[node name="Table5" parent="Furniture/TableManager" instance=ExtResource("7_dl3la")]
+position = Vector2(440, 360)
 
-[node name="TicketBoard" parent="Furniture" instance=ExtResource("8_0ddbl")]
-position = Vector2(590, 197)
+[node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_dl3la")]
+position = Vector2(640, 456)
 
 [node name="Foods" type="Node2D" parent="."]
 

diff --git a/DayScenes/Day2T.tscn b/DayScenes/Day2T.tscn
@@ -64,7 +64,7 @@ theme_override_fonts/font = ExtResource("1_1tnix")
 script = ExtResource("2_a37mh")
 
 [node name="Background" parent="." instance=ExtResource("3_jwh4r")]
-scroll_offset = Vector2(0, 0)
+scroll_offset = Vector2(-1.66667, 0)
 Planet = "Green Planet"
 
 [node name="Furniture" type="Node" parent="."]
@@ -77,23 +77,31 @@ spawnString = "c"
 position = Vector2(19, 563)
 rotation = 1.55858
 
+[node name="TicketBoard" parent="Furniture" instance=ExtResource("8_qqis5")]
+position = Vector2(590, 197)
+
 [node name="TableManager" type="Node" parent="Furniture"]
 script = ExtResource("6_dymra")
+threshold = 1.0
+day = 2
 
 [node name="Table" parent="Furniture/TableManager" instance=ExtResource("7_ix8j0")]
-position = Vector2(565, 317)
+position = Vector2(632, 360)
 
 [node name="Table2" parent="Furniture/TableManager" instance=ExtResource("7_ix8j0")]
-position = Vector2(464, 384)
+position = Vector2(536, 456)
+
+[node name="Table7" parent="Furniture/TableManager" instance=ExtResource("7_ix8j0")]
+position = Vector2(528, 360)
 
 [node name="Table3" parent="Furniture/TableManager" instance=ExtResource("7_ix8j0")]
-position = Vector2(560, 459)
+position = Vector2(432, 456)
 
-[node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_ix8j0")]
-position = Vector2(653, 405)
+[node name="Table5" parent="Furniture/TableManager" instance=ExtResource("7_ix8j0")]
+position = Vector2(440, 360)
 
-[node name="TicketBoard" parent="Furniture" instance=ExtResource("8_qqis5")]
-position = Vector2(590, 197)
+[node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_ix8j0")]
+position = Vector2(640, 456)
 
 [node name="Foods" type="Node2D" parent="."]
 

diff --git a/DayScenes/Day3G.tscn b/DayScenes/Day3G.tscn
@@ -7,7 +7,6 @@
 [ext_resource type="PackedScene" uid="uid://bbui5hao4bmbp" path="res://Scenes/Restaurant/TestItems/HostingStand.tscn" id="5_sw8lu"]
 [ext_resource type="Script" path="res://Scenes/Restaurant/Tablez/table_manager.gd" id="6_mp2ng"]
 [ext_resource type="PackedScene" uid="uid://82nfelbi5c41" path="res://Scenes/Restaurant/Tablez/table.tscn" id="7_mtses"]
-[ext_resource type="PackedScene" uid="uid://7w6hlbstmayh" path="res://Scenes/Restaurant/Tablez/Bar.tscn" id="8_74a6l"]
 [ext_resource type="PackedScene" uid="uid://wcr6e8ubq8aj" path="res://Scenes/Restaurant/Interactables/TicketBoard/ticket_board.tscn" id="9_nuigl"]
 [ext_resource type="PackedScene" uid="uid://thygj4fuuxqk" path="res://Scenes/Restaurant/TestItems/jukebox.tscn" id="10_pkpbu"]
 [ext_resource type="PackedScene" uid="uid://ede2frngbs0e" path="res://Scenes/Restaurant/Interactables/Stove/stove.tscn" id="11_u46eg"]
@@ -19,6 +18,7 @@
 [ext_resource type="PackedScene" uid="uid://cuek2wfflpv5k" path="res://Scenes/Restaurant/Environment/lavaLamp.tscn" id="20_sh3oi"]
 [ext_resource type="Texture2D" uid="uid://l1vy4hqh6sri" path="res://Assets/UI/pulsar.png" id="21_dhjfp"]
 [ext_resource type="PackedScene" uid="uid://b37amv1v2ky1c" path="res://Scenes/Tutorial/tutorialUI.tscn" id="22_7fjot"]
+[ext_resource type="PackedScene" uid="uid://pboyl84wmi8l" path="res://Scenes/Restaurant/Holdables/Food/FoodSpawnBoxes/glassStack.tscn" id="22_8km4f"]
 [ext_resource type="PackedScene" uid="uid://dgjrwni0x7oo8" path="res://Scenes/Restaurant/Interactables/TrashCan/trashCan.tscn" id="22_eytij"]
 [ext_resource type="PackedScene" uid="uid://cmkwxcvadpr4y" path="res://Scenes/Restaurant/Holdables/Food/FoodSpawnBoxes/cuttableRack.tscn" id="23_2fqkd"]
 [ext_resource type="PackedScene" uid="uid://txto47x1ji8o" path="res://Scenes/Restaurant/Interactables/DrinkTube/drinkTube.tscn" id="24_bax71"]
@@ -56,7 +56,7 @@ theme_override_fonts/font = ExtResource("1_meoy7")
 script = ExtResource("2_5wuyo")
 
 [node name="Background" parent="." instance=ExtResource("3_go0tx")]
-scroll_offset = Vector2(0, 0)
+scroll_offset = Vector2(-0.833333, 0)
 Planet = "Green Planet"
 
 [node name="Furniture" type="Node" parent="."]
@@ -71,29 +71,28 @@ rotation = 1.55858
 
 [node name="TableManager" type="Node" parent="Furniture"]
 script = ExtResource("6_mp2ng")
+day = 3
 
 [node name="Table" parent="Furniture/TableManager" instance=ExtResource("7_mtses")]
-position = Vector2(639, 318)
+position = Vector2(632, 360)
 
 [node name="Table2" parent="Furniture/TableManager" instance=ExtResource("7_mtses")]
-position = Vector2(548, 407)
+position = Vector2(536, 464)
+
+[node name="Table7" parent="Furniture/TableManager" instance=ExtResource("7_mtses")]
+position = Vector2(536, 360)
 
 [node name="Table3" parent="Furniture/TableManager" instance=ExtResource("7_mtses")]
 position = Vector2(444, 466)
 
-[node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_mtses")]
-position = Vector2(666, 453)
-
-[node name="Bar" parent="Furniture/TableManager" instance=ExtResource("8_74a6l")]
-position = Vector2(442, 301)
+[node name="Table5" parent="Furniture/TableManager" instance=ExtResource("7_mtses")]
+position = Vector2(440, 360)
 
-[node name="Bar2" parent="Furniture/TableManager" instance=ExtResource("8_74a6l")]
-position = Vector2(474, 301)
-barSide = 1
+[node name="Table6" parent="Furniture/TableManager" instance=ExtResource("7_mtses")]
+position = Vector2(440, 360)
 
-[node name="Bar3" parent="Furniture/TableManager" instance=ExtResource("8_74a6l")]
-position = Vector2(506, 301)
-barSide = 2
+[node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_mtses")]
+position = Vector2(632, 464)
 
 [node name="TicketBoard" parent="Furniture" instance=ExtResource("9_nuigl")]
 position = Vector2(590, 197)
@@ -172,10 +171,19 @@ isCounter = true
 side = 2
 
 [node name="DrinkTube" parent="." instance=ExtResource("24_bax71")]
-position = Vector2(251, 278)
+position = Vector2(240, 280)
+
+[node name="DrinkTube2" parent="." instance=ExtResource("24_bax71")]
+position = Vector2(280, 280)
+color = 0
 
 [node name="OrderRack hint" parent="." instance=ExtResource("22_7fjot")]
 position = Vector2(590, 156)
 control = 3
 
+[node name="GlassStack" parent="." instance=ExtResource("22_8km4f")]
+position = Vector2(147, 290)
+isCounter = true
+side = 2
+
 [connection signal="display_orders" from="Furniture/TicketBoard" to="Furniture/TableManager" method="_on_ticket_board_display_orders"]
diff --git a/DayScenes/Day3T.tscn b/DayScenes/Day3T.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=29 format=3 uid="uid://dx4nc2orebc0q"]
+[gd_scene load_steps=28 format=3 uid="uid://dx4nc2orebc0q"]
 
 [ext_resource type="FontFile" uid="uid://df7lvaaeis5to" path="res://Assets/Fonts/VeniteAdoremusStraight-Yzo6v.ttf" id="1_davyu"]
 [ext_resource type="Script" path="res://DevScenes/Logan/MoneyLabel.gd" id="2_4ff61"]
@@ -7,7 +7,6 @@
 [ext_resource type="PackedScene" uid="uid://bbui5hao4bmbp" path="res://Scenes/Restaurant/TestItems/HostingStand.tscn" id="5_m1v12"]
 [ext_resource type="Script" path="res://Scenes/Restaurant/Tablez/table_manager.gd" id="6_t4lye"]
 [ext_resource type="PackedScene" uid="uid://82nfelbi5c41" path="res://Scenes/Restaurant/Tablez/table.tscn" id="7_onxoe"]
-[ext_resource type="PackedScene" uid="uid://7w6hlbstmayh" path="res://Scenes/Restaurant/Tablez/Bar.tscn" id="8_d502v"]
 [ext_resource type="PackedScene" uid="uid://wcr6e8ubq8aj" path="res://Scenes/Restaurant/Interactables/TicketBoard/ticket_board.tscn" id="8_quy6a"]
 [ext_resource type="PackedScene" uid="uid://thygj4fuuxqk" path="res://Scenes/Restaurant/TestItems/jukebox.tscn" id="9_3hwl6"]
 [ext_resource type="PackedScene" uid="uid://ede2frngbs0e" path="res://Scenes/Restaurant/Interactables/Stove/stove.tscn" id="10_wdk2w"]
@@ -67,7 +66,7 @@ theme_override_fonts/font = ExtResource("1_davyu")
 script = ExtResource("2_4ff61")
 
 [node name="Background" parent="." instance=ExtResource("3_306gv")]
-scroll_offset = Vector2(-3.33333, 0)
+scroll_offset = Vector2(-1.66667, 0)
 Planet = "Green Planet"
 
 [node name="Furniture" type="Node" parent="."]
@@ -80,32 +79,31 @@ spawnString = "c"
 position = Vector2(19, 563)
 rotation = 1.55858
 
+[node name="TicketBoard" parent="Furniture" instance=ExtResource("8_quy6a")]
+position = Vector2(590, 197)
+
 [node name="TableManager" type="Node" parent="Furniture"]
 script = ExtResource("6_t4lye")
+threshold = 1.0
+day = 3
 
 [node name="Table" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")]
-position = Vector2(639, 318)
+position = Vector2(632, 360)
 
 [node name="Table2" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")]
-position = Vector2(548, 407)
-
-[node name="Table3" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")]
-position = Vector2(444, 466)
-
-[node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")]
-position = Vector2(666, 453)
+position = Vector2(536, 456)
 
-[node name="Bar" parent="Furniture/TableManager" instance=ExtResource("8_d502v")]
-position = Vector2(442, 301)
+[node name="Table7" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")]
+position = Vector2(528, 360)
 
-[node name="Bar2" parent="Furniture/TableManager" instance=ExtResource("8_d502v")]
-position = Vector2(474, 301)
+[node name="Table3" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")]
+position = Vector2(432, 456)
 
-[node name="Bar3" parent="Furniture/TableManager" instance=ExtResource("8_d502v")]
-position = Vector2(506, 301)
+[node name="Table5" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")]
+position = Vector2(440, 360)
 
-[node name="TicketBoard" parent="Furniture" instance=ExtResource("8_quy6a")]
-position = Vector2(590, 197)
+[node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")]
+position = Vector2(640, 456)
 
 [node name="Foods" type="Node2D" parent="."]
 
@@ -190,6 +188,10 @@ side = 2
 [node name="DrinkTube" parent="." instance=ExtResource("24_qwlsl")]
 position = Vector2(251, 278)
 
+[node name="DrinkTube2" parent="." instance=ExtResource("24_qwlsl")]
+position = Vector2(296, 280)
+color = 0
+
 [node name="TextureButton" type="TextureButton" parent="."]
 custom_minimum_size = Vector2(128, 0)
 offset_left = 620.0