diff --git a/Assets/game.tscn b/Assets/game.tscn index 20d45f2..7cfd57c 100644 --- a/Assets/game.tscn +++ b/Assets/game.tscn @@ -1,10 +1,13 @@ -[gd_scene load_steps=6 format=3 uid="uid://dc26wfgxnhsnh"] +[gd_scene load_steps=9 format=3 uid="uid://dc26wfgxnhsnh"] [ext_resource type="Script" path="res://Assets/scripts/game.gd" id="1_l82qa"] [ext_resource type="PackedScene" uid="uid://dy3tsag0bcs4n" path="res://Assets/components/game_over.tscn" id="2_6q1xr"] [ext_resource type="PackedScene" uid="uid://bwo6gvmi3jcqt" path="res://Assets/components/Pause Screen.tscn" id="2_j4ays"] [ext_resource type="PackedScene" uid="uid://bcjijcf8br8t4" path="res://Assets/components/player.tscn" id="3_g384r"] [ext_resource type="Script" path="res://Assets/scripts/MapLoader.gd" id="4_cjwjg"] +[ext_resource type="PackedScene" uid="uid://b2knd58e85mif" path="res://Assets/Levels/Apartment.tscn" id="6_gytet"] +[ext_resource type="PackedScene" uid="uid://blr74r0xi0nyv" path="res://Assets/Levels/Hospital_Outside.tscn" id="7_krx07"] +[ext_resource type="PackedScene" uid="uid://cmchbx8ndjlmu" path="res://Assets/Levels/Hospital_Inside.tscn" id="8_8rawl"] [node name="Game" type="Node3D"] script = ExtResource("1_l82qa") @@ -19,6 +22,8 @@ visible = false [node name="Map" type="Node3D" parent="."] script = ExtResource("4_cjwjg") +Default_Map = ExtResource("6_gytet") +scenes = Array[PackedScene]([ExtResource("6_gytet"), ExtResource("7_krx07"), ExtResource("8_8rawl"), null]) [connection signal="paused" from="Pause Menu" to="." method="_on_pause_menu_paused"] [connection signal="unpaused" from="Pause Menu" to="." method="_on_pause_menu_unpaused"] diff --git a/Assets/game_window.tscn b/Assets/game_window.tscn index d6b163a..55d7b8f 100644 --- a/Assets/game_window.tscn +++ b/Assets/game_window.tscn @@ -1,11 +1,16 @@ -[gd_scene load_steps=3 format=3 uid="uid://bhukko76s4u2h"] +[gd_scene load_steps=5 format=3 uid="uid://bhukko76s4u2h"] [ext_resource type="Script" path="res://Assets/scripts/game_window.gd" id="1_87aie"] +[ext_resource type="PackedScene" uid="uid://dc26wfgxnhsnh" path="res://Assets/game.tscn" id="2_6fjbd"] [ext_resource type="PackedScene" uid="uid://brmo5qqqtj2mk" path="res://Assets/components/main_menu.tscn" id="2_srceb"] +[ext_resource type="PackedScene" uid="uid://b2knd58e85mif" path="res://Assets/Levels/Apartment.tscn" id="3_psp4g"] [node name="Game Window" type="Node"] script = ExtResource("1_87aie") +game_base = ExtResource("2_6fjbd") +main_menu = ExtResource("2_srceb") [node name="Main Menu" parent="." instance=ExtResource("2_srceb")] +play_level = ExtResource("3_psp4g") [connection signal="startGame" from="Main Menu" to="." method="_on_main_menu_start_game"] diff --git a/Assets/scripts/Main Menu.gd b/Assets/scripts/Main Menu.gd index 49d7fbd..25921c8 100644 --- a/Assets/scripts/Main Menu.gd +++ b/Assets/scripts/Main Menu.gd @@ -4,6 +4,8 @@ signal startGame var load_list = ["Back"] @export var level_folder = "res://Assets/Levels/" +@export var play_level:PackedScene +@export var scenes: Array[PackedScene] func _ready(): var dir = DirAccess.open(level_folder) @@ -20,7 +22,7 @@ func _on_exit_pressed(): func _on_start_pressed(): - GlobalSettings.current_map = "res://Assets/Levels/TestMapHospitalTextures.tscn" + GlobalSettings.current_map = play_level emit_signal("startGame") func _on_settings_pressed(): diff --git a/Assets/scripts/MapLoader.gd b/Assets/scripts/MapLoader.gd index efc2097..d2fa24c 100644 --- a/Assets/scripts/MapLoader.gd +++ b/Assets/scripts/MapLoader.gd @@ -1,13 +1,16 @@ class_name MapLoader extends Node3D -var Default_Map = "res://Assets/Levels/test_map.tscn" -var Test_Map = "res://Assets/Levels/TestMapHospitalTextures.tscn" +@export var Default_Map:PackedScene +@export var scenes: Array[PackedScene] var current_map func openMap(path=GlobalSettings.current_map): - current_map = load(path).instantiate() + if path is PackedScene: + current_map = path.instantiate() + else: + current_map = load(path).instantiate() add_child(current_map) diff --git a/Assets/scripts/game_window.gd b/Assets/scripts/game_window.gd index 706c6eb..a12078a 100644 --- a/Assets/scripts/game_window.gd +++ b/Assets/scripts/game_window.gd @@ -1,7 +1,9 @@ extends Node +@export var game_base:PackedScene +@export var main_menu:PackedScene func _on_main_menu_start_game(): - var game = load("res://Assets/game.tscn").instantiate() + var game = game_base.instantiate() remove_child($"Main Menu") self.add_child(game)