Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -185,4 +185,4 @@ metadata/_custom_type_script = "uid://x1mxt6bmei2o"
[connection signal="toggled" from="OnTheGround/RepellableLever2" to="TileMapLayers/VoidUnderBridge2" method="_on_repellable_lever_toggled"]
[connection signal="toggled" from="OnTheGround/RepellableLever2" to="TileMapLayers/Bridge2" method="_on_repellable_lever_toggled"]
[connection signal="solved" from="OnTheGround/Statue Puzzle" to="OnTheGround/Door" method="open"]
[connection signal="solved" from="OnTheGround/Statue Puzzle" to="OnTheGround/Skeleton" method="_on_statue_puzzle_solved"]
[connection signal="solved" from="OnTheGround/Statue Puzzle" to="OnTheGround/Skeleton" method="puzzle_solved"]

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Warnings on here to look at once merged

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@export var num_of_entries: int = 3

var _objects: Array[SequencePuzzleObject]
var _objects: Array[ToggableLight]
var _sequence: Dictionary[int, int]
var current_step: int = 0
var done: bool = false
Expand All @@ -17,7 +17,7 @@

func _find_objects() -> void:
_objects.clear()
var num = 0

Check warning on line 20 in scenes/quests/lore_quests/side_quest_001/4_temple_room_1/components/lever_sequence.gd

View workflow job for this annotation

GitHub Actions / Build for web

(UNTYPED_DECLARATION): Variable "num" has no static type.

for o: Node in get_tree().get_nodes_in_group("lights"):
if o is ToggableLight:
Expand All @@ -30,7 +30,7 @@
num += 1


func _on_enabled(num: int):

Check warning on line 33 in scenes/quests/lore_quests/side_quest_001/4_temple_room_1/components/lever_sequence.gd

View workflow job for this annotation

GitHub Actions / Build for web

(UNTYPED_DECLARATION): Function "_on_enabled()" has no static return type.
_sequence[num] = current_step
current_step += 1
if current_step >= num_of_entries:
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -261,5 +261,5 @@ limit_bottom = 512
position_smoothing_enabled = true
editor_draw_limits = true

[connection signal="solved" from="OnTheGround/SequencePuzzle" to="OnTheGround/Skeleton" method="puzzle_solved"]
[connection signal="step_solved" from="OnTheGround/SequencePuzzle" to="TileMapLayers/BridgeController" method="_on_sequence_puzzle_step_solved"]
[connection signal="hidden" from="OnTheGround/SequencePuzzle/Steps/SequencePuzzleStep4" to="OnTheGround/Skeleton" method="_on_sequence_puzzle_step_4_hidden"]

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,40 +1,15 @@
[gd_scene format=3 uid="uid://b8hje84ld36o5"]

[ext_resource type="Script" uid="uid://ompfuw82ctb2" path="res://scenes/quests/lore_quests/side_quest_001/6_treasure_room/components/book/book.gd" id="1_fmb8s"]
[ext_resource type="Texture2D" uid="uid://bhqanyxhpxpm" path="res://assets/first_party/rocks/Rock_Idle.png" id="1_g276n"]
[ext_resource type="Script" uid="uid://edcifob4jc4s" path="res://scenes/game_logic/talk_behavior.gd" id="2_g705x"]
[ext_resource type="Resource" uid="uid://bo4uavbp0al61" path="res://scenes/quests/lore_quests/side_quest_001/6_treasure_room/components/book/outro.dialogue" id="3_fmb8s"]
[ext_resource type="Script" uid="uid://du8wfijr35r35" path="res://scenes/game_elements/props/interact_area/interact_area.gd" id="4_5lx86"]

[sub_resource type="RectangleShape2D" id="RectangleShape2D_kkask"]
size = Vector2(60, 55)

[sub_resource type="RectangleShape2D" id="RectangleShape2D_spiih"]
size = Vector2(53, 45)

[node name="Book" type="StaticBody2D" unique_id=1091175077]
script = ExtResource("1_fmb8s")

