Frank/beach scene - #2726
Merged
Merged
Conversation
Added the parrot and pirate hat interaction. The player can grapple the parrot to drop the hat, pick it up through dialogue, and return it to the skeleton pirate.
Added the skeleton pirate interaction, hat pickup dialogue, journal entry, and updated Beach scene. Added logic for returning the pirate hat and changing the skeleton's appearance.
Added new dialogue file
|
Sorry for being very nitpicky, but could you remove the new line after "Replace this with dialogue for a cutscene." in scenes/ui_elements/cinematic/cinematic_placeholder.dialogue |
remove empty line
|
Play this branch at https://play.threadbare.game/branches/endlessm/frank/beach-scene/. (This launches the game from the start, not directly at the change(s) in this pull request.) |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Added new dialougue file and restore cinematic dialouge