diff --git a/src/animations/youth_weather.res b/src/animations/youth_weather.res index bbf013e..1d8324e 100644 Binary files a/src/animations/youth_weather.res and b/src/animations/youth_weather.res differ diff --git a/src/base-environments/youth_room/youth_room.gd b/src/base-environments/youth_room/youth_room.gd index f0ee1d8..e88c559 100644 --- a/src/base-environments/youth_room/youth_room.gd +++ b/src/base-environments/youth_room/youth_room.gd @@ -9,14 +9,14 @@ extends RoomTemplate func _ready() -> void: id = State.rooms.YOUTH - super._ready() # UwU, superclass _ready is not called by Godot automatically... - + super._ready() # UwU, superclass _ready is not called by Godot automatically... + func start_room(): await super.start_room() - + %UI.show() - + await Main.curtain.open() # To start breathing etc. @@ -28,8 +28,9 @@ func start_room(): await _play_intro_scene() else: %LightAnimationPlayer.lights_on() + %SceneAnimationPlayer.start_soundtrack() - Scenes.player_enable.emit(true) + Scenes.player_enable.emit(true) @@ -43,7 +44,7 @@ func get_ready(): super.get_ready() prints("indeed") Scenes.scene_finished.connect(_on_scene_finished) - + card_board.board_completed.connect(func(): %DoorInteractable.show() if not save_game.is_childhood_board_complete: @@ -98,3 +99,7 @@ func play_chest_reveal() -> void: $visuals/AnimationPlayer.play("chest_reveal") $visuals/SecondaryAnimation.play("chest_reveal") await $visuals/AnimationPlayer.animation_finished + + +func play_thunder() -> void: + %RoomAnimationPlayer.play("lightning_and_thunder") diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 7a267b2..e35aa54 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -685,19 +685,23 @@ bus = &"text" [node name="Moving" type="AudioStreamPlayer" parent="logic/SceneAnimationPlayer"] stream = ExtResource("8_egnow") bus = &"music" +playback_type = 1 [node name="Childhood" type="AudioStreamPlayer" parent="logic/SceneAnimationPlayer"] stream = ExtResource("9_i8mqk") volume_db = -80.0 bus = &"music" +playback_type = 1 [node name="VoiceTraining" type="AudioStreamPlayer" parent="logic/SceneAnimationPlayer"] stream = ExtResource("10_wwwdq") volume_db = -80.0 bus = &"music" +playback_type = 1 [node name="Jui_Jutsu" type="AudioStreamPlayer" parent="logic/SceneAnimationPlayer"] bus = &"music" +playback_type = 1 [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) @@ -817,6 +821,7 @@ billboard = false transform = Transform3D(-0.99999964, 0, -8.7422755e-08, 0, 1, 0, 8.7422755e-08, 0, -0.99999964, 0.30241805, 0.49012983, -5.9604645e-08) [node name="RoomAnimationPlayer" type="AnimationPlayer" parent="."] +unique_name_in_owner = true libraries = { &"": ExtResource("23_corra") } diff --git a/src/logic-scenes/luna/playables/story_playable.gd b/src/logic-scenes/luna/playables/story_playable.gd index ce6440a..0846855 100644 --- a/src/logic-scenes/luna/playables/story_playable.gd +++ b/src/logic-scenes/luna/playables/story_playable.gd @@ -4,7 +4,6 @@ extends Playable signal text_finished signal finished signal intro -signal emit_thunder @export var scene_id : Scenes.id @@ -29,7 +28,6 @@ var progress: float = 0: elif progress > 0: for i in range(min(progress, substring_sizes.size()-1) as int) if progress > 0 else range(substring_sizes.size()-1): start_index += substring_sizes[i] - label.visible_characters = start_index + int(substring_sizes[min(progress as int, substring_sizes.size()-1)] * fmod(progress, 1)) else: label.visible_ratio = 0 @@ -179,6 +177,7 @@ func play(): finished.emit() + func _unhandled_input(event: InputEvent) -> void: var just_revealed_text := false if event is InputEventMouseButton: @@ -222,5 +221,7 @@ func _on_text_finished(): if not animation_complete: text_finished.emit() -func _emit_thunder(): - emit_thunder.emit() + +func _emit_thunder() -> void: + if State.room is YouthRoom: State.room.play_thunder() +