Skip to content
This repository has been archived by the owner on Dec 4, 2020. It is now read-only.

Fix cutscene in COP 2-5 "Ancient Vows" #1429

Merged
merged 4 commits into from
Nov 15, 2020

Conversation

MarianArlt
Copy link
Contributor

@MarianArlt MarianArlt commented Oct 25, 2020

I affirm:

  • that I agree to Project Topaz's Limited Contributor License Agreement, as written on this date
  • that I've tested my code since the last commit in the PR, and will test after any later commits

_ Fixes a wrong cutscene ( #1420 ) after entering through the Dilapidated Gate in Misareaux Coast (F-7) and clicking the Spacial Displacement
_ This affected mission 4-2 (csid 8) so I added one optional dialogue and a new default dialogue there while at it
_ Minor style guide clean up for the Dilapidated Gate (4383c20)

Captures used for this PR:
Missions: COP 2-4 (An Eternal Melody) ~ COP 2-5 (Ancient Vows)
Chains of Promathia: COP 4-1 (Sheltering Doubt)
Chains of Promathia: COP 4-2 (The Savage)

Copy link
Contributor

@zach2good zach2good left a comment

Choose a reason for hiding this comment

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

Looks fine to me, thanks for all the cleanup!

Just two small style dings, then this is ready to go.

scripts/zones/Tavnazian_Safehold/npcs/Despachiaire.lua Outdated Show resolved Hide resolved
@zach2good zach2good added the reviewed Has been reviewed by at least one Staff Member label Nov 6, 2020
@MarianArlt
Copy link
Contributor Author

MarianArlt commented Nov 6, 2020

Please check Despechiaire again, I cleaned that one up too, structured it a little to make it legible and added comments.
The "Sheltering Doubt" optional dialogue needed a missionStatus condition or else it would trigger after going to Bastok.
I moved the event references to the bottom; wouldn't want to delete those, somebody put in effort to pick them, but they shouldn't clutter the functions.

(Force Push fixed a missing Unix (LF) line end)

@zircon-tpl zircon-tpl changed the base branch from release to pr/1429 November 15, 2020 04:42
@zircon-tpl zircon-tpl merged commit 46beba7 into project-topaz:pr/1429 Nov 15, 2020
Copy link
Contributor

@ibm2431 ibm2431 left a comment

Choose a reason for hiding this comment

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

Was initially merged into a safekeeping branch, but I'll "approve" this and merge the branch into release.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
reviewed Has been reviewed by at least one Staff Member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants