-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
[Ability] Implement Mirror Armor #4769
base: beta
Are you sure you want to change the base?
Conversation
I would also like if someone updated the ability draft with this PR as well...I dont think I can. Thanks :) |
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.
For ArenaTag
s, they should have a sourceId
field that contains the ID of the pokemon that set it. If that's not viable for whatever reason, you should be able to add a field to the class used by Sticky Webs etc to store the necessary information instead.
Co-authored-by: NightKev <[email protected]>
Co-authored-by: NightKev <[email protected]>
Co-authored-by: NightKev <[email protected]>
Co-authored-by: NightKev <[email protected]>
I changed the code to use the source ID field from arena tag. I dont know why there is an issue with public/locales in this repo - and I am not sure how to fix it. I dont think I touched public/locales in this branch. |
Try running |
|
I tried running those commands and updating the submodule but it hasnt changed the conflict in github. Not really sure how to proceed, never seen something like this before. |
Should I just make a new branch with these changes and try to redo it? I dont think I manually made changes to public/locales at any point in this branch |
Fixed it by merging beta locally, not sure what GitHub's problem was. |
Oh wait, that made it pull the latest remote commit...? What is even going on. |
cd241fe
to
46affa2
Compare
Okay there we go, now it's fixed. Git can be very annoying sometimes... |
Appreciated. Do you know how I can fix this locally? I get I have tried
and
but it hasnt really changed anything... |
Hmmm... not sure. Submodules are weird. Try the following:
|
When I do that then I have to commit public/locales and once that is done then my local branch is ahead of upstream/beta by 16 commits which doesnt make sense to me - that means I have extra stuff in my repo right? I tried to delete the beta repo and re pull but same issue with public/locales exists... |
Oh wait you were trying to fix your local beta branch? In that case change the SHA1 in my above message to
Sorry I thought you were trying to fix your local version of this PR branch. Hopefully that should fix your local version of the beta branch. |
Got it, thanks! |
Should be working now, and passes all test
When magic bounce is implemented, should probably add a test for how mirror armor interacts with magic bounce, but
I feel like how its implemented now should be fine, since magic bounce shouldnt reflect stat moves directly, rather status moves (some of which are stat moves). But still a test should be made.
What are the changes the user will see?
Mirror Armor will work as intended in the game
Why am I making these changes?
Adding new gameplay features
What are the changes from a developer perspective?
Added several variables to keep track of which pokemon used certain moves or abilities so mirror armor can properly
target
Added a new ability attr
changed certain phase files to implement this behavior,
I dont really like using all these extra variables and tried to keep the additions to a minimum, but I just couldnt find enough
tools to do what I needed to do so I had to hard code in some of these variables to make the ability work.
Screenshots/Videos
Video 1
2024-11-19.13-20-40.mp4
Video 2
2024-11-19.13-19-58.mp4
Video 3
2024-11-19.13-19-03.mp4
Video 4
2024-11-19.13-17-21.mp4
Video 5
2024-11-19.13-00-22.mp4
Video 6
2024-11-19.13-04-07.mp4
Video 7
2024-11-19.13-04-53.mp4
Video 8
2024-11-19.13-05-39.mp4
Video 9
2024-11-19.13-06-20.mp4
Video 10
2024-11-19.13-07-30.mp4
Video 11
2024-11-19.13-08-09.mp4
How to test the changes?
Override Files and unit tests, and debugger in browser
Checklist
beta
as my base branchnpm run test
)