The ultimate merge conflict PR - #411
Draft
yoshimo wants to merge 9 commits into
Draft
Conversation
add NPCs file for BC Anniversary
- fix typo for Midnight
add standalone npc file for BC-Anniversary
Contributor
Author
|
The changes with base on my current state can be seen inside |
yoshimo
force-pushed
the
TheWarWithin
branch
3 times, most recently
from
March 14, 2026 08:13
6c09914 to
96661b4
Compare
- add some preliminary data for Eversong Woods Midnight
- add "Gnoll Way" (90882) - add "The War Within Recap" (93929)
- add Siege of Arathi Highlands, Slayers Rise, Cave poof Wartha'nan and Handar Delve of Rememberance to ZonesForLooting Treasure - track achievements and their tracking quests when reading items like wallpanels and include their location - correct a typo for achievement handling - add commented debug options to warn for missing tracking
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
1 participant
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.
This is a draft to see where our files differ so we can discuss them and work out the right approach.
I was in the middle of figuring out how to log when you read stone tablets and a quest completes that way.
The approach to avoid errors when the looted target has a secret value as name.
It logs more criteria stuff and hides one achievement debug print behind the debug switch.
Also tries to include the bc anniversary support.