Created test branch for save testing

Scenes/Debug Scenes/test_player_house_tilemap.gd

@@ -0,0 +1,14 @@
+#class_name testHouse
+extends Control
+#
+#@onready var margin_container: MarginContainer = $MarginContainer
+#@onready var pause_menu: Control = $CanvasLayer/Pause_Menu
+#
+#
+#func _ready() -> void:
+	#pass
+#
+#func _on_esc_button_down() -> void:
+	##margin_container.visible = false
+	#pause_menu.set_process(true)
+	#pause_menu.visible = true

Scenes/Debug Scenes/test_player_house_tilemap.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=4 format=4 uid="uid://chsjvan3usgv7"]
+[gd_scene load_steps=5 format=4 uid="uid://chsjvan3usgv7"]
 
 [ext_resource type="TileSet" uid="uid://qww2eqjct2pi" path="res://Tilesets/game_tile_set.tres" id="1_nnbhu"]
 [ext_resource type="PackedScene" uid="uid://bhscvpkwhrjjm" path="res://Scenes/Characters/player/player.tscn" id="2_dgemu"]
 [ext_resource type="PackedScene" uid="uid://cax7fe0vlwndk" path="res://Scenes/Characters/player/byte/byte.tscn" id="3_xg4os"]
+[ext_resource type="PackedScene" uid="uid://c0lwytkkfncny" path="res://Scenes/Menu-In-Game/pause_menu.tscn" id="4_urjeg"]
 
 [node name="testSceneHouseTileMap" type="Node2D"]
 metadata/_edit_horizontal_guides_ = [-33.0]
@@ -35,3 +36,13 @@ position = Vector2(391, 136)
 [node name="Byte" parent="GameTileMap" node_paths=PackedStringArray("parent") instance=ExtResource("3_xg4os")]
 position = Vector2(381, 101)
 parent = NodePath("../Player")
+
+[node name="CanvasLayer" type="CanvasLayer" parent="."]
+
+[node name="Pause_Menu" parent="CanvasLayer" instance=ExtResource("4_urjeg")]
+process_mode = 3
+visible = false
+offset_left = 22.0
+offset_top = 116.0
+offset_right = 22.0
+offset_bottom = 116.0

Scenes/Menu-In-Game/menu.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://menu.gd" id="1_4xx2o"]
 [ext_resource type="Texture2D" uid="uid://4rj4yn6iuakb" path="res://Scenes/Backgrounds/solid-light-blue-background-53xkyn7gnrw2373e.jpg" id="2_ir47e"]
-[ext_resource type="PackedScene" uid="uid://dy5caa0mf4mqb" path="res://Scenes/user settings screen/options_menu.tscn" id="3_kw1sd"]
+[ext_resource type="PackedScene" uid="uid://baalldi3m3fpd" path="res://Scenes/user settings screen/options_menu.tscn" id="3_kw1sd"]
 
 [sub_resource type="SystemFont" id="SystemFont_ml8si"]
 font_names = PackedStringArray("SimSun")

Scenes/Menu-In-Game/pause_menu.tscn

@@ -3,7 +3,7 @@
 [ext_resource type="Script" path="res://menu.gd" id="1_a11kk"]
 [ext_resource type="Texture2D" uid="uid://4rj4yn6iuakb" path="res://Scenes/Backgrounds/solid-light-blue-background-53xkyn7gnrw2373e.jpg" id="2_e1i7s"]
 [ext_resource type="Script" path="res://Scenes/Menu-In-Game/resume.gd" id="3_6rkdd"]
-[ext_resource type="PackedScene" path="res://Scenes/user settings screen/options_menu.tscn" id="3_snyir"]
+[ext_resource type="PackedScene" uid="uid://baalldi3m3fpd" path="res://Scenes/user settings screen/options_menu.tscn" id="3_snyir"]
 
 [sub_resource type="SystemFont" id="SystemFont_ml8si"]
 font_names = PackedStringArray("SimSun")
@@ -96,6 +96,7 @@ text = "Resume"
 script = ExtResource("3_6rkdd")
 
 [node name="settings" type="Button" parent="MarginContainer/HBoxContainer/VBoxContainer"]
+process_mode = 3
 layout_mode = 2
 theme_override_fonts/font = SubResource("SystemFont_j7bib")
 theme_override_font_sizes/font_size = 30
@@ -111,6 +112,6 @@ text = "Quit"
 visible = false
 layout_mode = 1
 