[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1054940245]
texture = ExtResource("1_g276n")

[node name="TalkBehavior" type="Node" parent="." unique_id=2026477836 node_paths=PackedStringArray("interact_area")]
script = ExtResource("2_g705x")
dialogue = ExtResource("3_fmb8s")
interact_area = NodePath("../Interact Area")
metadata/_custom_type_script = "uid://edcifob4jc4s"

[node name="Interact Area" type="Area2D" parent="." unique_id=1349640596]
collision_layer = 32
collision_mask = 0
script = ExtResource("4_5lx86")

[node name="CollisionShape2D" type="CollisionShape2D" parent="Interact Area" unique_id=1724627938]
position = Vector2(-2, -16.5)
shape = SubResource("RectangleShape2D_kkask")

[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=110530989]
position = Vector2(-1.5, -0.5)
shape = SubResource("RectangleShape2D_spiih")

[connection signal="interaction_ended" from="Interact Area" to="." method="reveal_thread"]
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,20 @@
[ext_resource type="PackedScene" uid="uid://b8hje84ld36o5" path="res://scenes/quests/lore_quests/side_quest_001/6_treasure_room/components/book/book.tscn" id="5_b0wwu"]
[ext_resource type="PackedScene" uid="uid://dxl6j7uc7o0nu" path="res://scenes/quests/lore_quests/side_quest_001/6_treasure_room/components/spawner/spawner.tscn" id="5_dd31k"]
[ext_resource type="PackedScene" uid="uid://fuhl3l6gxq5k" path="res://scenes/game_elements/props/collectible_item/collectible_item.tscn" id="6_b0wwu"]
[ext_resource type="Script" uid="uid://edcifob4jc4s" path="res://scenes/game_logic/talk_behavior.gd" id="6_cvvx4"]
[ext_resource type="Resource" uid="uid://bo4uavbp0al61" path="res://scenes/quests/lore_quests/side_quest_001/6_treasure_room/components/book/outro.dialogue" id="7_7uw37"]
[ext_resource type="Script" uid="uid://bgmwplmj3bfls" path="res://scenes/globals/game_state/inventory/inventory_item.gd" id="7_u1grp"]
[ext_resource type="Script" uid="uid://du8wfijr35r35" path="res://scenes/game_elements/props/interact_area/interact_area.gd" id="8_sy1lo"]
[ext_resource type="PackedScene" uid="uid://ei57s5k8ibov" path="res://scenes/quests/lore_quests/side_quest_001/components/skeleton/skeleton.tscn" id="11_4cswt"]
[ext_resource type="Resource" uid="uid://rphgyd7morsi" path="res://scenes/quests/lore_quests/side_quest_001/6_treasure_room/components/ready_treasure.dialogue" id="12_q5kb8"]
[ext_resource type="Resource" uid="uid://xendamkquh6t" path="res://scenes/quests/lore_quests/side_quest_001/6_treasure_room/components/hint_treasure.dialogue" id="12_yvyvq"]
[ext_resource type="PackedScene" uid="uid://cfcgrfvtn04yp" path="res://scenes/ui_elements/hud/hud.tscn" id="13_u1grp"]
[ext_resource type="Script" uid="uid://x1mxt6bmei2o" path="res://scenes/ui_elements/cinematic/cinematic.gd" id="14_53ojm"]
[ext_resource type="Resource" uid="uid://cx6v6n1guhxyo" path="res://scenes/quests/lore_quests/side_quest_001/6_treasure_room/components/intro_treasure.dialogue" id="15_4cswt"]

[sub_resource type="RectangleShape2D" id="RectangleShape2D_andwd"]
size = Vector2(59, 50)

