Merge pull request #36 from Alexander-Worley/Prototype-2;-Alexander

Final Prototype 2 Build
Alexander-Worley · May 23, 2024 · 7f84160 · 7f84160
2 parents 4954fd3 + 6d63ca2
commit 7f84160
Show file tree

Hide file tree

Showing 29 changed files with 519 additions and 848 deletions.
diff --git a/Assets/BGs/planet-2-background.png → Assets/BGs/bluePlanetBG.png b/Assets/BGs/planet-2-background.png → Assets/BGs/bluePlanetBG.png
diff --git a/Assets/BGs/planet-2-background.png.import → Assets/BGs/bluePlanetBG.png.import b/Assets/BGs/planet-2-background.png.import → 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/...s/planet-2-dining-no-space-background.png → Assets/BGs/bluePlanetDiner.png b/...s/planet-2-dining-no-space-background.png → Assets/BGs/bluePlanetDiner.png
diff --git a/...t-2-dining-no-space-background.png.import → Assets/BGs/bluePlanetDiner.png.import b/...t-2-dining-no-space-background.png.import → 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 → Assets/BGs/greenPlanetBG.png b/Assets/BGs/planet-1-background.png → Assets/BGs/greenPlanetBG.png
diff --git a/Assets/BGs/planet-1-background.png.import → Assets/BGs/greenPlanetBG.png.import b/Assets/BGs/planet-1-background.png.import → 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/...s/planet-1-dining-no-space-background.png → Assets/BGs/greenPlanetDiner.png b/...s/planet-1-dining-no-space-background.png → Assets/BGs/greenPlanetDiner.png
diff --git a/...t-1-dining-no-space-background.png.import → Assets/BGs/greenPlanetDiner.png.import b/...t-1-dining-no-space-background.png.import → 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 → Assets/BGs/mainMenuBG.png b/Assets/BGs/start-screen-background.png → Assets/BGs/mainMenuBG.png
diff --git a/...ts/BGs/start-screen-background.png.import → Assets/BGs/mainMenuBG.png.import b/...ts/BGs/start-screen-background.png.import → 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
@@ -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
@@ -1,37 +1,25 @@
-[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
 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
@@ -1,37 +1,25 @@
-[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
 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")]