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.

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

[Lua, SQL] Fix bugs in confrontation, add IDs to valkurm #7121

Open
wants to merge 1 commit into
base: base
Choose a base branch
from

Conversation

Flibe-XI
Copy link
Contributor

@Flibe-XI Flibe-XI commented Feb 22, 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?

Improves a number of things required for confrontations to work properly

  1. Add function annotations
  2. Addresses some edge case bugs that cause confrontation to break down when players re-enter the zone without confrontation effect
  3. Add time limit functionality to confrontations
  4. Prepare player list for appropriate enmity list management on pop (To be added to npcUtil.lua)
  5. Update confrontation effect flag to include xi.effectFlag.ON_ZONE
  6. Add some mob IDs to valkurm IDs.lua for pirates chart quest
  7. Add some text IDs to outer horutoto ruins IDs.lua

Steps to test these changes

Setup some dummy confrontation somewhere, such as qm4 in valkurm dunes (!pos -168 4 -131 103, id = 17199740)
Test out numerous edge cases for wins and losses.
Player can still force win with multiple players because hate list doesn't autopopulate all alliance members. So spawning player can pop mobs, then zone. Mobs will then despawn, and because valid player count > 0, win condition triggers. This can be fixed by adjusting the logic in npcUtil.lua to include the enmity player list logic. To be handled in separate PR.

coauthor: TracentEden [email protected]
github.com/AirSkyBoat/AirSkyBoat 0c8cb7e
github.com/AirSkyBoat/AirSkyBoat 3881abe

@Flibe-XI Flibe-XI force-pushed the confrontation_fixes branch from 33152be to 9ee8062 Compare February 22, 2025 04:29
MARCHELUTE = GetFirstID('Marchelute'),
DOMAN = GetFirstID('Doman'),
ONRYO = GetFirstID('Onryo'),
HOUU_THE_SHOALWADER = GetFirstID('Houu_the_Shoalwader'),
Copy link
Contributor

Choose a reason for hiding this comment

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

can we put these in alpha order

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can do that - Is that the format going forward? I haven't seen any "IDs.lua" file follow that format yet, but it makes sense to me

Copy link
Contributor

Choose a reason for hiding this comment

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

If we use a raw id, like with text ids, we follow the id order.
With this ones we are moving away from raw ids, so we have to follow another order. Alphabetical order makes sense

@Flibe-XI Flibe-XI force-pushed the confrontation_fixes branch from 9ee8062 to 597e052 Compare February 23, 2025 13:52
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.

I've purged all information about this system from my mind since I originally wrote it, so I'm going to have to assume this all does as you say it does 😆

@zach2good
Copy link
Contributor

To get proper GH attribution, you have to add this line to the commit message:

Co-Authored-By: TracentEden <[email protected]>

Otherwise it won't pick it up

@zach2good
Copy link
Contributor

Can you make sure to test other things that use confrontation? Garrison, the AMK Cardian Fight, etc.?

@Flibe-XI
Copy link
Contributor Author

To get proper GH attribution, you have to add this line to the commit message:

Co-Authored-By: TracentEden <[email protected]>

Otherwise it won't pick it up

Got it thanks. Will fix tonight.

Co-Authored-By: TracentEden <[email protected]>
github.com/AirSkyBoat/AirSkyBoat 0c8cb7e
github.com/AirSkyBoat/AirSkyBoat 3881abe
@Flibe-XI Flibe-XI force-pushed the confrontation_fixes branch from 597e052 to 64b650f Compare February 25, 2025 04:01
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.

4 participants