diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 471552e..e1cb460 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -1,26 +1,21 @@ -<<<<<<< HEAD -[gd_scene load_steps=11 format=3 uid="uid://cqkd0g15r5btu"] -======= -[gd_scene load_steps=10 format=3 uid="uid://db0pxwq1hvs45"] ->>>>>>> bd10d8ca58e6a0e8419cbdc69a905587f0691bee +[gd_scene load_steps=10 format=3 uid="uid://b8u4bo4mklj55"] -[ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_gf730"] -[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_8im8o"] -[ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="3_s558u"] -[ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="4_05mbx"] -[ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_gee2r"] -[ext_resource type="PackedScene" uid="uid://cys06pnxfjl2m" path="res://Nodes/UI.tscn" id="6_l0q7q"] -[ext_resource type="AudioStream" uid="uid://c5jhukuk8r3mf" path="res://Assets/Sounds/_MUSIC_/GameJamGameLoop.wav" id="7_0xbd4"] -[ext_resource type="AudioStream" uid="uid://n4ynf7hg2pcl" path="res://Assets/Sounds/_SOUNDFX_/GleiseLoop.wav" id="8_1d2gk"] -[ext_resource type="AudioStream" uid="uid://dovvnflvxtqpi" path="res://Assets/Sounds/_SOUNDFX_/WindLoop.wav" id="9_8qwj6"] -[ext_resource type="PackedScene" uid="uid://bw3yluhr72n2t" path="res://Nodes/InfiniteScroller.tscn" id="10_rs3tc"] +[ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_dubwq"] +[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_1lh4t"] +[ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="3_xcgy2"] +[ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="4_gg4ea"] +[ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_wi6pu"] +[ext_resource type="PackedScene" uid="uid://cys06pnxfjl2m" path="res://Nodes/UI.tscn" id="6_eicse"] +[ext_resource type="AudioStream" uid="uid://c5jhukuk8r3mf" path="res://Assets/Sounds/_MUSIC_/GameJamGameLoop.wav" id="7_wagg2"] +[ext_resource type="AudioStream" uid="uid://n4ynf7hg2pcl" path="res://Assets/Sounds/_SOUNDFX_/GleiseLoop.wav" id="8_c6uwu"] +[ext_resource type="AudioStream" uid="uid://dovvnflvxtqpi" path="res://Assets/Sounds/_SOUNDFX_/WindLoop.wav" id="9_q7v3t"] [node name="Game" type="Node"] -script = ExtResource("1_gf730") +script = ExtResource("1_dubwq") -[node name="LightSetup" parent="." instance=ExtResource("2_8im8o")] +[node name="LightSetup" parent="." instance=ExtResource("2_1lh4t")] -[node name="StartNode" parent="." instance=ExtResource("3_s558u")] +[node name="StartNode" parent="." instance=ExtResource("3_xcgy2")] [node name="Camera3D" type="Camera3D" parent="."] transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 43, 26.0132) @@ -29,35 +24,29 @@ fov = 30.0 size = 32.0 near = 0.041 -[node name="Train1" parent="." instance=ExtResource("4_05mbx")] -transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, -12, 0, 0) +[node name="Train1" parent="." instance=ExtResource("4_gg4ea")] +transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, -10, 0, 0) -[node name="InfiniteScroller" parent="Train1" instance=ExtResource("10_rs3tc")] -transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 0, -1, -96) - -[node name="Train2" parent="." instance=ExtResource("5_gee2r")] -transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 11.9011, -0.0549407, -0.085681) - -[node name="InfiniteScroller2" parent="Train2" instance=ExtResource("10_rs3tc")] -transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 0, -2, -104) +[node name="Train2" parent="." instance=ExtResource("5_wi6pu")] +transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 9.90113, -0.0549407, -0.085681) [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(0.875944, -0.294781, 0.381872, -0.106805, 0.65344, 0.749406, -0.470441, -0.697224, 0.540892, 0, 8.25958, 0) visible = false -[node name="Control" parent="." instance=ExtResource("6_l0q7q")] +[node name="Control" parent="." instance=ExtResource("6_eicse")] [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] -stream = ExtResource("7_0xbd4") +stream = ExtResource("7_wagg2") volume_db = -27.238 autoplay = true [node name="AudioStreamPlayer2" type="AudioStreamPlayer" parent="."] -stream = ExtResource("8_1d2gk") +stream = ExtResource("8_c6uwu") volume_db = -10.0 autoplay = true [node name="AudioStreamPlayer3" type="AudioStreamPlayer" parent="."] -stream = ExtResource("9_8qwj6") +stream = ExtResource("9_q7v3t") volume_db = -2.476 autoplay = true diff --git a/Nodes/game2.tscn b/Nodes/game2.tscn index 3f18caf..22c630f 100644 --- a/Nodes/game2.tscn +++ b/Nodes/game2.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=10 format=3 uid="uid://dyw054t0rhigr"] +[gd_scene load_steps=10 format=3 uid="uid://dum2wygf6g8dt"] [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_gf730"] -[ext_resource type="PackedScene" path="res://Nodes/light_setup.tscn" id="2_8im8o"] +[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_8im8o"] [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="3_s558u"] [ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="4_05mbx"] [ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_gee2r"] diff --git a/project.godot b/project.godot index 30b5e90..54075ea 100644 --- a/project.godot +++ b/project.godot @@ -29,7 +29,7 @@ _global_script_classes=[{ "language": &"GDScript", "path": "res://scripts/Logic/MapNode.gd" }, { -"base": "StaticBody3D", +"base": "Node", "class": &"Module", "language": &"GDScript", "path": "res://scripts/Modules/Module.gd" diff --git a/scripts/Player.gd b/scripts/Player.gd index 7ff098e..801ab99 100644 --- a/scripts/Player.gd +++ b/scripts/Player.gd @@ -24,12 +24,7 @@ var rng = RandomNumberGenerator.new() func _ready(): walking = "walking" idle = "idle" - $MiniGameButton0.hide() - $MiniGameButton1.hide() - $MiniGameButton2.hide() - $MiniGameButton3.hide() - $MiniGameButton4.hide() - $MiniGameButton5.hide() + #get_parent().find_child("CharacterBody3D").find_child("MiniGameButton0").hide() #get_parent().find_child("CharacterBody3D").find_child("MiniGameButton1").hide() #get_parent().find_child("CharacterBody3D").find_child("MiniGameButton2").hide()