[sub_resource type="Resource" id="Resource_mxhht"]
script = ExtResource("7_u1grp")
metadata/_custom_type_script = "uid://bgmwplmj3bfls"
Expand All @@ -42,13 +48,30 @@ tile_set = ExtResource("3_b0wwu")
[node name="Walls" type="TileMapLayer" parent="TileMapLayers" unique_id=56441085]
texture_filter = 1
material = ExtResource("1_2ftnb")
tile_map_data = PackedByteArray("AAABAP7/BAABAAEAAAABAP//BAABAAEAAAABAAAABAABAAEAAAABAAEABAABAAEAAAABAAIABAABAAEAAAABAAMABAABAAEAAAABAAQABAABAAEAAAABAAUABAABAAEAAAABAAYABAABAAEAAAABAAcABAABAAEAAAABAAkABAAAAAMAAAABAAgABAAAAAIAAAACAAgABAABAAQAAAADAAgABAABAAQAAAAEAAgABAABAAQAAAAFAAgABAABAAQAAAAGAAgABAABAAQAAAAHAAgABAABAAQAAAAIAAgABAABAAQAAAAJAAgABAABAAQAAAAKAAgABAABAAQAAAALAAgABAABAAQAAAAMAAgABAABAAQAAAANAAgABAABAAQAAAAOAAgABAABAAQAAAAPAAgABAABAAQAAAAQAAgABAABAAQAAAARAAgABAABAAQAAAASAAgABAABAAQAAAATAAgABAABAAQAAAAUAAgABAABAAQAAAAVAAgABAABAAQAAAAWAAgABAABAAQAAAAXAAgABAABAAQAAAAYAAgABAACAAIAAAACAAkABAABAAUAAAADAAkABAABAAUAAAAEAAkABAABAAUAAAAFAAkABAABAAUAAAAGAAkABAABAAUAAAAHAAkABAABAAUAAAAIAAkABAABAAUAAAAJAAkABAABAAUAAAAKAAkABAABAAUAAAALAAkABAABAAUAAAAMAAkABAABAAUAAAANAAkABAABAAUAAAAOAAkABAABAAUAAAAPAAkABAABAAUAAAAQAAkABAABAAUAAAARAAkABAABAAUAAAASAAkABAABAAUAAAATAAkABAABAAUAAAAUAAkABAABAAUAAAAVAAkABAABAAUAAAAWAAkABAABAAUAAAAXAAkABAABAAUAAAAYAAkABAACAAMAAAAYAP3/BAADAAEAAAAYAP7/BAADAAEAAAAYAP//BAADAAEAAAAYAAAABAADAAEAAAAYAAEABAADAAEAAAAYAAIABAADAAEAAAAYAAMABAADAAEAAAAYAAQABAADAAEAAAAYAAUABAADAAEAAAAYAAYABAADAAEAAAAYAAcABAADAAEAAAABAP3/BAADAAEAAAABAPz/BAAAAAAAAAAYAPz/BAACAAAAAAACAPz/BAABAAQAAAADAPz/BAABAAQAAAAEAPz/BAABAAQAAAAFAPz/BAABAAQAAAAGAPz/BAABAAQAAAAHAPz/BAABAAQAAAAIAPz/BAABAAQAAAAJAPz/BAABAAQAAAAKAPz/BAABAAQAAAALAPz/BAABAAQAAAAMAPz/BAABAAQAAAANAPz/BAABAAQAAAAOAPz/BAABAAQAAAAPAPz/BAABAAQAAAAQAPz/BAABAAQAAAARAPz/BAABAAQAAAASAPz/BAABAAQAAAATAPz/BAABAAQAAAAUAPz/BAABAAQAAAAVAPz/BAABAAQAAAAWAPz/BAABAAQAAAAXAPz/BAABAAQAAAACAP3/BAABAAUAAAADAP3/BAABAAUAAAAEAP3/BAABAAUAAAAFAP3/BAABAAUAAAAGAP3/BAABAAUAAAAHAP3/BAABAAUAAAAIAP3/BAABAAUAAAAJAP3/BAABAAUAAAAKAP3/BAABAAUAAAALAP3/BAABAAUAAAAMAP3/BAABAAUAAAANAP3/BAABAAUAAAAOAP3/BAABAAUAAAAPAP3/BAABAAUAAAAQAP3/BAABAAUAAAARAP3/BAABAAUAAAASAP3/BAABAAUAAAATAP3/BAABAAUAAAAUAP3/BAABAAUAAAAVAP3/BAABAAUAAAAWAP3/BAABAAUAAAAXAP3/BAABAAUAAAA=")
tile_map_data = PackedByteArray("AAABAP7/BAADAAEAAAABAP//BAADAAEAAAABAAAABAADAAEAAAABAAEABAADAAEAAAABAAIABAADAAEAAAABAAMABAADAAEAAAABAAQABAADAAEAAAABAAUABAADAAEAAAABAAYABAADAAEAAAABAAcABAADAAEAAAABAAkABAAAAAMAAAABAAgABAAAAAIAAAACAAgABAABAAQAAAADAAgABAABAAQAAAAEAAgABAABAAQAAAAFAAgABAABAAQAAAAGAAgABAABAAQAAAAHAAgABAABAAQAAAAIAAgABAABAAQAAAAJAAgABAABAAQAAAAKAAgABAABAAQAAAALAAgABAABAAQAAAAMAAgABAABAAQAAAANAAgABAABAAQAAAAOAAgABAABAAQAAAAPAAgABAABAAQAAAAQAAgABAABAAQAAAARAAgABAABAAQAAAASAAgABAABAAQAAAATAAgABAABAAQAAAAUAAgABAABAAQAAAAVAAgABAABAAQAAAAWAAgABAABAAQAAAAXAAgABAABAAQAAAAYAAgABAACAAIAAAACAAkABAABAAUAAAADAAkABAABAAUAAAAEAAkABAABAAUAAAAFAAkABAABAAUAAAAGAAkABAABAAUAAAAHAAkABAABAAUAAAAIAAkABAABAAUAAAAJAAkABAABAAUAAAAKAAkABAABAAUAAAALAAkABAABAAUAAAAMAAkABAABAAUAAAANAAkABAABAAUAAAAOAAkABAABAAUAAAAPAAkABAABAAUAAAAQAAkABAABAAUAAAARAAkABAABAAUAAAASAAkABAABAAUAAAATAAkABAABAAUAAAAUAAkABAABAAUAAAAVAAkABAABAAUAAAAWAAkABAABAAUAAAAXAAkABAABAAUAAAAYAAkABAACAAMAAAAYAP3/BAADAAEAAAAYAP7/BAADAAEAAAAYAP//BAADAAEAAAAYAAAABAADAAEAAAAYAAEABAADAAEAAAAYAAIABAADAAEAAAAYAAMABAADAAEAAAAYAAQABAADAAEAAAAYAAUABAADAAEAAAAYAAYABAADAAEAAAAYAAcABAADAAEAAAABAP3/BAADAAEAAAABAPz/BAAAAAAAAAAYAPz/BAACAAAAAAACAPz/BAABAAQAAAADAPz/BAABAAQAAAAEAPz/BAABAAQAAAAFAPz/BAABAAQAAAAGAPz/BAABAAQAAAAHAPz/BAABAAQAAAAIAPz/BAABAAQAAAAJAPz/BAABAAQAAAAKAPz/BAABAAQAAAALAPz/BAABAAQAAAAMAPz/BAABAAQAAAANAPz/BAABAAQAAAAOAPz/BAABAAQAAAAPAPz/BAABAAQAAAAQAPz/BAABAAQAAAARAPz/BAABAAQAAAASAPz/BAABAAQAAAATAPz/BAABAAQAAAAUAPz/BAABAAQAAAAVAPz/BAABAAQAAAAWAPz/BAABAAQAAAAXAPz/BAABAAQAAAACAP3/BAABAAUAAAADAP3/BAABAAUAAAAEAP3/BAABAAUAAAAFAP3/BAABAAUAAAAGAP3/BAABAAUAAAAHAP3/BAABAAUAAAAIAP3/BAABAAUAAAAJAP3/BAABAAUAAAAKAP3/BAABAAUAAAALAP3/BAABAAUAAAAMAP3/BAABAAUAAAANAP3/BAABAAUAAAAOAP3/BAABAAUAAAAPAP3/BAABAAUAAAAQAP3/BAABAAUAAAARAP3/BAABAAUAAAASAP3/BAABAAUAAAATAP3/BAABAAUAAAAUAP3/BAABAAUAAAAVAP3/BAABAAUAAAAWAP3/BAABAAUAAAAXAP3/BAABAAUAAAA=")
tile_set = ExtResource("3_b0wwu")

