From 43487bb448622fc092d75ac07265958d37860880 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Mon, 5 May 2025 19:27:19 -0500 Subject: [PATCH] scene stuff --- scenes/MainMenu.tscn | 61 +++++++++++++++++++++- scenes/Maps/{SomeMap.tscn => TestMap.tscn} | 0 scenes/Meta/Overworld.tscn | 2 +- scenes/Meta/Systems.tscn | 7 ++- scripts/Scenes/MainMenuScene.gd | 21 ++++++++ scripts/Scenes/MainMenuScene.gd.uid | 1 + scripts/Scenes/RootScene.gd | 2 +- scripts/System/OverworldSystem.gd | 14 +++++ scripts/System/OverworldSystem.gd.uid | 1 + scripts/System/SceneSystem.gd | 3 +- scripts/System/Systems.gd | 6 +-- 11 files changed, 110 insertions(+), 8 deletions(-) rename scenes/Maps/{SomeMap.tscn => TestMap.tscn} (100%) create mode 100644 scripts/Scenes/MainMenuScene.gd create mode 100644 scripts/Scenes/MainMenuScene.gd.uid create mode 100644 scripts/System/OverworldSystem.gd create mode 100644 scripts/System/OverworldSystem.gd.uid diff --git a/scenes/MainMenu.tscn b/scenes/MainMenu.tscn index 5df1622..ca7140b 100644 --- a/scenes/MainMenu.tscn +++ b/scenes/MainMenu.tscn @@ -1,3 +1,62 @@ -[gd_scene format=3 uid="uid://w1q5eoiejmy3"] +[gd_scene load_steps=2 format=3 uid="uid://w1q5eoiejmy3"] + +[ext_resource type="Script" uid="uid://cak4lch21nq30" path="res://scripts/Scenes/MainMenuScene.gd" id="1_yqorp"] [node name="MainMenu" type="Node3D"] +script = ExtResource("1_yqorp") + +[node name="UI" type="Control" parent="."] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="VBoxContainer" type="VBoxContainer" parent="UI"] +layout_mode = 1 +anchors_preset = 9 +anchor_bottom = 1.0 +offset_right = 171.0 +grow_vertical = 2 + +[node name="HBoxContainer" type="HBoxContainer" parent="UI/VBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 + +[node name="Overworld" type="Button" parent="UI/VBoxContainer/HBoxContainer"] +layout_mode = 2 +text = "Prototype Overworld" + +[node name="MapDropdown" type="OptionButton" parent="UI/VBoxContainer/HBoxContainer"] +layout_mode = 2 +selected = 0 +item_count = 1 +popup/item_0/text = "TEST_MAP" +popup/item_0/id = 0 + +[node name="Quests" type="Button" parent="UI/VBoxContainer"] +layout_mode = 2 +text = "Prototype Quests +" + +[node name="Cutscene" type="Button" parent="UI/VBoxContainer"] +layout_mode = 2 +text = "Prototype Cutscene" + +[node name="Cooking" type="Button" parent="UI/VBoxContainer"] +layout_mode = 2 +text = "Prototype Cooking +" + +[node name="Battle" type="Button" parent="UI/VBoxContainer"] +layout_mode = 2 +text = "Prototype Battle +" + +[connection signal="pressed" from="UI/VBoxContainer/HBoxContainer/Overworld" to="." method="_on_Overworld_pressed"] +[connection signal="pressed" from="UI/VBoxContainer/Quests" to="." method="_on_Quests_pressed"] +[connection signal="pressed" from="UI/VBoxContainer/Cutscene" to="." method="_on_Custscene_pressed"] +[connection signal="pressed" from="UI/VBoxContainer/Cooking" to="." method="_on_Cooking_pressed"] +[connection signal="pressed" from="UI/VBoxContainer/Battle" to="." method="_on_Battle_pressed"] diff --git a/scenes/Maps/SomeMap.tscn b/scenes/Maps/TestMap.tscn similarity index 100% rename from scenes/Maps/SomeMap.tscn rename to scenes/Maps/TestMap.tscn diff --git a/scenes/Meta/Overworld.tscn b/scenes/Meta/Overworld.tscn index 3b4d7ee..517afe8 100644 --- a/scenes/Meta/Overworld.tscn +++ b/scenes/Meta/Overworld.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://tmbx2kit0jyq"] [ext_resource type="Script" uid="uid://pcncoc6wum4q" path="res://scripts/Scenes/OverworldScene.gd" id="1_yv6j0"] -[ext_resource type="PackedScene" uid="uid://dx6fv8n4jl5ku" path="res://scenes/Maps/SomeMap.tscn" id="4_8dvtu"] +[ext_resource type="PackedScene" uid="uid://dx6fv8n4jl5ku" path="res://scenes/Maps/TestMap.tscn" id="4_8dvtu"] [node name="Overworld" type="Node3D"] script = ExtResource("1_yv6j0") diff --git a/scenes/Meta/Systems.tscn b/scenes/Meta/Systems.tscn index 3705ac6..23573ca 100644 --- a/scenes/Meta/Systems.tscn +++ b/scenes/Meta/Systems.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=3 uid="uid://iibqlagufwhm"] +[gd_scene load_steps=11 format=3 uid="uid://iibqlagufwhm"] [ext_resource type="Script" uid="uid://cj8athi16655p" path="res://scripts/System/Systems.gd" id="1_uen2c"] [ext_resource type="Script" uid="uid://d2b7r3t5ownc5" path="res://scripts/System/CutsceneSystem.gd" id="2_sf62c"] @@ -9,9 +9,11 @@ [ext_resource type="Script" uid="uid://mr6i8copcn37" path="res://scripts/System/BattleSystem.gd" id="7_miqgj"] [ext_resource type="Script" uid="uid://drcaiuyla2psa" path="res://scripts/System/CookingSystem.gd" id="7_nou1j"] [ext_resource type="Script" uid="uid://bbd8gcx6byjhf" path="res://scripts/System/SceneSystem.gd" id="9_budbk"] +[ext_resource type="Script" uid="uid://btowswycywrgc" path="res://scripts/System/OverworldSystem.gd" id="10_56i3s"] [node name="Systems" type="Node"] script = ExtResource("1_uen2c") +metadata/_custom_type_script = "uid://cj8athi16655p" [node name="Cutscene" type="Node" parent="."] script = ExtResource("2_sf62c") @@ -36,3 +38,6 @@ script = ExtResource("7_miqgj") [node name="Scene" type="Node" parent="."] script = ExtResource("9_budbk") + +[node name="Overworld" type="Node" parent="."] +script = ExtResource("10_56i3s") diff --git a/scripts/Scenes/MainMenuScene.gd b/scripts/Scenes/MainMenuScene.gd new file mode 100644 index 0000000..d651ca8 --- /dev/null +++ b/scripts/Scenes/MainMenuScene.gd @@ -0,0 +1,21 @@ +class_name MainMenuScene extends Node3D + +var mapDropdown:OptionButton + +func _ready() -> void: + mapDropdown = $UI/VBoxContainer/HBoxContainer/MapDropdown; + +func _on_Overworld_pressed(): + print("Overworld pressed") + +func _on_Quests_pressed(): + print("Quests pressed") + +func _on_Custscene_pressed(): + print("Cutscene pressed") + +func _on_Cooking_pressed(): + print("Cooking pressed") + +func _on_Battle_pressed(): + print("Battle pressed") diff --git a/scripts/Scenes/MainMenuScene.gd.uid b/scripts/Scenes/MainMenuScene.gd.uid new file mode 100644 index 0000000..935ab8f --- /dev/null +++ b/scripts/Scenes/MainMenuScene.gd.uid @@ -0,0 +1 @@ +uid://cak4lch21nq30 diff --git a/scripts/Scenes/RootScene.gd b/scripts/Scenes/RootScene.gd index c2daf37..b2ce17a 100644 --- a/scripts/Scenes/RootScene.gd +++ b/scripts/Scenes/RootScene.gd @@ -7,4 +7,4 @@ var systems:Systems; func _ready() -> void: print("Game started"); systems = $Systems; - systems.SCENE.setScene(SceneSystem.DawnScene.OVERWORLD); + systems.SCENE.setScene(SceneSystem.DawnScene.MAIN_MENU); diff --git a/scripts/System/OverworldSystem.gd b/scripts/System/OverworldSystem.gd new file mode 100644 index 0000000..615979e --- /dev/null +++ b/scripts/System/OverworldSystem.gd @@ -0,0 +1,14 @@ +class_name OverworldSystem extends Node + +enum Map { + TEST_MAP +}; + +var MAPS = [ + "res://scenes/Maps/TestMap.tscn" +]; + +var currentMap:String = ""; + +func setMap(map:Map): + pass \ No newline at end of file diff --git a/scripts/System/OverworldSystem.gd.uid b/scripts/System/OverworldSystem.gd.uid new file mode 100644 index 0000000..a2d1e1a --- /dev/null +++ b/scripts/System/OverworldSystem.gd.uid @@ -0,0 +1 @@ +uid://btowswycywrgc diff --git a/scripts/System/SceneSystem.gd b/scripts/System/SceneSystem.gd index 3efcab3..9b45a01 100644 --- a/scripts/System/SceneSystem.gd +++ b/scripts/System/SceneSystem.gd @@ -3,13 +3,14 @@ const MainMenu = preload("res://scenes/MainMenu.tscn"); const OverworldScene = preload("res://scenes/Meta/Overworld.tscn"); enum DawnScene { + INITIAL, MAIN_MENU, OVERWORLD, BATTLE, COOKING }; -var scene:DawnScene = DawnScene.OVERWORLD; +var scene:DawnScene = DawnScene.INITIAL; func getMainMenuScene(): return get_tree().current_scene.get_node("MainMenu"); diff --git a/scripts/System/Systems.gd b/scripts/System/Systems.gd index 40fb193..7f5c874 100644 --- a/scripts/System/Systems.gd +++ b/scripts/System/Systems.gd @@ -7,6 +7,7 @@ const PauseSystem = preload("res://scripts/System/PauseSystem.gd"); const BattleSystem = preload("res://scripts/System/BattleSystem.gd"); const CookingSystem = preload("res://scripts/System/CookingSystem.gd"); const SceneSystem = preload("res://scripts/System/SceneSystem.gd"); +const OverworldSystem = preload("res://scripts/System/OverworldSystem.gd"); var ITEM:ItemSystem; var CUTSCENE:CutsceneSystem; @@ -16,6 +17,7 @@ var PAUSE:PauseSystem; var BATTLE:BattleSystem; var COOKING:CookingSystem; var SCENE:SceneSystem; +var OVERWORLD:OverworldSystem; func _ready(): ITEM = $Item; @@ -26,6 +28,4 @@ func _ready(): BATTLE = $Battle; COOKING = $Cooking; SCENE = $Scene; - -func _process(delta): - pass + OVERWORLD = $Overworld; \ No newline at end of file