diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index bdd9250..0ae7b8c 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -16,11 +16,11 @@ dock_5="Inspector,Node,History" [EditorNode] -open_scenes=["res://menu/credits_screen.tscn", "res://menu/main_menu.tscn"] +open_scenes=["res://menu/main_menu.tscn"] [ScriptEditor] -open_scripts=["res://menu/MainMenu.gd", "res://menu/VBoxContainer.gd"] +open_scripts=["res://menu/MainMenu.gd"] open_help=[] script_split_offset=341 list_split_offset=0 diff --git a/.godot/editor/filesystem_cache7 b/.godot/editor/filesystem_cache7 index 19b711a..f5a2329 100644 --- a/.godot/editor/filesystem_cache7 +++ b/.godot/editor/filesystem_cache7 @@ -1,53 +1,35 @@ 0b7126e0c6e86d3ec295a72f5aa6e0bd -::res://::1670632385 -Cannon.gd::GDScript::-1::1670629036::0::1::::Cannon<>Module<>:: -icon.svg::CompressedTexture2D::6522824948983567251::1670629036::1670629159::1::::<><>:: -Module.gd::GDScript::-1::1670629036::0::1::::Module<>Node<>:: -Module.tscn::PackedScene::4768830431356509682::1670629036::0::1::::<><>::res://Module.gd -README.md::TextFile::-1::1663483435::0::1::::<><>:: -::res://addons/::1670630039 -::res://addons/input_helper/::1670630039 -input_helper.gd::GDScript::-1::1663483435::0::1::::<>Node<>:: -plugin.cfg::TextFile::-1::1663483435::0::1::::<><>:: -plugin.gd::GDScript::-1::1663483435::0::1::::<>EditorPlugin<>:: -::res://addons/input_helper/examples/::1670630039 -device_tester.gd::GDScript::-1::1663483435::0::1::::<>Control<>:: -device_tester.tscn::PackedScene::5061974568981614892::1663483435::0::1::::<><>::res://addons/input_helper/examples/device_tester.gd -remap.gd::GDScript::-1::1663483435::0::1::::<>CenterContainer<>:: -remap.tscn::PackedScene::4419793292071700980::1663483435::0::1::::<><>::res://addons/input_helper/examples/remap.gd -::res://docs/::1670630044 -detect-input-device.png::CompressedTexture2D::9215399741497997798::1663483435::1670630044::1::::<><>:: -Devices.md::TextFile::-1::1663483435::0::1::::<><>:: -discord.svg::CompressedTexture2D::774374502318533672::1663483435::1670630044::1::::<><>:: -logo.svg::CompressedTexture2D::9084694994195617567::1663483435::1670630044::1::::<><>:: -Mapping.md::TextFile::-1::1663483435::0::1::::<><>:: -remapping-input.png::CompressedTexture2D::3785890667852270049::1663483435::1670630044::1::::<><>:: -Rumbling.md::TextFile::-1::1663483435::0::1::::<><>:: -video.jpg::CompressedTexture2D::9037406145455979599::1663483435::1670630044::1::::<><>:: -::res://menu/::1670633695 -MainMenu.gd::GDScript::-1::1670629799::0::1::::<>Control<>:: -main_menu.tscn::PackedScene::-1::1670630290::0::1::::<><>:: -VBoxContainer.gd::GDScript::-1::1670632859::0::1::::<>VBoxContainer<>:: -VolumeSlider.gd::GDScript::-1::1670632376::0::1::::<>HSlider<>:: -settings_menu.tscn::PackedScene::4893316486235402577::1670632546::0::1::::<><>::res://menu/VolumeSlider.gd -::res://menu/input_menu/::1670633696 -InputMenu.gd::GDScript::-1::1630756894::0::1::::<><>:: -InputMenu.tscn::PackedScene::-1::1630756894::0::1::::<><>::res://input_menu/InputMenu.gd<>res://input_menu/input_mapper/InputMapper.tscn<>res://input_menu/fonts/montserrat-extra-bold-48px.tres<>res://input_menu/fonts/montserrat-extra-bold-24px.tres<>res://input_menu/input_line/ActionList.gd<>res://input_menu/buttons/play.png<>res://input_menu/buttons/play-pressed.png<>res://input_menu/KeySelectMenu.gd -KeySelectMenu.gd::GDScript::-1::1630756894::0::1::::<>Panel<>:: -::res://menu/input_menu/buttons/::1670633696 -change-disabled.png::CompressedTexture2D::3616856081463519596::1630756894::1670633705::1::::<><>:: -change-pressed.png::CompressedTexture2D::5005672528785862335::1630756894::1670633705::1::::<><>:: -change.png::CompressedTexture2D::7360928298251965539::1630756894::1670633705::1::::<><>:: -play-pressed.png::CompressedTexture2D::1281318022072127060::1630756894::1670633705::1::::<><>:: -play.png::CompressedTexture2D::2156969973143953914::1630756894::1670633705::1::::<><>:: -::res://menu/input_menu/fonts/::1670633696 -montserrat-extra-bold-24px.tres::FontFile::-1::1630756894::0::1::::<><>::res://input_menu/fonts/Montserrat-ExtraBold.ttf -montserrat-extra-bold-48px.tres::FontFile::-1::1630756894::0::1::::<><>::res://input_menu/fonts/Montserrat-ExtraBold.ttf -Montserrat-ExtraBold.ttf::FontFile::1883053353428646667::1630756894::1670633705::1::::<><>:: -::res://menu/input_menu/input_line/::1670633696 -ActionList.gd::GDScript::-1::1630756894::0::1::::<>Control<>:: -InputLine.gd::GDScript::-1::1630756894::0::1::::<>HBoxContainer<>:: -InputLine.tscn::PackedScene::-1::1630756894::0::1::::<><>::res://input_menu/input_line/InputLine.gd<>res://input_menu/fonts/montserrat-extra-bold-24px.tres<>res://input_menu/buttons/change.png<>res://input_menu/buttons/change-pressed.png<>res://input_menu/buttons/change-disabled.png -::res://menu/input_menu/input_mapper/::1670633696 -InputMapper.gd::GDScript::-1::1630756894::0::1::::<>Node<>:: -InputMapper.tscn::PackedScene::-1::1630756894::0::1::::<><>::res://input_menu/input_mapper/InputMapper.gd +::res://::1670660428 +background.tscn::PackedScene::1961402969811487537::1670659387::0::1::::<><>::res://Backround.gd +background_straight.tscn::PackedScene::5221065382326708573::1670659387::0::1::::<><>::uid://cy6x8d3xe8lux +Backround.gd::GDScript::-1::1670659387::0::1::::<>Node<>:: +icon.svg::CompressedTexture2D::6522824948983567251::1670629036::1670660487::1::::<><>:: +Module.tscn::PackedScene::-1::1670659387::0::1::::<><>::res://scripts/Modules/Module.gd +Storage.tscn::PackedScene::5094869426301899524::1670659387::0::1::::<><>::res://scripts/Modules/Storage.gd +::res://menu/::1670660427 +credits_screen.tscn::PackedScene::-1::1670660023::0::1::::<><>:: +MainMenu.gd::GDScript::-1::1670660427::0::1::::<>Control<>:: +main_menu.tscn::PackedScene::3675691252334213643::1670660258::0::1::::<><>::res://menu/MainMenu.gd<>res://menu/VolSlider.gd +VBoxContainer.gd::GDScript::-1::1670660023::0::1::::<>VBoxContainer<>:: +VolSlider.gd::GDScript::-1::1670660023::0::1::::<>HSlider<>:: +VolumeSlider.gd::GDScript::-1::1670660023::0::1::::<>HSlider<>:: +::res://Nodes/::1670659387 +cannon.tscn::PackedScene::4101455625328834836::1670659387::0::1::::<><>::res://scripts/Modules/Cannon.gd +game.tscn::PackedScene::979895745935348226::1670659387::0::1::::<><>::res://scripts/Logic/Game.gd<>uid://bqe8ucbruto1j<>uid://byo1m0n20yl45<>res://scripts/Train.gd<>uid://vwjd5od63jgh +Player.tscn::PackedScene::1519935434811217959::1670659387::0::1::::<><>::res://scripts/Player.gd<>uid://cy6x8d3xe8lux +StartNode.tscn::PackedScene::3519739176948647021::1670659387::0::1::::<><>::res://scripts/Logic/StraightMapNode.gd<>uid://bup2ps8l2ifj8<>uid://c3ynfb5ky5p8g +StraightMapNode.tscn::PackedScene::3822830365412952951::1670659387::0::1::::<><>::res://scripts/Logic/StraightMapNode.gd +TurnMapNode.tscn::PackedScene::6788472404579138516::1670659387::0::1::::<><>::res://scripts/Logic/TurnMapNode.gd +::res://scripts/::1670659387 +Player.gd::GDScript::-1::1670659387::0::1::::<>CharacterBody3D<>:: +Train.gd::GDScript::-1::1670659387::0::1::::Train<>Node<>:: +::res://scripts/Logic/::1670660427 +Game.gd::GDScript::-1::1670660427::0::1::::Game<>Node<>:: +MapNode.gd::GDScript::-1::1670659387::0::1::::MapNode<>Node<>:: +StraightMapNode.gd::GDScript::-1::1670659387::0::1::::StraightMapNode<>MapNode<>:: +TurnMapNode.gd::GDScript::-1::1670659387::0::1::::TurnMapNode<>StraightMapNode<>:: +::res://scripts/Modules/::1670659387 +Cannon.gd::GDScript::-1::1670659387::0::1::::Cannon<>Module<>:: +Engine.gd::GDScript::-1::1670659387::0::1::::TrainEngine<>Module<>:: +Module.gd::GDScript::-1::1670659387::0::1::::Module<>Node<>:: +Storage.gd::GDScript::-1::1670659387::0::1::::Storage<>Module<>:: diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index e86587d..17c30b5 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -1,13 +1,2 @@ -res://MainMenu.gd -res://main_menu.tscn res://menu/main_menu.tscn -res://VolumeSlider.gd -res://menu/settings_menu.tscn -res://menu/VolumeSlider.gd -res://menu/VBoxContainer.gd -res://menu/input_menu/InputMenu.tscn -res://InputMenu.gd -res://menu/input_menu.tscn -res://menu/VolSlider.gd -res://menu/credits_screen.tscn res://menu/MainMenu.gd diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index 9f2dae9..7ca776f 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -3,85 +3,11 @@ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 29, "folded_lines": [], "h_scroll_position": 0, -"row": 25, +"row": 20, "scroll_position": 4.0, "selection": false, "syntax_highlighter": "GDScript" } - -[res://menu/VolumeSlider.gd] - -state={ -"bookmarks": PackedInt32Array(), -"breakpoints": PackedInt32Array(), -"column": 0, -"folded_lines": [], -"h_scroll_position": 0, -"row": 1, -"scroll_position": 0.0, -"selection": true, -"selection_from_column": 0, -"selection_from_line": 1, -"selection_to_column": 74, -"selection_to_line": 19, -"syntax_highlighter": "GDScript" -} - -[res://menu/VBoxContainer.gd] - -state={ -"bookmarks": PackedInt32Array(), -"breakpoints": PackedInt32Array(), -"column": 0, -"folded_lines": [], -"h_scroll_position": 0, -"row": 17, -"scroll_position": 0.0, -"selection": false, -"syntax_highlighter": "GDScript" -} - -[res://input_menu/input_mapper/InputMapper.gd] - -state={ -"bookmarks": PackedInt32Array(), -"breakpoints": PackedInt32Array(), -"column": 0, -"folded_lines": [], -"h_scroll_position": 0, -"row": 0, -"scroll_position": 0.0, -"selection": false, -"syntax_highlighter": "GDScript" -} - -[res://menu/VolSlider.gd] - -state={ -"bookmarks": PackedInt32Array(), -"breakpoints": PackedInt32Array(), -"column": 0, -"folded_lines": [], -"h_scroll_position": 0, -"row": 14, -"scroll_position": 0.0, -"selection": false, -"syntax_highlighter": "GDScript" -} - -[res://Module.gd] - -state={ -"bookmarks": PackedInt32Array(), -"breakpoints": PackedInt32Array(), -"column": 0, -"folded_lines": [], -"h_scroll_position": 0, -"row": 0, -"scroll_position": 0.0, -"selection": false, -"syntax_highlighter": "GDScript" -} diff --git a/.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.etc2.ctex b/.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.etc2.ctex new file mode 100644 index 0000000..84a7d64 Binary files /dev/null and b/.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.etc2.ctex differ diff --git a/.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.md5 b/.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.md5 index a4b5560..80b8377 100644 --- a/.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.md5 +++ b/.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.md5 @@ -1,3 +1,3 @@ source_md5="f61362c482127f3c9e02b6a390afeea8" -dest_md5="070132ccfe7233bfc44d6742a65b3739" +dest_md5="b4b583da1be933751963b8ccdabd103e" diff --git a/.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.s3tc.ctex b/.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.s3tc.ctex new file mode 100644 index 0000000..81bb63b Binary files /dev/null and b/.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.s3tc.ctex differ diff --git a/menu/MainMenu.gd b/menu/MainMenu.gd index 1b018f6..bbbd491 100644 --- a/menu/MainMenu.gd +++ b/menu/MainMenu.gd @@ -13,11 +13,12 @@ func _ready(): func _on_start_pressed(): - get_tree().change_scene("res://pathTo/Level.tscn") # Replace with function body. + get_tree().change_scene_to_file("res://Nodes/game.tscn") +# Replace with function body. func _on_tutorial_pressed(): - get_tree().change_scene("res://pathTo/Level.tscn") # Replace with function body. + get_tree().change_scene_to_file("res://Nodes/game.tscn") # Replace with function body. func _on_quit_pressed(): diff --git a/menu/main_menu.tscn b/menu/main_menu.tscn index 95c0a10..91d0824 100644 --- a/menu/main_menu.tscn +++ b/menu/main_menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://bad6he0psvv6c"] +[gd_scene load_steps=3 format=3 uid="uid://bsmsdlf5jiukx"] [ext_resource type="Script" path="res://menu/MainMenu.gd" id="1_hyw8p"] [ext_resource type="Script" path="res://menu/VolSlider.gd" id="2_h85ei"] diff --git a/project.godot b/project.godot index b6fb41e..2c46326 100644 --- a/project.godot +++ b/project.godot @@ -69,7 +69,7 @@ _global_script_class_icons={ [application] config/name="Semester Game Jam 2022" -run/main_scene="res://menu/settings_menu.tscn" +run/main_scene="res://menu/main_menu.tscn" config/features=PackedStringArray("4.0", "Forward Plus") config/icon="res://icon.svg"