[node name="OnTheGround" type="Node2D" parent="." unique_id=1991035904]

[node name="Book" parent="OnTheGround" unique_id=1091175077 instance=ExtResource("5_b0wwu")]
position = Vector2(1186, 218)
position = Vector2(1188, 218)

[node name="TalkBehavior2" type="Node" parent="OnTheGround/Book" unique_id=1114742180 node_paths=PackedStringArray("interact_area")]
script = ExtResource("6_cvvx4")
dialogue = ExtResource("7_7uw37")
interact_area = NodePath("InteractArea")
metadata/_custom_type_script = "uid://edcifob4jc4s"

[node name="InteractArea" type="Area2D" parent="OnTheGround/Book/TalkBehavior2" unique_id=101004925]
position = Vector2(1188, 218)
collision_layer = 32
collision_mask = 0
script = ExtResource("8_sy1lo")
metadata/_custom_type_script = "uid://du8wfijr35r35"

[node name="CollisionShape2D" type="CollisionShape2D" parent="OnTheGround/Book/TalkBehavior2/InteractArea" unique_id=1623743238]
position = Vector2(-2.5, -15)
shape = SubResource("RectangleShape2D_andwd")

[node name="CollectibleItem" parent="OnTheGround" unique_id=327991066 instance=ExtResource("6_b0wwu")]
position = Vector2(1315, 210)
Expand Down Expand Up @@ -82,9 +105,9 @@ arrow = ExtResource("4_sabig")
time = 0.5