-[connection signal="button_down" from="MarginContainer/HBoxContainer/VBoxContainer/resume" to="." method="_on_start_game_button_down"]
-[connection signal="button_down" from="MarginContainer/HBoxContainer/VBoxContainer/settings" to="." method="_on_exit_game_button_down"]
-[connection signal="button_down" from="MarginContainer/HBoxContainer/VBoxContainer/quit" to="." method="_on_settings_button_down"]
+[connection signal="pressed" from="MarginContainer/HBoxContainer/VBoxContainer/resume" to="." method="_on_resume_pressed"]
+[connection signal="pressed" from="MarginContainer/HBoxContainer/VBoxContainer/settings" to="." method="_on_settings_pressed"]
+[connection signal="pressed" from="MarginContainer/HBoxContainer/VBoxContainer/quit" to="." method="_on_quit_pressed"]

Scenes/mainmenu/main_menu.gd

@@ -24,8 +24,8 @@ func _ready():
 func on_exit_pressed() -> void:
 	get_tree().quit()
 
-func _on_settings_pressed() -> void:
-	get_tree().change_scene_to_file("res://Scenes/user settings screen/settings.tscn")
+#func _on_settings_pressed() -> void:
+	#get_tree().change_scene_to_file("res://Scenes/user settings screen/settings.tscn")
 
 
 #func _on_start_game_button_down() -> void:

Scenes/mainmenu/main_menu.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://Scenes/mainmenu/main_menu.gd" id="1_ti2el"]
 [ext_resource type="Texture2D" uid="uid://4rj4yn6iuakb" path="res://Scenes/Backgrounds/solid-light-blue-background-53xkyn7gnrw2373e.jpg" id="2_mx22y"]
-[ext_resource type="PackedScene" path="res://Scenes/user settings screen/options_menu.tscn" id="3_12owe"]
+[ext_resource type="PackedScene" uid="uid://baalldi3m3fpd" path="res://Scenes/user settings screen/options_menu.tscn" id="3_12owe"]
 
 [sub_resource type="SystemFont" id="SystemFont_ml8si"]
 font_names = PackedStringArray("SimSun")

Scenes/user settings screen/options_menu.tscn

@@ -1,7 +1,7 @@
-[gd_scene load_steps=4 format=3 uid="uid://dy5caa0mf4mqb"]
+[gd_scene load_steps=4 format=3 uid="uid://baalldi3m3fpd"]
 
 [ext_resource type="Script" path="res://Scenes/user settings screen/options_menu.gd" id="1_38k07"]
-[ext_resource type="PackedScene" uid="uid://dlk6vicnk01c8" path="res://Scenes/user settings screen/settings_tab_container.tscn" id="2_cpye6"]
+[ext_resource type="PackedScene" uid="uid://bpvpb4xpfwcb5" path="res://Scenes/user settings screen/settings_tab_container.tscn" id="2_cpye6"]
 
 [sub_resource type="SystemFont" id="SystemFont_8ix8c"]
 font_names = PackedStringArray("Impact")

Scenes/user settings screen/settings_tab_container.tscn

@@ -1,11 +1,11 @@
-[gd_scene load_steps=10 format=3 uid="uid://dlk6vicnk01c8"]
-
-[ext_resource type="PackedScene" uid="uid://jcmkb4ogg185" path="res://Scenes/user settings screen/hotkey_rebind_button.tscn" id="1_414l2"]
-[ext_resource type="PackedScene" uid="uid://cscbxntl4g8r0" path="res://Scenes/user settings screen/window_mode_button.tscn" id="1_xwnnn"]
-[ext_resource type="PackedScene" uid="uid://b5i2mxnbkyoaa" path="res://Scenes/user settings screen/audio_slider_settings.tscn" id="1_ybqgg"]
-[ext_resource type="PackedScene" uid="uid://4o1tq8cbsyxe" path="res://Scenes/user settings screen/resolution_display_button.tscn" id="2_yhiif"]
-[ext_resource type="PackedScene" uid="uid://dlpuitkygxyt0" path="res://Scenes/user settings screen/subtitles_toggle_button.tscn" id="5_8qv5e"]
-[ext_resource type="PackedScene" uid="uid://dwbqlx5ywpw8a" path="res://Scenes/user settings screen/text_to_speech_button.tscn" id="6_65bpf"]
+[gd_scene load_steps=10 format=3 uid="uid://bpvpb4xpfwcb5"]
+
+[ext_resource type="PackedScene" path="res://Scenes/user settings screen/hotkey_rebind_button.tscn" id="1_414l2"]
+[ext_resource type="PackedScene" path="res://Scenes/user settings screen/window_mode_button.tscn" id="1_xwnnn"]
+[ext_resource type="PackedScene" path="res://Scenes/user settings screen/audio_slider_settings.tscn" id="1_ybqgg"]
+[ext_resource type="PackedScene" path="res://Scenes/user settings screen/resolution_display_button.tscn" id="2_yhiif"]
+[ext_resource type="PackedScene" path="res://Scenes/user settings screen/subtitles_toggle_button.tscn" id="5_8qv5e"]
+[ext_resource type="PackedScene" path="res://Scenes/user settings screen/text_to_speech_button.tscn" id="6_65bpf"]
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_nihob"]
 

