-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
[Move] Spectral Thief Full Implementation #4891
[Move] Spectral Thief Full Implementation #4891
Conversation
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
How do i solve this conflict? Running |
|
thanks! Unfortunately that did not resolve it :/. Is it because I have this? |
I believe I've figured out the fix. I have a merge PR ready I did via command line. |
The associated locales PR is here: pagefaultgames/pokerogue-locales#52 (It's marked as a draft) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Being able to approve this PR is the entire motivation behind me contributing so heavily to the project recently. (I jest)
Once the locales PR is merged the locales can be updated in this PR and then it can be merged. 👍 |
Wait does the PR have to be updated? It should just work right? Or it will cause a conflict cause of submodules |
The submodule will need to be updated, without doing so the i18n keys won't exist and then it'll display the raw i18n keys in-game. |
This is what I meant. Is the locales submodule not merged independently of the PRs that need them? It really should be. |
Even if the locales were to be updated separately we'd still want to wait until it's ready before merging this PR or there'd be broken text in the game. |
Yup yup, entirely agree :) we def don't put this in until the locales is in the beta branch. I was just unclear on how the locales got into the beta branch. Thought there was something that needed to be changed in this PR, as in a commit to be added. |
What are the changes the user will see?
Spectral Thief now steals the stat changes correctly.
Why am I making these changes?
(#3503)
What are the changes from a developer perspective?
Added a
SpectralThiefAttr
which extends a newStatChangeBeforeDmgCalcAttr
that applies Stat Stage changes before damage calculation.Ability Attributes such as
Contrary
andSimple
are applied correctly since the stat changes happen through theStatStageChangePhase
.I would also like a message to pop up if stats are stolen correctly. I added the english text here
public/locales/en/move-trigger.json
. Do I need to push it for the other languages too?https://github.com/geeilhan/pokerogueFork/blob/590f66e09f61f2163534d265d21b84048175cfe2/src/data/move.ts#L4367-L4368
Link to pokerogue-locales PR
Screenshots/Videos
Before Spectral Thief implementation:
spectral-thief-implementation-before.webm
After Spectral Thief implementation:
spectral-thief-implementation-after.webm
How to test the changes?
added automated tests for
Checklist
beta
as my base branchnpm run test
)