-
Notifications
You must be signed in to change notification settings - Fork 455
Skeleton dialogue fixes and Temple room 1 layout modified #2727
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
7beb64d
Finished jungle puzzle and arrow components
rencarle eb85485
Tested repellable box
rencarle bbdf757
Resolved merge conflicts in jungle and treasure room
rencarle 3333930
Resolved merge conflicts
rencarle eab6672
Merge branch 'intern_side_quest' of https://github.com/endlessm/threa…
rencarle f2288e4
Merge branch 'intern_side_quest' of https://github.com/endlessm/threa…
rencarle aadb80e
Merge branch 'intern_side_quest' of https://github.com/endlessm/threa…
rencarle 952297a
Merge branch 'intern_side_quest' of https://github.com/endlessm/threa…
rencarle c418d83
Merge branch 'intern_side_quest' of https://github.com/endlessm/threa…
rencarle c789adb
Fixed skeleton's dialogue issues and room 1 layout
rencarle File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 11 additions & 5 deletions
16
scenes/quests/lore_quests/side_quest_001/4_temple_room_1/temple_room_1.tscn
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 0 additions & 12 deletions
12
scenes/quests/lore_quests/side_quest_001/6_treasure_room/components/book/book.gd
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
scenes/quests/lore_quests/side_quest_001/6_treasure_room/components/book/book.gd.uid
This file was deleted.
Oops, something went wrong.
25 changes: 0 additions & 25 deletions
25
scenes/quests/lore_quests/side_quest_001/6_treasure_room/components/book/book.tscn
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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