Tilesets/house_tile_set.tres

@@ -1,4 +1,4 @@
-[gd_resource type="TileSet" load_steps=7 format=3 uid="uid://npn60pmj57ly"]
+[gd_resource type="TileSet" load_steps=7 format=3 uid="uid://hb6f0itmvssy"]
 
 [ext_resource type="Texture2D" uid="uid://bjp3idubuaopy" path="res://assets/farming_game/tilesets/wooden_house_walls_tilset.png" id="1_1ngxc"]
 [ext_resource type="Texture2D" uid="uid://xd3ec83bk8x6" path="res://assets/farming_game/objects/basic_furniture.png" id="2_ived1"]

menu.gd

@@ -1,48 +1,74 @@
-class_name pauseMenu
+#class_name pauseMenu
 extends Control
 
+
 @onready var resume: Button = $MarginContainer/HBoxContainer/VBoxContainer/resume
 @onready var settings: Button = $MarginContainer/HBoxContainer/VBoxContainer/settings
 @onready var quit: Button = $MarginContainer/HBoxContainer/VBoxContainer/quit
 
+
 @onready var options_menu: OptionsMenu = $Options_Menu
 @onready var margin_container: MarginContainer = $MarginContainer
+#test branch 
 
 @onready var start_level = preload("res://Scenes/mainmenu/main_menu.tscn") as PackedScene
 
 func _ready():
-	resume.button_down.connect(_on_resume_button_down)
-	settings.button_down.connect(_on_settings_button_down)
-	quit.button_down.connect(_on_quit_button_down)
+	resume.button_down.connect(_on_resume_pressed)
+	settings.button_down.connect(_on_settings_pressed)
+	quit.button_down.connect(_on_quit_pressed)
 	options_menu.exit_options_menu.connect(on_exit_options_menu)
 
-func on_exit_pressed() -> void:
-	get_tree().quit()
+
+func resume_game() -> void:
+	get_tree().paused = false
+
+func pause_game() -> void:
+	get_tree().paused = true
+
+func esc_key_pressed() -> void:
+	if Input.is_action_just_pressed("esc") and !get_tree().paused:
+		pause_game()
+	elif Input.is_action_just_pressed("esc") and get_tree().paused:
+		resume_game()
+
+
+func _on_resume_pressed() -> void:
+	resume_game()
 
 func _on_settings_pressed() -> void:
-	get_tree().change_scene_to_file("res://Scenes/user settings screen/settings.tscn")
+	margin_container.visible = false
+	options_menu.set_process(true)
+	options_menu.visible = true
+
+func _on_quit_pressed() -> void:
+	get_tree().quit()
+
 
 func on_exit_options_menu() -> void:
 	margin_container.visible = true
 	options_menu.visible = false
 
-func _on_resume_button_down() -> void:
-	get_tree().change_scene_to_file("res://Scenes/Debug Scenes/test_player_house_tilemap.tscn")
-
-func _on_quit_button_down() -> void:
-	get_tree().change_scene_to_file("res://Scenes/mainmenu/main_menu.tscn")
+#func _on_resume_button_down() -> void:
+	#get_tree().change_scene_to_file("res://Scenes/Debug Scenes/test_player_house_tilemap.tscn")
 
+#func _on_quit_button_down() -> void:
+	#get_tree().change_scene_to_file("res://Scenes/mainmenu/main_menu.tscn")
+	#
 #Reeha: Added this to change the visibility upon pressing settings button. Connection to settings menu
-func _on_settings_button_down() -> void:
-	margin_container.visible = false
-	options_menu.set_process(true)
-	options_menu.visible = true
+#func _on_settings_button_down() -> void:
+	#margin_container.visible = false
+	#options_menu.set_process(true)
+	#options_menu.visible = true
 
 # Called when the node enters the scene tree for the first time.
 #func _ready() -> void:
 #	pass # Replace with function body.
 
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
-#func _process(delta: float) -> void:
-#	pass
+func _process(delta: float) -> void:
+	esc_key_pressed()
+
+#func on_exit_pressed() -> void:
+	#get_tree().quit()

project.godot

@@ -23,6 +23,7 @@ global="*res://global.gd"
 
 window/size/viewport_width=640
 window/size/viewport_height=360
+window/size/mode=3
 window/size/window_width_override=1280
 window/size/window_height_override=720
 window/subwindows/embed_subwindows=false