Skip to content

[lua,sql] Add Divine Interference quest and instance#7463

Merged
Xaver-DaRed merged 1 commit intoLandSandBoat:basefrom
sruon:divine_interference
Apr 21, 2025
Merged

[lua,sql] Add Divine Interference quest and instance#7463
Xaver-DaRed merged 1 commit intoLandSandBoat:basefrom
sruon:divine_interference

Conversation

@sruon
Copy link
Copy Markdown
Contributor

@sruon sruon commented Apr 21, 2025

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?

#5826 with working CS and cleaned up. Closes #5852

  • Updated NPC flags and models to get the CS to work
  • Added the right music
  • Added enfeeb resistances to Alexander
  • Updated all IDs

CS + Enfeeb testing capture

Ran through it a dozen times, both solo and partied up. Retested each event and cutscene.

All credits @ampitere @siknoz

Steps to test these changes

  1. !addmission 4 47 (Eternal Merecenary)
  2. !addquest 6 74 (Waking the Colossus)
  3. !completequest 6 74
  4. Naja Salaheem, !pos 22.700 -8.804 -45.591 50
  5. Imperial Whitegate, !pos 152.8295 -2.2 0.0613 50
  6. !additem slab_of_plumbago 3 (alternatively !addkeyitem lightning_cell but you still need to trigger the CS at the door)
  7. Acid-Eaten Door, !pos 271.9045 -32 -88 61
  8. Blank Lamp, !pos 209.3953 0.05 20.0207 72
  9. Runic Seal, !pos 125.4569 0 19.9914 72
  10. Naja Salaheem, !pos 22.700 -8.804 -45.591 50

To test just the instance use !instance 7702

@sruon sruon force-pushed the divine_interference branch from afac39b to a11000f Compare April 21, 2025 04:31
@Xaver-DaRed
Copy link
Copy Markdown
Contributor

Another PR got merged that occupied the spell list ids used here. Rebase will be needed and those lists updated

Co-Authored-By: ampitere <166072302+ampitere@users.noreply.github.com>
Co-Authored-By: siknoz <78240569+siknoz@users.noreply.github.com>
@sruon sruon force-pushed the divine_interference branch from a11000f to 43c99c3 Compare April 21, 2025 18:07
@sruon
Copy link
Copy Markdown
Contributor Author

sruon commented Apr 21, 2025

Rebased, updated spell lists IDs and added @siknoz as co-author for original capture

@Xaver-DaRed Xaver-DaRed merged commit 6f103f4 into LandSandBoat:base Apr 21, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

🐛 Cutscenes fade to black but don't play for Waking the Colossus/Divine Interference

3 participants