diff --git a/godot/Level/Island.tscn b/godot/Level/Island.tscn index 50ff3f0..a09b494 100644 --- a/godot/Level/Island.tscn +++ b/godot/Level/Island.tscn @@ -22,10 +22,10 @@ [ext_resource type="PackedScene" uid="uid://c4s6y758n77lw" path="res://villager_shared.tscn" id="24_ddfvk"] [ext_resource type="PackedScene" uid="uid://b3aus2kigf8xt" path="res://Models/beach_decor/cooler.tscn" id="24_sl7ne"] [ext_resource type="PackedScene" uid="uid://cft26nug7kyqb" path="res://ambient_light_1.tscn" id="25_novxt"] -[ext_resource type="PackedScene" path="res://color_cube.tscn" id="25_rm0cr"] -[ext_resource type="PackedScene" path="res://slime_kill_box.tscn" id="27_cjxk6"] +[ext_resource type="PackedScene" uid="uid://ukful430mmkn" path="res://color_cube.tscn" id="25_rm0cr"] +[ext_resource type="PackedScene" uid="uid://d2pvg0f5jtpve" path="res://slime_kill_box.tscn" id="27_cjxk6"] [ext_resource type="PackedScene" uid="uid://bw3k2c75qavce" path="res://Models/beach_decor/bucket.tscn" id="27_f3p1i"] -[ext_resource type="PackedScene" path="res://Level/World/DayNightEnvironment.tscn" id="27_jutn4"] +[ext_resource type="PackedScene" uid="uid://6ycop5t3nra5" path="res://Level/World/DayNightEnvironment.tscn" id="27_jutn4"] [ext_resource type="PackedScene" uid="uid://g4gmc0pwlak1" path="res://Models/buildings/fence.tscn" id="28_prydb"] [ext_resource type="PackedScene" uid="uid://ckbba1bs71tl" path="res://crate.tscn" id="28_x0lrj"] diff --git a/godot/Models/grape_man.tscn b/godot/Models/grape_man.tscn index bee880f..759ad10 100644 --- a/godot/Models/grape_man.tscn +++ b/godot/Models/grape_man.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=41 format=3 uid="uid://bgoo1lbt28na"] +[gd_scene load_steps=42 format=3 uid="uid://bgoo1lbt28na"] [ext_resource type="PackedScene" uid="uid://bhanbx2dyhv2d" path="res://Models/grape_man.glb" id="1_fh5yr"] [ext_resource type="Script" path="res://Models/grape_man.gd" id="2_ksje8"] @@ -6,6 +6,7 @@ [ext_resource type="AudioStream" uid="uid://baocyd0p3jcku" path="res://Sounds/pickup_grunt.ogg" id="4_nvurj"] [ext_resource type="AudioStream" uid="uid://b80t5xqckjoqk" path="res://Sounds/heartychuckle.ogg" id="5_b32re"] [ext_resource type="AudioStream" uid="uid://0mhkf1ls1wcn" path="res://Sounds/sadsound.ogg" id="6_qe4bi"] +[ext_resource type="AudioStream" uid="uid://bmocmgq06o6f5" path="res://Sounds/footstep.ogg" id="7_b2ik0"] [sub_resource type="AnimationNodeAdd2" id="AnimationNodeAdd2_a0vxm"] filters = ["rig/Skeleton3D:forearm.L", "rig/Skeleton3D:forearm.R", "rig/Skeleton3D:head", "rig/Skeleton3D:upper_arm.L", "rig/Skeleton3D:upper_arm.R"] @@ -154,7 +155,7 @@ transform = Transform3D(0.065, 0, 0, 0, 0.065, 0, 0, 0, 0.065, 0, 0, 0) script = ExtResource("2_ksje8") [node name="Skeleton3D" parent="rig" index="0"] -bones/0/rotation = Quaternion(0.0664168, 0, 0, 0.997792) +bones/0/rotation = Quaternion(0.0733902, 0, 0, 0.997303) bones/1/rotation = Quaternion(-0.0891896, 1.18734e-07, -1.06322e-08, 0.996015) bones/2/rotation = Quaternion(0.0133933, -1.19199e-07, 1.5966e-09, 0.99991) bones/3/rotation = Quaternion(-0.00997737, 0.100365, -0.694951, 0.711948) @@ -169,6 +170,7 @@ bones/15/rotation = Quaternion(0.105246, -0.0039338, 0.0113526, 0.994374) [node name="OmniLight3D" type="OmniLight3D" parent="." index="2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.289473, 8.26292, 4.26359) +light_energy = 0.5 [node name="AnimationTree" type="AnimationTree" parent="." index="3"] tree_root = SubResource("AnimationNodeStateMachine_6mfdu") @@ -191,5 +193,9 @@ stream = ExtResource("5_b32re") [node name="sad" type="AudioStreamPlayer" parent="." index="7"] stream = ExtResource("6_qe4bi") -[node name="woohoo" type="AudioStreamPlayer" parent="." index="8"] +[node name="soundboard" type="AudioStreamPlayer" parent="." index="8"] stream = ExtResource("6_qe4bi") + +[node name="footstep" type="AudioStreamPlayer" parent="." index="9"] +stream = ExtResource("7_b2ik0") +volume_db = -10.0 diff --git a/godot/Models/island.tscn b/godot/Models/island.tscn index 2d39693..e29ec4f 100644 --- a/godot/Models/island.tscn +++ b/godot/Models/island.tscn @@ -1,15 +1,11 @@ -[gd_scene load_steps=5 format=3 uid="uid://difi2tur2j4dg"] +[gd_scene load_steps=4 format=3 uid="uid://difi2tur2j4dg"] [ext_resource type="PackedScene" uid="uid://dfyt6kjw8yli" path="res://Models/island.glb" id="1_5vc8b"] [ext_resource type="Script" path="res://Models/island.gd" id="2_1q8nk"] [ext_resource type="Material" uid="uid://yuhlhpwji3c4" path="res://Textures/sand.tres" id="2_nhexh"] -[ext_resource type="Material" uid="uid://b88xmds4mx7rd" path="res://Textures/grass.tres" id="4_uusb2"] [node name="island" instance=ExtResource("1_5vc8b")] script = ExtResource("2_1q8nk") [node name="Island" parent="." index="0"] material_override = ExtResource("2_nhexh") - -[node name="Island_001" parent="." index="2"] -surface_material_override/0 = ExtResource("4_uusb2") diff --git a/godot/player.tscn b/godot/player.tscn index 4b969c4..55e8271 100644 --- a/godot/player.tscn +++ b/godot/player.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=6 format=3 uid="uid://7utef1nnena8"] +[gd_scene load_steps=7 format=3 uid="uid://7utef1nnena8"] [ext_resource type="Script" path="res://Player.gd" id="1_7gpdp"] [ext_resource type="PackedScene" uid="uid://bgoo1lbt28na" path="res://Models/grape_man.tscn" id="2_ctyy5"] [ext_resource type="Script" path="res://Holster.gd" id="3_a68da"] +[ext_resource type="PackedScene" uid="uid://cbca7q18ae42h" path="res://UI/PauseMenu.tscn" id="4_kcqpl"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kb4ms"] radius = 0.0669067 @@ -24,8 +25,7 @@ shape = SubResource("CapsuleShape3D_kb4ms") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.389874, 0) [node name="PlayerCam" type="Camera3D" parent="CameraMount"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.643936) -current = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.930216) fov = 50.0 [node name="Holster" type="Node3D" parent="."] @@ -37,6 +37,9 @@ script = ExtResource("3_a68da") transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0.0672282, 0) shape = SubResource("SphereShape3D_6l1w6") +[node name="PauseMenu" parent="." instance=ExtResource("4_kcqpl")] +visible = false + [connection signal="anim_check_grab" from="grape_man" to="." method="_on_grape_man_anim_check_grab"] [connection signal="body_entered" from="Holster/Area3D" to="." method="_on_holster_enter"] [connection signal="body_exited" from="Holster/Area3D" to="." method="_on_holster_exit"]