From cdafe44af7ab18f2036daa55dc7bd174a66a1d7d Mon Sep 17 00:00:00 2001 From: Alexander-Worley <108299450+Alexander-Worley@users.noreply.github.com> Date: Sun, 9 Jun 2024 15:53:04 -0700 Subject: [PATCH] Fixed Bar Sprites --- DayScenes/Day1G.tscn | 4 +- DayScenes/Day1T.tscn | 2 +- DayScenes/Day2G.tscn | 2 +- DayScenes/Day2T.tscn | 2 +- DayScenes/Day3G.tscn | 99 ++++++++++++++++++--- DayScenes/Day3T.tscn | 98 ++++++++++++++++++-- DayScenes/Day4G.tscn | 96 ++++++++++++++++++-- DayScenes/Day4T.tscn | 98 ++++++++++++++++++-- DayScenes/Day5G.tscn | 98 ++++++++++++++++++-- DayScenes/Day5T.tscn | 98 ++++++++++++++++++-- DayScenes/Intro1.tscn | 2 +- DevScenes/Alexander/Alexander.tscn | 2 +- Scenes/InputSelection/p1InputSelection.tscn | 2 +- Scenes/MainMenu/mainMenu.tscn | 2 +- 14 files changed, 547 insertions(+), 58 deletions(-) diff --git a/DayScenes/Day1G.tscn b/DayScenes/Day1G.tscn index 6e506b1..5402517 100644 --- a/DayScenes/Day1G.tscn +++ b/DayScenes/Day1G.tscn @@ -14,7 +14,7 @@ [ext_resource type="PackedScene" uid="uid://ct4bob2krtxcc" path="res://Scenes/Restaurant/Holdables/Food/FoodSpawnBoxes/plateRack.tscn" id="14_5rmxh"] [ext_resource type="PackedScene" uid="uid://btugtq4bxfaeh" path="res://Scenes/Restaurant/PlainSurface/plainSurface.tscn" id="15_7xror"] [ext_resource type="PackedScene" uid="uid://dvdmgcuv7anep" path="res://Scenes/Restaurant/Holdables/Food/FoodSpawnBoxes/cookableRack.tscn" id="16_0a4st"] -[ext_resource type="PackedScene" path="res://Scenes/Restaurant/TestItems/sink.tscn" id="18_7u52s"] +[ext_resource type="PackedScene" uid="uid://bjuumf0g03s12" path="res://Scenes/Restaurant/TestItems/sink.tscn" id="18_7u52s"] [ext_resource type="PackedScene" uid="uid://cuek2wfflpv5k" path="res://Scenes/Restaurant/Environment/lavaLamp.tscn" id="19_tra5n"] [ext_resource type="Texture2D" uid="uid://l1vy4hqh6sri" path="res://Assets/UI/pulsar.png" id="20_qyp11"] [ext_resource type="PackedScene" uid="uid://dgjrwni0x7oo8" path="res://Scenes/Restaurant/Interactables/TrashCan/trashCan.tscn" id="21_dqay7"] @@ -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(-1.66667, 0) +scroll_offset = Vector2(-0.833333, 0) Planet = "Green Planet" [node name="Furniture" type="Node" parent="."] diff --git a/DayScenes/Day1T.tscn b/DayScenes/Day1T.tscn index 3bf4261..f387f89 100644 --- 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(-1.66667, 0) +scroll_offset = Vector2(-0.833333, 0) Planet = "Green Planet" [node name="Furniture" type="Node" parent="."] diff --git a/DayScenes/Day2G.tscn b/DayScenes/Day2G.tscn index f069965..b3f9952 100644 --- 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(-1.11111, 0) +scroll_offset = Vector2(-1.70277, 0) Planet = "Green Planet" [node name="Furniture" type="Node" parent="."] diff --git a/DayScenes/Day2T.tscn b/DayScenes/Day2T.tscn index bc45b98..55b123a 100644 --- 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(-1.66667, 0) +scroll_offset = Vector2(-1.1169, 0) Planet = "Green Planet" [node name="Furniture" type="Node" parent="."] diff --git a/DayScenes/Day3G.tscn b/DayScenes/Day3G.tscn index 15576dc..a0a86c6 100644 --- a/DayScenes/Day3G.tscn +++ b/DayScenes/Day3G.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=3 uid="uid://ftn3o8dn7x03"] +[gd_scene load_steps=30 format=3 uid="uid://ftn3o8dn7x03"] [ext_resource type="FontFile" uid="uid://df7lvaaeis5to" path="res://Assets/Fonts/VeniteAdoremusStraight-Yzo6v.ttf" id="1_meoy7"] [ext_resource type="Script" path="res://DevScenes/Logan/MoneyLabel.gd" id="2_5wuyo"] @@ -7,6 +7,9 @@ [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="Script" path="res://Scenes/Restaurant/Tablez/table.gd" id="7_rox31"] +[ext_resource type="Texture2D" uid="uid://d1b4hokfhh1qd" path="res://Assets/Interactables/PlainSurfaces/table.png" id="8_ex086"] +[ext_resource type="PackedScene" uid="uid://jecoiu4ygk5f" path="res://Scenes/Restaurant/TestItems/chair.tscn" id="9_54wgm"] [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"] @@ -21,7 +24,9 @@ [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="Texture2D" uid="uid://lfthblp0kp4t" path="res://Assets/Interactables/PlainSurfaces/bar.png" id="23_oipsf"] [ext_resource type="PackedScene" uid="uid://txto47x1ji8o" path="res://Scenes/Restaurant/Interactables/DrinkTube/drinkTube.tscn" id="24_bax71"] +[ext_resource type="Texture2D" uid="uid://d3p25sj3n3qi0" path="res://Assets/Environment/Ambiance/bar-stool.png" id="24_t6tp5"] [sub_resource type="GDScript" id="GDScript_tyb3y"] script/source = "extends \"res://Scenes/SceneManager/playerManager.gd\" @@ -44,6 +49,9 @@ func _on_timer_timeout(): Utils.setScene(nextScene) " +[sub_resource type="RectangleShape2D" id="RectangleShape2D_q2ckp"] +size = Vector2(32, 32) + [node name="Day3G" type="Node2D"] script = SubResource("GDScript_tyb3y") @@ -56,7 +64,7 @@ theme_override_fonts/font = ExtResource("1_meoy7") script = ExtResource("2_5wuyo") [node name="Background" parent="." instance=ExtResource("3_go0tx")] -scroll_offset = Vector2(-0.833333, 0) +scroll_offset = Vector2(-0.9463, 0) Planet = "Green Planet" [node name="Furniture" type="Node" parent="."] @@ -73,23 +81,77 @@ rotation = 1.55858 script = ExtResource("6_mp2ng") day = 3 -[node name="Table" parent="Furniture/TableManager" instance=ExtResource("7_mtses")] -position = Vector2(632, 360) +[node name="Table" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 336) +script = ExtResource("7_rox31") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table"] +visible = false +texture = ExtResource("8_ex086") + +[node name="Chair" parent="Furniture/TableManager/Table" instance=ExtResource("9_54wgm")] +visible = false +position = Vector2(-32, -1) [node name="Table2" parent="Furniture/TableManager" instance=ExtResource("7_mtses")] position = Vector2(536, 464) -[node name="Table7" parent="Furniture/TableManager" instance=ExtResource("7_mtses")] -position = Vector2(536, 360) +[node name="Table7" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 368) +script = ExtResource("7_rox31") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table7"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table7/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table7"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table7"] +visible = false +texture = ExtResource("8_ex086") + +[node name="Chair" parent="Furniture/TableManager/Table7" instance=ExtResource("9_54wgm")] +visible = false +position = Vector2(-32, -1) [node name="Table3" parent="Furniture/TableManager" instance=ExtResource("7_mtses")] position = Vector2(444, 466) -[node name="Table5" parent="Furniture/TableManager" instance=ExtResource("7_mtses")] -position = Vector2(440, 360) +[node name="Table5" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 304) +script = ExtResource("7_rox31") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table5"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table5/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table5"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table5"] +visible = false +texture = ExtResource("8_ex086") -[node name="Table6" parent="Furniture/TableManager" instance=ExtResource("7_mtses")] -position = Vector2(440, 360) +[node name="Chair" parent="Furniture/TableManager/Table5" instance=ExtResource("9_54wgm")] +visible = false +position = Vector2(-32, -1) [node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_mtses")] position = Vector2(632, 464) @@ -186,4 +248,21 @@ position = Vector2(147, 290) isCounter = true side = 2 +[node name="Bar" type="Sprite2D" parent="."] +position = Vector2(544, 336) +rotation = 1.5708 +texture = ExtResource("23_oipsf") + +[node name="Bar-stool" type="Sprite2D" parent="."] +position = Vector2(496, 368) +texture = ExtResource("24_t6tp5") + +[node name="Bar-stool2" type="Sprite2D" parent="."] +position = Vector2(496, 336) +texture = ExtResource("24_t6tp5") + +[node name="Bar-stool3" type="Sprite2D" parent="."] +position = Vector2(496, 304) +texture = ExtResource("24_t6tp5") + [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 index 6a13295..9cbf8c8 100644 --- a/DayScenes/Day3T.tscn +++ b/DayScenes/Day3T.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=3 uid="uid://dx4nc2orebc0q"] +[gd_scene load_steps=34 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,8 +7,11 @@ [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="Script" path="res://Scenes/Restaurant/Tablez/table.gd" id="8_5d6oq"] [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="Texture2D" uid="uid://d1b4hokfhh1qd" path="res://Assets/Interactables/PlainSurfaces/table.png" id="9_71rie"] +[ext_resource type="PackedScene" uid="uid://jecoiu4ygk5f" path="res://Scenes/Restaurant/TestItems/chair.tscn" id="10_op3gr"] [ext_resource type="PackedScene" uid="uid://ede2frngbs0e" path="res://Scenes/Restaurant/Interactables/Stove/stove.tscn" id="10_wdk2w"] [ext_resource type="PackedScene" uid="uid://oi2debxs4xwk" path="res://Scenes/Restaurant/Interactables/CuttingBoard/cuttingBoard.tscn" id="11_3ywkr"] [ext_resource type="PackedScene" uid="uid://ct4bob2krtxcc" path="res://Scenes/Restaurant/Holdables/Food/FoodSpawnBoxes/plateRack.tscn" id="12_e3iuk"] @@ -23,6 +26,8 @@ [ext_resource type="PackedScene" uid="uid://cmkwxcvadpr4y" path="res://Scenes/Restaurant/Holdables/Food/FoodSpawnBoxes/cuttableRack.tscn" id="22_plewd"] [ext_resource type="PackedScene" uid="uid://txto47x1ji8o" path="res://Scenes/Restaurant/Interactables/DrinkTube/drinkTube.tscn" id="24_qwlsl"] [ext_resource type="Texture2D" uid="uid://dkuj4g0x7bb1l" path="res://Assets/UI/button-controls-spritesheet.png" id="25_tegf0"] +[ext_resource type="Texture2D" uid="uid://lfthblp0kp4t" path="res://Assets/Interactables/PlainSurfaces/bar.png" id="25_uxej8"] +[ext_resource type="Texture2D" uid="uid://d3p25sj3n3qi0" path="res://Assets/Environment/Ambiance/bar-stool.png" id="26_6fun4"] [ext_resource type="PackedScene" uid="uid://pboyl84wmi8l" path="res://Scenes/Restaurant/Holdables/Food/FoodSpawnBoxes/glassStack.tscn" id="26_uqhy6"] [sub_resource type="GDScript" id="GDScript_tyb3y"] @@ -46,6 +51,9 @@ func _on_timer_timeout(): Utils.setScene(nextScene) " +[sub_resource type="RectangleShape2D" id="RectangleShape2D_q2ckp"] +size = Vector2(32, 32) + [sub_resource type="AtlasTexture" id="AtlasTexture_6nbmx"] atlas = ExtResource("25_tegf0") region = Rect2(96, 56, 54, 24) @@ -66,7 +74,7 @@ theme_override_fonts/font = ExtResource("1_davyu") script = ExtResource("2_4ff61") [node name="Background" parent="." instance=ExtResource("3_306gv")] -scroll_offset = Vector2(-1.66667, 0) +scroll_offset = Vector2(-0.909091, 0) Planet = "Green Planet" [node name="Furniture" type="Node" parent="."] @@ -87,20 +95,77 @@ script = ExtResource("6_t4lye") threshold = 1.0 day = 3 -[node name="Table" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")] -position = Vector2(632, 360) +[node name="Table" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 336) +script = ExtResource("8_5d6oq") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table"] +visible = false +texture = ExtResource("9_71rie") + +[node name="Chair" parent="Furniture/TableManager/Table" instance=ExtResource("10_op3gr")] +visible = false +position = Vector2(-32, -1) [node name="Table2" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")] position = Vector2(536, 456) -[node name="Table7" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")] -position = Vector2(528, 360) +[node name="Table7" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 368) +script = ExtResource("8_5d6oq") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table7"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table7/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table7"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table7"] +visible = false +texture = ExtResource("9_71rie") + +[node name="Chair" parent="Furniture/TableManager/Table7" instance=ExtResource("10_op3gr")] +visible = false +position = Vector2(-32, -1) [node name="Table3" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")] position = Vector2(432, 456) -[node name="Table5" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")] -position = Vector2(440, 360) +[node name="Table5" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 304) +script = ExtResource("8_5d6oq") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table5"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table5/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table5"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table5"] +visible = false +texture = ExtResource("9_71rie") + +[node name="Chair" parent="Furniture/TableManager/Table5" instance=ExtResource("10_op3gr")] +visible = false +position = Vector2(-32, -1) [node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_onxoe")] position = Vector2(640, 456) @@ -207,5 +272,22 @@ position = Vector2(147, 290) isCounter = true side = 2 +[node name="Bar" type="Sprite2D" parent="."] +position = Vector2(544, 336) +rotation = 1.5708 +texture = ExtResource("25_uxej8") + +[node name="Bar-stool" type="Sprite2D" parent="."] +position = Vector2(496, 368) +texture = ExtResource("26_6fun4") + +[node name="Bar-stool2" type="Sprite2D" parent="."] +position = Vector2(496, 336) +texture = ExtResource("26_6fun4") + +[node name="Bar-stool3" type="Sprite2D" parent="."] +position = Vector2(496, 304) +texture = ExtResource("26_6fun4") + [connection signal="display_orders" from="Furniture/TicketBoard" to="Furniture/TableManager" method="_on_ticket_board_display_orders"] [connection signal="pressed" from="TextureButton" to="." method="_on_texture_button_pressed"] diff --git a/DayScenes/Day4G.tscn b/DayScenes/Day4G.tscn index 0853689..d2495bb 100644 --- a/DayScenes/Day4G.tscn +++ b/DayScenes/Day4G.tscn @@ -1,12 +1,15 @@ -[gd_scene load_steps=24 format=3 uid="uid://cdb3jkuwncr8m"] +[gd_scene load_steps=30 format=3 uid="uid://cdb3jkuwncr8m"] [ext_resource type="Script" path="res://DevScenes/Logan/MoneyLabel.gd" id="2_gaqw6"] [ext_resource type="PackedScene" uid="uid://c25l7bpom1gm4" path="res://Scenes/Background/background.tscn" id="3_4le4m"] [ext_resource type="PackedScene" uid="uid://blxn4sm30k3lc" path="res://Scenes/Restaurant/TestItems/teleporter.tscn" id="4_atmys"] [ext_resource type="PackedScene" uid="uid://bbui5hao4bmbp" path="res://Scenes/Restaurant/TestItems/HostingStand.tscn" id="5_r20ob"] [ext_resource type="Script" path="res://Scenes/Restaurant/Tablez/table_manager.gd" id="6_7w16m"] +[ext_resource type="Script" path="res://Scenes/Restaurant/Tablez/table.gd" id="7_2s3o5"] [ext_resource type="PackedScene" uid="uid://82nfelbi5c41" path="res://Scenes/Restaurant/Tablez/table.tscn" id="7_p11v3"] +[ext_resource type="Texture2D" uid="uid://d1b4hokfhh1qd" path="res://Assets/Interactables/PlainSurfaces/table.png" id="8_dmm5n"] [ext_resource type="PackedScene" uid="uid://wcr6e8ubq8aj" path="res://Scenes/Restaurant/Interactables/TicketBoard/ticket_board.tscn" id="9_jj70k"] +[ext_resource type="PackedScene" uid="uid://jecoiu4ygk5f" path="res://Scenes/Restaurant/TestItems/chair.tscn" id="9_seohw"] [ext_resource type="PackedScene" uid="uid://thygj4fuuxqk" path="res://Scenes/Restaurant/TestItems/jukebox.tscn" id="10_wguih"] [ext_resource type="PackedScene" uid="uid://ede2frngbs0e" path="res://Scenes/Restaurant/Interactables/Stove/stove.tscn" id="11_lidkb"] [ext_resource type="PackedScene" uid="uid://oi2debxs4xwk" path="res://Scenes/Restaurant/Interactables/CuttingBoard/cuttingBoard.tscn" id="12_nxdg7"] @@ -22,6 +25,8 @@ [ext_resource type="PackedScene" uid="uid://b37amv1v2ky1c" path="res://Scenes/Tutorial/tutorialUI.tscn" id="23_d4s46"] [ext_resource type="PackedScene" uid="uid://cmkwxcvadpr4y" path="res://Scenes/Restaurant/Holdables/Food/FoodSpawnBoxes/cuttableRack.tscn" id="24_q0ko8"] [ext_resource type="PackedScene" uid="uid://txto47x1ji8o" path="res://Scenes/Restaurant/Interactables/DrinkTube/drinkTube.tscn" id="25_lff3r"] +[ext_resource type="Texture2D" uid="uid://lfthblp0kp4t" path="res://Assets/Interactables/PlainSurfaces/bar.png" id="26_yvbhj"] +[ext_resource type="Texture2D" uid="uid://d3p25sj3n3qi0" path="res://Assets/Environment/Ambiance/bar-stool.png" id="27_of0ng"] [sub_resource type="GDScript" id="GDScript_tyb3y"] script/source = "extends \"res://Scenes/SceneManager/playerManager.gd\" @@ -44,6 +49,9 @@ func _on_timer_timeout(): Utils.setScene(nextScene) " +[sub_resource type="RectangleShape2D" id="RectangleShape2D_q2ckp"] +size = Vector2(32, 32) + [node name="Day4G" type="Node2D"] script = SubResource("GDScript_tyb3y") @@ -76,20 +84,77 @@ script = ExtResource("6_7w16m") threshold = 1.0 day = 4 -[node name="Table" parent="Furniture/TableManager" instance=ExtResource("7_p11v3")] -position = Vector2(632, 360) +[node name="Table" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 336) +script = ExtResource("7_2s3o5") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table"] +visible = false +texture = ExtResource("8_dmm5n") + +[node name="Chair" parent="Furniture/TableManager/Table" instance=ExtResource("9_seohw")] +visible = false +position = Vector2(-32, -1) [node name="Table2" parent="Furniture/TableManager" instance=ExtResource("7_p11v3")] position = Vector2(536, 456) -[node name="Table7" parent="Furniture/TableManager" instance=ExtResource("7_p11v3")] -position = Vector2(528, 360) +[node name="Table7" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 368) +script = ExtResource("7_2s3o5") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table7"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table7/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table7"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table7"] +visible = false +texture = ExtResource("8_dmm5n") + +[node name="Chair" parent="Furniture/TableManager/Table7" instance=ExtResource("9_seohw")] +visible = false +position = Vector2(-32, -1) [node name="Table3" parent="Furniture/TableManager" instance=ExtResource("7_p11v3")] position = Vector2(432, 456) -[node name="Table5" parent="Furniture/TableManager" instance=ExtResource("7_p11v3")] -position = Vector2(440, 360) +[node name="Table5" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 304) +script = ExtResource("7_2s3o5") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table5"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table5/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table5"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table5"] +visible = false +texture = ExtResource("8_dmm5n") + +[node name="Chair" parent="Furniture/TableManager/Table5" instance=ExtResource("9_seohw")] +visible = false +position = Vector2(-32, -1) [node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_p11v3")] position = Vector2(640, 456) @@ -207,4 +272,21 @@ position = Vector2(147, 290) isCounter = true side = 2 +[node name="Bar" type="Sprite2D" parent="."] +position = Vector2(544, 336) +rotation = 1.5708 +texture = ExtResource("26_yvbhj") + +[node name="Bar-stool" type="Sprite2D" parent="."] +position = Vector2(496, 368) +texture = ExtResource("27_of0ng") + +[node name="Bar-stool2" type="Sprite2D" parent="."] +position = Vector2(496, 336) +texture = ExtResource("27_of0ng") + +[node name="Bar-stool3" type="Sprite2D" parent="."] +position = Vector2(496, 304) +texture = ExtResource("27_of0ng") + [connection signal="display_orders" from="Furniture/TicketBoard" to="Furniture/TableManager" method="_on_ticket_board_display_orders"] diff --git a/DayScenes/Day4T.tscn b/DayScenes/Day4T.tscn index b84beb6..9a6e339 100644 --- a/DayScenes/Day4T.tscn +++ b/DayScenes/Day4T.tscn @@ -1,11 +1,14 @@ -[gd_scene load_steps=27 format=3 uid="uid://dqselsxp5oyhu"] +[gd_scene load_steps=33 format=3 uid="uid://dqselsxp5oyhu"] [ext_resource type="Script" path="res://DevScenes/Logan/MoneyLabel.gd" id="2_8qujc"] [ext_resource type="PackedScene" uid="uid://c25l7bpom1gm4" path="res://Scenes/Background/background.tscn" id="3_vpvqv"] [ext_resource type="PackedScene" uid="uid://blxn4sm30k3lc" path="res://Scenes/Restaurant/TestItems/teleporter.tscn" id="4_5e0y6"] [ext_resource type="PackedScene" uid="uid://bbui5hao4bmbp" path="res://Scenes/Restaurant/TestItems/HostingStand.tscn" id="5_odrg1"] [ext_resource type="Script" path="res://Scenes/Restaurant/Tablez/table_manager.gd" id="6_wjks0"] +[ext_resource type="Script" path="res://Scenes/Restaurant/Tablez/table.gd" id="7_5qeci"] [ext_resource type="PackedScene" uid="uid://82nfelbi5c41" path="res://Scenes/Restaurant/Tablez/table.tscn" id="7_r0b7u"] +[ext_resource type="Texture2D" uid="uid://d1b4hokfhh1qd" path="res://Assets/Interactables/PlainSurfaces/table.png" id="8_yt5ls"] +[ext_resource type="PackedScene" uid="uid://jecoiu4ygk5f" path="res://Scenes/Restaurant/TestItems/chair.tscn" id="9_7254p"] [ext_resource type="PackedScene" uid="uid://wcr6e8ubq8aj" path="res://Scenes/Restaurant/Interactables/TicketBoard/ticket_board.tscn" id="9_wxov7"] [ext_resource type="PackedScene" uid="uid://thygj4fuuxqk" path="res://Scenes/Restaurant/TestItems/jukebox.tscn" id="10_g2k35"] [ext_resource type="PackedScene" uid="uid://ede2frngbs0e" path="res://Scenes/Restaurant/Interactables/Stove/stove.tscn" id="11_klu1g"] @@ -23,6 +26,8 @@ [ext_resource type="Texture2D" uid="uid://l1vy4hqh6sri" path="res://Assets/UI/pulsar.png" id="23_vbomk"] [ext_resource type="PackedScene" uid="uid://txto47x1ji8o" path="res://Scenes/Restaurant/Interactables/DrinkTube/drinkTube.tscn" id="24_cylh8"] [ext_resource type="PackedScene" uid="uid://pboyl84wmi8l" path="res://Scenes/Restaurant/Holdables/Food/FoodSpawnBoxes/glassStack.tscn" id="24_gkdjd"] +[ext_resource type="Texture2D" uid="uid://lfthblp0kp4t" path="res://Assets/Interactables/PlainSurfaces/bar.png" id="27_p6or4"] +[ext_resource type="Texture2D" uid="uid://d3p25sj3n3qi0" path="res://Assets/Environment/Ambiance/bar-stool.png" id="28_kwqky"] [sub_resource type="GDScript" id="GDScript_tyb3y"] script/source = "extends \"res://Scenes/SceneManager/playerManager.gd\" @@ -45,6 +50,9 @@ func _on_timer_timeout(): Utils.setScene(nextScene) " +[sub_resource type="RectangleShape2D" id="RectangleShape2D_q2ckp"] +size = Vector2(32, 32) + [sub_resource type="AtlasTexture" id="AtlasTexture_6nbmx"] atlas = ExtResource("22_0jtdf") region = Rect2(96, 56, 54, 24) @@ -64,7 +72,7 @@ offset_bottom = 29.0 script = ExtResource("2_8qujc") [node name="Background" parent="." instance=ExtResource("3_vpvqv")] -scroll_offset = Vector2(-1.66667, 0) +scroll_offset = Vector2(-2.73222, 0) Planet = "Green Planet" [node name="Furniture" type="Node" parent="."] @@ -85,20 +93,77 @@ script = ExtResource("6_wjks0") threshold = 1.0 day = 5 -[node name="Table" parent="Furniture/TableManager" instance=ExtResource("7_r0b7u")] -position = Vector2(632, 360) +[node name="Table" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 336) +script = ExtResource("7_5qeci") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table"] +visible = false +texture = ExtResource("8_yt5ls") + +[node name="Chair" parent="Furniture/TableManager/Table" instance=ExtResource("9_7254p")] +visible = false +position = Vector2(-32, -1) [node name="Table2" parent="Furniture/TableManager" instance=ExtResource("7_r0b7u")] position = Vector2(536, 456) -[node name="Table7" parent="Furniture/TableManager" instance=ExtResource("7_r0b7u")] -position = Vector2(528, 360) +[node name="Table7" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 368) +script = ExtResource("7_5qeci") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table7"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table7/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table7"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table7"] +visible = false +texture = ExtResource("8_yt5ls") + +[node name="Chair" parent="Furniture/TableManager/Table7" instance=ExtResource("9_7254p")] +visible = false +position = Vector2(-32, -1) [node name="Table3" parent="Furniture/TableManager" instance=ExtResource("7_r0b7u")] position = Vector2(432, 456) -[node name="Table5" parent="Furniture/TableManager" instance=ExtResource("7_r0b7u")] -position = Vector2(440, 360) +[node name="Table5" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 304) +script = ExtResource("7_5qeci") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table5"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table5/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table5"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table5"] +visible = false +texture = ExtResource("8_yt5ls") + +[node name="Chair" parent="Furniture/TableManager/Table5" instance=ExtResource("9_7254p")] +visible = false +position = Vector2(-32, -1) [node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_r0b7u")] position = Vector2(640, 456) @@ -220,5 +285,22 @@ position = Vector2(147, 290) isCounter = true side = 2 +[node name="Bar" type="Sprite2D" parent="."] +position = Vector2(544, 336) +rotation = 1.5708 +texture = ExtResource("27_p6or4") + +[node name="Bar-stool" type="Sprite2D" parent="."] +position = Vector2(496, 368) +texture = ExtResource("28_kwqky") + +[node name="Bar-stool2" type="Sprite2D" parent="."] +position = Vector2(496, 336) +texture = ExtResource("28_kwqky") + +[node name="Bar-stool3" type="Sprite2D" parent="."] +position = Vector2(496, 304) +texture = ExtResource("28_kwqky") + [connection signal="display_orders" from="Furniture/TicketBoard" to="Furniture/TableManager" method="_on_ticket_board_display_orders"] [connection signal="pressed" from="TextureButton" to="." method="_on_texture_button_pressed"] diff --git a/DayScenes/Day5G.tscn b/DayScenes/Day5G.tscn index 4cdf7c8..35735fa 100644 --- a/DayScenes/Day5G.tscn +++ b/DayScenes/Day5G.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=3 uid="uid://bqqokemo4n8mx"] +[gd_scene load_steps=33 format=3 uid="uid://bqqokemo4n8mx"] [ext_resource type="FontFile" uid="uid://df7lvaaeis5to" path="res://Assets/Fonts/VeniteAdoremusStraight-Yzo6v.ttf" id="1_vsj2k"] [ext_resource type="Script" path="res://DevScenes/Logan/MoneyLabel.gd" id="2_g2n6n"] @@ -7,8 +7,11 @@ [ext_resource type="PackedScene" uid="uid://bbui5hao4bmbp" path="res://Scenes/Restaurant/TestItems/HostingStand.tscn" id="5_8u7s5"] [ext_resource type="Script" path="res://Scenes/Restaurant/Tablez/table_manager.gd" id="6_v5wh4"] [ext_resource type="PackedScene" uid="uid://82nfelbi5c41" path="res://Scenes/Restaurant/Tablez/table.tscn" id="7_50tpv"] +[ext_resource type="Script" path="res://Scenes/Restaurant/Tablez/table.gd" id="8_xm2kf"] +[ext_resource type="Texture2D" uid="uid://d1b4hokfhh1qd" path="res://Assets/Interactables/PlainSurfaces/table.png" id="9_3osdt"] [ext_resource type="PackedScene" uid="uid://wcr6e8ubq8aj" path="res://Scenes/Restaurant/Interactables/TicketBoard/ticket_board.tscn" id="9_n6cao"] [ext_resource type="PackedScene" uid="uid://thygj4fuuxqk" path="res://Scenes/Restaurant/TestItems/jukebox.tscn" id="10_fpbsb"] +[ext_resource type="PackedScene" uid="uid://jecoiu4ygk5f" path="res://Scenes/Restaurant/TestItems/chair.tscn" id="10_qgmxh"] [ext_resource type="PackedScene" uid="uid://ede2frngbs0e" path="res://Scenes/Restaurant/Interactables/Stove/stove.tscn" id="11_vcyk2"] [ext_resource type="PackedScene" uid="uid://oi2debxs4xwk" path="res://Scenes/Restaurant/Interactables/CuttingBoard/cuttingBoard.tscn" id="12_2l5i6"] [ext_resource type="PackedScene" uid="uid://ct4bob2krtxcc" path="res://Scenes/Restaurant/Holdables/Food/FoodSpawnBoxes/plateRack.tscn" id="13_b3m65"] @@ -25,6 +28,8 @@ [ext_resource type="PackedScene" uid="uid://i45lk6yxg0oy" path="res://Scenes/SceneTransition/level_progressor.tscn" id="24_ljrxi"] [ext_resource type="PackedScene" uid="uid://txto47x1ji8o" path="res://Scenes/Restaurant/Interactables/DrinkTube/drinkTube.tscn" id="25_fcjbc"] [ext_resource type="PackedScene" uid="uid://bgc3musmo8bkh" path="res://Scenes/Restaurant/TestItems/Catgun.tscn" id="25_fsq3y"] +[ext_resource type="Texture2D" uid="uid://lfthblp0kp4t" path="res://Assets/Interactables/PlainSurfaces/bar.png" id="29_i01hf"] +[ext_resource type="Texture2D" uid="uid://d3p25sj3n3qi0" path="res://Assets/Environment/Ambiance/bar-stool.png" id="30_v0b1l"] [sub_resource type="GDScript" id="GDScript_tyb3y"] script/source = "extends \"res://Scenes/SceneManager/playerManager.gd\" @@ -47,6 +52,9 @@ func _on_timer_timeout(): Utils.setScene(nextScene, false) " +[sub_resource type="RectangleShape2D" id="RectangleShape2D_q2ckp"] +size = Vector2(32, 32) + [node name="Day5G" type="Node2D"] script = SubResource("GDScript_tyb3y") @@ -59,7 +67,7 @@ theme_override_fonts/font = ExtResource("1_vsj2k") script = ExtResource("2_g2n6n") [node name="Background" parent="." instance=ExtResource("3_agnsc")] -scroll_offset = Vector2(-0.833333, 0) +scroll_offset = Vector2(-1.53317, 0) Planet = "Green Planet" [node name="Furniture" type="Node" parent="."] @@ -80,20 +88,77 @@ script = ExtResource("6_v5wh4") threshold = 1.0 day = 5 -[node name="Table" parent="Furniture/TableManager" instance=ExtResource("7_50tpv")] -position = Vector2(632, 360) +[node name="Table" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 336) +script = ExtResource("8_xm2kf") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table"] +visible = false +texture = ExtResource("9_3osdt") + +[node name="Chair" parent="Furniture/TableManager/Table" instance=ExtResource("10_qgmxh")] +visible = false +position = Vector2(-32, -1) [node name="Table2" parent="Furniture/TableManager" instance=ExtResource("7_50tpv")] position = Vector2(536, 456) -[node name="Table7" parent="Furniture/TableManager" instance=ExtResource("7_50tpv")] -position = Vector2(528, 360) +[node name="Table7" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 368) +script = ExtResource("8_xm2kf") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table7"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table7/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table7"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table7"] +visible = false +texture = ExtResource("9_3osdt") + +[node name="Chair" parent="Furniture/TableManager/Table7" instance=ExtResource("10_qgmxh")] +visible = false +position = Vector2(-32, -1) [node name="Table3" parent="Furniture/TableManager" instance=ExtResource("7_50tpv")] position = Vector2(432, 456) -[node name="Table5" parent="Furniture/TableManager" instance=ExtResource("7_50tpv")] -position = Vector2(440, 360) +[node name="Table5" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 304) +script = ExtResource("8_xm2kf") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table5"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table5/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table5"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table5"] +visible = false +texture = ExtResource("9_3osdt") + +[node name="Chair" parent="Furniture/TableManager/Table5" instance=ExtResource("10_qgmxh")] +visible = false +position = Vector2(-32, -1) [node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_50tpv")] position = Vector2(640, 456) @@ -200,4 +265,21 @@ side = 2 [node name="Catgun" parent="PlainSurface4" instance=ExtResource("25_fsq3y")] position = Vector2(0, -8) +[node name="Bar" type="Sprite2D" parent="."] +position = Vector2(544, 336) +rotation = 1.5708 +texture = ExtResource("29_i01hf") + +[node name="Bar-stool" type="Sprite2D" parent="."] +position = Vector2(496, 368) +texture = ExtResource("30_v0b1l") + +[node name="Bar-stool2" type="Sprite2D" parent="."] +position = Vector2(496, 336) +texture = ExtResource("30_v0b1l") + +[node name="Bar-stool3" type="Sprite2D" parent="."] +position = Vector2(496, 304) +texture = ExtResource("30_v0b1l") + [connection signal="display_orders" from="Furniture/TicketBoard" to="Furniture/TableManager" method="_on_ticket_board_display_orders"] diff --git a/DayScenes/Day5T.tscn b/DayScenes/Day5T.tscn index d6f58b2..b9524e4 100644 --- a/DayScenes/Day5T.tscn +++ b/DayScenes/Day5T.tscn @@ -1,11 +1,14 @@ -[gd_scene load_steps=28 format=3 uid="uid://bkf5ldsvui8ab"] +[gd_scene load_steps=34 format=3 uid="uid://bkf5ldsvui8ab"] [ext_resource type="Script" path="res://DevScenes/Logan/MoneyLabel.gd" id="2_qk84v"] [ext_resource type="PackedScene" uid="uid://c25l7bpom1gm4" path="res://Scenes/Background/background.tscn" id="3_ownmq"] [ext_resource type="PackedScene" uid="uid://blxn4sm30k3lc" path="res://Scenes/Restaurant/TestItems/teleporter.tscn" id="4_iplj5"] [ext_resource type="PackedScene" uid="uid://bbui5hao4bmbp" path="res://Scenes/Restaurant/TestItems/HostingStand.tscn" id="5_5bfeb"] [ext_resource type="Script" path="res://Scenes/Restaurant/Tablez/table_manager.gd" id="6_udxm8"] +[ext_resource type="Script" path="res://Scenes/Restaurant/Tablez/table.gd" id="7_i0fx6"] [ext_resource type="PackedScene" uid="uid://82nfelbi5c41" path="res://Scenes/Restaurant/Tablez/table.tscn" id="7_s1t1m"] +[ext_resource type="Texture2D" uid="uid://d1b4hokfhh1qd" path="res://Assets/Interactables/PlainSurfaces/table.png" id="8_lnwwo"] +[ext_resource type="PackedScene" uid="uid://jecoiu4ygk5f" path="res://Scenes/Restaurant/TestItems/chair.tscn" id="9_4catb"] [ext_resource type="PackedScene" uid="uid://wcr6e8ubq8aj" path="res://Scenes/Restaurant/Interactables/TicketBoard/ticket_board.tscn" id="9_iet1g"] [ext_resource type="PackedScene" uid="uid://thygj4fuuxqk" path="res://Scenes/Restaurant/TestItems/jukebox.tscn" id="10_a5hrc"] [ext_resource type="PackedScene" uid="uid://ede2frngbs0e" path="res://Scenes/Restaurant/Interactables/Stove/stove.tscn" id="11_g5heq"] @@ -24,6 +27,8 @@ [ext_resource type="PackedScene" uid="uid://cmkwxcvadpr4y" path="res://Scenes/Restaurant/Holdables/Food/FoodSpawnBoxes/cuttableRack.tscn" id="22_bptdv"] [ext_resource type="PackedScene" uid="uid://b37amv1v2ky1c" path="res://Scenes/Tutorial/tutorialUI.tscn" id="23_eyu7p"] [ext_resource type="PackedScene" uid="uid://txto47x1ji8o" path="res://Scenes/Restaurant/Interactables/DrinkTube/drinkTube.tscn" id="23_xvjny"] +[ext_resource type="Texture2D" uid="uid://lfthblp0kp4t" path="res://Assets/Interactables/PlainSurfaces/bar.png" id="28_0vfkf"] +[ext_resource type="Texture2D" uid="uid://d3p25sj3n3qi0" path="res://Assets/Environment/Ambiance/bar-stool.png" id="29_7ylt4"] [sub_resource type="GDScript" id="GDScript_tyb3y"] script/source = "extends \"res://Scenes/SceneManager/playerManager.gd\" @@ -46,6 +51,9 @@ func _on_timer_timeout(): Utils.setScene(nextScene) " +[sub_resource type="RectangleShape2D" id="RectangleShape2D_q2ckp"] +size = Vector2(32, 32) + [sub_resource type="AtlasTexture" id="AtlasTexture_kbthv"] atlas = ExtResource("21_epchl") region = Rect2(96, 56, 54, 24) @@ -65,7 +73,7 @@ offset_bottom = 29.0 script = ExtResource("2_qk84v") [node name="Background" parent="." instance=ExtResource("3_ownmq")] -scroll_offset = Vector2(-1.31127, 0) +scroll_offset = Vector2(-1.66667, 0) Planet = "Green Planet" [node name="Furniture" type="Node" parent="."] @@ -86,20 +94,77 @@ script = ExtResource("6_udxm8") threshold = 1.0 day = 5 -[node name="Table" parent="Furniture/TableManager" instance=ExtResource("7_s1t1m")] -position = Vector2(632, 360) +[node name="Table" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 336) +script = ExtResource("7_i0fx6") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table"] +visible = false +texture = ExtResource("8_lnwwo") + +[node name="Chair" parent="Furniture/TableManager/Table" instance=ExtResource("9_4catb")] +visible = false +position = Vector2(-32, -1) [node name="Table2" parent="Furniture/TableManager" instance=ExtResource("7_s1t1m")] position = Vector2(536, 456) -[node name="Table7" parent="Furniture/TableManager" instance=ExtResource("7_s1t1m")] -position = Vector2(528, 360) +[node name="Table7" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 368) +script = ExtResource("7_i0fx6") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table7"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table7/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table7"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table7"] +visible = false +texture = ExtResource("8_lnwwo") + +[node name="Chair" parent="Furniture/TableManager/Table7" instance=ExtResource("9_4catb")] +visible = false +position = Vector2(-32, -1) [node name="Table3" parent="Furniture/TableManager" instance=ExtResource("7_s1t1m")] position = Vector2(432, 456) -[node name="Table5" parent="Furniture/TableManager" instance=ExtResource("7_s1t1m")] -position = Vector2(440, 360) +[node name="Table5" type="Area2D" parent="Furniture/TableManager" groups=["Surfaces"]] +z_index = -1 +position = Vector2(528, 304) +script = ExtResource("7_i0fx6") + +[node name="StaticBody2D" type="StaticBody2D" parent="Furniture/TableManager/Table5"] +z_index = -1 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table5/StaticBody2D"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Furniture/TableManager/Table5"] +shape = SubResource("RectangleShape2D_q2ckp") + +[node name="Surface" type="Sprite2D" parent="Furniture/TableManager/Table5"] +visible = false +texture = ExtResource("8_lnwwo") + +[node name="Chair" parent="Furniture/TableManager/Table5" instance=ExtResource("9_4catb")] +visible = false +position = Vector2(-32, -1) [node name="Table4" parent="Furniture/TableManager" instance=ExtResource("7_s1t1m")] position = Vector2(640, 456) @@ -213,5 +278,22 @@ side = 2 position = Vector2(252, 434) control = 2 +[node name="Bar" type="Sprite2D" parent="."] +position = Vector2(544, 336) +rotation = 1.5708 +texture = ExtResource("28_0vfkf") + +[node name="Bar-stool" type="Sprite2D" parent="."] +position = Vector2(496, 368) +texture = ExtResource("29_7ylt4") + +[node name="Bar-stool2" type="Sprite2D" parent="."] +position = Vector2(496, 336) +texture = ExtResource("29_7ylt4") + +[node name="Bar-stool3" type="Sprite2D" parent="."] +position = Vector2(496, 304) +texture = ExtResource("29_7ylt4") + [connection signal="display_orders" from="Furniture/TicketBoard" to="Furniture/TableManager" method="_on_ticket_board_display_orders"] [connection signal="pressed" from="TextureButton" to="." method="_on_texture_button_pressed"] diff --git a/DayScenes/Intro1.tscn b/DayScenes/Intro1.tscn index 5ebc4b9..f70b98a 100644 --- a/DayScenes/Intro1.tscn +++ b/DayScenes/Intro1.tscn @@ -17,7 +17,7 @@ region = Rect2(96, 208, 54, 24) [node name="Intro1" type="Node2D"] [node name="Background" parent="." instance=ExtResource("1_jd8qx")] -scroll_offset = Vector2(-0.683311, 0) +scroll_offset = Vector2(-1.66667, 0) Planet = "Level Select" [node name="Console" type="Sprite2D" parent="."] diff --git a/DevScenes/Alexander/Alexander.tscn b/DevScenes/Alexander/Alexander.tscn index a20e866..67525eb 100644 --- a/DevScenes/Alexander/Alexander.tscn +++ b/DevScenes/Alexander/Alexander.tscn @@ -35,7 +35,7 @@ script = SubResource("GDScript_paifd") [node name="Environment" type="Node2D" parent="."] [node name="Background" parent="Environment" instance=ExtResource("1_1fft2")] -scroll_offset = Vector2(-1.66667, 0) +scroll_offset = Vector2(0, 0) Planet = "Green Planet" [node name="Alexander" type="Label" parent="Environment/Background"] diff --git a/Scenes/InputSelection/p1InputSelection.tscn b/Scenes/InputSelection/p1InputSelection.tscn index 48fcc16..c1645bb 100644 --- a/Scenes/InputSelection/p1InputSelection.tscn +++ b/Scenes/InputSelection/p1InputSelection.tscn @@ -15,7 +15,7 @@ size = Vector2(128, 256) script = ExtResource("1_t7ts5") [node name="Background" parent="." instance=ExtResource("1_ddpmq")] -scroll_offset = Vector2(-1.3373, 0) +scroll_offset = Vector2(0, 0) Planet = "Blue Planet" [node name="Player" parent="." instance=ExtResource("2_td5us")] diff --git a/Scenes/MainMenu/mainMenu.tscn b/Scenes/MainMenu/mainMenu.tscn index fe8ac71..ae3941a 100644 --- a/Scenes/MainMenu/mainMenu.tscn +++ b/Scenes/MainMenu/mainMenu.tscn @@ -18,7 +18,7 @@ region = Rect2(372, 18, 282, 120) script = ExtResource("1_7cu48") [node name="Background" parent="." instance=ExtResource("1_0v6ry")] -scroll_offset = Vector2(-1.66667, 0) +scroll_offset = Vector2(0, 0) [node name="startButton" type="TextureButton" parent="."] offset_left = 240.0