diff --git a/Audio/hoest-yentl.wav b/Audio/hoest-yentl.wav index b4c5529..333f945 100644 Binary files a/Audio/hoest-yentl.wav and b/Audio/hoest-yentl.wav differ diff --git a/Kamer.tscn b/Kamer.tscn index 2a8305e..ef45d7a 100644 --- a/Kamer.tscn +++ b/Kamer.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=3 uid="uid://cm3uix0tqqavw"] +[gd_scene load_steps=31 format=3 uid="uid://cm3uix0tqqavw"] [ext_resource type="PackedScene" uid="uid://d4hqxyxouje7e" path="res://Objects/Meshes/kamer.glb" id="1_50aco"] [ext_resource type="Texture2D" uid="uid://bjok373y2ssb3" path="res://Images/sky.hdr" id="2_2aenl"] @@ -17,53 +17,53 @@ [ext_resource type="AudioStream" uid="uid://cdyategn54nml" path="res://Audio/F#.mp3" id="14_uv1td"] [ext_resource type="AudioStream" uid="uid://wphketv7cs0b" path="res://Audio/D.mp3" id="15_k8hy3"] [ext_resource type="AudioStream" uid="uid://csa4bd0pvp5as" path="res://Audio/pianomuziek.mp3" id="17_1cw2k"] +[ext_resource type="FontFile" uid="uid://ba6teo1asddxo" path="res://Fonts/Galimer-ExtraLight.ttf" id="17_7yj1s"] [ext_resource type="Script" path="res://Scripts/Gui.gd" id="18_80vxw"] -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_bn6fj"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_78vk0"] transparency = 1 albedo_color = Color(0.14902, 0.152941, 0.164706, 0.47451) -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_ru3o2"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_nikfu"] points = PackedVector3Array(-1.05, -0.5247, -0.4794, -2.4247e-05, 0.5253, 0.5706, -2.4247e-05, 0.5253, -0.4794, -2.4247e-05, -0.5247, 0.5706, -1.05, 0.5253, 0.5706, -2.4247e-05, -0.5247, -0.4794, -1.05, 0.5253, -0.4794, -1.05, -0.5247, 0.5706) -[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_1vwq2"] +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_yxpwa"] data = PackedVector3Array(-2.0289, -1.2789, 2.0289, -2.0289, 1.2789, 2.0289, -2.0289, 1.2789, -2.0289, -2.0289, -1.2789, 2.0289, -2.0289, 1.2789, -2.0289, -2.0289, -1.2789, -2.0289, 2.0289, -1.2789, -2.0289, 2.0289, 1.2789, -2.0289, 2.0289, 1.2789, 2.0289, 2.0289, -1.2789, -2.0289, 2.0289, 1.2789, 2.0289, 2.0289, -1.2789, 2.0289, -2.0289, -1.2789, -2.0289, -2.0289, 1.2789, -2.0289, 2.0289, 1.2789, -2.0289, -2.0289, -1.2789, -2.0289, 2.0289, 1.2789, -2.0289, 2.0289, -1.2789, -2.0289, -0.5269, -1.2789, 2.0289, -0.5269, 0.9153, 2.0289, -2.0289, 1.2789, 2.0289, -0.5269, -1.2789, 2.0289, -2.0289, 1.2789, 2.0289, -2.0289, -1.2789, 2.0289, 0.5269, 0.9153, 2.0289, 0.5269, -1.2789, 2.0289, 2.0289, -1.2789, 2.0289, 0.5269, 0.9153, 2.0289, 2.0289, -1.2789, 2.0289, 2.0289, 1.2789, 2.0289, -0.5269, 0.9153, 2.0289, 0.5269, 0.9153, 2.0289, 2.0289, 1.2789, 2.0289, -0.5269, 0.9153, 2.0289, 2.0289, 1.2789, 2.0289, -2.0289, 1.2789, 2.0289, 0.5269, -1.2789, 2.0289, -0.5269, -1.2789, 2.0289, 2.0289, -1.2789, 2.0289, -0.5269, -1.2789, 2.0289, -2.0289, -1.2789, 2.0289, 2.0289, -1.2789, 2.0289, 0.8296, 1.2789, 0.8296, -0.8296, 1.2789, 0.8296, -2.0289, 1.2789, 2.0289, 0.8296, 1.2789, 0.8296, -2.0289, 1.2789, 2.0289, 2.0289, 1.2789, 2.0289, 0.8296, 1.2789, -0.8296, 0.8296, 1.2789, 0.8296, 2.0289, 1.2789, 2.0289, 0.8296, 1.2789, -0.8296, 2.0289, 1.2789, 2.0289, 2.0289, 1.2789, -2.0289, -0.8296, 1.2789, 0.8296, -0.8296, 1.2789, -0.8296, -2.0289, 1.2789, -2.0289, -0.8296, 1.2789, 0.8296, -2.0289, 1.2789, -2.0289, -2.0289, 1.2789, 2.0289, -0.8296, 1.2789, -0.8296, 0.8296, 1.2789, -0.8296, 2.0289, 1.2789, -2.0289, -0.8296, 1.2789, -0.8296, 2.0289, 1.2789, -2.0289, -2.0289, 1.2789, -2.0289, -2.0731, -1.3202, 2.0702, -2.0711, -1.3211, -2.0711, -2.066, 1.3276, -2.071, -2.0731, -1.3202, 2.0702, -2.066, 1.3276, -2.071, -2.071, 1.3276, 2.066, -2.0711, -1.3211, -2.0711, -2.0731, -1.3202, 2.0702, 2.0731, -1.3202, 2.0702, -2.0711, -1.3211, -2.0711, 2.0731, -1.3202, 2.0702, 2.0711, -1.3212, -2.0711, 2.0711, -1.3212, -2.0711, 2.0731, -1.3202, 2.0702, 2.071, 1.3276, 2.066, 2.0711, -1.3212, -2.0711, 2.071, 1.3276, 2.066, 2.066, 1.3276, -2.071, -2.0711, -1.3211, -2.0711, 2.0711, -1.3212, -2.0711, 2.066, 1.3276, -2.071, -2.0711, -1.3211, -2.0711, 2.066, 1.3276, -2.071, -2.066, 1.3276, -2.071, -0.5269, -1.2789, 2.0711, -2.0731, -1.3202, 2.0702, -2.071, 1.3276, 2.066, -0.5269, -1.2789, 2.0711, -2.071, 1.3276, 2.066, -0.5269, 0.9153, 2.0711, 0.5269, 0.9153, 2.0711, 2.071, 1.3276, 2.066, 2.0731, -1.3202, 2.0702, 0.5269, 0.9153, 2.0711, 2.0731, -1.3202, 2.0702, 0.5269, -1.2789, 2.0711, -0.5269, 0.9153, 2.0711, -2.071, 1.3276, 2.066, 2.071, 1.3276, 2.066, -0.5269, 0.9153, 2.0711, 2.071, 1.3276, 2.066, 0.5269, 0.9153, 2.0711, 0.5269, -1.2789, 2.0711, 2.0731, -1.3202, 2.0702, -2.0731, -1.3202, 2.0702, 0.5269, -1.2789, 2.0711, -2.0731, -1.3202, 2.0702, -0.5269, -1.2789, 2.0711, 0.8294, 1.6416, 0.8294, 2.071, 1.3276, 2.066, -2.071, 1.3276, 2.066, 0.8294, 1.6416, 0.8294, -2.071, 1.3276, 2.066, -0.8294, 1.6416, 0.8294, 0.8294, 1.6416, -0.8294, 2.066, 1.3276, -2.071, 2.071, 1.3276, 2.066, 0.8294, 1.6416, -0.8294, 2.071, 1.3276, 2.066, 0.8294, 1.6416, 0.8294, -0.8294, 1.6416, 0.8294, -2.071, 1.3276, 2.066, -2.066, 1.3276, -2.071, -0.8294, 1.6416, 0.8294, -2.066, 1.3276, -2.071, -0.8294, 1.6416, -0.8294, -0.8294, 1.6416, -0.8294, -2.066, 1.3276, -2.071, 2.066, 1.3276, -2.071, -0.8294, 1.6416, -0.8294, 2.066, 1.3276, -2.071, 0.8294, 1.6416, -0.8294, -0.8296, 1.2789, 0.8296, 0.8296, 1.2789, 0.8296, 0.8294, 1.6416, 0.8294, -0.8296, 1.2789, 0.8296, 0.8294, 1.6416, 0.8294, -0.8294, 1.6416, 0.8294, 0.5269, 0.9153, 2.0289, -0.5269, 0.9153, 2.0289, -0.5269, 0.9153, 2.0711, 0.5269, 0.9153, 2.0289, -0.5269, 0.9153, 2.0711, 0.5269, 0.9153, 2.0711, 0.8296, 1.2789, -0.8296, -0.8296, 1.2789, -0.8296, -0.8294, 1.6416, -0.8294, 0.8296, 1.2789, -0.8296, -0.8294, 1.6416, -0.8294, 0.8294, 1.6416, -0.8294, -0.5269, 0.9153, 2.0289, -0.5269, -1.2789, 2.0289, -0.5269, -1.2789, 2.0711, -0.5269, 0.9153, 2.0289, -0.5269, -1.2789, 2.0711, -0.5269, 0.9153, 2.0711, 0.8296, 1.2789, 0.8296, 0.8296, 1.2789, -0.8296, 0.8294, 1.6416, -0.8294, 0.8296, 1.2789, 0.8296, 0.8294, 1.6416, -0.8294, 0.8294, 1.6416, 0.8294, -0.5269, -1.2789, 2.0289, 0.5269, -1.2789, 2.0289, 0.5269, -1.2789, 2.0711, -0.5269, -1.2789, 2.0289, 0.5269, -1.2789, 2.0711, -0.5269, -1.2789, 2.0711, 0.5269, -1.2789, 2.0289, 0.5269, 0.9153, 2.0289, 0.5269, 0.9153, 2.0711, 0.5269, -1.2789, 2.0289, 0.5269, 0.9153, 2.0711, 0.5269, -1.2789, 2.0711, -0.8296, 1.2789, -0.8296, -0.8296, 1.2789, 0.8296, -0.8294, 1.6416, 0.8294, -0.8296, 1.2789, -0.8296, -0.8294, 1.6416, 0.8294, -0.8294, 1.6416, -0.8294, -2.0289, -1.2789, -2.0289, 2.0289, -1.2789, -2.0289, 2.0289, -1.2789, 2.0289, -2.0289, -1.2789, -2.0289, 2.0289, -1.2789, 2.0289, -2.0289, -1.2789, 2.0289) -[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_qxjrj"] +[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_bxgh2"] panorama = ExtResource("2_2aenl") -[sub_resource type="Sky" id="Sky_54rpa"] -sky_material = SubResource("PanoramaSkyMaterial_qxjrj") +[sub_resource type="Sky" id="Sky_eixpi"] +sky_material = SubResource("PanoramaSkyMaterial_bxgh2") radiance_size = 1 -[sub_resource type="Environment" id="Environment_tjd70"] +[sub_resource type="Environment" id="Environment_xu0tm"] background_mode = 2 background_energy_multiplier = 0.5 -sky = SubResource("Sky_54rpa") +sky = SubResource("Sky_eixpi") ambient_light_sky_contribution = 0.01 reflected_light_source = 1 tonemap_mode = 3 -ssao_intensity = 7.65 -sdfgi_energy = 10.0 +ssao_enabled = true volumetric_fog_density = 0.1529 -[sub_resource type="CapsuleMesh" id="CapsuleMesh_08urk"] +[sub_resource type="CapsuleMesh" id="CapsuleMesh_2anhq"] height = 3.703 -[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_djjyr"] +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_6cmwy"] radius = 0.8 height = 4.5 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_ofuss"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_fxqfk"] render_priority = 0 shader = ExtResource("8_oclf0") -[sub_resource type="TextMesh" id="TextMesh_2mo7i"] -material = SubResource("ShaderMaterial_ofuss") +[sub_resource type="TextMesh" id="TextMesh_xx8lm"] +material = SubResource("ShaderMaterial_fxqfk") text = "1984" depth = 0.01 -[sub_resource type="BoxShape3D" id="BoxShape3D_6llxy"] +[sub_resource type="BoxShape3D" id="BoxShape3D_ahrce"] [node name="kamer" instance=ExtResource("1_50aco")] script = ExtResource("2_m2v8w") @@ -71,7 +71,6 @@ script = ExtResource("2_m2v8w") [node name="IndirectLight" type="OmniLight3D" parent="." index="0"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.68221, -0.692571, -1.67621) light_color = Color(1, 0.952941, 0.898039, 1) -light_energy = 1.389 light_size = 1.0 light_specular = 0.0 shadow_enabled = true @@ -105,18 +104,21 @@ omni_range = 10.0 omni_attenuation = 0.435276 [node name="Dakraam" parent="Room" index="0"] -surface_material_override/0 = SubResource("StandardMaterial3D_bn6fj") +surface_material_override/0 = SubResource("StandardMaterial3D_78vk0") [node name="Doorframe" parent="Room" index="1"] cast_shadow = 0 +[node name="Door" parent="Room/Doorframe" index="0"] +transform = Transform3D(0.948, 0, 0, 0, 0.955, 0, 0, 0, 0.7, 0.472735, -0.0314843, -0.0304289) + [node name="Deur" type="StaticBody3D" parent="Room/Doorframe/Door" index="0"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Doorframe/Door/Deur" index="0"] -shape = SubResource("ConvexPolygonShape3D_ru3o2") +shape = SubResource("ConvexPolygonShape3D_nikfu") [node name="OmniLight3D2" type="OmniLight3D" parent="Room" index="2"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.533369, 1.5549, -0.629147) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.533369, 1.60456, -0.629147) light_color = Color(1, 0.960784, 0.933333, 1) light_energy = 6.867 light_indirect_energy = 0.0 @@ -128,10 +130,10 @@ omni_attenuation = 0.108819 [node name="StaticBody3D" type="StaticBody3D" parent="Room" index="3"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Room/StaticBody3D" index="0"] -shape = SubResource("ConcavePolygonShape3D_1vwq2") +shape = SubResource("ConcavePolygonShape3D_yxpwa") [node name="WorldEnvironment" type="WorldEnvironment" parent="." index="4"] -environment = SubResource("Environment_tjd70") +environment = SubResource("Environment_xu0tm") [node name="Zon" type="DirectionalLight3D" parent="." index="5"] transform = Transform3D(0.744253, 0.38803, -0.543618, 0.0836868, 0.753332, 0.652294, 0.662634, -0.530966, 0.528196, 0, 4.22767, 0) @@ -156,7 +158,7 @@ transform = Transform3D(1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 1.969, 0 [node name="FlashLight" type="MeshInstance3D" parent="." index="9"] transform = Transform3D(0.0965925, -0.0258819, -1.13134e-09, 0, -4.37114e-09, 0.1, -0.0258819, -0.0965925, -4.2222e-09, -1.21576, -0.391011, -1.00824) -mesh = SubResource("CapsuleMesh_08urk") +mesh = SubResource("CapsuleMesh_2anhq") skeleton = NodePath("../safe") [node name="FlashLight" type="StaticBody3D" parent="FlashLight" index="0"] @@ -165,7 +167,7 @@ collision_layer = 2 [node name="CollisionShape3D" type="CollisionShape3D" parent="FlashLight/FlashLight" index="0"] transform = Transform3D(1, 0, 8.88178e-16, 0, 1, -7.10543e-15, 0, 0, 1, 0, 0, 0) -shape = SubResource("CapsuleShape3D_djjyr") +shape = SubResource("CapsuleShape3D_6cmwy") [node name="safe" parent="." index="10" instance=ExtResource("6_3qx7f")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -1.50079, -0.0682462, -1.05664) @@ -175,7 +177,7 @@ transform = Transform3D(-8.74228e-09, 0, 0.2, 0, 0.2, 0, -0.2, 0, -8.74228e-09, [node name="CombiCode" type="MeshInstance3D" parent="." index="12"] transform = Transform3D(0.709362, 0.443678, -0.547682, -5.96046e-08, 0.777026, 0.62947, 0.704845, -0.446522, 0.551192, 1.84123, -0.566121, -1.81842) -mesh = SubResource("TextMesh_2mo7i") +mesh = SubResource("TextMesh_xx8lm") [node name="Slot" parent="." index="13" instance=ExtResource("9_pjl12")] transform = Transform3D(-4.37114e-09, 0, 0.1, 0, 0.1, 0, -0.1, 0, -4.37114e-09, -1.95266, 0.0372345, 0.0309203) @@ -201,7 +203,7 @@ script = ExtResource("13_srhqr") [node name="CollisionShape3D" type="CollisionShape3D" parent="Einde" index="0"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.113057) -shape = SubResource("BoxShape3D_6llxy") +shape = SubResource("BoxShape3D_ahrce") [node name="Wincamera" type="Camera3D" parent="Einde" index="1"] transform = Transform3D(-0.717378, 0.325996, 0.615708, 0.022655, 0.894217, -0.447061, -0.696316, -0.306763, -0.648877, -0.0045743, -0.224675, 3.27438) @@ -248,17 +250,17 @@ grow_vertical = 2 [node name="RichTextLabel" type="RichTextLabel" parent="Einde/Thx/CenterContainer" index="0"] clip_contents = false -custom_minimum_size = Vector2(300, 0) +custom_minimum_size = Vector2(300, 300) layout_mode = 2 size_flags_horizontal = 0 size_flags_vertical = 4 theme_override_colors/default_color = Color(0, 0, 0, 1) theme_override_colors/font_selected_color = Color(0, 0, 0, 1) theme_override_colors/font_shadow_color = Color(0, 0, 0, 1) +theme_override_fonts/normal_font = ExtResource("17_7yj1s") theme_override_font_sizes/normal_font_size = 72 bbcode_enabled = true text = "[center]Thanks for playing[/center]" -fit_content_height = true [node name="MarginContainer" type="MarginContainer" parent="Einde/Thx" index="1"] layout_mode = 1 diff --git a/Scripts/Splash.gd b/Scripts/Splash.gd index 7692d5b..04fd701 100644 --- a/Scripts/Splash.gd +++ b/Scripts/Splash.gd @@ -12,22 +12,20 @@ func _ready(): anim.play("default") $Draakje/Hoest.playing = true var size = get_viewport_rect().size - anim.position = Vector2(size.x/2, size.y/2) - var bg = get_theme_stylebox("panel") - bg.bg_color = Color("3a223a") + anim.position = Vector2(size.x/2, size.y/2 - 100) func _process(delta): if fadeout: - opacity_dragon -= delta * 2.0 + opacity_dragon = max(0.0, opacity_dragon - delta * 2.0) anim.material.set_shader_parameter("opacity", opacity_dragon) - $Draakje/Label.material.set_shader_parameter("opacity", opacity_dragon) - if opacity_dragon <= 0.25: + if opacity_dragon <= 0.99: if !start: - get_tree().root.add_child(room) + get_tree().get_root().add_child(room) var bg = get_theme_stylebox("panel") - opacity_panel -= delta * 0.5 + opacity_panel -= delta * (1.1 - opacity_panel) bg.bg_color.a = opacity_panel if opacity_panel <= 0: + print("free willy") queue_free() #Recenter draakje diff --git a/Splash.tscn b/Splash.tscn index dd54ae2..30bf1ea 100644 --- a/Splash.tscn +++ b/Splash.tscn @@ -25,10 +25,11 @@ [ext_resource type="Texture2D" uid="uid://bddxdc4c07tmm" path="res://Images/draakje/872063671600304149-png_apngframe21.png" id="21_ot667"] [ext_resource type="Texture2D" uid="uid://bmlmk8ccxgg8k" path="res://Images/draakje/872063671600304149-png_apngframe22.png" id="22_ndb6m"] [ext_resource type="Texture2D" uid="uid://bj4dwjugfwi2b" path="res://Images/draakje/872063671600304149-png_apngframe23.png" id="23_nsh3l"] +[ext_resource type="FontFile" uid="uid://ba6teo1asddxo" path="res://Fonts/Galimer-ExtraLight.ttf" id="26_de6rn"] [ext_resource type="AudioStream" uid="uid://1etkpg552pkc" path="res://Audio/hoest-yentl.wav" id="26_p05g5"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_117ed"] -bg_color = Color(0.227451, 0.133333, 0.227451, 1) +bg_color = Color(0.984314, 1, 0.937255, 1) [sub_resource type="SpriteFrames" id="SpriteFrames_wd2ai"] animations = [{ @@ -125,33 +126,12 @@ animations = [{ }, { "duration": 1.0, "texture": ExtResource("23_nsh3l") -}, { -"duration": 1.0, -"texture": ExtResource("23_nsh3l") -}, { -"duration": 1.0, -"texture": ExtResource("23_nsh3l") -}, { -"duration": 1.0, -"texture": ExtResource("1_v6etj") -}, { -"duration": 1.0, -"texture": ExtResource("1_v6etj") -}, { -"duration": 1.0, -"texture": ExtResource("1_v6etj") }], "loop": false, "name": &"default", "speed": 10.0 }] -[sub_resource type="SystemFont" id="SystemFont_8q1ew"] -font_names = PackedStringArray("Noto Sans Khmer") -font_weight = 999 -hinting = 2 -subpixel_positioning = 3 - [node name="Splash" type="Control"] layout_mode = 3 anchors_preset = 15 @@ -180,26 +160,21 @@ sprite_frames = SubResource("SpriteFrames_wd2ai") [node name="Label" type="Label" parent="Panel/Draakje"] material = ExtResource("2_cayiq") -anchors_preset = 8 +anchors_preset = 7 anchor_left = 0.5 -anchor_top = 0.5 +anchor_top = 1.0 anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -349.0 -offset_top = -14.0 -offset_right = 221.0 -offset_bottom = 66.0 +anchor_bottom = 1.0 +offset_left = -260.0 +offset_top = -59.5 +offset_right = 524.0 +offset_bottom = 44.5 grow_horizontal = 2 -grow_vertical = 2 -theme_override_colors/font_color = Color(0.32549, 0.662745, 0.494118, 1) -theme_override_colors/font_shadow_color = Color(0.556863, 0.564706, 0.513726, 1) -theme_override_colors/font_outline_color = Color(0, 0, 0, 1) -theme_override_constants/shadow_offset_x = 2 -theme_override_constants/shadow_offset_y = 3 -theme_override_constants/outline_size = 25 -theme_override_constants/shadow_outline_size = 0 -theme_override_fonts/font = SubResource("SystemFont_8q1ew") -theme_override_font_sizes/font_size = 36 +grow_vertical = 0 +scale = Vector2(0.5, 0.5) +theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_fonts/font = ExtResource("26_de6rn") +theme_override_font_sizes/font_size = 96 text = "Coughing Dragon" horizontal_alignment = 1