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

Updating to main #151

Merged
merged 358 commits into from
Aug 22, 2024
Merged

Updating to main #151

merged 358 commits into from
Aug 22, 2024

Conversation

ben-lear
Copy link
Collaborator

No description provided.

pom-eranian and others added 30 commits August 1, 2024 22:01
…3292)

* [Fix][Sprite] 4083 Galarian Farfetch'd exp

Fixed cropped feet on exp for default & shiny.
Rearranged spritesheet to fit new size.
Both sritesheets have identical sprite framing.
Both json are identical.

* [Sprite] 71- Fixed  missing stem

fixed missing stem segment on victreebil's head
default and shiny
png positions are identical
json are identical
…gefaultgames#3275)

* localize form change message (test required)

* Update src/locales/fr/pokemon-form.ts

Co-authored-by: Lugiad' <[email protected]>

* Update src/locales/pt_BR/pokemon-form.ts

Co-authored-by: José Ricardo Fleury Oliveira <[email protected]>

* Update src/locales/zh_CN/pokemon-form.ts

Co-authored-by: mercurius-00 <[email protected]>

* Update src/locales/zh_TW/pokemon-form.ts

Co-authored-by: mercurius-00 <[email protected]>

* Update src/locales/de/pokemon-form.ts

Co-authored-by: Jannik Tappert <[email protected]>

* Update src/locales/it/pokemon-form.ts

Co-authored-by: Niccolò <[email protected]>

---------

Co-authored-by: Lugiad' <[email protected]>
Co-authored-by: José Ricardo Fleury Oliveira <[email protected]>
Co-authored-by: mercurius-00 <[email protected]>
Co-authored-by: Jannik Tappert <[email protected]>
Co-authored-by: Niccolò <[email protected]>
…agefaultgames#3092)

* Create enemy-ai.md

* Finish enemy-ai doc

* Fix outspeed logic + document enemy command functions

* Fix errors in target score formula

* Add example section and implementation guidelines

* Add info on matchup score range

* Fix GitHub rendering issues (maybe)

* Add types to function comments

* Trying to fix GitHub rendering issues again

* Use images for "cases" equations instead
…#3297)

* [Sprite] Recolour shiny Clawitzer

Palette taken from back counterpart

* [Sprite] Recolour shiny Clawitzer

Palette taken from back counterpart
* Allow Starters to Remember Egg Moves

* Adjust Documentation

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

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

* Fix some cases of wrong affixes

* There are two trainer send out messages

---------

Co-authored-by: Adrian T. <[email protected]>
Co-authored-by: NightKev <[email protected]>
* Add female and double grunts, add localizations

* Update src/locales/fr/trainers.ts

Co-authored-by: Lugiad' <[email protected]>

* Update src/locales/it/trainers.ts

Co-authored-by: Niccolò <[email protected]>

* Update src/locales/ko/trainers.ts

Co-authored-by: Enoch <[email protected]>

* Update src/locales/pt_BR/trainers.ts

Co-authored-by: José Ricardo Fleury Oliveira <[email protected]>

* Update trainers.ts

---------

Co-authored-by: Lugiad' <[email protected]>
Co-authored-by: Niccolò <[email protected]>
Co-authored-by: Enoch <[email protected]>
Co-authored-by: José Ricardo Fleury Oliveira <[email protected]>
* chore: Refactor excludedMenus logic in MenuUiHandler

* Refactor excludedMenus logic in MenuUiHandler

* Update src/ui/menu-ui-handler.ts

Co-authored-by: flx-sta <[email protected]>

* Refactor excludedMenus logic in MenuUiHandler

* chore: Add setup method to MenuUiHandler

* Refactor excludedMenus logic in MenuUiHandler

---------

Co-authored-by: flx-sta <[email protected]>
* [Fix][Sprite] 4083 Galarian Farfetch'd exp

Fixed cropped feet on exp for default & shiny.
Rearranged spritesheet to fit new size.
Both sritesheets have identical sprite framing.
Both json are identical.

* [Fix][Sprite] 1001 Wo-Chien exp fix

cleaned up tips of antlers
slightly improved back sprite
default + shiny. identical json, identical framing
…3309)

* Update trainers.ts

* Update bgm-name.ts

* Update bgm-name.ts
* `resetArenaEffects()` should also reset weather

* Update function doc
…agefaultgames#3298)

* added revive function in gamaManager & a double-battle test

* extended timeout of double battle test referencing to battle test

* less code, deleted unused param, clearer description of test

* add back dbond to move in test

* more straight forward testing

* reverse back override

* polish double battle test a bit
…agefaultgames#3281)

* localize missed move-trigger message and remove redundant getPokemonMessage

* Update src/locales/zh_CN/move-trigger.ts

Co-authored-by: mercurius-00 <[email protected]>

* Update src/locales/zh_TW/move-trigger.ts

Co-authored-by: mercurius-00 <[email protected]>

* Update src/locales/de/move-trigger.ts

Co-authored-by: Jannik Tappert <[email protected]>

* Update src/data/move.ts

Co-authored-by: Jannik Tappert <[email protected]>

* Update src/locales/de/move-trigger.ts

Co-authored-by: mercurius-00 <[email protected]>

* Update src/locales/zh_TW/move-trigger.ts

Co-authored-by: mercurius-00 <[email protected]>

