diff --git a/Assets/BGs/planet-2-background.png b/Assets/BGs/bluePlanetBG.png similarity index 100% rename from Assets/BGs/planet-2-background.png rename to Assets/BGs/bluePlanetBG.png diff --git a/Assets/BGs/planet-2-background.png.import b/Assets/BGs/bluePlanetBG.png.import similarity index 69% rename from Assets/BGs/planet-2-background.png.import rename to Assets/BGs/bluePlanetBG.png.import index 830c4cd..0308b8d 100644 --- a/Assets/BGs/planet-2-background.png.import +++ b/Assets/BGs/bluePlanetBG.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cwjtin5ybxwyg" -path="res://.godot/imported/planet-2-background.png-a165e38b77e646e5f8c195bdf7368fe3.ctex" +path="res://.godot/imported/bluePlanetBG.png-021d98f3721f561c485468d2a0f035c6.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/BGs/planet-2-background.png" -dest_files=["res://.godot/imported/planet-2-background.png-a165e38b77e646e5f8c195bdf7368fe3.ctex"] +source_file="res://Assets/BGs/bluePlanetBG.png" +dest_files=["res://.godot/imported/bluePlanetBG.png-021d98f3721f561c485468d2a0f035c6.ctex"] [params] diff --git a/Assets/BGs/planet-2-dining-no-space-background.png b/Assets/BGs/bluePlanetDiner.png similarity index 100% rename from Assets/BGs/planet-2-dining-no-space-background.png rename to Assets/BGs/bluePlanetDiner.png diff --git a/Assets/BGs/planet-2-dining-no-space-background.png.import b/Assets/BGs/bluePlanetDiner.png.import similarity index 65% rename from Assets/BGs/planet-2-dining-no-space-background.png.import rename to Assets/BGs/bluePlanetDiner.png.import index 17b7d14..cd453d3 100644 --- a/Assets/BGs/planet-2-dining-no-space-background.png.import +++ b/Assets/BGs/bluePlanetDiner.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bcjpwjtnr8ki3" -path="res://.godot/imported/planet-2-dining-no-space-background.png-112955562db345f6879a67affaeaea07.ctex" +path="res://.godot/imported/bluePlanetDiner.png-3b59bc6e8ff914877bf8c1c3b6dd646f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/BGs/planet-2-dining-no-space-background.png" -dest_files=["res://.godot/imported/planet-2-dining-no-space-background.png-112955562db345f6879a67affaeaea07.ctex"] +source_file="res://Assets/BGs/bluePlanetDiner.png" +dest_files=["res://.godot/imported/bluePlanetDiner.png-3b59bc6e8ff914877bf8c1c3b6dd646f.ctex"] [params] diff --git a/Assets/BGs/planet-1-background.png b/Assets/BGs/greenPlanetBG.png similarity index 100% rename from Assets/BGs/planet-1-background.png rename to Assets/BGs/greenPlanetBG.png diff --git a/Assets/BGs/planet-1-background.png.import b/Assets/BGs/greenPlanetBG.png.import similarity index 69% rename from Assets/BGs/planet-1-background.png.import rename to Assets/BGs/greenPlanetBG.png.import index 0e840c9..99fb5e7 100644 --- a/Assets/BGs/planet-1-background.png.import +++ b/Assets/BGs/greenPlanetBG.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b1rnxw3m74xsc" -path="res://.godot/imported/planet-1-background.png-c01cfbc10df64dd2f1f6da298ae8bafb.ctex" +path="res://.godot/imported/greenPlanetBG.png-eb2583656aa99f6517a0499aac1eb91a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/BGs/planet-1-background.png" -dest_files=["res://.godot/imported/planet-1-background.png-c01cfbc10df64dd2f1f6da298ae8bafb.ctex"] +source_file="res://Assets/BGs/greenPlanetBG.png" +dest_files=["res://.godot/imported/greenPlanetBG.png-eb2583656aa99f6517a0499aac1eb91a.ctex"] [params] diff --git a/Assets/BGs/planet-1-dining-no-space-background.png b/Assets/BGs/greenPlanetDiner.png similarity index 100% rename from Assets/BGs/planet-1-dining-no-space-background.png rename to Assets/BGs/greenPlanetDiner.png diff --git a/Assets/BGs/planet-1-dining-no-space-background.png.import b/Assets/BGs/greenPlanetDiner.png.import similarity index 65% rename from Assets/BGs/planet-1-dining-no-space-background.png.import rename to Assets/BGs/greenPlanetDiner.png.import index 0cfe7c3..c251065 100644 --- a/Assets/BGs/planet-1-dining-no-space-background.png.import +++ b/Assets/BGs/greenPlanetDiner.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bu6tn7cysqhjy" -path="res://.godot/imported/planet-1-dining-no-space-background.png-1e0a089195e2374f6af85d6c9b14a654.ctex" +path="res://.godot/imported/greenPlanetDiner.png-42bd9ee909285bc4a20a29c076663e3e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/BGs/planet-1-dining-no-space-background.png" -dest_files=["res://.godot/imported/planet-1-dining-no-space-background.png-1e0a089195e2374f6af85d6c9b14a654.ctex"] +source_file="res://Assets/BGs/greenPlanetDiner.png" +dest_files=["res://.godot/imported/greenPlanetDiner.png-42bd9ee909285bc4a20a29c076663e3e.ctex"] [params] diff --git a/Assets/BGs/start-screen-background.png b/Assets/BGs/mainMenuBG.png similarity index 100% rename from Assets/BGs/start-screen-background.png rename to Assets/BGs/mainMenuBG.png diff --git a/Assets/BGs/start-screen-background.png.import b/Assets/BGs/mainMenuBG.png.import similarity index 68% rename from Assets/BGs/start-screen-background.png.import rename to Assets/BGs/mainMenuBG.png.import index 74bac62..5b82912 100644 --- a/Assets/BGs/start-screen-background.png.import +++ b/Assets/BGs/mainMenuBG.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b2vslko42kst5" -path="res://.godot/imported/start-screen-background.png-feb6f7934b93943facfb8cb63eb6bb36.ctex" +path="res://.godot/imported/mainMenuBG.png-12e3f2bb4322b18486eb6a5152416c1e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/BGs/start-screen-background.png" -dest_files=["res://.godot/imported/start-screen-background.png-feb6f7934b93943facfb8cb63eb6bb36.ctex"] +source_file="res://Assets/BGs/mainMenuBG.png" +dest_files=["res://.godot/imported/mainMenuBG.png-12e3f2bb4322b18486eb6a5152416c1e.ctex"] [params] diff --git a/DevScenes/Alexander/Alexander.tscn b/DevScenes/Alexander/Alexander.tscn index a334437..dc6b706 100644 --- a/DevScenes/Alexander/Alexander.tscn +++ b/DevScenes/Alexander/Alexander.tscn @@ -1,26 +1,16 @@ -[gd_scene load_steps=7 format=3 uid="uid://cq4rjomlqw06p"] +[gd_scene load_steps=4 format=3 uid="uid://cq4rjomlqw06p"] -[ext_resource type="PackedScene" uid="uid://b233dqvocmp88" path="res://Scenes/Restaurant/BG/BGrestaurant.tscn" id="1_kqqf8"] -[ext_resource type="Texture2D" uid="uid://bu6tn7cysqhjy" path="res://Assets/BGs/planet-1-dining-no-space-background.png" id="2_udwln"] +[ext_resource type="PackedScene" uid="uid://c25l7bpom1gm4" path="res://Scenes/Background/background.tscn" id="1_1fft2"] [ext_resource type="PackedScene" uid="uid://btugtq4bxfaeh" path="res://Scenes/Restaurant/PlainSurface/plainSurface.tscn" id="3_gejkp"] [ext_resource type="PackedScene" uid="uid://d1ahdwi2ft7k0" path="res://Scenes/Restaurant/Player/player.tscn" id="5_2orcc"] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_x5j51"] -size = Vector2(20, 442) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_wog68"] -size = Vector2(784, 24) - [node name="Alexander" type="Node2D"] -[node name="BGrestaurant" parent="." instance=ExtResource("1_kqqf8")] +[node name="Background" parent="." instance=ExtResource("1_1fft2")] +scroll_offset = Vector2(-42246.1, 0) +Planet = "Green Planet" -[node name="Diner-background" type="Sprite2D" parent="BGrestaurant"] -position = Vector2(576, 272) -scale = Vector2(1.2, 1.2) -texture = ExtResource("2_udwln") - -[node name="Alexander" type="Label" parent="BGrestaurant"] +[node name="Alexander" type="Label" parent="Background"] offset_left = 8.0 offset_top = 576.0 offset_right = 292.0 @@ -31,37 +21,8 @@ theme_override_font_sizes/font_size = 50 text = "Alexander" metadata/_edit_use_anchors_ = true -[node name="Boundaries" type="Node2D" parent="."] - -[node name="LeftBoundary" type="StaticBody2D" parent="Boundaries"] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/LeftBoundary"] -position = Vector2(184, 269) -shape = SubResource("RectangleShape2D_x5j51") - -[node name="RightBoundary" type="StaticBody2D" parent="Boundaries"] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/RightBoundary"] -position = Vector2(968, 272) -shape = SubResource("RectangleShape2D_x5j51") - -[node name="TopBoundary" type="StaticBody2D" parent="Boundaries"] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/TopBoundary"] -position = Vector2(576, 48) -shape = SubResource("RectangleShape2D_wog68") - -[node name="BottomBoundary" type="StaticBody2D" parent="Boundaries"] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/BottomBoundary"] -position = Vector2(576, 496) -shape = SubResource("RectangleShape2D_wog68") - [node name="Surfaces" type="Node2D" parent="."] -[node name="PlainSurface" parent="Surfaces" instance=ExtResource("3_gejkp")] -position = Vector2(640, 320) - [node name="PlainSurface2" parent="Surfaces" instance=ExtResource("3_gejkp")] position = Vector2(512, 320) diff --git a/DevScenes/Andreea/Andreea.tscn b/DevScenes/Andreea/Andreea.tscn index 8bb49e5..6516051 100644 --- a/DevScenes/Andreea/Andreea.tscn +++ b/DevScenes/Andreea/Andreea.tscn @@ -1,27 +1,16 @@ -[gd_scene load_steps=8 format=3 uid="uid://ch4giiesrmblg"] +[gd_scene load_steps=5 format=3 uid="uid://ch4giiesrmblg"] -[ext_resource type="PackedScene" uid="uid://b233dqvocmp88" path="res://Scenes/Restaurant/BG/BGrestaurant.tscn" id="1_my8l5"] -[ext_resource type="Texture2D" uid="uid://wbnivqiais7r" path="res://Assets/BGs/diner-background.png" id="2_u7325"] +[ext_resource type="PackedScene" uid="uid://c25l7bpom1gm4" path="res://Scenes/Background/background.tscn" id="1_my8l5"] [ext_resource type="PackedScene" uid="uid://btugtq4bxfaeh" path="res://Scenes/Restaurant/PlainSurface/plainSurface.tscn" id="3_q7uel"] [ext_resource type="PackedScene" uid="uid://b1tqrv16m7ras" path="res://Scenes/Restaurant/TestItems/testFood.tscn" id="4_ixkjg"] [ext_resource type="PackedScene" uid="uid://d1ahdwi2ft7k0" path="res://Scenes/Restaurant/Player/player.tscn" id="5_wcnvx"] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_x5j51"] -size = Vector2(20, 442) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_wog68"] -size = Vector2(784, 24) - [node name="Andreea" type="Node2D"] -[node name="BGrestaurant" parent="." instance=ExtResource("1_my8l5")] - -[node name="Diner-background" type="Sprite2D" parent="BGrestaurant"] -position = Vector2(576, 272) -scale = Vector2(0.2, 0.2) -texture = ExtResource("2_u7325") +[node name="Background" parent="." instance=ExtResource("1_my8l5")] +Planet = "Green Planet" -[node name="Andreea" type="Label" parent="BGrestaurant"] +[node name="Andreea" type="Label" parent="Background"] offset_top = 576.0 offset_right = 284.0 offset_bottom = 648.0 @@ -29,9 +18,8 @@ theme_override_colors/font_color = Color(1, 1, 1, 1) theme_override_colors/font_shadow_color = Color(0, 0.862745, 0.94902, 1) theme_override_font_sizes/font_size = 50 text = "Andreea" -metadata/_edit_use_anchors_ = true -[node name="Instructions" type="Label" parent="BGrestaurant"] +[node name="Instructions" type="Label" parent="Background"] offset_left = 48.0 offset_top = 504.0 offset_right = 1150.0 @@ -42,35 +30,6 @@ theme_override_font_sizes/font_size = 50 text = "Instructions: 1. \"Arrow keys\" to move. 2. \"Space\" to pickup/place items." -[node name="Boundaries" type="Node2D" parent="."] - -[node name="LeftBoundary" type="StaticBody2D" parent="Boundaries"] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/LeftBoundary"] -position = Vector2(184, 269) -shape = SubResource("RectangleShape2D_x5j51") - -[node name="RightBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(784, 0) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/RightBoundary"] -position = Vector2(184, 269) -shape = SubResource("RectangleShape2D_x5j51") - -[node name="TopBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(384, -112) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/TopBoundary"] -position = Vector2(192, 160) -shape = SubResource("RectangleShape2D_wog68") - -[node name="BottomBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(384, -112) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/BottomBoundary"] -position = Vector2(192, 608) -shape = SubResource("RectangleShape2D_wog68") - [node name="Tables" type="Node2D" parent="."] [node name="Table" parent="Tables" instance=ExtResource("3_q7uel")] diff --git a/DevScenes/Caitlin/Caitlin.tscn b/DevScenes/Caitlin/Caitlin.tscn index 01970ad..af14009 100644 --- a/DevScenes/Caitlin/Caitlin.tscn +++ b/DevScenes/Caitlin/Caitlin.tscn @@ -1,27 +1,16 @@ -[gd_scene load_steps=8 format=3 uid="uid://caot8k2ggesm4"] +[gd_scene load_steps=5 format=3 uid="uid://caot8k2ggesm4"] -[ext_resource type="PackedScene" uid="uid://b233dqvocmp88" path="res://Scenes/Restaurant/BG/BGrestaurant.tscn" id="1_g1wcd"] -[ext_resource type="Texture2D" uid="uid://wbnivqiais7r" path="res://Assets/BGs/diner-background.png" id="2_vrqbq"] +[ext_resource type="PackedScene" uid="uid://c25l7bpom1gm4" path="res://Scenes/Background/background.tscn" id="1_g1wcd"] [ext_resource type="PackedScene" uid="uid://btugtq4bxfaeh" path="res://Scenes/Restaurant/PlainSurface/plainSurface.tscn" id="3_56i0x"] [ext_resource type="PackedScene" uid="uid://b1tqrv16m7ras" path="res://Scenes/Restaurant/TestItems/testFood.tscn" id="4_y2rdv"] [ext_resource type="PackedScene" uid="uid://d1ahdwi2ft7k0" path="res://Scenes/Restaurant/Player/player.tscn" id="5_81q1u"] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_x5j51"] -size = Vector2(20, 442) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_wog68"] -size = Vector2(784, 24) - [node name="Caitlin" type="Node2D"] -[node name="BGrestaurant" parent="." instance=ExtResource("1_g1wcd")] - -[node name="Diner-background" type="Sprite2D" parent="BGrestaurant"] -position = Vector2(576, 272) -scale = Vector2(0.2, 0.2) -texture = ExtResource("2_vrqbq") +[node name="Background" parent="." instance=ExtResource("1_g1wcd")] +Planet = "Green Planet" -[node name="Caitlin" type="Label" parent="BGrestaurant"] +[node name="Caitlin" type="Label" parent="Background"] offset_top = 576.0 offset_right = 284.0 offset_bottom = 648.0 @@ -29,9 +18,8 @@ theme_override_colors/font_color = Color(1, 1, 1, 1) theme_override_colors/font_shadow_color = Color(0, 0.862745, 0.94902, 1) theme_override_font_sizes/font_size = 50 text = "Caitlin" -metadata/_edit_use_anchors_ = true -[node name="Instructions" type="Label" parent="BGrestaurant"] +[node name="Instructions" type="Label" parent="Background"] offset_left = 48.0 offset_top = 504.0 offset_right = 1150.0 @@ -42,35 +30,6 @@ theme_override_font_sizes/font_size = 50 text = "Instructions: 1. \"Arrow keys\" to move. 2. \"Space\" to pickup/place items." -[node name="Boundaries" type="Node2D" parent="."] - -[node name="LeftBoundary" type="StaticBody2D" parent="Boundaries"] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/LeftBoundary"] -position = Vector2(184, 269) -shape = SubResource("RectangleShape2D_x5j51") - -[node name="RightBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(784, 0) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/RightBoundary"] -position = Vector2(184, 269) -shape = SubResource("RectangleShape2D_x5j51") - -[node name="TopBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(384, -112) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/TopBoundary"] -position = Vector2(192, 160) -shape = SubResource("RectangleShape2D_wog68") - -[node name="BottomBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(384, -112) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/BottomBoundary"] -position = Vector2(192, 608) -shape = SubResource("RectangleShape2D_wog68") - [node name="Tables" type="Node2D" parent="."] [node name="Table" parent="Tables" instance=ExtResource("3_56i0x")] diff --git a/DevScenes/DevMenu.tscn b/DevScenes/DevMenu.tscn index eaf686e..cb17e10 100644 --- a/DevScenes/DevMenu.tscn +++ b/DevScenes/DevMenu.tscn @@ -32,8 +32,8 @@ func _on_matthew_pressed(): script = SubResource("GDScript_meghy") [node name="BG" type="ColorRect" parent="."] -offset_right = 1152.0 -offset_bottom = 648.0 +offset_right = 768.0 +offset_bottom = 576.0 color = Color(1, 1, 1, 0.498039) [node name="Main Menu" type="Button" parent="BG"] @@ -47,70 +47,60 @@ text = "Main Menu" [node name="Main Restaurant" type="Button" parent="BG"] layout_mode = 0 -offset_left = 256.0 -offset_top = 64.0 -offset_right = 393.0 -offset_bottom = 95.0 +offset_left = 64.0 +offset_top = 128.0 +offset_right = 275.0 +offset_bottom = 171.0 theme_override_font_sizes/font_size = 25 text = "Main Restaurant" -[node name="Prototype 1" type="Button" parent="BG"] +[node name="Alexander" type="Button" parent="BG"] layout_mode = 0 offset_left = 512.0 offset_top = 64.0 -offset_right = 660.0 +offset_right = 649.0 offset_bottom = 107.0 theme_override_font_sizes/font_size = 25 -text = "Prototype 1" - -[node name="Alexander" type="Button" parent="BG"] -layout_mode = 0 -offset_left = 64.0 -offset_top = 192.0 -offset_right = 201.0 -offset_bottom = 223.0 -theme_override_font_sizes/font_size = 25 text = "Alexander" [node name="Andreea" type="Button" parent="BG"] layout_mode = 0 -offset_left = 256.0 -offset_top = 192.0 -offset_right = 393.0 -offset_bottom = 223.0 +offset_left = 512.0 +offset_top = 128.0 +offset_right = 649.0 +offset_bottom = 171.0 theme_override_font_sizes/font_size = 25 text = "Andreea" [node name="Caitlin" type="Button" parent="BG"] layout_mode = 0 -offset_left = 448.0 +offset_left = 512.0 offset_top = 192.0 -offset_right = 585.0 -offset_bottom = 223.0 +offset_right = 649.0 +offset_bottom = 235.0 theme_override_font_sizes/font_size = 25 text = "Caitlin" [node name="Logan" type="Button" parent="BG"] layout_mode = 0 -offset_left = 640.0 -offset_top = 192.0 -offset_right = 777.0 -offset_bottom = 223.0 +offset_left = 512.0 +offset_top = 256.0 +offset_right = 649.0 +offset_bottom = 299.0 theme_override_font_sizes/font_size = 25 text = "Logan" [node name="Matthew" type="Button" parent="BG"] layout_mode = 0 -offset_left = 832.0 -offset_top = 192.0 -offset_right = 969.0 -offset_bottom = 223.0 +offset_left = 512.0 +offset_top = 320.0 +offset_right = 649.0 +offset_bottom = 363.0 theme_override_font_sizes/font_size = 25 text = "Matthew" [connection signal="pressed" from="BG/Main Menu" to="." method="_on_main_menu_pressed"] [connection signal="pressed" from="BG/Main Restaurant" to="." method="_on_main_restaurant_pressed"] -[connection signal="pressed" from="BG/Prototype 1" to="." method="_on_prototype_1_pressed"] [connection signal="pressed" from="BG/Alexander" to="." method="_on_alexander_pressed"] [connection signal="pressed" from="BG/Andreea" to="." method="_on_andreea_pressed"] [connection signal="pressed" from="BG/Caitlin" to="." method="_on_caitlin_pressed"] diff --git a/DevScenes/Logan/Logan.tscn b/DevScenes/Logan/Logan.tscn index 3bc54cd..d52a418 100644 --- a/DevScenes/Logan/Logan.tscn +++ b/DevScenes/Logan/Logan.tscn @@ -1,27 +1,16 @@ -[gd_scene load_steps=8 format=3 uid="uid://cgfsbwimetswc"] +[gd_scene load_steps=5 format=3 uid="uid://cgfsbwimetswc"] -[ext_resource type="PackedScene" uid="uid://b233dqvocmp88" path="res://Scenes/Restaurant/BG/BGrestaurant.tscn" id="1_tkrl2"] -[ext_resource type="Texture2D" uid="uid://wbnivqiais7r" path="res://Assets/BGs/diner-background.png" id="2_y3qw4"] +[ext_resource type="PackedScene" uid="uid://c25l7bpom1gm4" path="res://Scenes/Background/background.tscn" id="1_tkrl2"] [ext_resource type="PackedScene" uid="uid://btugtq4bxfaeh" path="res://Scenes/Restaurant/PlainSurface/plainSurface.tscn" id="3_3tdtl"] [ext_resource type="PackedScene" uid="uid://r0sqnmyx2q5r" path="res://Scenes/Restaurant/TestItems/testWeapon.tscn" id="4_3jxto"] [ext_resource type="PackedScene" uid="uid://d1ahdwi2ft7k0" path="res://Scenes/Restaurant/Player/player.tscn" id="5_sp0jg"] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_x5j51"] -size = Vector2(20, 442) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_wog68"] -size = Vector2(784, 24) - [node name="Logan" type="Node2D"] -[node name="BGrestaurant" parent="." instance=ExtResource("1_tkrl2")] - -[node name="Diner-background" type="Sprite2D" parent="BGrestaurant"] -position = Vector2(576, 272) -scale = Vector2(0.2, 0.2) -texture = ExtResource("2_y3qw4") +[node name="Background" parent="." instance=ExtResource("1_tkrl2")] +Planet = "Green Planet" -[node name="Logan" type="Label" parent="BGrestaurant"] +[node name="Logan" type="Label" parent="Background"] offset_top = 576.0 offset_right = 284.0 offset_bottom = 648.0 @@ -31,35 +20,6 @@ theme_override_font_sizes/font_size = 50 text = "Logan" metadata/_edit_use_anchors_ = true -[node name="Boundaries" type="Node2D" parent="."] - -[node name="LeftBoundary" type="StaticBody2D" parent="Boundaries"] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/LeftBoundary"] -position = Vector2(184, 269) -shape = SubResource("RectangleShape2D_x5j51") - -[node name="RightBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(784, 0) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/RightBoundary"] -position = Vector2(184, 269) -shape = SubResource("RectangleShape2D_x5j51") - -[node name="TopBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(384, -112) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/TopBoundary"] -position = Vector2(192, 160) -shape = SubResource("RectangleShape2D_wog68") - -[node name="BottomBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(384, -112) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/BottomBoundary"] -position = Vector2(192, 608) -shape = SubResource("RectangleShape2D_wog68") - [node name="Tables" type="Node2D" parent="."] [node name="Table" parent="Tables" instance=ExtResource("3_3tdtl")] diff --git a/DevScenes/Matthew/Matthew.tscn b/DevScenes/Matthew/Matthew.tscn index 381a7a1..86614b2 100644 --- a/DevScenes/Matthew/Matthew.tscn +++ b/DevScenes/Matthew/Matthew.tscn @@ -1,27 +1,16 @@ -[gd_scene load_steps=8 format=3 uid="uid://yag64isjnwu3"] +[gd_scene load_steps=5 format=3 uid="uid://yag64isjnwu3"] -[ext_resource type="PackedScene" uid="uid://b233dqvocmp88" path="res://Scenes/Restaurant/BG/BGrestaurant.tscn" id="1_3v4wo"] -[ext_resource type="Texture2D" uid="uid://wbnivqiais7r" path="res://Assets/BGs/diner-background.png" id="2_0qoec"] +[ext_resource type="PackedScene" uid="uid://c25l7bpom1gm4" path="res://Scenes/Background/background.tscn" id="1_3v4wo"] [ext_resource type="PackedScene" uid="uid://btugtq4bxfaeh" path="res://Scenes/Restaurant/PlainSurface/plainSurface.tscn" id="3_6e77c"] [ext_resource type="PackedScene" uid="uid://b1tqrv16m7ras" path="res://Scenes/Restaurant/TestItems/testFood.tscn" id="4_p3wgr"] [ext_resource type="PackedScene" uid="uid://d1ahdwi2ft7k0" path="res://Scenes/Restaurant/Player/player.tscn" id="5_7g1q4"] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_x5j51"] -size = Vector2(20, 442) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_wog68"] -size = Vector2(784, 24) - [node name="Matthew" type="Node2D"] -[node name="BGrestaurant" parent="." instance=ExtResource("1_3v4wo")] - -[node name="Diner-background" type="Sprite2D" parent="BGrestaurant"] -position = Vector2(576, 272) -scale = Vector2(0.2, 0.2) -texture = ExtResource("2_0qoec") +[node name="Background" parent="." instance=ExtResource("1_3v4wo")] +Planet = "Green Planet" -[node name="Matthew" type="Label" parent="BGrestaurant"] +[node name="Matthew" type="Label" parent="Background"] offset_top = 576.0 offset_right = 284.0 offset_bottom = 648.0 @@ -31,7 +20,7 @@ theme_override_font_sizes/font_size = 50 text = "Matthew" metadata/_edit_use_anchors_ = true -[node name="Instructions" type="Label" parent="BGrestaurant"] +[node name="Instructions" type="Label" parent="Background"] offset_left = 48.0 offset_top = 504.0 offset_right = 1150.0 @@ -42,35 +31,6 @@ theme_override_font_sizes/font_size = 50 text = "Instructions: 1. \"Arrow keys\" to move. 2. \"Space\" to pickup/place items." -[node name="Boundaries" type="Node2D" parent="."] - -[node name="LeftBoundary" type="StaticBody2D" parent="Boundaries"] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/LeftBoundary"] -position = Vector2(184, 269) -shape = SubResource("RectangleShape2D_x5j51") - -[node name="RightBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(784, 0) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/RightBoundary"] -position = Vector2(184, 269) -shape = SubResource("RectangleShape2D_x5j51") - -[node name="TopBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(384, -112) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/TopBoundary"] -position = Vector2(192, 160) -shape = SubResource("RectangleShape2D_wog68") - -[node name="BottomBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(384, -112) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/BottomBoundary"] -position = Vector2(192, 608) -shape = SubResource("RectangleShape2D_wog68") - [node name="Tables" type="Node2D" parent="."] [node name="Table" parent="Tables" instance=ExtResource("3_6e77c")] diff --git a/DevScenes/Prototype1/Prototype1.tscn b/DevScenes/Prototype1/Prototype1.tscn deleted file mode 100644 index 545d641..0000000 --- a/DevScenes/Prototype1/Prototype1.tscn +++ /dev/null @@ -1,337 +0,0 @@ -[gd_scene load_steps=14 format=3 uid="uid://desf53nln1wu"] - -[ext_resource type="Texture2D" uid="uid://wbnivqiais7r" path="res://Assets/BGs/diner-background.png" id="1_h6128"] -[ext_resource type="Texture2D" uid="uid://g6sa6xxkg7q4" path="res://Assets/Environment/Ambiance/chair.png" id="2_61b67"] -[ext_resource type="PackedScene" uid="uid://btugtq4bxfaeh" path="res://Scenes/Restaurant/PlainSurface/plainSurface.tscn" id="3_m47k8"] -[ext_resource type="Texture2D" uid="uid://dgi88oy8lx1gl" path="res://Assets/Interactables/CookingStations/cutting-board-square.png" id="4_lb271"] -[ext_resource type="Texture2D" uid="uid://etvg2vjc3pxe" path="res://Assets/Interactables/HoldableSpawnPoints/dish-pile.png" id="5_dn6j5"] -[ext_resource type="Texture2D" uid="uid://cyl1kp4qdrfe2" path="res://Assets/Holdables/Food/dish-side-profile.png" id="6_orlip"] -[ext_resource type="Texture2D" uid="uid://dnxr7l784a38t" path="res://Assets/Holdables/Food/dish-top-down.png" id="7_y6q3j"] -[ext_resource type="PackedScene" uid="uid://b1tqrv16m7ras" path="res://Scenes/Restaurant/TestItems/testFood.tscn" id="8_odbj5"] -[ext_resource type="PackedScene" uid="uid://b233dqvocmp88" path="res://Scenes/Restaurant/BG/BGrestaurant.tscn" id="9_4yv7r"] -[ext_resource type="PackedScene" uid="uid://d1ahdwi2ft7k0" path="res://Scenes/Restaurant/Player/player.tscn" id="10_p6rjf"] - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_vrass"] -size = Vector2(32, 32) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_rmwvq"] -size = Vector2(20, 442) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_llght"] -size = Vector2(784, 24) - -[node name="Prototype1" type="Node2D"] - -[node name="TempForPrototype1Demo" type="Node2D" parent="."] - -[node name="Diner-background" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(576, 272) -scale = Vector2(0.2, 0.2) -texture = ExtResource("1_h6128") - -[node name="Chair" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(544, 384) -scale = Vector2(0.015951, 0.016) -texture = ExtResource("2_61b67") - -[node name="Chair2" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(608, 384) -scale = Vector2(0.016, 0.016) -texture = ExtResource("2_61b67") -flip_h = true - -[node name="Table" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(576, 384) - -[node name="Chair3" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(416.334, 384.384) -scale = Vector2(0.015951, 0.016) -texture = ExtResource("2_61b67") - -[node name="Chair4" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(480.334, 384.384) -scale = Vector2(0.016, 0.016) -texture = ExtResource("2_61b67") -flip_h = true - -[node name="Table11" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(448.334, 384.384) - -[node name="Chair23" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(320.334, 272.384) -scale = Vector2(0.015951, 0.016) -texture = ExtResource("2_61b67") - -[node name="Chair24" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(384.334, 272.384) -scale = Vector2(0.016, 0.016) -texture = ExtResource("2_61b67") -flip_h = true - -[node name="Table21" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(352.334, 272.384) - -[node name="Chair15" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(320, 360) -scale = Vector2(0.015951, 0.016) -texture = ExtResource("2_61b67") -flip_h = true - -[node name="Table17" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(320, 384) - -[node name="Chair16" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(320, 408) -scale = Vector2(0.016, 0.016) -texture = ExtResource("2_61b67") - -[node name="Chair17" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(832.384, 360.384) -scale = Vector2(0.015951, 0.016) -texture = ExtResource("2_61b67") -flip_h = true - -[node name="Table18" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(832.384, 384.384) - -[node name="Chair18" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(832.384, 408.384) -scale = Vector2(0.016, 0.016) -texture = ExtResource("2_61b67") - -[node name="Chair19" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(896.384, 328.384) -scale = Vector2(0.015951, 0.016) -texture = ExtResource("2_61b67") -flip_h = true - -[node name="Table19" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(896.384, 352.384) - -[node name="Chair20" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(896.384, 376.384) -scale = Vector2(0.016, 0.016) -texture = ExtResource("2_61b67") - -[node name="Chair21" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(768.384, 256.384) -scale = Vector2(0.015951, 0.016) -texture = ExtResource("2_61b67") -flip_h = true - -[node name="Table20" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(768.384, 280.384) - -[node name="Chair22" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(768.384, 304.384) -scale = Vector2(0.016, 0.016) -texture = ExtResource("2_61b67") - -[node name="Chair5" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(672.334, 384.384) -scale = Vector2(0.015951, 0.016) -texture = ExtResource("2_61b67") - -[node name="Chair6" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(736.334, 384.384) -scale = Vector2(0.016, 0.016) -texture = ExtResource("2_61b67") -flip_h = true - -[node name="Table12" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(704.334, 384.384) - -[node name="Chair7" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(672.334, 416.384) -scale = Vector2(0.015951, 0.016) -texture = ExtResource("2_61b67") - -[node name="Chair8" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(736.334, 416.384) -scale = Vector2(0.016, 0.016) -texture = ExtResource("2_61b67") -flip_h = true - -[node name="Table13" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(704.334, 416.384) - -[node name="Chair9" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(544.334, 416.384) -scale = Vector2(0.015951, 0.016) -texture = ExtResource("2_61b67") - -[node name="Chair10" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(608.334, 416.384) -scale = Vector2(0.016, 0.016) -texture = ExtResource("2_61b67") -flip_h = true - -[node name="Table14" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(576.334, 416.384) - -[node name="Chair11" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(544.334, 448.384) -scale = Vector2(0.015951, 0.016) -texture = ExtResource("2_61b67") - -[node name="Chair12" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(608.334, 448.384) -scale = Vector2(0.016, 0.016) -texture = ExtResource("2_61b67") -flip_h = true - -[node name="Table15" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(576.334, 448.384) - -[node name="Chair13" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(416.334, 448.384) -scale = Vector2(0.015951, 0.016) -texture = ExtResource("2_61b67") - -[node name="Chair14" type="Sprite2D" parent="TempForPrototype1Demo"] -position = Vector2(480.334, 448.384) -scale = Vector2(0.016, 0.016) -texture = ExtResource("2_61b67") -flip_h = true - -[node name="Table16" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(448.334, 448.384) - -[node name="Table2" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(576, 240) -scale = Vector2(0.965028, 0.943134) - -[node name="CuttingBoard" type="Area2D" parent="TempForPrototype1Demo" groups=["Holdables"]] -position = Vector2(576, 232) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="TempForPrototype1Demo/CuttingBoard"] -shape = SubResource("RectangleShape2D_vrass") - -[node name="Sprite2D" type="Sprite2D" parent="TempForPrototype1Demo/CuttingBoard"] -scale = Vector2(0.013, 0.013) -texture = ExtResource("4_lb271") - -[node name="Table3" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(544, 240) - -[node name="DishPile" type="Area2D" parent="TempForPrototype1Demo" groups=["Holdables"]] -position = Vector2(544, 232) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="TempForPrototype1Demo/DishPile"] -shape = SubResource("RectangleShape2D_vrass") - -[node name="Sprite2D" type="Sprite2D" parent="TempForPrototype1Demo/DishPile"] -scale = Vector2(0.8, 0.8) -texture = ExtResource("5_dn6j5") - -[node name="Table4" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(512, 240) - -[node name="Dish" type="Area2D" parent="TempForPrototype1Demo" groups=["Holdables"]] -position = Vector2(512, 232) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="TempForPrototype1Demo/Dish"] -shape = SubResource("RectangleShape2D_vrass") - -[node name="Sprite2D" type="Sprite2D" parent="TempForPrototype1Demo/Dish"] -scale = Vector2(0.8, 0.8) -texture = ExtResource("6_orlip") - -[node name="Table5" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(480, 240) - -[node name="Table6" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(448, 240) - -[node name="Table7" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(448, 272) - -[node name="Table8" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(448, 304) - -[node name="Table9" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(608, 240) - -[node name="Table10" parent="TempForPrototype1Demo" instance=ExtResource("3_m47k8")] -position = Vector2(640, 240) - -[node name="Dish2" type="Area2D" parent="TempForPrototype1Demo" groups=["Holdables"]] -position = Vector2(448, 296) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="TempForPrototype1Demo/Dish2"] -shape = SubResource("RectangleShape2D_vrass") - -[node name="Sprite2D" type="Sprite2D" parent="TempForPrototype1Demo/Dish2"] -scale = Vector2(0.8, 0.8) -texture = ExtResource("7_y6q3j") - -[node name="TestFood" parent="TempForPrototype1Demo" instance=ExtResource("8_odbj5")] -position = Vector2(448, 232) - -[node name="StaticBody2D" type="StaticBody2D" parent="TempForPrototype1Demo"] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="TempForPrototype1Demo/StaticBody2D"] -position = Vector2(184, 269) -shape = SubResource("RectangleShape2D_rmwvq") - -[node name="StaticBody2D2" type="StaticBody2D" parent="TempForPrototype1Demo"] -position = Vector2(784, 0) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="TempForPrototype1Demo/StaticBody2D2"] -position = Vector2(184, 269) -shape = SubResource("RectangleShape2D_rmwvq") - -[node name="StaticBody2D3" type="StaticBody2D" parent="TempForPrototype1Demo"] -position = Vector2(384, -112) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="TempForPrototype1Demo/StaticBody2D3"] -position = Vector2(192, 160) -shape = SubResource("RectangleShape2D_llght") - -[node name="StaticBody2D4" type="StaticBody2D" parent="TempForPrototype1Demo"] -position = Vector2(384, -112) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="TempForPrototype1Demo/StaticBody2D4"] -position = Vector2(192, 608) -shape = SubResource("RectangleShape2D_llght") - -[node name="TestFood2" parent="TempForPrototype1Demo" instance=ExtResource("8_odbj5")] -position = Vector2(448, 376) - -[node name="Instructions" type="Label" parent="TempForPrototype1Demo"] -offset_left = 48.0 -offset_top = 504.0 -offset_right = 1150.0 -offset_bottom = 645.0 -theme_override_colors/font_color = Color(1, 0, 1, 1) -theme_override_colors/font_shadow_color = Color(0, 0.862745, 0.94902, 1) -theme_override_font_sizes/font_size = 50 -text = "Instructions: 1. \"Arrow keys\" to move. - 2. \"Space\" to pickup/place items." - -[node name="BGrestaurant" parent="." instance=ExtResource("9_4yv7r")] - -[node name="Prototype 1" type="Label" parent="BGrestaurant"] -offset_top = 576.0 -offset_right = 284.0 -offset_bottom = 648.0 -theme_override_colors/font_color = Color(1, 1, 1, 1) -theme_override_colors/font_shadow_color = Color(0, 0.862745, 0.94902, 1) -theme_override_font_sizes/font_size = 50 -text = "Prototype 1" -metadata/_edit_use_anchors_ = true - -[node name="Tables" type="Node2D" parent="."] - -[node name="Table" parent="Tables" instance=ExtResource("3_m47k8")] -position = Vector2(640, 320) - -[node name="Foods" type="Node2D" parent="."] - -[node name="TestFood" parent="Foods" instance=ExtResource("8_odbj5")] -position = Vector2(640, 312) - -[node name="Players" type="Node2D" parent="."] - -[node name="Player" parent="Players" instance=ExtResource("10_p6rjf")] -position = Vector2(576, 320) diff --git a/Scenes/Background/background.gd b/Scenes/Background/background.gd new file mode 100644 index 0000000..a1442c3 --- /dev/null +++ b/Scenes/Background/background.gd @@ -0,0 +1,52 @@ +@tool +extends ParallaxBackground + +const SCROLL_SPEED: int = 100 +const LOGO_AMPLITUDE: float = 20.0 +const LOGO_FREQUENCY: float = 2.0 +const LOGO_DEFAULT_POSITION = Vector2(384, 160) +var time: float = 300 +const BG_TEXTURES = { + "Main Menu": preload("res://Assets/BGs/mainMenuBG.png"), + "Green Planet": preload("res://Assets/BGs/greenPlanetBG.png"), + "Blue Planet": preload("res://Assets/BGs/bluePlanetBG.png") +} +const LOGO_SPRITES = { + "Main Menu": preload("res://Assets/UI/outer-plates-logo.png"), + "Green Planet": null, + "Blue Planet": null +} +const DINER_TEXTURES = { + "Main Menu": null, + "Green Planet": preload("res://Assets/BGs/greenPlanetDiner.png"), + "Blue Planet": preload("res://Assets/BGs/bluePlanetDiner.png") +} +@export_category("Developer Tools :0") +@export_enum("Main Menu", "Green Planet", "Blue Planet") var Planet = "Main Menu" +@onready var backgroundTexture = $BG/BackgroundTexture +@onready var dinerTexture = $DinerTexture +@onready var logo = $Logo + +func _ready(): + backgroundTexture.texture = BG_TEXTURES[Planet] + logo.texture = LOGO_SPRITES[Planet] + dinerTexture.texture = DINER_TEXTURES[Planet] + # If on Main Menu + if !Engine.is_editor_hint() and Planet == "Main Menu": + $RotateLeft.queue_free() + $FlyLeft.queue_free() + $FlyRight.queue_free() + +func _process(delta): + scroll_offset.x -= SCROLL_SPEED * delta + time += delta * LOGO_FREQUENCY + if logo.texture: + logo.position = LOGO_DEFAULT_POSITION + Vector2(0, sin(time) * LOGO_AMPLITUDE) + if Planet != "Main Menu": + var sprites = $RotateLeft.get_children() + for sprite in sprites: + sprite.rotation = -time + +func _physics_process(_delta): + # Update textures in the editor interface + if Engine.is_editor_hint(): _ready() diff --git a/Scenes/Background/background.tscn b/Scenes/Background/background.tscn new file mode 100644 index 0000000..1100bcc --- /dev/null +++ b/Scenes/Background/background.tscn @@ -0,0 +1,162 @@ +[gd_scene load_steps=11 format=3 uid="uid://c25l7bpom1gm4"] + +[ext_resource type="Texture2D" uid="uid://b2vslko42kst5" path="res://Assets/BGs/mainMenuBG.png" id="1_2gtax"] +[ext_resource type="Script" path="res://Scenes/Background/background.gd" id="1_sqvij"] +[ext_resource type="Texture2D" uid="uid://cfky5qwj6umiq" path="res://Assets/Characters/Customers/alien-customer-spritesheets.png" id="3_i7whd"] +[ext_resource type="Texture2D" uid="uid://bxqrrr2jelsf5" path="res://Assets/UI/outer-plates-logo.png" id="3_o71y2"] +[ext_resource type="Texture2D" uid="uid://c3kbuyj3uucdi" path="res://Assets/Environment/Ambiance/ship-1.png" id="3_sb0hm"] +[ext_resource type="Texture2D" uid="uid://cbcxfo8nf0jha" path="res://Assets/Environment/Ambiance/ship-2.png" id="4_rfdc0"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_sdyu7"] +atlas = ExtResource("3_i7whd") +region = Rect2(0, 10, 32, 18) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_5t4l2"] +size = Vector2(10, 336) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_4rgr5"] +size = Vector2(10, 312) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_qxe0j"] +size = Vector2(704, 4) + +[node name="Background" type="ParallaxBackground"] +scroll_offset = Vector2(-488109, 0) +script = ExtResource("1_sqvij") + +[node name="BG" type="ParallaxLayer" parent="."] +motion_mirroring = Vector2(1152, 2.08165e-12) + +[node name="BackgroundTexture" type="Sprite2D" parent="BG"] +position = Vector2(576, 288) +scale = Vector2(1.8, 1.6) +texture = ExtResource("1_2gtax") + +[node name="RotateLeft" type="ParallaxLayer" parent="."] +motion_scale = Vector2(0.75, 1) +motion_mirroring = Vector2(2304, 2.08165e-12) + +[node name="Slug1" type="Sprite2D" parent="RotateLeft"] +position = Vector2(896, 64) +scale = Vector2(3, 3) +texture = SubResource("AtlasTexture_sdyu7") + +[node name="FlyLeft" type="ParallaxLayer" parent="."] +motion_scale = Vector2(1.5, 1) +motion_mirroring = Vector2(1152, 2.08165e-12) + +[node name="ShipType1-1" type="Sprite2D" parent="FlyLeft"] +position = Vector2(168, 128) +rotation = -1.5708 +texture = ExtResource("3_sb0hm") + +[node name="ShipType1-2" type="Sprite2D" parent="FlyLeft"] +position = Vector2(704, 392) +rotation = -1.5708 +scale = Vector2(2, 2) +texture = ExtResource("3_sb0hm") + +[node name="ShipType1-3" type="Sprite2D" parent="FlyLeft"] +position = Vector2(88, 440) +rotation = -1.5708 +scale = Vector2(1.5, 1.5) +texture = ExtResource("3_sb0hm") + +[node name="ShipType2-1" type="Sprite2D" parent="FlyLeft"] +position = Vector2(672, 40) +rotation = -1.5708 +texture = ExtResource("4_rfdc0") + +[node name="ShipType2-2" type="Sprite2D" parent="FlyLeft"] +position = Vector2(880, 520) +rotation = -1.5708 +scale = Vector2(2, 2) +texture = ExtResource("4_rfdc0") + +[node name="ShipType2-3" type="Sprite2D" parent="FlyLeft"] +position = Vector2(904, 128) +rotation = -1.5708 +scale = Vector2(1.5, 1.5) +texture = ExtResource("4_rfdc0") + +[node name="FlyRight" type="ParallaxLayer" parent="."] +motion_scale = Vector2(-1.5, 1) +motion_mirroring = Vector2(1152, 2.08165e-12) + +[node name="ShipType1-1" type="Sprite2D" parent="FlyRight"] +position = Vector2(224, 144) +rotation = 1.5708 +texture = ExtResource("3_sb0hm") + +[node name="ShipType1-2" type="Sprite2D" parent="FlyRight"] +position = Vector2(344, 48) +rotation = 1.5708 +scale = Vector2(2, 2) +texture = ExtResource("3_sb0hm") + +[node name="ShipType1-3" type="Sprite2D" parent="FlyRight"] +position = Vector2(752, 184) +rotation = 1.5708 +scale = Vector2(1.5, 1.5) +texture = ExtResource("3_sb0hm") + +[node name="ShipType2-1" type="Sprite2D" parent="FlyRight"] +position = Vector2(256, 328) +rotation = 1.5708 +texture = ExtResource("4_rfdc0") + +[node name="ShipType2-2" type="Sprite2D" parent="FlyRight"] +position = Vector2(464, 496) +rotation = 1.5708 +scale = Vector2(2, 2) +texture = ExtResource("4_rfdc0") + +[node name="ShipType2-3" type="Sprite2D" parent="FlyRight"] +position = Vector2(912, 288) +rotation = 1.5708 +scale = Vector2(1.5, 1.5) +texture = ExtResource("4_rfdc0") + +[node name="Logo" type="Sprite2D" parent="."] +position = Vector2(384, 156.183) +scale = Vector2(3, 3) +texture = ExtResource("3_o71y2") + +[node name="DinerTexture" type="Sprite2D" parent="."] +position = Vector2(384, 288) +scale = Vector2(1.1, 1.42222) + +[node name="Boundaries" type="Node2D" parent="."] +visible = false + +[node name="LeftBoundary" type="StaticBody2D" parent="Boundaries"] +visible = false +position = Vector2(29, 376) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/LeftBoundary"] +visible = false +shape = SubResource("RectangleShape2D_5t4l2") + +[node name="RightBoundary" type="StaticBody2D" parent="Boundaries"] +visible = false +position = Vector2(739, 388) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/RightBoundary"] +visible = false +shape = SubResource("RectangleShape2D_4rgr5") + +[node name="TopBoundary" type="StaticBody2D" parent="Boundaries"] +visible = false +position = Vector2(384, 144) + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Boundaries/TopBoundary"] +visible = false +polygon = PackedVector2Array(0, 0, 72, 8, 120, 16, 176, 24, 208, 32, 240, 40, 280, 56, 296, 64, 320, 72, 328, 80, 352, 88, 352, -8, -352, -8, -352, 72, -328, 56, -312, 48, -296, 40, -272, 32, -256, 24, -224, 16, -184, 8, -120, 0) + +[node name="BottomBoundary" type="StaticBody2D" parent="Boundaries"] +visible = false +position = Vector2(384, 542) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/BottomBoundary"] +visible = false +shape = SubResource("RectangleShape2D_qxe0j") diff --git a/Scenes/MainMenu/BG/BGmainMenu.tscn b/Scenes/MainMenu/BG/BGmainMenu.tscn deleted file mode 100644 index c92736b..0000000 --- a/Scenes/MainMenu/BG/BGmainMenu.tscn +++ /dev/null @@ -1,12 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://c25l7bpom1gm4"] - -[ext_resource type="Texture2D" uid="uid://b2vslko42kst5" path="res://Assets/BGs/start-screen-background.png" id="1_ubwqv"] - -[node name="BGmainMenu" type="ParallaxBackground"] - -[node name="ParallaxLayer" type="ParallaxLayer" parent="."] - -[node name="BackgroundImage" type="Sprite2D" parent="ParallaxLayer"] -position = Vector2(576, 324) -scale = Vector2(1.8, 1.8) -texture = ExtResource("1_ubwqv") diff --git a/Scenes/MainMenu/mainMenu.tscn b/Scenes/MainMenu/mainMenu.tscn index 32cf2db..5522ab3 100644 --- a/Scenes/MainMenu/mainMenu.tscn +++ b/Scenes/MainMenu/mainMenu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=3 uid="uid://f6tgbob7uydx"] -[ext_resource type="PackedScene" uid="uid://c25l7bpom1gm4" path="res://Scenes/MainMenu/BG/BGmainMenu.tscn" id="1_0v6ry"] +[ext_resource type="PackedScene" uid="uid://c25l7bpom1gm4" path="res://Scenes/Background/background.tscn" id="1_0v6ry"] [ext_resource type="Script" path="res://Scenes/MainMenu/mainMenu.gd" id="1_ncq7n"] [ext_resource type="Texture2D" uid="uid://cwv4k3jb73ulm" path="res://Assets/UI/startButton.png" id="3_slenx"] @@ -17,24 +17,23 @@ region = Rect2(372, 18, 282, 120) [node name="Main" type="Node2D"] script = ExtResource("1_ncq7n") -[node name="BGmainMenu" parent="." instance=ExtResource("1_0v6ry")] +[node name="Background" parent="." instance=ExtResource("1_0v6ry")] +scroll_offset = Vector2(-39794.2, 0) -[node name="Prototype 2" type="Label" parent="BGmainMenu"] +[node name="Prototype 2" type="Label" parent="Background"] offset_left = 8.0 -offset_top = -8.0 -offset_right = 292.0 -offset_bottom = 64.0 +offset_right = 152.0 +offset_bottom = 40.0 theme_override_colors/font_color = Color(1, 1, 1, 1) theme_override_colors/font_shadow_color = Color(0, 0.862745, 0.94902, 1) -theme_override_font_sizes/font_size = 50 +theme_override_font_sizes/font_size = 25 text = "Prototype 2" -metadata/_edit_use_anchors_ = true [node name="startButton" type="TextureButton" parent="."] -offset_left = 432.0 -offset_top = 408.0 -offset_right = 720.0 -offset_bottom = 536.0 +offset_left = 240.0 +offset_top = 320.0 +offset_right = 528.0 +offset_bottom = 448.0 texture_normal = SubResource("AtlasTexture_grw4p") texture_pressed = SubResource("AtlasTexture_aumqd") stretch_mode = 3 diff --git a/Scenes/Restaurant/BG/BGrestaurant.gd b/Scenes/Restaurant/BG/BGrestaurant.gd deleted file mode 100644 index d3a2eb9..0000000 --- a/Scenes/Restaurant/BG/BGrestaurant.gd +++ /dev/null @@ -1,6 +0,0 @@ -extends ParallaxBackground - -const SCROLL_SPEED: int = 100 - -func _process(delta): - scroll_offset.x -= SCROLL_SPEED * delta diff --git a/Scenes/Restaurant/BG/BGrestaurant.tscn b/Scenes/Restaurant/BG/BGrestaurant.tscn deleted file mode 100644 index 94ecb07..0000000 --- a/Scenes/Restaurant/BG/BGrestaurant.tscn +++ /dev/null @@ -1,27 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://b233dqvocmp88"] - -[ext_resource type="Script" path="res://Scenes/Restaurant/BG/BGrestaurant.gd" id="1_038iy"] -[ext_resource type="Texture2D" uid="uid://b1rnxw3m74xsc" path="res://Assets/BGs/planet-1-background.png" id="2_q78bg"] -[ext_resource type="Texture2D" uid="uid://d0002nqwlgbm1" path="res://Assets/BGs/TEMP Restaurant BG-2.jpg" id="3_53n3j"] - -[node name="BGrestaurant" type="ParallaxBackground"] -script = ExtResource("1_038iy") - -[node name="ParallaxLayer" type="ParallaxLayer" parent="."] -motion_mirroring = Vector2(1728, 2.08165e-12) - -[node name="BackgroundImage" type="Sprite2D" parent="ParallaxLayer"] -position = Vector2(864, 324) -scale = Vector2(2.7, 1.8) -texture = ExtResource("2_q78bg") - -[node name="ParallaxLayer2" type="ParallaxLayer" parent="."] -motion_scale = Vector2(0.7, 0.7) -motion_mirroring = Vector2(1152, 2.08165e-12) - -[node name="BackgroundImage" type="Sprite2D" parent="ParallaxLayer2"] -position = Vector2(272, 496) -scale = Vector2(0.395349, 0.291793) -texture = ExtResource("3_53n3j") -region_enabled = true -region_rect = Rect2(336.27, 1378.15, 688.476, 658.307) diff --git a/Scenes/Restaurant/PlainSurface/plainSurface.gd b/Scenes/Restaurant/PlainSurface/plainSurface.gd index 72d06c8..978416b 100644 --- a/Scenes/Restaurant/PlainSurface/plainSurface.gd +++ b/Scenes/Restaurant/PlainSurface/plainSurface.gd @@ -1,9 +1,11 @@ @tool extends Area2D -var centerOfSurface = Vector2.ZERO -var isHolding: bool = false -var holdableOnSurface: Area2D = null +# A 2D Array: Array[Vector2][bool] +# Vector2 contains a surfaceCenter +# bool contains whether said surfaceCenter is occupied +var centersOfSurface: Array = [] +var holdablesOnSurface: Array[Area2D] = [] @export_category("Developer Tools :0") @export_enum("Up", "Right", "Down", "Left") var direction: int = 0 @export var width: int = 1 @@ -11,39 +13,70 @@ var holdableOnSurface: Area2D = null @export var texture: Texture2D = null func _ready(): - # Set Texture if texture: $Surface.texture = texture - # Set Collision - var collision: CollisionShape2D = get_node("CollisionShape2D") + var collision: StaticBody2D = get_node("StaticBody2D") if collision: collision.scale = Vector2(width, height) - # Set Rotation $Surface.rotation_degrees = 90 * direction - # Set centerOfSurface based on Rotation - match direction: - 0: - centerOfSurface = Vector2(0,-8) - 1: - centerOfSurface = Vector2(8,0) - 2: - centerOfSurface = Vector2(0,8) - 3: - centerOfSurface = Vector2(-8,0) - # Set starting holdableOnSurface if needed - var originalHoldable: Array[Node] = find_children("*", "Area2D", false) - if originalHoldable: - holdableOnSurface = originalHoldable[0] - holdableOnSurface.position = centerOfSurface - isHolding = true + initialize_surface_points() + initialize_holdables_on_surface() + +# Initializes centersOfSurface[Vector2][bool=false] +func initialize_surface_points(): + var w_offset = (width - 1) * (Global.PIXEL_DIMENSION / 2.0) + var h_offset = (height - 1) * (Global.PIXEL_DIMENSION / 2.0) + for w in width: + for h in height: + var newX = w * Global.PIXEL_DIMENSION - w_offset + var newY = h * Global.PIXEL_DIMENSION - h_offset + var newPoint = Vector2(newX, newY) + # Adjust for surface rotation + match direction: + 0: + newPoint.y -= Global.PIXEL_DIMENSION / 4.0 + 1: + newPoint.x += Global.PIXEL_DIMENSION / 4.0 + 2: + newPoint.y += Global.PIXEL_DIMENSION / 4.0 + 3: + newPoint.x -= Global.PIXEL_DIMENSION / 4.0 + centersOfSurface.append([newPoint, false]) + +# Initializes holdablesOnSurface[Area2D] +func initialize_holdables_on_surface(): + var maxHoldables: int = width * height + for i: int in maxHoldables: + holdablesOnSurface.append(null) + # Set starting holdablesOnSurface[0] if needed + var originalHoldables: Array[Node] = find_children("*", "Area2D", false) + for i: int in originalHoldables.size(): + # If this errors, you spawned too many holdables on one surface! + originalHoldables[i].position = centersOfSurface[i][0] + originalHoldables[i].rotation = 0 + holdablesOnSurface[i] = originalHoldables[i] + centersOfSurface[i][1] = true # Given a holdable, set it on the surface +# Return true if successful and false if not successful +# This wrapper function is necessary because interactable surfaces (like Stoves) have additional functionality +func set_holdable_on_surface_wrapper(holdableInHand: Area2D): + return set_holdable_on_surface(holdableInHand) func set_holdable_on_surface(holdableInHand: Area2D): - if isHolding: return false - holdableOnSurface = holdableInHand.duplicate() - add_child(holdableOnSurface) - holdableOnSurface.position = centerOfSurface - holdableOnSurface.rotation = 0 - isHolding = true - return true + var newHoldable: Area2D = holdableInHand.duplicate() + for i: int in centersOfSurface.size(): + if !centersOfSurface[i][1]: # If center has no holdable + newHoldable.position = centersOfSurface[i][0] + newHoldable.rotation = 0 + holdablesOnSurface[i] = newHoldable + centersOfSurface[i][1] = true # Center is now occupied + add_child(newHoldable) + return true + +# Given a holdable, remove it from the surface +func remove_holdable_from_surface(holdable: Area2D): + for i: int in centersOfSurface.size(): + if centersOfSurface[i][0] == holdable.position: + holdablesOnSurface[i] = null + centersOfSurface[i][1] = false # Center is no longer occupied func _physics_process(_delta): # Update sprite in the editor interface diff --git a/Scenes/Restaurant/Player/player.gd b/Scenes/Restaurant/Player/player.gd index 1bc1507..a8bf4d4 100644 --- a/Scenes/Restaurant/Player/player.gd +++ b/Scenes/Restaurant/Player/player.gd @@ -28,7 +28,7 @@ func pickup_holdable(holdable: Area2D): if holdableParent.is_in_group("CookingStation"): holdableParent.stop_cooking() if holdableParent.is_in_group("Surfaces"): - holdableParent.isHolding = false + holdableParent.remove_holdable_from_surface(holdable) if holdableInHand.is_in_group("ForStove"): holdableInHand.doneness = holdable.doneness holdable.queue_free() @@ -37,7 +37,7 @@ func pickup_holdable(holdable: Area2D): # Places "holdableInHand" on a surface func place_holdable(): for surface: Area2D in surfacesInRange: - if surface.set_holdable_on_surface(holdableInHand): + if surface.set_holdable_on_surface_wrapper(holdableInHand): holdableInHand.queue_free() isHolding = false break diff --git a/Scenes/Restaurant/Player/player.tscn b/Scenes/Restaurant/Player/player.tscn index 66c0d1f..933d3f6 100644 --- a/Scenes/Restaurant/Player/player.tscn +++ b/Scenes/Restaurant/Player/player.tscn @@ -4,7 +4,7 @@ [ext_resource type="Texture2D" uid="uid://tl1k83qfbilg" path="res://Assets/Characters/Player/player-spritesheet.png" id="2_yefjo"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_kn0nk"] -size = Vector2(32, 32) +size = Vector2(21.3333, 21.3333) [sub_resource type="CircleShape2D" id="CircleShape2D_5x6jq"] @@ -111,10 +111,12 @@ animations = [{ script = ExtResource("1_inif3") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -scale = Vector2(0.9, 0.9) +position = Vector2(-3.57628e-07, 8) +scale = Vector2(0.75, 0.75) shape = SubResource("RectangleShape2D_kn0nk") [node name="interactRange" type="Area2D" parent="."] +position = Vector2(0, 8) [node name="CollisionShape2D" type="CollisionShape2D" parent="interactRange"] shape = SubResource("CircleShape2D_5x6jq") diff --git a/Scenes/Restaurant/Stove/stove.gd b/Scenes/Restaurant/Stove/stove.gd index 12a0f81..20c3dcb 100644 --- a/Scenes/Restaurant/Stove/stove.gd +++ b/Scenes/Restaurant/Stove/stove.gd @@ -5,21 +5,18 @@ var isCooking: bool = false @onready var cookingTimer = $CookingTimer # Given a holdable, set it on the surface -func set_holdable_on_surface(holdableInHand: Area2D): - if isHolding: return false - holdableOnSurface = holdableInHand.duplicate() - add_child(holdableOnSurface) - holdableOnSurface.position = centerOfSurface - holdableOnSurface.rotation = 0 - isHolding = true - if holdableOnSurface.is_in_group("ForStove"): - holdableOnSurface.doneness = holdableInHand.doneness - begin_cooking() +# Return true if successful and false if not successful +func set_holdable_on_surface_wrapper(holdableInHand: Area2D): + if !set_holdable_on_surface(holdableInHand): return false + for holdable: Area2D in holdablesOnSurface: + if holdable.is_in_group("ForStove"): + holdable.doneness = holdableInHand.doneness + begin_cooking() return true # Begin cooking func begin_cooking(): - if isCooking or holdableOnSurface.isBurnt(): return + if isCooking or holdablesOnSurface[0].isBurnt(): return cookingTimer.start() isCooking = true # Cook asynchronously @@ -35,7 +32,7 @@ func stop_cooking(): # Finished cooking timer func _on_cookingTimer_timeout(): stop_cooking() - holdableOnSurface.increase_doneness() + holdablesOnSurface[0].increase_doneness() begin_cooking() func _physics_process(_delta): diff --git a/Scenes/Restaurant/restaurant.tscn b/Scenes/Restaurant/restaurant.tscn index 17d2f13..2df15d0 100644 --- a/Scenes/Restaurant/restaurant.tscn +++ b/Scenes/Restaurant/restaurant.tscn @@ -1,188 +1,157 @@ -[gd_scene load_steps=15 format=3 uid="uid://behneg0nnc0bq"] +[gd_scene load_steps=12 format=3 uid="uid://behneg0nnc0bq"] -[ext_resource type="PackedScene" uid="uid://b233dqvocmp88" path="res://Scenes/Restaurant/BG/BGrestaurant.tscn" id="1_8ks8p"] -[ext_resource type="Texture2D" uid="uid://bu6tn7cysqhjy" path="res://Assets/BGs/planet-1-dining-no-space-background.png" id="2_6veqw"] +[ext_resource type="PackedScene" uid="uid://c25l7bpom1gm4" path="res://Scenes/Background/background.tscn" id="1_t7iru"] [ext_resource type="PackedScene" uid="uid://d1ahdwi2ft7k0" path="res://Scenes/Restaurant/Player/player.tscn" id="2_srumu"] [ext_resource type="PackedScene" uid="uid://b1tqrv16m7ras" path="res://Scenes/Restaurant/TestItems/testFood.tscn" id="3_d20ud"] [ext_resource type="PackedScene" uid="uid://btugtq4bxfaeh" path="res://Scenes/Restaurant/PlainSurface/plainSurface.tscn" id="4_jgfwf"] [ext_resource type="Texture2D" uid="uid://g6sa6xxkg7q4" path="res://Assets/Environment/Ambiance/chair.png" id="4_uo0mj"] [ext_resource type="PackedScene" uid="uid://ede2frngbs0e" path="res://Scenes/Restaurant/Stove/stove.tscn" id="4_x3u6a"] [ext_resource type="Texture2D" uid="uid://w6mky47wi66h" path="res://Assets/Interactables/PlainSurfaces/square-counter.png" id="5_rtq4x"] -[ext_resource type="PackedScene" uid="uid://r0sqnmyx2q5r" path="res://Scenes/Restaurant/TestItems/testWeapon.tscn" id="6_0lq2q"] [ext_resource type="PackedScene" uid="uid://dtdmt8ydsnyci" path="res://Scenes/Restaurant/TestItems/testFoodForStove.tscn" id="6_uutht"] [ext_resource type="Texture2D" uid="uid://cuawvf5dcoirc" path="res://Assets/Interactables/PlainSurfaces/table-oval.png" id="7_4r5b2"] +[ext_resource type="PackedScene" uid="uid://r0sqnmyx2q5r" path="res://Scenes/Restaurant/TestItems/testWeapon.tscn" id="9_3ncmo"] [ext_resource type="PackedScene" uid="uid://cuek2wfflpv5k" path="res://Scenes/Restaurant/Environment/lavaLamp.tscn" id="10_f2two"] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_kn11v"] -size = Vector2(20, 442) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_nd5hu"] -size = Vector2(784, 24) - [node name="Restaurant" type="Node2D"] [node name="Environment" type="Node2D" parent="."] -[node name="BGrestaurant" parent="Environment" instance=ExtResource("1_8ks8p")] +[node name="Background" parent="Environment" instance=ExtResource("1_t7iru")] +scroll_offset = Vector2(-420595, 0) +Planet = "Green Planet" -[node name="Diner-background" type="Sprite2D" parent="Environment/BGrestaurant"] -position = Vector2(576, 272) -scale = Vector2(1.2, 1.2) -texture = ExtResource("2_6veqw") - -[node name="Prototype 2" type="Label" parent="Environment/BGrestaurant"] +[node name="Prototype 2" type="Label" parent="Environment/Background"] offset_left = 8.0 -offset_top = -8.0 -offset_right = 292.0 -offset_bottom = 64.0 +offset_right = 152.0 +offset_bottom = 40.0 theme_override_colors/font_color = Color(1, 1, 1, 1) theme_override_colors/font_shadow_color = Color(0, 0.862745, 0.94902, 1) -theme_override_font_sizes/font_size = 50 +theme_override_font_sizes/font_size = 25 text = "Prototype 2" -metadata/_edit_use_anchors_ = true -[node name="Instructions" type="Label" parent="Environment/BGrestaurant"] +[node name="Instructions" type="Label" parent="Environment/Background"] offset_left = 8.0 -offset_top = 504.0 -offset_right = 1152.0 -offset_bottom = 648.0 +offset_top = 496.0 +offset_right = 560.0 +offset_bottom = 576.0 theme_override_colors/font_color = Color(1, 0, 1, 1) theme_override_colors/font_shadow_color = Color(0, 0.862745, 0.94902, 1) -theme_override_font_sizes/font_size = 50 -text = "Instructions: \"WASD\" to move, \"E\" to pickup/ -place items, & (optional) \"Arrow keys\" to aim." +theme_override_font_sizes/font_size = 25 +text = "Instructions: \"WASD\" to move, \"E\" to pickup/place items, & +(optional) \"Arrow keys\" to aim. Controllers are supported!" [node name="Ambiance" type="Node2D" parent="Environment"] -[node name="LavaLamp" parent="Environment/Ambiance" instance=ExtResource("10_f2two")] -position = Vector2(320, 176) +[node name="Decor" type="Node2D" parent="Environment/Ambiance"] + +[node name="LavaLamp" parent="Environment/Ambiance/Decor" instance=ExtResource("10_f2two")] +position = Vector2(48, 208) -[node name="LavaLamp2" parent="Environment/Ambiance" instance=ExtResource("10_f2two")] -position = Vector2(768, 176) +[node name="LavaLamp2" parent="Environment/Ambiance/Decor" instance=ExtResource("10_f2two")] +position = Vector2(240, 144) -[node name="LavaLamp3" parent="Environment/Ambiance" instance=ExtResource("10_f2two")] -position = Vector2(912, 224) +[node name="LavaLamp3" parent="Environment/Ambiance/Decor" instance=ExtResource("10_f2two")] +position = Vector2(336, 144) -[node name="Chair" type="Sprite2D" parent="Environment/Ambiance"] -position = Vector2(304, 432) +[node name="LavaLamp4" parent="Environment/Ambiance/Decor" instance=ExtResource("10_f2two")] +position = Vector2(720, 240) + +[node name="Chairs" type="Node2D" parent="Environment/Ambiance"] + +[node name="Chair" type="Sprite2D" parent="Environment/Ambiance/Chairs"] +position = Vector2(432, 368) texture = ExtResource("4_uo0mj") -[node name="Chair2" type="Sprite2D" parent="Environment/Ambiance"] -position = Vector2(432, 432) +[node name="Chair2" type="Sprite2D" parent="Environment/Ambiance/Chairs"] +position = Vector2(496, 432) texture = ExtResource("4_uo0mj") -[node name="Chair3" type="Sprite2D" parent="Environment/Ambiance"] -position = Vector2(608, 400) +[node name="Chair3" type="Sprite2D" parent="Environment/Ambiance/Chairs"] +position = Vector2(400, 432) texture = ExtResource("4_uo0mj") -[node name="Chair4" type="Sprite2D" parent="Environment/Ambiance"] -position = Vector2(608, 304) +[node name="Chair4" type="Sprite2D" parent="Environment/Ambiance/Chairs"] +position = Vector2(592, 368) texture = ExtResource("4_uo0mj") -[node name="Chair5" type="Sprite2D" parent="Environment/Ambiance"] -position = Vector2(752, 272) +[node name="Chair13" type="Sprite2D" parent="Environment/Ambiance/Chairs"] +position = Vector2(400, 240) texture = ExtResource("4_uo0mj") -[node name="Chair6" type="Sprite2D" parent="Environment/Ambiance"] -position = Vector2(880, 240) +[node name="Chair5" type="Sprite2D" parent="Environment/Ambiance/Chairs"] +position = Vector2(624, 208) texture = ExtResource("4_uo0mj") -[node name="Chair9" type="Sprite2D" parent="Environment/Ambiance"] -position = Vector2(848, 368) +[node name="Chair6" type="Sprite2D" parent="Environment/Ambiance/Chairs"] +position = Vector2(528, 208) texture = ExtResource("4_uo0mj") -[node name="Chair7" type="Sprite2D" parent="Environment/Ambiance"] -position = Vector2(880, 336) +[node name="Chair9" type="Sprite2D" parent="Environment/Ambiance/Chairs"] +position = Vector2(688, 368) texture = ExtResource("4_uo0mj") -flip_h = true -[node name="Chair8" type="Sprite2D" parent="Environment/Ambiance"] -position = Vector2(848, 464) +[node name="Chair7" type="Sprite2D" parent="Environment/Ambiance/Chairs"] +position = Vector2(528, 304) texture = ExtResource("4_uo0mj") flip_h = true -[node name="Chair10" type="Sprite2D" parent="Environment/Ambiance"] -position = Vector2(784, 400) +[node name="Chair8" type="Sprite2D" parent="Environment/Ambiance/Chairs"] +position = Vector2(688, 464) texture = ExtResource("4_uo0mj") flip_h = true -[node name="Chair11" type="Sprite2D" parent="Environment/Ambiance"] -position = Vector2(528, 432) +[node name="Chair10" type="Sprite2D" parent="Environment/Ambiance/Chairs"] +position = Vector2(688, 304) texture = ExtResource("4_uo0mj") flip_h = true -[node name="Chair12" type="Sprite2D" parent="Environment/Ambiance"] -position = Vector2(400, 432) +[node name="Chair11" type="Sprite2D" parent="Environment/Ambiance/Chairs"] +position = Vector2(592, 432) texture = ExtResource("4_uo0mj") flip_h = true -[node name="Boundaries" type="Node2D" parent="."] - -[node name="LeftBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(184, 272) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/LeftBoundary"] -shape = SubResource("RectangleShape2D_kn11v") - -[node name="RightBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(968, 272) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/RightBoundary"] -shape = SubResource("RectangleShape2D_kn11v") - -[node name="TopBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(576, 144) - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Boundaries/TopBoundary"] -visible = false -polygon = PackedVector2Array(-8, 8, -112, 8, -208, 16, -288, 32, -312, 40, -336, 48, -384, 72, -384, -16, 384, -16, 384, 88, 352, 72, 328, 64, 304, 56, 280, 48, 256, 40, 208, 32, 168, 24, 112, 16, 32, 8) - -[node name="BottomBoundary" type="StaticBody2D" parent="Boundaries"] -position = Vector2(576, 496) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Boundaries/BottomBoundary"] -shape = SubResource("RectangleShape2D_nd5hu") +[node name="Chair12" type="Sprite2D" parent="Environment/Ambiance/Chairs"] +position = Vector2(528, 368) +texture = ExtResource("4_uo0mj") +flip_h = true [node name="Surfaces" type="Node2D" parent="."] [node name="Tables" type="Node2D" parent="Surfaces"] [node name="Table" parent="Surfaces/Tables" instance=ExtResource("4_jgfwf")] -position = Vector2(640, 304) +position = Vector2(624, 368) -[node name="TestFood" parent="Surfaces/Tables/Table" instance=ExtResource("3_d20ud")] -position = Vector2(0, -8) +[node name="Table9" parent="Surfaces/Tables" instance=ExtResource("4_jgfwf")] +position = Vector2(432, 240) [node name="Table2" parent="Surfaces/Tables" instance=ExtResource("4_jgfwf")] -position = Vector2(640, 400) +position = Vector2(432, 432) [node name="Table3" parent="Surfaces/Tables" instance=ExtResource("4_jgfwf")] -position = Vector2(752, 304) - -[node name="TestFood" parent="Surfaces/Tables/Table3" instance=ExtResource("3_d20ud")] -position = Vector2(0, -8) +position = Vector2(624, 240) [node name="Table4" parent="Surfaces/Tables" instance=ExtResource("4_jgfwf")] -position = Vector2(752, 400) +position = Vector2(656, 304) [node name="Table5" parent="Surfaces/Tables" instance=ExtResource("4_jgfwf")] -position = Vector2(352, 432) +position = Vector2(480, 368) width = 2 texture = ExtResource("7_4r5b2") [node name="Table6" parent="Surfaces/Tables" instance=ExtResource("4_jgfwf")] -position = Vector2(480, 432) +position = Vector2(544, 432) width = 2 texture = ExtResource("7_4r5b2") [node name="Table7" parent="Surfaces/Tables" instance=ExtResource("4_jgfwf")] -position = Vector2(848, 416) +position = Vector2(688, 416) direction = 1 height = 2 texture = ExtResource("7_4r5b2") [node name="Table8" parent="Surfaces/Tables" instance=ExtResource("4_jgfwf")] -position = Vector2(880, 288) +position = Vector2(528, 256) direction = 1 height = 2 texture = ExtResource("7_4r5b2") @@ -190,49 +159,104 @@ texture = ExtResource("7_4r5b2") [node name="Counters" type="Node2D" parent="Surfaces"] [node name="Counter" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] -position = Vector2(448, 216) +position = Vector2(240, 208) texture = ExtResource("5_rtq4x") [node name="TestFoodForStove" parent="Surfaces/Counters/Counter" instance=ExtResource("6_uutht")] position = Vector2(0, -8) [node name="Counter2" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] -position = Vector2(608, 216) +position = Vector2(272, 208) texture = ExtResource("5_rtq4x") -[node name="TestWeapon" parent="Surfaces/Counters/Counter2" instance=ExtResource("6_0lq2q")] +[node name="TestFoodForStove" parent="Surfaces/Counters/Counter2" instance=ExtResource("6_uutht")] position = Vector2(0, -8) [node name="Counter3" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] -position = Vector2(512, 216) +position = Vector2(144, 432) +direction = 2 texture = ExtResource("5_rtq4x") [node name="TestFood" parent="Surfaces/Counters/Counter3" instance=ExtResource("3_d20ud")] -position = Vector2(0, -8) +position = Vector2(0, 8) + +[node name="Counter16" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] +position = Vector2(112, 368) +direction = 3 +texture = ExtResource("5_rtq4x") + +[node name="TestFood" parent="Surfaces/Counters/Counter16" instance=ExtResource("3_d20ud")] +position = Vector2(-8, 0) + +[node name="Counter17" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] +position = Vector2(112, 400) +direction = 3 +texture = ExtResource("5_rtq4x") + +[node name="TestFood" parent="Surfaces/Counters/Counter17" instance=ExtResource("3_d20ud")] +position = Vector2(-8, 0) [node name="Counter4" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] -position = Vector2(544, 216) +position = Vector2(176, 432) +direction = 2 texture = ExtResource("5_rtq4x") [node name="TestFood" parent="Surfaces/Counters/Counter4" instance=ExtResource("3_d20ud")] -position = Vector2(0, -8) +position = Vector2(0, 8) -[node name="Counter5" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] -position = Vector2(576, 216) +[node name="Counter6" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] +position = Vector2(112, 304) +direction = 3 texture = ExtResource("5_rtq4x") -[node name="TestFood" parent="Surfaces/Counters/Counter5" instance=ExtResource("3_d20ud")] -position = Vector2(0, -8) +[node name="Counter15" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] +position = Vector2(112, 336) +direction = 3 +texture = ExtResource("5_rtq4x") -[node name="Counter6" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] -position = Vector2(416, 216) +[node name="Counter8" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] +position = Vector2(208, 432) +direction = 2 texture = ExtResource("5_rtq4x") -[node name="TestFoodForStove" parent="Surfaces/Counters/Counter6" instance=ExtResource("6_uutht")] -position = Vector2(0, -8) +[node name="TestWeapon" parent="Surfaces/Counters/Counter8" instance=ExtResource("9_3ncmo")] +position = Vector2(0, 8) + +[node name="Counter9" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] +position = Vector2(240, 432) +direction = 2 +texture = ExtResource("5_rtq4x") + +[node name="TestWeapon" parent="Surfaces/Counters/Counter9" instance=ExtResource("9_3ncmo")] +position = Vector2(0, 8) + +[node name="Counter10" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] +position = Vector2(272, 432) +direction = 2 +texture = ExtResource("5_rtq4x") + +[node name="Counter11" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] +position = Vector2(304, 400) +direction = 1 +texture = ExtResource("5_rtq4x") + +[node name="Counter14" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] +position = Vector2(304, 368) +direction = 1 +texture = ExtResource("5_rtq4x") + +[node name="Counter12" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] +position = Vector2(304, 240) +direction = 1 +texture = ExtResource("5_rtq4x") + +[node name="Counter13" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] +position = Vector2(304, 272) +direction = 1 +texture = ExtResource("5_rtq4x") [node name="Counter7" parent="Surfaces/Counters" instance=ExtResource("4_jgfwf")] -position = Vector2(384, 216) +position = Vector2(208, 208) texture = ExtResource("5_rtq4x") [node name="TestFoodForStove" parent="Surfaces/Counters/Counter7" instance=ExtResource("6_uutht")] @@ -241,27 +265,22 @@ position = Vector2(0, -8) [node name="Stoves" type="Node2D" parent="Surfaces"] [node name="Stove" parent="Surfaces/Stoves" instance=ExtResource("4_x3u6a")] -position = Vector2(384, 320) +position = Vector2(112, 272) +direction = 3 texture = ExtResource("5_rtq4x") -[node name="Stove2" parent="Surfaces/Stoves" instance=ExtResource("4_x3u6a")] -position = Vector2(640, 216) - [node name="Stove3" parent="Surfaces/Stoves" instance=ExtResource("4_x3u6a")] -position = Vector2(352, 216) - -[node name="Stove4" parent="Surfaces/Stoves" instance=ExtResource("4_x3u6a")] -position = Vector2(320, 216) +position = Vector2(144, 208) [node name="Stove5" parent="Surfaces/Stoves" instance=ExtResource("4_x3u6a")] -position = Vector2(288, 248) -direction = 3 +position = Vector2(176, 208) [node name="Stove6" parent="Surfaces/Stoves" instance=ExtResource("4_x3u6a")] -position = Vector2(288, 280) +position = Vector2(112, 240) direction = 3 [node name="Players" type="Node2D" parent="."] [node name="Player" parent="Players" instance=ExtResource("2_srumu")] -position = Vector2(448, 320) +position = Vector2(400, 328) +playerNum = 3 diff --git a/project.godot b/project.godot index 7816ecc..3590550 100644 --- a/project.godot +++ b/project.godot @@ -23,9 +23,9 @@ Utils="*res://Global/Utils.gd" [display] window/size/viewport_width=2304 -window/size/viewport_height=1296 -window/stretch/mode="canvas_items" -window/stretch/scale=2.0 +window/size/viewport_height=1728 +window/stretch/mode="viewport" +window/stretch/scale=3.0 [file_customization]