Merge pull request #155 from Alexander-Worley/Alexander

Final Prototype 3 Build
Alexander-Worley · Jun 5, 2024 · 5fad95c · 5fad95c
2 parents a325f98 + d9cda51
commit 5fad95c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/DevScenes/Alexander/Alexander.tscn b/DevScenes/Alexander/Alexander.tscn
@@ -24,7 +24,7 @@
 [node name="Environment" type="Node2D" parent="."]
 
 [node name="Background" parent="Environment" instance=ExtResource("1_1fft2")]
-scroll_offset = Vector2(-3.11307, 0)
+scroll_offset = Vector2(-1.66667, 0)
 Planet = "Green Planet"
 
 [node name="Alexander" type="Label" parent="Environment/Background"]

diff --git a/Scenes/Levels/Day1.tscn b/Scenes/Levels/Day1.tscn
@@ -19,7 +19,7 @@
 [node name="Environment" type="Node2D" parent="."]
 
 [node name="Background" parent="Environment" instance=ExtResource("1_3xx8h")]
-scroll_offset = Vector2(-1.66667, 0)
+scroll_offset = Vector2(0, 0)
 Planet = "Green Planet"
 
 [node name="Day 1" type="Label" parent="Environment/Background"]

diff --git a/Scenes/PauseMenu/controls.tscn b/Scenes/PauseMenu/controls.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=3 format=3 uid="uid://bo1fe5sid5ckt"]
+[gd_scene load_steps=3 format=3 uid="uid://cqwiprklrqnx7"]
 
 [ext_resource type="Script" path="res://Scenes/PauseMenu/controls.gd" id="1_66yxh"]
 

diff --git a/Scenes/PauseMenu/pauseMenu.gd b/Scenes/PauseMenu/pauseMenu.gd
@@ -4,23 +4,25 @@ var controls_scene = preload("res://Scenes/PauseMenu/controls.tscn")
 var controls_instance = null
 
 func _on_quit_button_pressed():
-	get_tree().change_scene_to_file("res://DevScenes/DevMenu.tscn")
+	toggle_pause()
+	get_tree().change_scene_to_file("res://Scenes/MainMenu/mainMenu.tscn")
 
 func _on_continue_button_pressed():
-	visible = !visible
-	get_tree().paused = !get_tree().paused
+	toggle_pause()
 
 func _on_controls_button_pressed():
 	if controls_instance == null:
 		controls_instance = controls_scene.instantiate()
 		add_child(controls_instance)
 	controls_instance.visible = true
 
+func toggle_pause():
+	visible = !visible
+	get_tree().paused = !get_tree().paused
 
 func _ready():
-	pass
+	hide()
 
 func _input(event):
 	if event.is_action_pressed("pause"):
-		visible = !visible
-		get_tree().paused = !get_tree().paused
+		toggle_pause()
diff --git a/Scenes/Restaurant/Player/player.tscn b/Scenes/Restaurant/Player/player.tscn
@@ -7,9 +7,10 @@
 size = Vector2(21.3333, 21.3333)
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_5x6jq"]
-radius = 8.0
+radius = 0.0
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_2c8pm"]
+radius = 0.0
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_xjlov"]
 atlas = ExtResource("2_yefjo")

diff --git a/Scenes/Restaurant/restaurant.tscn b/Scenes/Restaurant/restaurant.tscn
@@ -25,17 +25,17 @@
 [node name="Environment" type="Node2D" parent="."]
 
 [node name="Background" parent="Environment" instance=ExtResource("1_t7iru")]
-scroll_offset = Vector2(0, 0)
+scroll_offset = Vector2(-0.909091, 0)
 Planet = "Green Planet"
 
-[node name="MVP" type="Label" parent="Environment/Background"]
+[node name="Prototype3" type="Label" parent="Environment/Background"]
 offset_left = 8.0
 offset_right = 62.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 = 25
-text = "MVP"
+text = "Prototype 3"
 
 [node name="Instructions" type="Label" parent="Environment/Background"]
 offset_left = 8.0