* Update src/locales/zh_CN/move-trigger.ts

Co-authored-by: mercurius-00 <[email protected]>

* Update src/locales/fr/move-trigger.ts

Co-authored-by: Lugiad' <[email protected]>

* Update src/locales/it/move-trigger.ts

Co-authored-by: Niccolò <[email protected]>

* Revert "Update src/data/move.ts"

This reverts commit 4dd6130.

* fix italian param error

* Update src/locales/de/move-trigger.ts

Co-authored-by: Jannik Tappert <[email protected]>

* Update src/locales/de/move-trigger.ts

Co-authored-by: Jannik Tappert <[email protected]>

* Update src/locales/pt_BR/move-trigger.ts

Co-authored-by: José Ricardo Fleury Oliveira <[email protected]>

---------

Co-authored-by: mercurius-00 <[email protected]>
Co-authored-by: Jannik Tappert <[email protected]>
Co-authored-by: Lugiad' <[email protected]>
Co-authored-by: Niccolò <[email protected]>
Co-authored-by: José Ricardo Fleury Oliveira <[email protected]>
* [Sprite] Missing Gen 7 variant icons

Taken from current icon spritesheet

* [Sprite] Remove non-Gen 6 icon

* Delete public/images/pokemon/icons/variant/6/742_3.png

* Delete public/images/pokemon/icons/variant/6/743_2.png

* Delete public/images/pokemon/icons/variant/6/743_3.png

* Delete public/images/pokemon/icons/variant/6/777_2.png

* Delete public/images/pokemon/icons/variant/6/777_3.png

* Delete public/images/pokemon/icons/variant/6/779_2.png

* Delete public/images/pokemon/icons/variant/6/779_3.png

* Delete public/images/pokemon/icons/variant/6/354-mega_2.png

* Delete public/images/pokemon/icons/variant/6/354-mega_3.png

* [Sprite] Missing Mega Banette variant icons

Taken from the Gen 6 variant icon folder

* [Sprite] Missing Poltchageist/Sinistcha form icons

Renamed duplicates of alternate forms
…d() function (pagefaultgames#3310)

* refactor duplicated code into leaveField function

* replace bugfix code
…ames#3316)

* add confirmExit popup

* add translation entries for `confirmExit`

* Update src/ui/starter-select-ui-handler.ts

Co-authored-by: Adrian T. <[email protected]>

---------

Co-authored-by: Adrian T. <[email protected]>
frutescens and others added 24 commits August 18, 2024 05:50
* Removed isFreshStartChallenge() check

* Better conditional

---------

Co-authored-by: Frutescens <info@laptop>
…aultgames#3596)

* Add hideInfo param to leaveField

* Update docs for leaveField
* Needs more testing.

* removed debugging

---------

Co-authored-by: Frutescens <info@laptop>
…mes#3610)

* 177-178 icons, variant icons

* 178 icons

* [HotFix][Sprite] Xatu female variants added

* [HotFix][Sprite] Floette json: update to match images

* Xatu variant- reverted _masterlist

reverted _masterlist.json
added anim files for both female variants

* [fix] Xatu female: show variants, added back sprite anim

Edited _masterlist on correct keys
added anim json for back sprites
…3611)

* Should fix it.

* typedocs fixes

---------

Co-authored-by: Frutescens <info@laptop>
…riant setting is wrong.

in addition, that fix code include gender fix, so i revert old gender fix.
update wrong log message.
…ant-form-bugs

[Hotfix] Fixed a bug occurring when only single rare/epic variant or a single rare form in Starter UI
…-fix

[Bug] Fixed issue with falsy issue within condition to get a stat for IV scanner
…mes#3619)

* Fix Memory Mushroom not showing relearner moves

* Fix rollout test
cropped static frames, fixed cropped sprite
set runerigus exp to use the shiny exp's animation
verified all hex colors are unchanged

- fixed ultra necrozma exp front variant swapped arrays.
- xatu female eye color fix
…#3630)

* Endless MBH Fix

* add import

* Revert "add import"

This reverts commit 814a405.

* Revert "Endless MBH Fix"

This reverts commit 8eb4481.

* removed newline

---------

Co-authored-by: Frederico Santos <[email protected]>
Co-authored-by: frutescens <info@laptop>
* enable mock containers to be found by name

* enable mock text to be found by name

* add test coverage for type-hints

Only for "immunity" and "status moves"
* Still have no idea where Eternatus is given the MBH....

* typedocs

---------

Co-authored-by: frutescens <info@laptop>
…rops (pagefaultgames#3624)

* Abilities that prevent ATK drops no longer stop other stat drops

* Apply suggestions from code review

Co-authored-by: Mumble <[email protected]>

* Add `isNullOrUndefined()` utility function

---------
Copy link

netlify bot commented Aug 20, 2024

Deploy Preview for pokerogue-mystery-encounter-beta ready!

Name Link
🔨 Latest commit d0844d1
🔍 Latest deploy log https://app.netlify.com/sites/pokerogue-mystery-encounter-beta/deploys/66c76ff0a37cbf0008336560
😎 Deploy Preview https://deploy-preview-151--pokerogue-mystery-encounter-beta.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@ben-lear ben-lear merged commit 87c450a into mystery-battle-events Aug 22, 2024
8 checks passed
@ben-lear ben-lear deleted the updating-to-main branch August 22, 2024 17:16
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.