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.

Sign up for GitHub

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

Jump to bottom

[Hotfix] Fix interactions of moves that change type #3183

Merged
merged 1 commit into from
Jul 28, 2024
Merged

[Hotfix] Fix interactions of moves that change type #3183

merged 1 commit into from
Jul 28, 2024

Conversation

torranx
Copy link
Collaborator

@torranx torranx commented Jul 28, 2024 •
edited
Loading

What are the changes?

  • fixes power and interaction of moves that change type

Why am I doing these changes?

this recent change caused the relevant moves to only change type after the typeMultiplier is defined thus not applying the correct type
reference: discord bug report

What did change?

  • moved the calculateBattlePower higher in the code
  • updated calculateBattlePower to return early with -1 if move category is of Status

Screenshots/Videos

  • Normalize now properly works
Screen.Recording.2024-07-28.at.4.18.09.PM.mov

How to test the changes?

  • get any ability with attr of MoveTypeChangeAttr ie Normalize
  • use a move with type other than Normal against a Ghost-type mon

Checklist

  • [ ] I'm using beta as my base branch
  • There is no overlap with another PR?
  • The PR is self-contained and cannot be split into smaller PRs?
  • Have I provided a clear explanation of the changes?
  • Have I considered writing automated tests for the issue?
  • Have I tested the changes (manually)?
    • Are all unit tests still passing? (npm run test)
  • [ ] Are the changes visual?
    • Have I provided screenshots/videos of the changes?

@torranx torranx changed the title [Hotfix] Fix interaction with moves that change type [Hotfix] Fix interactions of moves that change type Jul 28, 2024
@torranx torranx changed the title [Hotfix] Fix interactions of moves that change type [Hotfix] Fix interactions of moves/pokemon that change type Jul 28, 2024
@torranx torranx changed the title [Hotfix] Fix interactions of moves/pokemon that change type [Hotfix] Fix interactions of moves that change type Jul 28, 2024
@Tempo-anon Tempo-anon added the (Legacy) Bug Legacy Label, don't apply to new issues/PRs label Jul 28, 2024
@Tempo-anon Tempo-anon merged commit a8adfc2 into pagefaultgames:main Jul 28, 2024
4 checks passed
Tempo-anon added a commit that referenced this pull request Jul 30, 2024
@Tempo-anon @torranx
@DayKev @f-fsantos
Sync beta with changes to main (#3235)
e9c48ef 
* [Hotfix] Fix interactions of some moves not changing types (#3183)

* [Hotfix] Fix wild spawns not having their HA (#3190)

* [Hotfix] Allow to hatch pokemon with Hidden Ability again (#3222)

* chore: Update TNC links layout and position in index.html

* chore: Update TNC links font size in index.css (#3230)

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Tempo-anon added a commit that referenced this pull request Aug 2, 2024
@Tempo-anon @torranx @DayKev
[Bug] Fix affixes appearing when they shouldn't (#3236)
e5f458d 
* [Hotfix] Fix interactions of some moves not changing types (#3183)

* [Hotfix] Fix wild spawns not having their HA (#3190)

* Fix some cases of wrong affixes

* There are two trainer send out messages

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Tempo-anon added a commit that referenced this pull request Aug 3, 2024
@Tempo-anon @torranx @DayKev
[Feature] Implement generic evil team admins (#3234)
7048fbe 
* [Hotfix] Fix interactions of some moves not changing types (#3183)

* [Hotfix] Fix wild spawns not having their HA (#3190)

* Add evil admin placeholder images

* Add admin names to locale files

* Add evil team admin dialogue

* Added new sprites

* Make simple admin trainer pools

* Add Korean localization

* Increase evil boss money multiplier from 2.25 to 2.5

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Tempo-anon pushed a commit that referenced this pull request Aug 7, 2024
@CodeTappert @torranx
@DayKev @Adri1 @returntoice @sodaMelon
[Feature] Unique Evil Team Admins (#3384)
60d19c9 
* Hardcoded Pokemon should have proper names

* Add evil admin placeholder images

* Add admin names to locale files

* Add evil team admin dialogue

* current things.

* rename

* team galactic wants to be special

* Revert debug changes

* Added Trainer Names and Titles

* [Hotfix] Fix interactions of some moves not changing types (#3183)

* [Hotfix] Fix wild spawns not having their HA (#3190)

* Add evil admin placeholder images

* Add admin names to locale files

* Add evil team admin dialogue

* Added new sprites

* Make simple admin trainer pools

* Add Korean localization

* Revert this

* [Feature] Named Evil Team Admins

* Dateien removed

* Revert override

* French only needs one pair of evil team bosses :)

* Some things Temp Mentioned in the PR

* Removed NoDuplicates again...Because it only works on the speciality pool....
Also reordered the second admin wave. So we guarantee it is never the same one

* German dialogue

* Offset

* Jördis just better

* Credit for the artists (see https://www.deviantart.com/icejkai/art/Magma-Admin-Courtney-Trainer-Sprite-544510574)

* Order

* Added tsdoc and named it more clear

* Fixed formatting and made it a void function

* Changed offset to number and updated tsdoch

* Improve readability

* Removed extra lines

* Fix this

* Revert override

* colress gets his own pool because @Blitzy wants it (and i agree)

* Added Rood (some plasma sage guy)

* has voucher is not false by default. So only it will be set true for evil team leaders, gym leaders, elite 4 and champions

* Apply suggestions from code review

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>

* Added the localization also to japanese

* Update src/locales/ko/trainers.ts

Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>

* CA

* Removed Colress

* Colress Last Stand

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
f-fsantos added a commit that referenced this pull request Aug 10, 2024
@TimPerdok @torranx
@DayKev @f-fsantos
[Feature] Move touch controls configuration (Reopened) (#3256)
566cd80 
* [Hotfix] Fix interactions of some moves not changing types (#3183)

* [Hotfix] Fix wild spawns not having their HA (#3190)

* [Hotfix] Allow to hatch pokemon with Hidden Ability again (#3222)

* chore: Update TNC links layout and position in index.html

* chore: Update TNC links font size in index.css (#3230)

* Move Touch Controls

* ConfigToolbar alignment

* Insert config toolbar on open, camel-case classes, hidden setting

* Better toolbar styling, fixed double configToolbar bug

* Fixed typedocs

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
@torranx torranx deleted the bug-move_type_change branch October 4, 2024 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Tempo-anon Tempo-anon Tempo-anon approved these changes

@innerthunder innerthunder innerthunder approved these changes

Assignees
No one assigned
Labels
(Legacy) Bug Legacy Label, don't apply to new issues/PRs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@torranx @Tempo-anon @innerthunder