Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23

godot/Level/Island.tscn

@@ -1,7 +1,6 @@
 [gd_scene load_steps=31 format=3 uid="uid://3d51hjh2st8a"]
 
 [ext_resource type="PackedScene" uid="uid://d2d4uv7o5gx5p" path="res://Level/World/screen_shader.tscn" id="1_huyen"]
-[ext_resource type="PackedScene" uid="uid://b35w4hlh4n1jt" path="res://Level/World/world_environment.tscn" id="2_lerrn"]
 [ext_resource type="PackedScene" uid="uid://d3ccrfjpg4hbv" path="res://Models/palm_curved.tscn" id="3_bth2b"]
 [ext_resource type="PackedScene" uid="uid://c1n2lfcn4rkx7" path="res://Models/palm_default.tscn" id="4_2cnue"]
 [ext_resource type="PackedScene" uid="uid://ctbyl0qbks4k6" path="res://Models/ocean.tscn" id="4_dey2i"]
@@ -23,8 +22,9 @@
 [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" uid="uid://ukful430mmkn" path="res://color_cube.tscn" id="25_rm0cr"]
+[ext_resource type="PackedScene" path="res://color_cube.tscn" id="25_rm0cr"]
 [ext_resource type="PackedScene" uid="uid://bw3k2c75qavce" path="res://Models/beach_decor/bucket.tscn" id="27_f3p1i"]
+[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"]
 
 [sub_resource type="Animation" id="Animation_jpnyu"]
@@ -53,8 +53,6 @@ size = Vector3(19.9041, 1, 1)
 
 [node name="ScreenShader" parent="." instance=ExtResource("1_huyen")]
 
-[node name="WorldEnvironment" parent="." instance=ExtResource("2_lerrn")]
-
 [node name="island" parent="." instance=ExtResource("4_lq6cy")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 
@@ -420,21 +418,27 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.11439, 2.14828, -1.28646)
 
 [node name="OmniLight3D" parent="." instance=ExtResource("25_novxt")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.13746, 2.69992, -0.435097)
+light_energy = 0.1
 
 [node name="OmniLight3D2" parent="." instance=ExtResource("25_novxt")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.22669, 2.84986, -2.06954)
+light_energy = 0.1
 
 [node name="OmniLight3D3" parent="." instance=ExtResource("25_novxt")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.76529, 2.60448, -0.160995)
+light_energy = 0.1
 
 [node name="OmniLight3D4" parent="." instance=ExtResource("25_novxt")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.57077, 2.69259, -2.05053)
+light_energy = 0.1
 
 [node name="OmniLight3D5" parent="." instance=ExtResource("25_novxt")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.41671, 2.76416, -1.32509)
+light_energy = 0.1
 
 [node name="OmniLight3D6" parent="." instance=ExtResource("25_novxt")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.19657, 2.76902, -1.46035)
+light_energy = 0.1
 
 [node name="WorldBottom" type="StaticBody3D" parent="."]
 
@@ -470,6 +474,8 @@ transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 4.0092
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.12274, 3.12891, 9.31375)
 shape = SubResource("BoxShape3D_um2bu")
 
+[node name="DayNightEnvironment" parent="." instance=ExtResource("27_jutn4")]
+
 [connection signal="finished" from="Music" to="Music" method="_on_finished"]
 [connection signal="timeout" from="Music/Transition" to="Music" method="_on_transition_timer_timeout"]
 [connection signal="timeout" from="Music/Tween" to="Music" method="_on_tween_timer_timeout"]

godot/Level/World/DayNightEnvironment.tscn

@@ -1,24 +1,27 @@
-[gd_scene load_steps=7 format=3 uid="uid://6ycop5t3nra5"]
+[gd_scene load_steps=8 format=3 uid="uid://6ycop5t3nra5"]
 
-[ext_resource type="Texture2D" uid="uid://6k4ialfiwfxe" path="res://Textures/blueskygradient.jpg" id="1_l2fuq"]
+[sub_resource type="Gradient" id="Gradient_6ntap"]
+colors = PackedColorArray(0, 0.447059, 0.603922, 1, 0, 0, 0, 1)
 
-[sub_resource type="PhysicalSkyMaterial" id="PhysicalSkyMaterial_jvebd"]
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_bagcs"]
-turbidity = 50.0
+gradient = SubResource("Gradient_6ntap")
-sun_disk_scale = 0.5
+fill_from = Vector2(1, 0.525641)
-ground_color = Color(0, 0, 0, 1)
-night_sky = ExtResource("1_l2fuq")
 
-[sub_resource type="Sky" id="Sky_ummxe"]
+[sub_resource type="PhysicalSkyMaterial" id="PhysicalSkyMaterial_es06v"]
-sky_material = SubResource("PhysicalSkyMaterial_jvebd")
+night_sky = SubResource("GradientTexture2D_bagcs")
+
+[sub_resource type="Sky" id="Sky_qcavb"]
+sky_material = SubResource("PhysicalSkyMaterial_es06v")
 
 [sub_resource type="Environment" id="Environment_d42bf"]
 background_mode = 2
 background_energy_multiplier = 0.5
-sky = SubResource("Sky_ummxe")
+sky = SubResource("Sky_qcavb")
+sky_rotation = Vector3(6.28319, 0, 0)
 
 [sub_resource type="Animation" id="Animation_l6y5u"]
 resource_name = "DayNightCycle"
-length = 10.0
+length = 300.0
 loop_mode = 1
 tracks/0/type = "value"
 tracks/0/imported = false
@@ -27,10 +30,10 @@ tracks/0/path = NodePath("DirectionalLight3D:rotation")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0, 10),
+"times": PackedFloat32Array(0, 300),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Vector3(0, 0, 0), Vector3(6.28319, 0, 0)]
+"values": [Vector3(0, 0, 0), Vector3(0, 0, 0)]
 }
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_2t5g8"]
@@ -44,6 +47,7 @@ _data = {
 environment = SubResource("Environment_d42bf")
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+light_energy = 0.75
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 autoplay = "DayNightCycle"

godot/Models/grape_man.tscn

@@ -154,7 +154,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.103747, 0, 0, 0.994604)
+bones/0/rotation = Quaternion(0.104104, 0, 0, 0.994567)
 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 +169,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 +192,5 @@ 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")