diff --git a/levels/base/environment.tscn b/levels/base/environment.tscn deleted file mode 100644 index a3dab31..0000000 --- a/levels/base/environment.tscn +++ /dev/null @@ -1,26 +0,0 @@ -[gd_scene load_steps=6 format=3 uid="uid://ygvokp5f78i5"] - -[sub_resource type="Gradient" id="Gradient_hs6gw"] - -[sub_resource type="GradientTexture2D" id="GradientTexture2D_hyysp"] -gradient = SubResource("Gradient_hs6gw") -fill_from = Vector2(0.536082, 1) -fill_to = Vector2(0.536082, 0) - -[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_g3k38"] -panorama = SubResource("GradientTexture2D_hyysp") - -[sub_resource type="Sky" id="Sky_du8e4"] -sky_material = SubResource("PanoramaSkyMaterial_g3k38") -radiance_size = 1 - -[sub_resource type="Environment" id="Environment_y0yoy"] -background_mode = 2 -background_color = Color(0.758192, 0.758192, 0.758192, 1) -sky = SubResource("Sky_du8e4") -ambient_light_source = 3 -ambient_light_color = Color(1, 1, 1, 1) -reflected_light_source = 2 - -[node name="Environment" type="WorldEnvironment"] -environment = SubResource("Environment_y0yoy") diff --git a/levels/base/level.tscn b/levels/base/level.tscn index 0a7d2e2..0683839 100644 --- a/levels/base/level.tscn +++ b/levels/base/level.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=8 format=3 uid="uid://ovtknjyj83gh"] +[gd_scene load_steps=12 format=3 uid="uid://ovtknjyj83gh"] -[ext_resource type="PackedScene" uid="uid://ygvokp5f78i5" path="res://levels/base/environment.tscn" id="1_n7fd8"] [ext_resource type="Script" uid="uid://w3fetao1pegm" path="res://levels/level.gd" id="1_rj40i"] [ext_resource type="PackedScene" uid="uid://cnnvwotv33u1b" path="res://elements/player.tscn" id="2_b00jj"] [ext_resource type="PackedScene" uid="uid://cpm3laywhlbq5" path="res://elements/ring.tscn" id="3_hel5x"] @@ -8,13 +7,36 @@ [ext_resource type="PackedScene" uid="uid://c77bli40240nk" path="res://elements/sign.tscn" id="4_atq6y"] [ext_resource type="PackedScene" uid="uid://dnuakh7n3fuij" path="res://levels/base/music.tscn" id="4_uq42r"] +[sub_resource type="Gradient" id="Gradient_hs6gw"] + +[sub_resource type="GradientTexture2D" id="GradientTexture2D_hyysp"] +gradient = SubResource("Gradient_hs6gw") +fill_from = Vector2(0.536082, 1) +fill_to = Vector2(0.536082, 0) + +[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_g3k38"] +panorama = SubResource("GradientTexture2D_hyysp") + +[sub_resource type="Sky" id="Sky_du8e4"] +sky_material = SubResource("PanoramaSkyMaterial_g3k38") +radiance_size = 1 + +[sub_resource type="Environment" id="Environment_y0yoy"] +background_mode = 2 +background_color = Color(0.758192, 0.758192, 0.758192, 1) +sky = SubResource("Sky_du8e4") +ambient_light_source = 3 +ambient_light_color = Color(1, 1, 1, 1) +reflected_light_source = 2 + [node name="Base" type="Node3D"] script = ExtResource("1_rj40i") metadata/_custom_type_script = "uid://w3fetao1pegm" [node name="Gravity" parent="." instance=ExtResource("3_muudg")] -[node name="Environment" parent="." instance=ExtResource("1_n7fd8")] +[node name="Environment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_y0yoy") [node name="Music" parent="." instance=ExtResource("4_uq42r")] diff --git a/levels/demo.tscn b/levels/demo.tscn index 51fed8b..4e1e5ad 100644 --- a/levels/demo.tscn +++ b/levels/demo.tscn @@ -1,19 +1,37 @@ -[gd_scene load_steps=7 format=3 uid="uid://dtfybhftwfn00"] +[gd_scene load_steps=11 format=3 uid="uid://0re2mcnpub4e"] [ext_resource type="Script" uid="uid://w3fetao1pegm" path="res://levels/level.gd" id="1_scm0b"] [ext_resource type="PackedScene" uid="uid://dw0xl8644x166" path="res://elements/gravity.tscn" id="2_fo4i1"] -[ext_resource type="PackedScene" uid="uid://b6gnffoboc5j5" path="res://levels/night/environment.tscn" id="3_j4ado"] [ext_resource type="PackedScene" uid="uid://drfy3vhe6skp1" path="res://levels/night/music.tscn" id="4_qr8kk"] [ext_resource type="PackedScene" uid="uid://cnnvwotv33u1b" path="res://elements/player.tscn" id="5_j5vh3"] [ext_resource type="PackedScene" uid="uid://cpm3laywhlbq5" path="res://elements/ring.tscn" id="6_st6rs"] +[sub_resource type="Gradient" id="Gradient_x6q8u"] + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_lu6nv"] +gradient = SubResource("Gradient_x6q8u") + +[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_4yv3y"] +panorama = SubResource("GradientTexture1D_lu6nv") + +[sub_resource type="Sky" id="Sky_ys2yp"] +sky_material = SubResource("PanoramaSkyMaterial_4yv3y") + +[sub_resource type="Environment" id="Environment_8o42c"] +background_mode = 1 +sky = SubResource("Sky_ys2yp") +ambient_light_source = 2 +ambient_light_color = Color(1, 1, 1, 1) +reflected_light_source = 2 + [node name="Demo" type="Node3D"] script = ExtResource("1_scm0b") metadata/_custom_type_script = "uid://w3fetao1pegm" [node name="Gravity" parent="." instance=ExtResource("2_fo4i1")] -[node name="Environment" parent="." instance=ExtResource("3_j4ado")] +[node name="Environment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_8o42c") [node name="Music" parent="." instance=ExtResource("4_qr8kk")] diff --git a/levels/forest/environment.tscn b/levels/forest/environment.tscn deleted file mode 100644 index b4b9656..0000000 --- a/levels/forest/environment.tscn +++ /dev/null @@ -1,24 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://6nfv4ewj3jop"] - -[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_clvpw"] -sky_top_color = Color(0, 0.504542, 0.579919, 1) -sky_horizon_color = Color(9.62615e-08, 0.776269, 0.496436, 1) -sky_curve = 0.219613 -ground_bottom_color = Color(0.078119, 0.275869, 4.81308e-08, 1) -ground_horizon_color = Color(0.300489, 0.406247, 0.0024617, 1) -sun_angle_max = 224.83 -sun_curve = 0.212132 - -[sub_resource type="Sky" id="Sky_8w3rf"] -sky_material = SubResource("ProceduralSkyMaterial_clvpw") - -[sub_resource type="Environment" id="Environment_nda78"] -background_mode = 2 -sky = SubResource("Sky_8w3rf") -sky_rotation = Vector3(0.0872665, 0.698132, 0.0872665) -ambient_light_source = 3 -ambient_light_color = Color(1, 1, 1, 1) -reflected_light_source = 2 - -[node name="Environment" type="WorldEnvironment"] -environment = SubResource("Environment_nda78") diff --git a/levels/forest/level.tscn b/levels/forest/level.tscn index 31e9018..36176ba 100644 --- a/levels/forest/level.tscn +++ b/levels/forest/level.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=12 format=3 uid="uid://e1761h6d522a"] +[gd_scene load_steps=11 format=3 uid="uid://e1761h6d522a"] -[ext_resource type="PackedScene" uid="uid://6nfv4ewj3jop" path="res://levels/forest/environment.tscn" id="1_7clrg"] [ext_resource type="Script" uid="uid://w3fetao1pegm" path="res://levels/level.gd" id="1_fdxcj"] [ext_resource type="PackedScene" uid="uid://dw0xl8644x166" path="res://elements/gravity.tscn" id="2_gxmta"] [ext_resource type="PackedScene" uid="uid://cnnvwotv33u1b" path="res://elements/player.tscn" id="2_mjogx"] @@ -40,7 +39,7 @@ transform = Transform3D(-0.920505, 0.195366, -0.338383, 0, 0.866025, 0.5, 0.3907 shadow_enabled = true directional_shadow_mode = 0 -[node name="Environment" parent="." instance=ExtResource("1_7clrg")] +[node name="Environment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_y3whn") [node name="Music" parent="." instance=ExtResource("3_n1xsx")] diff --git a/levels/night/environment.tscn b/levels/night/environment.tscn deleted file mode 100644 index 127d6d0..0000000 --- a/levels/night/environment.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[gd_scene load_steps=6 format=3 uid="uid://b6gnffoboc5j5"] - -[sub_resource type="Gradient" id="Gradient_x6q8u"] - -[sub_resource type="GradientTexture1D" id="GradientTexture1D_lu6nv"] -gradient = SubResource("Gradient_x6q8u") - -[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_4yv3y"] -panorama = SubResource("GradientTexture1D_lu6nv") - -[sub_resource type="Sky" id="Sky_ys2yp"] -sky_material = SubResource("PanoramaSkyMaterial_4yv3y") - -[sub_resource type="Environment" id="Environment_8o42c"] -background_mode = 1 -sky = SubResource("Sky_ys2yp") -ambient_light_source = 2 -ambient_light_color = Color(1, 1, 1, 1) -reflected_light_source = 2 - -[node name="Environment" type="WorldEnvironment"] -environment = SubResource("Environment_8o42c") diff --git a/levels/night/level.tscn b/levels/night/level.tscn index b40c61a..08f79de 100644 --- a/levels/night/level.tscn +++ b/levels/night/level.tscn @@ -1,22 +1,40 @@ -[gd_scene load_steps=10 format=3 uid="uid://drnqmu4lka22d"] +[gd_scene load_steps=14 format=3 uid="uid://drnqmu4lka22d"] [ext_resource type="Script" uid="uid://w3fetao1pegm" path="res://levels/level.gd" id="1_3m1pa"] [ext_resource type="PackedScene" uid="uid://drfy3vhe6skp1" path="res://levels/night/music.tscn" id="1_npc74"] [ext_resource type="PackedScene" uid="uid://cnnvwotv33u1b" path="res://elements/player.tscn" id="2_bc1ig"] [ext_resource type="PackedScene" uid="uid://dw0xl8644x166" path="res://elements/gravity.tscn" id="2_lfplq"] -[ext_resource type="PackedScene" uid="uid://b6gnffoboc5j5" path="res://levels/night/environment.tscn" id="2_wintp"] [ext_resource type="PackedScene" uid="uid://cpm3laywhlbq5" path="res://elements/ring.tscn" id="4_brcr0"] [ext_resource type="PackedScene" uid="uid://c77bli40240nk" path="res://elements/sign.tscn" id="6_36yav"] [ext_resource type="PackedScene" uid="uid://b4jtpua36m6b1" path="res://elements/star.tscn" id="7_ltcl0"] [ext_resource type="PackedScene" uid="uid://da6lkdiskdh8v" path="res://elements/tree.tscn" id="8_kgstj"] +[sub_resource type="Gradient" id="Gradient_x6q8u"] + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_lu6nv"] +gradient = SubResource("Gradient_x6q8u") + +[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_4yv3y"] +panorama = SubResource("GradientTexture1D_lu6nv") + +[sub_resource type="Sky" id="Sky_ys2yp"] +sky_material = SubResource("PanoramaSkyMaterial_4yv3y") + +[sub_resource type="Environment" id="Environment_8o42c"] +background_mode = 1 +sky = SubResource("Sky_ys2yp") +ambient_light_source = 2 +ambient_light_color = Color(1, 1, 1, 1) +reflected_light_source = 2 + [node name="Night" type="Node3D"] script = ExtResource("1_3m1pa") metadata/_custom_type_script = "uid://w3fetao1pegm" [node name="Gravity" parent="." instance=ExtResource("2_lfplq")] -[node name="Environment" parent="." instance=ExtResource("2_wintp")] +[node name="Environment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_8o42c") [node name="Music" parent="." instance=ExtResource("1_npc74")] diff --git a/menus/menu.tscn b/menus/menu.tscn index bc66e2b..3883c59 100644 --- a/menus/menu.tscn +++ b/menus/menu.tscn @@ -1,4 +1,7 @@ -[gd_scene load_steps=6 format=3 uid="uid://tasbgr10p84c"] +[gd_scene load_steps=8 format=3 uid="uid://tasbgr10p84c"] + +[ext_resource type="AudioStream" uid="uid://bnbf1nfaxuagi" path="res://sounds/select.ogg" id="1_y8e4h"] +[ext_resource type="AudioStream" uid="uid://bq3tw55s0ud55" path="res://sounds/confirm.ogg" id="2_hl3ms"] [sub_resource type="GDScript" id="GDScript_18a3y"] script/source = "extends MarginContainer @@ -26,6 +29,14 @@ func add(node: Control, return_button: bool): button.grow_vertical = Control.GROW_DIRECTION_BEGIN button.connect(\"pressed\", disable) node.add_child(button) + + link_to_sounds(node) + +func link_to_sounds(node: Control): + var buttons := node.find_children(\"*\", \"Button\", true, false) + for button in buttons as Array[Button]: + button.mouse_entered.connect(func(): $Select.play()) + button.pressed.connect(func(): $Confirm.play()) func disable(): $VSplitContainer/AnimationPlayer.play_backwards(\"split_offset\") @@ -109,3 +120,11 @@ theme_override_constants/margin_top = 20 [node name="ColorRect" type="ColorRect" parent="VSplitContainer/MarginContainer"] layout_mode = 2 color = Color(0, 0, 0, 1) + +[node name="Select" type="AudioStreamPlayer" parent="."] +stream = ExtResource("1_y8e4h") +bus = &"Sounds" + +[node name="Confirm" type="AudioStreamPlayer" parent="."] +stream = ExtResource("2_hl3ms") +bus = &"Sounds" diff --git a/sounds/confirm.ogg b/sounds/confirm.ogg new file mode 100644 index 0000000..f059bcc Binary files /dev/null and b/sounds/confirm.ogg differ diff --git a/sounds/confirm.ogg.import b/sounds/confirm.ogg.import new file mode 100644 index 0000000..26d36e7 --- /dev/null +++ b/sounds/confirm.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bq3tw55s0ud55" +path="res://.godot/imported/confirm.ogg-611700f2069cfd206385315fc10e9491.oggvorbisstr" + +[deps] + +source_file="res://sounds/confirm.ogg" +dest_files=["res://.godot/imported/confirm.ogg-611700f2069cfd206385315fc10e9491.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/sounds/select.ogg b/sounds/select.ogg new file mode 100644 index 0000000..7cc9589 Binary files /dev/null and b/sounds/select.ogg differ diff --git a/sounds/select.ogg.import b/sounds/select.ogg.import new file mode 100644 index 0000000..4eaade7 --- /dev/null +++ b/sounds/select.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bnbf1nfaxuagi" +path="res://.godot/imported/select.ogg-c7e346119419231e86eb892abcba5520.oggvorbisstr" + +[deps] + +source_file="res://sounds/select.ogg" +dest_files=["res://.godot/imported/select.ogg-c7e346119419231e86eb892abcba5520.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/sounds/templateiguess.mmpz b/sounds/templateiguess.mmpz deleted file mode 100644 index d1d4b4b..0000000 Binary files a/sounds/templateiguess.mmpz and /dev/null differ diff --git a/sounds/templateiguess.mmpz.bak b/sounds/templateiguess.mmpz.bak deleted file mode 100644 index 2efa8e2..0000000 Binary files a/sounds/templateiguess.mmpz.bak and /dev/null differ