[node name="Skeleton" parent="OnTheGround" unique_id=1366328255 instance=ExtResource("11_4cswt")]
position = Vector2(227, 22)
position = Vector2(1024, 147)
start_position = Vector2(228, 22)
end_position = Vector2(975, 150)
end_position = Vector2(1024, 147)
start_dialogue = ExtResource("12_yvyvq")
end_dialogue = ExtResource("12_q5kb8")

Expand All @@ -108,4 +131,5 @@ script = ExtResource("14_53ojm")
dialogue = ExtResource("15_4cswt")
metadata/_custom_type_script = "uid://x1mxt6bmei2o"

[connection signal="book_read" from="OnTheGround/Book" to="OnTheGround/Skeleton" method="_on_book_book_read"]
[connection signal="interaction_ended" from="OnTheGround/Book/TalkBehavior2/InteractArea" to="OnTheGround/CollectibleItem" method="reveal"]
[connection signal="interaction_started" from="OnTheGround/Book/TalkBehavior2/InteractArea" to="OnTheGround/Skeleton" method="_on_interaction_started"]
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ extends StaticBody2D

@onready var talk_behavior: TalkBehavior = $TalkBehavior

var already_teleported: bool = false

# Called when the node enters the scene tree for the first time.
func _ready() -> void:
Expand All @@ -18,22 +19,11 @@ func _ready() -> void:

## When a puzzle is solved, this changes the skeleton's position and their dialogue
func puzzle_solved():
position = end_position
talk_behavior.dialogue = end_dialogue
if not already_teleported:
position = end_position
talk_behavior.dialogue = end_dialogue
already_teleported = true


func _on_statue_puzzle_solved() -> void:
pass # Replace with function body.
position = end_position
talk_behavior.dialogue = end_dialogue

func _hidden() -> void:
pass # Replace with function body.
position = end_position
talk_behavior.dialogue = end_dialogue


func _on_sequence_puzzle_step_4_hidden() -> void:
pass # Replace with function body.
position = end_position
talk_behavior.dialogue = end_dialogue
func _on_interaction_started(player: Player, from_right: bool) -> void:
puzzle_solved()
Loading