diff --git a/src/animations/voice_training.res b/src/animations/voice_training.res new file mode 100644 index 0000000..eb9a932 Binary files /dev/null and b/src/animations/voice_training.res differ diff --git a/src/animations/youth_intro.res b/src/animations/youth_intro.res new file mode 100644 index 0000000..d3bc698 Binary files /dev/null and b/src/animations/youth_intro.res differ diff --git a/src/animations/youth_lights.res b/src/animations/youth_lights.res new file mode 100644 index 0000000..937d20a Binary files /dev/null and b/src/animations/youth_lights.res differ diff --git a/src/animations/youth_scenes.res b/src/animations/youth_scenes.res new file mode 100644 index 0000000..2e65433 Binary files /dev/null and b/src/animations/youth_scenes.res differ diff --git a/src/animations/youth_weather.res b/src/animations/youth_weather.res new file mode 100644 index 0000000..bbf013e Binary files /dev/null and b/src/animations/youth_weather.res differ diff --git a/src/base-environments/transition/train_line.gd b/src/base-environments/transition/train_line.gd deleted file mode 100644 index 5ba8864..0000000 --- a/src/base-environments/transition/train_line.gd +++ /dev/null @@ -1,14 +0,0 @@ -class_name TrainLine extends Resource - -enum id { - NONE, - RING, - U2, - U3, - U8 -} - -@export var train_id: id = id.NONE -@export var destination: StringName = "" -@export var via: StringName = "" -@export var stops: Dictionary[Station, float] diff --git a/src/base-environments/transition/train_line.gd.uid b/src/base-environments/transition/train_line.gd.uid deleted file mode 100644 index 9298f0d..0000000 --- a/src/base-environments/transition/train_line.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://dfkq0djtygmma diff --git a/src/base-environments/youth_room/scenes/voice_training.tscn b/src/base-environments/youth_room/scenes/voice_training.tscn index 50a9aa5..5f40938 100644 --- a/src/base-environments/youth_room/scenes/voice_training.tscn +++ b/src/base-environments/youth_room/scenes/voice_training.tscn @@ -1,4 +1,4 @@ -[gd_scene format=3 uid="uid://cj1ccdk0686ke"] +[gd_scene load_steps=12 format=3 uid="uid://cj1ccdk0686ke"] [ext_resource type="Script" uid="uid://cb1d5cwtgllvq" path="res://logic-scenes/luna/playables/story_playable.gd" id="1_543ki"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_ho85h"] @@ -6,8 +6,7 @@ [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="4_ayw8a"] [ext_resource type="ArrayMesh" uid="uid://byjfgvx7jeal" path="res://base-environments/youth_room/import/youth_special_meshes_comic_book_2.res" id="4_kn83e"] [ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="5_b3y80"] -[ext_resource type="AudioStream" uid="uid://d15ltkofdggly" path="res://base-environments/youth_room/audio/Voice-Training-Workshop.wav" id="8_ho85h"] -[ext_resource type="AudioStream" uid="uid://dupcfwi54fpjx" path="res://base-environments/youth_room/audio/FoM_Lisa_Kindheit_Voice_Acting_deutsch_newt.wav" id="8_kn83e"] +[ext_resource type="AnimationLibrary" path="res://animations/voice_training.res" id="7_1v0jk"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="9_kn83e"] [sub_resource type="ViewportTexture" id="ViewportTexture_ho85h"] @@ -24,635 +23,7 @@ adjustment_saturation = 0.9 [sub_resource type="World3D" id="World3D_4m36g"] environment = SubResource("Environment_sk23p") -[sub_resource type="Animation" id="Animation_ytihj"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("../../..:progress") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [17.0] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("..:custom_minimum_size") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector2(900, 900)] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath(".:rotation") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [0.349066] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("../..:modulate") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Color(1, 1, 1, 1)] -} -tracks/4/type = "value" -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/path = NodePath("../../..:visible") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [false] -} -tracks/5/type = "value" -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/path = NodePath("../../..:modulate") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Color(1, 1, 1, 1)] -} -tracks/6/type = "value" -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook1:position") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(-0.045, -0.111, 0.033)] -} -tracks/7/type = "value" -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook1:rotation") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(0.0855211, -1.65632, 0.0855211)] -} -tracks/8/type = "value" -tracks/8/imported = false -tracks/8/enabled = true -tracks/8/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook2:position") -tracks/8/interp = 1 -tracks/8/loop_wrap = true -tracks/8/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(0.02, -0.055, -0.02)] -} -tracks/9/type = "value" -tracks/9/imported = false -tracks/9/enabled = true -tracks/9/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook2:rotation") -tracks/9/interp = 1 -tracks/9/loop_wrap = true -tracks/9/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(-0.0872665, -2.08043, 0.171042)] -} - -[sub_resource type="Animation" id="Animation_ayw8a"] -resource_name = "de" -length = 86.0 -tracks/0/type = "audio" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("../../../AnimationPlayer/Text") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"clips": [{ -"end_offset": 1.36178, -"start_offset": 0.0, -"stream": ExtResource("8_kn83e") -}], -"times": PackedFloat32Array(1.16667) -} -tracks/0/use_blend = true -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("../../..:progress") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 1.66667, 4.73332, 6.03333, 11.6, 12.4, 15.8333, 16.4333, 18.9334, 19.6333, 24.5333, 25.6, 29, 30.3667, 36.1333, 39.4, 40.8, 42.2333, 44.6333, 45.2667, 47.0333, 49.2333, 53.4333, 54.6333, 57.1333, 57.8333, 61.1333, 63.2667, 66.5667, 67.5, 72.4597, 74.5, 77.2667, 78.4667, 85.2), -"transitions": PackedFloat32Array(1, 0.482968, 1, 0.482968, 1, 0.482968, 1, 0.482968, 1, 1.23114, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.287175, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968), -"update": 0, -"values": [0.0, 0.0, 1.0, 1.0, 2.0, 2.0, 3.0, 3.0, 4.0, 4.0, 5.0, 5.0, 6.0, 6.0, 7.0, 7.0, 8.0, 8.0, 9.0, 9.0, 10.0, 10.0, 11.0, 11.0, 12.0, 12.0, 13.0, 13.0, 14.0, 14.0, 15.0, 15.0, 16.0, 16.0, 17.0] -} -tracks/2/type = "method" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("../../..") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(24.8, 47.87, 61.7667, 74.0333, 85.2667), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1), -"values": [{ -"args": [], -"method": &"try_scroll" -}, { -"args": [], -"method": &"try_scroll" -}, { -"args": [], -"method": &"try_scroll" -}, { -"args": [], -"method": &"try_scroll" -}, { -"args": [], -"method": &"_on_text_finished" -}] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("..:custom_minimum_size") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"times": PackedFloat32Array(0, 0.7), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Vector2(900, 800), Vector2(900, 900)] -} -tracks/4/type = "value" -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/path = NodePath(".:rotation") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/keys = { -"times": PackedFloat32Array(0, 1.8), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [0.174533, 0.349066] -} -tracks/5/type = "value" -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/path = NodePath("../..:modulate") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/keys = { -"times": PackedFloat32Array(0, 0.733333), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)] -} -tracks/6/type = "value" -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/path = NodePath("../../..:visible") -tracks/6/interp = 0 -tracks/6/loop_wrap = true -tracks/6/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [true] -} -tracks/7/type = "value" -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/path = NodePath("../../..:modulate") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Color(1, 1, 1, 1)] -} -tracks/8/type = "value" -tracks/8/imported = false -tracks/8/enabled = true -tracks/8/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook1:position") -tracks/8/interp = 1 -tracks/8/loop_wrap = true -tracks/8/keys = { -"times": PackedFloat32Array(0.0497012, 1.46667), -"transitions": PackedFloat32Array(0.406126, 1), -"update": 0, -"values": [Vector3(-0.025, -0.211, 0.138), Vector3(-0.045, -0.111, 0.033)] -} -tracks/9/type = "value" -tracks/9/imported = false -tracks/9/enabled = true -tracks/9/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook1:rotation") -tracks/9/interp = 1 -tracks/9/loop_wrap = true -tracks/9/keys = { -"times": PackedFloat32Array(0, 1.46667), -"transitions": PackedFloat32Array(0.406126, 1), -"update": 0, -"values": [Vector3(0.280998, -2.77333, 0), Vector3(0.0855211, -1.65632, 0.0855211)] -} -tracks/10/type = "value" -tracks/10/imported = false -tracks/10/enabled = true -tracks/10/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook2:position") -tracks/10/interp = 1 -tracks/10/loop_wrap = true -tracks/10/keys = { -"times": PackedFloat32Array(0, 1.43333), -"transitions": PackedFloat32Array(0.353554, 1), -"update": 0, -"values": [Vector3(0.05, -0.21, -0.02), Vector3(0.02, -0.055, -0.02)] -} -tracks/11/type = "value" -tracks/11/imported = false -tracks/11/enabled = true -tracks/11/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook2:rotation") -tracks/11/interp = 1 -tracks/11/loop_wrap = true -tracks/11/keys = { -"times": PackedFloat32Array(0.0446739, 1.43333), -"transitions": PackedFloat32Array(0.353554, 1), -"update": 0, -"values": [Vector3(0.0349066, -2.51327, -0.00174533), Vector3(-0.0872665, -2.08043, 0.171042)] -} - -[sub_resource type="Animation" id="Animation_7qabw"] -resource_name = "en" -length = 108.0 -tracks/0/type = "audio" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("../../../AnimationPlayer/Text") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"clips": [{ -"end_offset": 0.0, -"start_offset": 4.92, -"stream": ExtResource("8_ho85h") -}], -"times": PackedFloat32Array(0.6) -} -tracks/0/use_blend = true -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("../../..:progress") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 1.66667, 4.73332, 6.03333, 14.9, 16.2667, 19.4, 20.3333, 22.5667, 23.6667, 29.2667, 29.7667, 34.5667, 36.4667, 41.6333, 44.9, 47.1, 48.1667, 51.6667, 53.0333, 55.9, 58.6667, 61.1, 62.9, 68.1001, 69.3667, 74.1028, 75.4667, 80.7334, 81.6667, 88.8597, 90.5667, 96.2333, 97.9, 104.733), -"transitions": PackedFloat32Array(1, 0.482968, 1, 0.482968, 1, 0.482968, 1, 0.482968, 1, 1.23114, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.287175, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968, 0.482968), -"update": 0, -"values": [0.0, 0.0, 1.0, 1.0, 2.0, 2.0, 3.0, 3.0, 4.0, 4.0, 5.0, 5.0, 6.0, 6.0, 7.0, 7.0, 8.0, 8.0, 9.0, 9.0, 10.0, 10.0, 11.0, 11.0, 12.0, 12.0, 13.0, 13.0, 14.0, 14.0, 15.0, 15.0, 16.0, 16.0, 17.0] -} -tracks/2/type = "method" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("../../..") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(15.2333, 35.2, 56, 74.5667, 96.9007, 107.867), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1), -"values": [{ -"args": [], -"method": &"try_scroll" -}, { -"args": [], -"method": &"try_scroll" -}, { -"args": [], -"method": &"try_scroll" -}, { -"args": [], -"method": &"try_scroll" -}, { -"args": [], -"method": &"try_scroll" -}, { -"args": [], -"method": &"_on_text_finished" -}] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("..:custom_minimum_size") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"times": PackedFloat32Array(0, 0.7), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Vector2(900, 800), Vector2(900, 900)] -} -tracks/4/type = "value" -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/path = NodePath(".:rotation") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/keys = { -"times": PackedFloat32Array(0, 1.8), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [0.174533, 0.349066] -} -tracks/5/type = "value" -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/path = NodePath("../..:modulate") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/keys = { -"times": PackedFloat32Array(0, 0.733333), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)] -} -tracks/6/type = "value" -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/path = NodePath("../../..:visible") -tracks/6/interp = 0 -tracks/6/loop_wrap = true -tracks/6/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [true] -} -tracks/7/type = "value" -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/path = NodePath("../../..:modulate") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Color(1, 1, 1, 1)] -} -tracks/8/type = "value" -tracks/8/imported = false -tracks/8/enabled = true -tracks/8/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook1:position") -tracks/8/interp = 1 -tracks/8/loop_wrap = true -tracks/8/keys = { -"times": PackedFloat32Array(0.0497012, 1.46667), -"transitions": PackedFloat32Array(0.406126, 1), -"update": 0, -"values": [Vector3(-0.025, -0.211, 0.138), Vector3(-0.045, -0.111, 0.033)] -} -tracks/9/type = "value" -tracks/9/imported = false -tracks/9/enabled = true -tracks/9/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook1:rotation") -tracks/9/interp = 1 -tracks/9/loop_wrap = true -tracks/9/keys = { -"times": PackedFloat32Array(0, 1.46667), -"transitions": PackedFloat32Array(0.406126, 1), -"update": 0, -"values": [Vector3(0.280998, -2.77333, 0), Vector3(0.0855211, -1.65632, 0.0855211)] -} -tracks/10/type = "value" -tracks/10/imported = false -tracks/10/enabled = true -tracks/10/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook2:position") -tracks/10/interp = 1 -tracks/10/loop_wrap = true -tracks/10/keys = { -"times": PackedFloat32Array(0, 1.43333), -"transitions": PackedFloat32Array(0.353554, 1), -"update": 0, -"values": [Vector3(0.05, -0.21, -0.02), Vector3(0.02, -0.055, -0.02)] -} -tracks/11/type = "value" -tracks/11/imported = false -tracks/11/enabled = true -tracks/11/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook2:rotation") -tracks/11/interp = 1 -tracks/11/loop_wrap = true -tracks/11/keys = { -"times": PackedFloat32Array(0.0446739, 1.43333), -"transitions": PackedFloat32Array(0.353554, 1), -"update": 0, -"values": [Vector3(0.0349066, -2.51327, -0.00174533), Vector3(-0.0872665, -2.08043, 0.171042)] -} - -[sub_resource type="Animation" id="Animation_kn83e"] -resource_name = "ini" -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("../../..:progress") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [17.0] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("..:custom_minimum_size") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector2(900, 900)] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath(".:rotation") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [0.349066] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("../..:modulate") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Color(1, 1, 1, 1)] -} -tracks/4/type = "value" -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/path = NodePath("../../..:visible") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [false] -} -tracks/5/type = "value" -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/path = NodePath("../../..:modulate") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Color(1, 1, 1, 1)] -} -tracks/6/type = "value" -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook1:position") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(-0.045, -0.111, 0.033)] -} -tracks/7/type = "value" -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook1:rotation") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(0.0855211, -1.65632, 0.0855211)] -} -tracks/8/type = "value" -tracks/8/imported = false -tracks/8/enabled = true -tracks/8/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook2:position") -tracks/8/interp = 1 -tracks/8/loop_wrap = true -tracks/8/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(0.02, -0.055, -0.02)] -} -tracks/9/type = "value" -tracks/9/imported = false -tracks/9/enabled = true -tracks/9/path = NodePath("../TextureRect/SubViewport/Node3D/YouthSpecialMeshesComicBook2:rotation") -tracks/9/interp = 1 -tracks/9/loop_wrap = true -tracks/9/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(-0.0872665, -2.08043, 0.171042)] -} - -[sub_resource type="Animation" id="Animation_x0d5q"] -resource_name = "vanish" -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("../../..:visible") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 1), -"transitions": PackedFloat32Array(1, 1), -"update": 1, -"values": [true, false] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("../../..:modulate") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 1), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 0)] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath(".:rotation") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0, 1), -"transitions": PackedFloat32Array(2.73208, 1), -"update": 0, -"values": [0.349066, 0.698132] -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_dc6th"] -_data = { -&"RESET": SubResource("Animation_ytihj"), -&"de": SubResource("Animation_ayw8a"), -&"en": SubResource("Animation_7qabw"), -&"ini": SubResource("Animation_kn83e"), -&"vanish": SubResource("Animation_x0d5q") -} - -[node name="voice_training" type="CenterContainer" unique_id=879195009] +[node name="voice_training" type="CenterContainer"] visible = false anchors_preset = 15 anchor_right = 1.0 @@ -665,11 +36,11 @@ scene_id = 2 story_array = PackedStringArray("My secret comic stash. I remember playing Clue-Men with the boys.", "I had a voice for every character in that comic. But more often than not I played him: Agent Q.", "Going under the radar, putting in precise work to save the world.", "Not having to deal with being a girl.", "Boys were so much easier. They like cars, bikes, guns and agents.", "They don\'t talk behind your back. They don\'t think everything is about relationships.", "Girls don\'t get that. I knew they talked behind my back about me only “pretending” to like boy stuff, so I’d get laid ", "… I mean, maybe they were right?", "Like I won\'t deny I was probably the first girl in my class to see a dick.", "But like - that’s what the boys do, right?", "At least it has gotten better after me and Jojo became friends.", "I still remember how that happend. I did a voice acting workshop in art class.", "Being allowed to share my technique in front of everyone was just :D", "I mean next to nobody put in any effort. But Jojo did.", "When our Mr Funny then decided to ape her attempts instead of just minding his own, I pretty much exploded.", "After this, we suddenly were besties. And my class finally started to just leave me be. ", "Maybe because I for once was friends with another girl. Maybe because I scared them. Maybe both.") paragraph_lengths = PackedInt32Array(1, 2, 5, 7, 9, 10, 13, 14, 16) -[node name="PanelContainer" type="PanelContainer" parent="." unique_id=2032917301] +[node name="PanelContainer" type="PanelContainer" parent="."] layout_mode = 2 mouse_filter = 1 -[node name="StartFrame" type="TextureRect" parent="PanelContainer" unique_id=756499554] +[node name="StartFrame" type="TextureRect" parent="PanelContainer"] custom_minimum_size = Vector2(900, 900) layout_mode = 2 size_flags_vertical = 0 @@ -677,7 +48,7 @@ texture = ExtResource("2_ho85h") expand_mode = 2 stretch_mode = 4 -[node name="Panel" type="PanelContainer" parent="PanelContainer/StartFrame" unique_id=907097464] +[node name="Panel" type="PanelContainer" parent="PanelContainer/StartFrame"] show_behind_parent = true layout_mode = 1 anchors_preset = 8 @@ -695,7 +66,7 @@ rotation = 0.349066 pivot_offset = Vector2(450, 450) mouse_filter = 1 -[node name="TextureRect" type="TextureRect" parent="PanelContainer/StartFrame" unique_id=1771437247] +[node name="TextureRect" type="TextureRect" parent="PanelContainer/StartFrame"] layout_mode = 1 anchors_preset = 6 anchor_left = 1.0 @@ -711,7 +82,7 @@ grow_vertical = 2 scale = Vector2(0.5, 0.5) texture = SubResource("ViewportTexture_ho85h") -[node name="SubViewport" type="SubViewport" parent="PanelContainer/StartFrame/TextureRect" unique_id=2093055714] +[node name="SubViewport" type="SubViewport" parent="PanelContainer/StartFrame/TextureRect"] own_world_3d = true world_3d = SubResource("World3D_4m36g") transparent_bg = true @@ -720,25 +91,25 @@ canvas_cull_mask = 4293918724 size = Vector2i(1024, 1536) render_target_update_mode = 3 -[node name="Node3D" type="Node3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport" unique_id=1223174623] +[node name="Node3D" type="Node3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.21953, 3.52719, 0) -[node name="YouthSpecialMeshesComicBook1" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D" unique_id=1635341837] -transform = Transform3D(-0.09237667, -0.07749739, -0.992704, 0.085104756, 0.99270374, -0.08541691, 0.992081, -0.09237429, -0.08510727, -0.045, -0.111, 0.033) +[node name="YouthSpecialMeshesComicBook1" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] +transform = Transform3D(-0.09237667, -0.07749739, -0.992704, 0.085104756, 0.9927037, -0.08541691, 0.992081, -0.09237428, -0.08510727, -0.045, -0.111, 0.033) mesh = ExtResource("3_ho85h") skeleton = NodePath("../..") -[node name="YouthSpecialMeshesComicBook2" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D" unique_id=1795445499] -transform = Transform3D(-0.4210099, 0.12640648, -0.7739451, 0.15260528, 0.7853272, 0.07756861, 0.78067994, -0.08534442, -0.4325408, 0.02, -0.055, -0.02) +[node name="YouthSpecialMeshesComicBook2" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] +transform = Transform3D(-0.4210099, 0.12640649, -0.7739451, 0.15260528, 0.78532726, 0.07756861, 0.78067994, -0.08534443, -0.4325408, 0.02, -0.055, -0.02) mesh = ExtResource("4_kn83e") skeleton = NodePath("../..") -[node name="Camera3D" type="Camera3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D" unique_id=1920540085] +[node name="Camera3D" type="Camera3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] transform = Transform3D(1, -4.88994e-09, 1.82221e-11, 4.88232e-09, 0.998636, 0.052214, -2.7352e-10, -0.052214, 0.998636, -0.025, 0, 0.81) current = true fov = 33.0 -[node name="SpotLight3D" type="SpotLight3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D" unique_id=327063891] +[node name="SpotLight3D" type="SpotLight3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] transform = Transform3D(0.302014, 0.249491, -0.920077, 0.207638, 0.924758, 0.318918, 0.930416, -0.287361, 0.227486, -0.495, 0.186, 0.167) layers = 4 light_color = Color(0.992157, 0.917647, 0.835294, 1) @@ -749,28 +120,28 @@ shadow_normal_bias = 2.171 spot_range = 0.846959 spot_angle = 23.1819 -[node name="OmniLight3D" type="OmniLight3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D" unique_id=997492291] +[node name="OmniLight3D" type="OmniLight3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.355, 0, -0.09) light_color = Color(0.266667, 0.286275, 1, 1) light_size = 0.5 omni_range = 2.5227 -[node name="OmniLight3D2" type="OmniLight3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D" unique_id=660273946] +[node name="OmniLight3D2" type="OmniLight3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.435, -0.145, 0) light_color = Color(0.607843, 0.34902, 0.203922, 1) light_energy = 0.1 light_size = 0.5 omni_range = 2.0 -[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer" unique_id=1232417546] +[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"] layout_mode = 2 -[node name="Label" type="Label" parent="PanelContainer/VBoxContainer" unique_id=990507674] +[node name="Label" type="Label" parent="PanelContainer/VBoxContainer"] layout_mode = 2 theme_type_variation = &"HeaderLarge" text = "secret Comic Stash" -[node name="StoryScroll" type="ScrollContainer" parent="PanelContainer/VBoxContainer" unique_id=1023430885] +[node name="StoryScroll" type="ScrollContainer" parent="PanelContainer/VBoxContainer"] unique_name_in_owner = true custom_minimum_size = Vector2(0, 700) layout_mode = 2 @@ -779,7 +150,7 @@ size_flags_vertical = 2 horizontal_scroll_mode = 0 vertical_scroll_mode = 3 -[node name="StoryLabel" type="RichTextLabel" parent="PanelContainer/VBoxContainer/StoryScroll" unique_id=1245725626] +[node name="StoryLabel" type="RichTextLabel" parent="PanelContainer/VBoxContainer/StoryScroll"] unique_name_in_owner = true custom_minimum_size = Vector2(800, 10) layout_mode = 2 @@ -790,7 +161,7 @@ fit_content = true scroll_active = false visible_characters_behavior = 1 -[node name="StartBottom" type="TextureRect" parent="PanelContainer/VBoxContainer" unique_id=532308306] +[node name="StartBottom" type="TextureRect" parent="PanelContainer/VBoxContainer"] custom_minimum_size = Vector2(0, 64) layout_mode = 2 size_flags_vertical = 8 @@ -798,17 +169,19 @@ texture = ExtResource("4_ayw8a") expand_mode = 2 stretch_mode = 4 -[node name="SkipControl" parent="PanelContainer" unique_id=615471104 instance=ExtResource("5_b3y80")] +[node name="SkipControl" parent="PanelContainer" instance=ExtResource("5_b3y80")] unique_name_in_owner = true layout_mode = 2 -[node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=1196634762] +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] unique_name_in_owner = true root_node = NodePath("../PanelContainer/StartFrame/Panel") -libraries/ = SubResource("AnimationLibrary_dc6th") -autoplay = &"ini" +libraries = { +&"": ExtResource("7_1v0jk") +} +autoplay = "ini" -[node name="Text" type="AudioStreamPlayer" parent="AnimationPlayer" unique_id=1140635269] +[node name="Text" type="AudioStreamPlayer" parent="AnimationPlayer"] mix_target = 2 bus = &"text" script = ExtResource("9_kn83e") diff --git a/src/base-environments/youth_room/youth_room.VoxelGI_data.res b/src/base-environments/youth_room/youth_room.VoxelGI_data.res index a3d71f9..3636702 100644 Binary files a/src/base-environments/youth_room/youth_room.VoxelGI_data.res and b/src/base-environments/youth_room/youth_room.VoxelGI_data.res differ diff --git a/src/base-environments/youth_room/youth_room.gd b/src/base-environments/youth_room/youth_room.gd index 88018f9..5230f15 100644 --- a/src/base-environments/youth_room/youth_room.gd +++ b/src/base-environments/youth_room/youth_room.gd @@ -22,7 +22,7 @@ func start_room(): # Play intro scene directly (not triggered by CollectableUi) await _play_intro_scene() else: - %LightAnimation.lights_on() + %LightAnimationPlayer.lights_on() Scenes.player_enable.emit(true) diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 88dc0ac..8ca5a60 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=92 format=4 uid="uid://b3b0gyvklqn50"] +[gd_scene load_steps=96 format=4 uid="uid://b3b0gyvklqn50"] [ext_resource type="Script" uid="uid://bsop46tqngddc" path="res://base-environments/youth_room/youth_room.gd" id="1_aitp0"] [ext_resource type="AudioStream" uid="uid://1h6k2d8q1kw3" path="res://base-environments/youth_room/import/sounds/rain_on_window.mp3" id="2_3haaq"] @@ -7,9 +7,11 @@ [ext_resource type="Script" uid="uid://hji6r2e8mcqo" path="res://base-environments/youth_room/climb_volume.gd" id="4_dqyng"] [ext_resource type="PackedScene" uid="uid://bnskiyx1sksww" path="res://logic-scenes/board/physics-board.tscn" id="4_gyjxx"] [ext_resource type="PackedScene" uid="uid://citwb7f4dl3l1" path="res://thank-you.tscn" id="5_kts6y"] +[ext_resource type="AnimationLibrary" uid="uid://c80h2b0uyk27g" path="res://animations/youth_intro.res" id="8_bgk6f"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="8_e5y1q"] [ext_resource type="AudioStream" uid="uid://cudna8k7fw06t" path="res://base-environments/youth_room/audio/Moving Loop.wav" id="8_egnow"] [ext_resource type="AudioStream" uid="uid://cl74a68tjwinh" path="res://base-environments/youth_room/audio/Youth Loop.wav" id="9_i8mqk"] +[ext_resource type="AnimationLibrary" uid="uid://b0bbcnu1dways" path="res://animations/youth_scenes.res" id="10_dqyng"] [ext_resource type="AudioStream" uid="uid://cho5neuxkvpyh" path="res://base-environments/youth_room/audio/Voice Loop.wav" id="10_wwwdq"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="10_ypa88"] [ext_resource type="PackedScene" uid="uid://g2a27jwdapai" path="res://logic-scenes/card_burner/card_burner.tscn" id="11_5bsh1"] @@ -25,7 +27,8 @@ [ext_resource type="PackedScene" uid="uid://dwtxjvprjyx8p" path="res://base-environments/youth_room/lava-lamp.tscn" id="21_0k2gr"] [ext_resource type="PackedScene" uid="uid://dreokijo757l1" path="res://logic-scenes/interactable/interactable.tscn" id="22_ks23q"] [ext_resource type="AudioStream" uid="uid://bghjiqkyehs1p" path="res://base-environments/youth_room/import/sounds/rain and thunder.mp3" id="22_xrkbj"] -[ext_resource type="Script" uid="uid://dv82vf5pdm1c2" path="res://base-environments/youth_room/youth_light_animation.gd" id="26_corra"] +[ext_resource type="AnimationLibrary" uid="uid://xw1oi4igdfsa" path="res://animations/youth_weather.res" id="23_corra"] +[ext_resource type="AnimationLibrary" uid="uid://dbx2ytc1l7apy" path="res://animations/youth_lights.res" id="27_ea6x8"] [ext_resource type="PackedScene" uid="uid://bpjympn3ps3wo" path="res://logic-scenes/luna/luna_imported.tscn" id="27_pb1jl"] [ext_resource type="Material" uid="uid://ct7uc5i5yp5qf" path="res://base-environments/youth_room/import/materials/wall.tres" id="28_oiweb"] [ext_resource type="PackedScene" uid="uid://bw47g00bi710i" path="res://base-environments/youth_room/youth_room_visuals.tscn" id="30_dqyng"] @@ -209,6 +212,22 @@ func switch_off(): tween.tween_property(self, \"litnes\", 0, 1) " +[sub_resource type="GDScript" id="GDScript_5ot1o"] +script/source = "extends AnimationPlayer + +func _ready() -> void: + Scenes.scene_finished.connect(lights_on) + Scenes.scene_starting.connect(lights_off) + +func lights_off(id: int = -1, _repeat: bool = false): + if id == Scenes.id.YOUTH_VOICE_TRAINING: + await get_tree().create_timer(10).timeout + queue(\"lights_out\") + +func lights_on(_id: int = -1, _repeat: bool = false): + queue(\"light_up\") +" + [sub_resource type="GDScript" id="GDScript_yn0pl"] script/source = "extends SpotLight3D @@ -469,6 +488,7 @@ shape = SubResource("SphereShape3D_4ckrq") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.811571, 0, 0) [node name="WorldBoundary (Floor)" type="CollisionShape3D" parent="logic/Collision/Room_Colission"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.01, 0) shape = SubResource("WorldBoundaryShape3D_dqyng") [node name="Wall1" type="CollisionShape3D" parent="logic/Collision/Room_Colission"] @@ -643,48 +663,54 @@ texture = ExtResource("8_e5y1q") expand_mode = 2 stretch_mode = 4 -[node name="AnimationPlayer" type="AnimationPlayer" parent="logic/UI/Opening"] +[node name="IntroAnimationPlayer" type="AnimationPlayer" parent="logic/UI/Opening"] +libraries = { +&"": ExtResource("8_bgk6f") +} -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="logic/UI/Opening/AnimationPlayer"] +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="logic/UI/Opening/IntroAnimationPlayer"] volume_db = -5.0 mix_target = 2 bus = &"text" script = ExtResource("10_ypa88") -[node name="ScenePlayer" type="AnimationPlayer" parent="logic" groups=["scene_actors"]] +[node name="SceneAnimationPlayer" type="AnimationPlayer" parent="logic" groups=["scene_actors"]] unique_name_in_owner = true +libraries = { +&"": ExtResource("10_dqyng") +} autoplay = "RESET" script = ExtResource("13_5bsh1") -[node name="Lisa" type="AudioStreamPlayer" parent="logic/ScenePlayer"] +[node name="Lisa" type="AudioStreamPlayer" parent="logic/SceneAnimationPlayer"] mix_target = 2 bus = &"text" -[node name="Moving" type="AudioStreamPlayer" parent="logic/ScenePlayer"] +[node name="Moving" type="AudioStreamPlayer" parent="logic/SceneAnimationPlayer"] stream = ExtResource("8_egnow") bus = &"music" -[node name="Childhood" type="AudioStreamPlayer" parent="logic/ScenePlayer"] +[node name="Childhood" type="AudioStreamPlayer" parent="logic/SceneAnimationPlayer"] stream = ExtResource("9_i8mqk") volume_db = -80.0 bus = &"music" -[node name="VoiceTraining" type="AudioStreamPlayer" parent="logic/ScenePlayer"] +[node name="VoiceTraining" type="AudioStreamPlayer" parent="logic/SceneAnimationPlayer"] stream = ExtResource("10_wwwdq") volume_db = -80.0 bus = &"music" -[node name="Jui_Jutsu" type="AudioStreamPlayer" parent="logic/ScenePlayer"] +[node name="Jui_Jutsu" type="AudioStreamPlayer" parent="logic/SceneAnimationPlayer"] bus = &"music" -[node name="starlight_mesh" type="MeshInstance3D" parent="logic/ScenePlayer"] +[node name="starlight_mesh" type="MeshInstance3D" parent="logic/SceneAnimationPlayer"] transform = Transform3D(0.999, 0, 0, 0, 0.999, 0, 0, 0, 0.999, 0, 0, 0) layers = 2 gi_mode = 0 mesh = SubResource("ArrayMesh_bgk6f") skeleton = NodePath("../../..") -[node name="starlight_ambient" type="SpotLight3D" parent="logic/ScenePlayer/starlight_mesh"] +[node name="starlight_ambient" type="SpotLight3D" parent="logic/SceneAnimationPlayer/starlight_mesh"] transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0.644969, 2.70318, -0.247641) light_color = Color(0.0313726, 0, 1, 1) light_energy = 0.2 @@ -696,7 +722,7 @@ shadow_blur = 1.277 spot_angle = 85.9425 spot_angle_attenuation = 0.57435 -[node name="starlight_lamp_dynamic" type="SpotLight3D" parent="logic/ScenePlayer/starlight_mesh"] +[node name="starlight_lamp_dynamic" type="SpotLight3D" parent="logic/SceneAnimationPlayer/starlight_mesh"] transform = Transform3D(0.55069, -0.676558, 0.488887, 0.695251, 0.0476608, -0.717185, 0.461917, 0.734845, 0.496624, 1.76541, 0.251864, 0.941618) light_color = Color(0, 1, 1, 1) light_energy = 2.0 @@ -708,7 +734,7 @@ spot_attenuation = 0.732044 spot_angle = 35.0 spot_angle_attenuation = 2.9742036 -[node name="starlight_lamp_static" type="SpotLight3D" parent="logic/ScenePlayer/starlight_mesh"] +[node name="starlight_lamp_static" type="SpotLight3D" parent="logic/SceneAnimationPlayer/starlight_mesh"] transform = Transform3D(0.55069, -0.676558, 0.488887, 0.695251, 0.0476608, -0.717185, 0.461917, 0.734845, 0.496624, 1.76541, 0.251864, 0.941618) light_color = Color(0, 0.078431375, 1, 1) light_specular = 0.0 @@ -719,13 +745,13 @@ spot_attenuation = 0.732044 spot_angle = 27.6108 spot_angle_attenuation = 1.18921 -[node name="material_handle" type="CSGBox3D" parent="logic/ScenePlayer"] +[node name="material_handle" type="CSGBox3D" parent="logic/SceneAnimationPlayer"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.70325, -1.08521, 0.0348804) visible = false size = Vector3(2.1502, 1.34648, 2.12063) material = ExtResource("28_oiweb") -[node name="OmniLight3D" type="OmniLight3D" parent="logic/ScenePlayer"] +[node name="OmniLight3D" type="OmniLight3D" parent="logic/SceneAnimationPlayer"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.12436, -0.521364) visible = false light_color = Color(0.741176, 0.211765, 0.698039, 1) @@ -733,18 +759,18 @@ light_energy = 0.0 light_size = 1.0 light_cull_mask = 4294967293 -[node name="Luna_frame-of-mind" parent="logic/ScenePlayer" instance=ExtResource("27_pb1jl")] +[node name="Luna_frame-of-mind" parent="logic/SceneAnimationPlayer" instance=ExtResource("27_pb1jl")] transform = Transform3D(0.95889795, 0, 0.28374717, 0, 1, 0, -0.28374717, 0, 0.95889795, -10.1552, 14.9384, -16.2182) visible = false -[node name="OmniLight3D" type="OmniLight3D" parent="logic/ScenePlayer/Luna_frame-of-mind"] +[node name="OmniLight3D" type="OmniLight3D" parent="logic/SceneAnimationPlayer/Luna_frame-of-mind"] transform = Transform3D(1, 0, 5.96046e-08, 0, 1, 0, -5.96046e-08, 0, 1, 0.0190229, 10.6551, -6.76412) light_color = Color(0.219608, 0.862745, 0.721569, 1) light_energy = 20.0 light_size = 10.0 omni_range = 14.8804 -[node name="OmniLight3D2" type="OmniLight3D" parent="logic/ScenePlayer/Luna_frame-of-mind"] +[node name="OmniLight3D2" type="OmniLight3D" parent="logic/SceneAnimationPlayer/Luna_frame-of-mind"] transform = Transform3D(0.999848, 0, -0.0174256, 0, 1, 0, 0.0174256, 0, 0.999848, 9.36941, 2.05006, -6.94176) light_color = Color(0.921569, 0.360784, 0.580392, 1) light_energy = 100.0 @@ -804,7 +830,10 @@ transform = Transform3D(0.9999998, 0, 2.1316282e-14, 0, 1, 0, -2.1316282e-14, 0, transform = Transform3D(-4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0, 1, -0.2322388, 0, 0) shape = SubResource("CapsuleShape3D_dqyng") -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +[node name="RoomAnimationPlayer" type="AnimationPlayer" parent="."] +libraries = { +&"": ExtResource("23_corra") +} [node name="sfx" type="Node3D" parent="."] @@ -945,10 +974,13 @@ shadow_enabled = true omni_range = 1.3534 omni_attenuation = 1.41421 -[node name="LightAnimation" type="AnimationPlayer" parent="visuals/lights" groups=["scene_actors"]] +[node name="LightAnimationPlayer" type="AnimationPlayer" parent="visuals/lights" groups=["scene_actors"]] unique_name_in_owner = true +libraries = { +&"": ExtResource("27_ea6x8") +} autoplay = "menu" -script = ExtResource("26_corra") +script = SubResource("GDScript_5ot1o") [node name="vfx" type="Node3D" parent="visuals"] diff --git a/src/dev-util/room_template.gd b/src/dev-util/room_template.gd index e57af91..e59a819 100644 --- a/src/dev-util/room_template.gd +++ b/src/dev-util/room_template.gd @@ -3,7 +3,7 @@ class_name RoomTemplate extends Node3D var initialised: bool = false var id: State.rooms = State.rooms.NULL -@onready var scene_player : AnimationPlayer = %ScenePlayer +@onready var scene_player : AnimationPlayer = %SceneAnimationPlayer @onready var card_board : CardBoard # Optional Board, if present - set by the board in its own _ready() var save_game:SaveGame = null diff --git a/src/internationalisation.de.translation b/src/internationalisation.de.translation index 9b81b50..d907a3e 100644 Binary files a/src/internationalisation.de.translation and b/src/internationalisation.de.translation differ diff --git a/src/internationalisation.en.translation b/src/internationalisation.en.translation index 0f7c76d..97ff273 100644 Binary files a/src/internationalisation.en.translation and b/src/internationalisation.en.translation differ diff --git a/src/internationalisation.es.translation b/src/internationalisation.es.translation index 8e10353..61de06a 100644 Binary files a/src/internationalisation.es.translation and b/src/internationalisation.es.translation differ diff --git a/src/internationalisation.ja.translation b/src/internationalisation.ja.translation index 1594e28..b90cb06 100644 Binary files a/src/internationalisation.ja.translation and b/src/internationalisation.ja.translation differ diff --git a/src/project.godot b/src/project.godot index 7b9f721..95ab957 100644 --- a/src/project.godot +++ b/src/project.godot @@ -10,6 +10,7 @@ config_version=5 [animation] +warnings/check_invalid_track_paths=false compatibility/default_parent_skeleton_in_mesh_instance_3d=true [application]