diff --git a/elements/ring.tscn b/elements/ring.tscn index 898bee7..e10d852 100644 --- a/elements/ring.tscn +++ b/elements/ring.tscn @@ -33,8 +33,8 @@ stream_1/stream = ExtResource("3_lkqw0") use_collision = true inner_radius = 4.0 outer_radius = 8.0 -sides = 16 -ring_sides = 8 +sides = 32 +ring_sides = 16 material = ExtResource("1_48h5f") script = SubResource("GDScript_86vhg") diff --git a/graphics/happy_material.tres b/graphics/happy_material.tres index 4cdfa67..8d285ac 100644 --- a/graphics/happy_material.tres +++ b/graphics/happy_material.tres @@ -1,5 +1,5 @@ [gd_resource type="StandardMaterial3D" format=3 uid="uid://df0n6u78ylb4h"] [resource] -albedo_color = Color(1, 0, 1, 1) -metallic_specular = 0.0 +albedo_color = Color(6.73831e-07, 0.700198, 0.789641, 1) +metallic_specular = 1.0 diff --git a/graphics/unhappy_material.tres b/graphics/unhappy_material.tres index e5d0a3d..c5bb7a3 100644 --- a/graphics/unhappy_material.tres +++ b/graphics/unhappy_material.tres @@ -1,4 +1,6 @@ [gd_resource type="StandardMaterial3D" format=3 uid="uid://brwwlwb1rpro7"] [resource] +albedo_color = Color(1, 0.32686, 0.232259, 1) metallic = 1.0 +metallic_specular = 0.0 diff --git a/index.tscn b/index.tscn index 814531d..35fb4b5 100644 --- a/index.tscn +++ b/index.tscn @@ -20,7 +20,9 @@ func _ready() -> void: $Informations.hide() $PauseMenu.hide() ## Add the version of the game and the name of the OS to the footer of the start menu - $StartMenu/VBoxContainer/MarginContainer2/Notice.text += \" - build \" + ProjectSettings.get_setting(\"application/config/version\") + \" (\" + os_name + \")\" + if OS.has_feature(\"editor\"): + $StartMenu/VBoxContainer/MarginContainer2/Notice.text = \"dev \" + $StartMenu/VBoxContainer/MarginContainer2/Notice.text += \"build \" + ProjectSettings.get_setting(\"application/config/version\") + \" (\" + os_name + \")\" func start_level(level_scene: PackedScene) -> void: $VictoryScreen.hide() @@ -421,7 +423,6 @@ theme_override_constants/margin_bottom = 20 [node name="Notice" type="Label" parent="StartMenu/VBoxContainer/MarginContainer2"] layout_mode = 2 -text = "Made during the 21st edition of Alakajam!" label_settings = SubResource("LabelSettings_5jdmh") horizontal_alignment = 1 diff --git a/levels/forest/environment.tscn b/levels/forest/environment.tscn index 4fd7d86..b4b9656 100644 --- a/levels/forest/environment.tscn +++ b/levels/forest/environment.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://w4h8ip754qnb"] +[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) diff --git a/levels/forest/level.tscn b/levels/forest/level.tscn index deffdc1..bb5308e 100644 --- a/levels/forest/level.tscn +++ b/levels/forest/level.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=8 format=3 uid="uid://dfvuxfxc6ooya"] +[gd_scene load_steps=11 format=3 uid="uid://dfvuxfxc6ooya"] -[ext_resource type="PackedScene" uid="uid://w4h8ip754qnb" path="res://levels/forest/environment.tscn" id="1_7clrg"] +[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://cnnvwotv33u1b" path="res://elements/player.tscn" id="2_mjogx"] [ext_resource type="PackedScene" uid="uid://cakmsiye3hjfe" path="res://levels/forest/music.tscn" id="3_n1xsx"] @@ -8,11 +8,37 @@ [ext_resource type="PackedScene" uid="uid://da6lkdiskdh8v" path="res://elements/tree.tscn" id="6_1e514"] [ext_resource type="PackedScene" uid="uid://c77bli40240nk" path="res://elements/sign.tscn" id="6_ifogr"] +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_grcut"] +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_gxmta"] +sky_material = SubResource("ProceduralSkyMaterial_grcut") + +[sub_resource type="Environment" id="Environment_y3whn"] +background_mode = 2 +sky = SubResource("Sky_gxmta") +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="Forest" type="Node3D"] script = ExtResource("1_fdxcj") metadata/name = "Forest" +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] +transform = Transform3D(-0.920505, 0.195366, -0.338383, 0, 0.866025, 0.5, 0.390731, 0.460252, -0.797181, 0, 0, 0) +shadow_enabled = true +directional_shadow_mode = 0 + [node name="Environment" parent="." instance=ExtResource("1_7clrg")] +environment = SubResource("Environment_y3whn") [node name="Music" parent="." instance=ExtResource("3_n1xsx")] @@ -110,7 +136,7 @@ transform = Transform3D(-49.1471, 0, -9.19585, 0, 50, 0, 9.19585, 0, -49.1471, - transform = Transform3D(-28.781, 0, 40.8859, 0, 50, 0, -40.8859, 0, -28.781, -460.677, -329.892, 361.614) [node name="Tree28" parent="Trees" instance=ExtResource("6_1e514")] -transform = Transform3D(-28.781, 0, 40.8859, 0, 50, 0, -40.8859, 0, -28.781, -643.482, -296.989, 101.924) +transform = Transform3D(-28.781, 0, 40.8859, 0, 50, 0, -40.8859, 0, -28.781, -643.482, -296.989, 139.279) [node name="Tree29" parent="Trees" instance=ExtResource("6_1e514")] transform = Transform3D(-29.5106, 0, 40.3624, 0, 50, 0, -40.3624, 0, -29.5106, -418.092, -296.989, 136.2)