Skip to content

Commit 72b069b

Browse files
authored
Merge pull request #1764 from endlessm/runner-forest-collider
Void runner: Add forest collider
2 parents e2e2ba7 + 4463c40 commit 72b069b

3 files changed

Lines changed: 26 additions & 17 deletions

File tree

scenes/game_elements/props/collectible_item/components/collectible_item.gd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ func reveal() -> void:
8080
revealed = true
8181
appear_sound.play()
8282
animation_player.play("reveal")
83+
await animation_player.animation_finished
8384

8485

8586
## When interacted with, the collectible will display a brief animation

scenes/quests/lore_quests/quest_002/1_void_runner/components/monk.gd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ extends NPC
77
@export var camera: Camera2D
88
@export var void_layer: TileMapCover
99
@export var enemy: CharacterBody2D
10+
@export var collectible_thread: CollectibleItem
1011

1112
var _repelled := false
1213

@@ -20,6 +21,8 @@ func repel_void() -> void:
2021
await tween.finished
2122
await void_layer.uncover_all(3.0)
2223

24+
await collectible_thread.reveal()
25+
2326
tween = create_tween()
2427
tween.tween_property(camera, "zoom", original_zoom, 1.0).set_ease(Tween.EASE_IN_OUT)
2528
await tween.finished

scenes/quests/lore_quests/quest_002/1_void_runner/void_runner.tscn

Lines changed: 22 additions & 17 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)