Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Interaction - Battlefields: Promyvion Spires #5774

Merged
merged 3 commits into from
May 18, 2024
Merged

Interaction - Battlefields: Promyvion Spires #5774

merged 3 commits into from
May 18, 2024

Conversation

claywar
Copy link
Contributor

@claywar claywar commented May 18, 2024 •
edited
Loading

I affirm:

  • I understand that if I do not agree to the following points by completing the checkboxes my PR will be ignored.
  • I understand I should leave resolving conversations to the LandSandBoat team so that reviewers won't miss what was said.
  • I have read and understood the Contributing Guide and the Code of Conduct.
  • I have tested my code and the things my code has changed since the last commit in the PR and will test after any later commits.

What does this pull request do?

  • Converts Ancient Flames Beckon (Dem, Holla, Mea) and Desires of Emptiness to Interaction Framework
  • Adds optional requiredVar/Value for BattlefieldMission in cases where missionStatus cannot be used
  • Updates Skip Cutscene checks to also include if the player is on the current mission, but has already completed the fight

Steps to test these changes

Enter/Win/Exit/Lose the converted battlefields

claywar added 2 commits May 18, 2024 07:53
@claywar
Interaction - Battlefield: Ancient Flames Beckon (Holla, Mea, Dem)
92f2b5c 
Add skip check

Remove old bcnm references

Fix entryRequirements

Remove old bcnm refs

Fix hasCompletedPromyvion helper to use parameter

Remove incorrect teleport for players who have previously completed

Fix getLocalVar spelling in CoP1-3, remove CI exception for errant function

Remove xi.bcnm references from Spire of Dem

Update converted comment for spire of dem

Fix battlefieldwin argument position for arg8
@claywar
Add charvar alternative to missionStatus with BattlefieldMission
45ce0c9 
Fix missed variables after name change
@LandSandBoat LandSandBoat deleted a comment from github-actions bot May 18, 2024
@claywar claywar force-pushed the interaction/battlefield-spires branch 2 times, most recently from 847834d to 96071eb Compare May 18, 2024 12:43
@claywar
Interaction - Battlefield: Desires of Emptiness
b0cbca7 
Properly set battlefield exit npcs

Fix BattlefieldMission checkSkipCutscene for var changes

Update skipcs checks to include further progress in current mission

Remove old desires of emptiness bcnm checks

Fix undefined local

Fix missionStatus check in onBattlefieldWin
@claywar claywar force-pushed the interaction/battlefield-spires branch from 96071eb to b0cbca7 Compare May 18, 2024 12:47
@claywar claywar merged commit 7fe4762 into base May 18, 2024
11 checks passed
@claywar claywar deleted the interaction/battlefield-spires branch May 18, 2024 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Xaver-DaRed Xaver-DaRed Xaver-DaRed approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@claywar @Xaver-DaRed