Commit Graph

4691 Commits

Author SHA1 Message Date
Bertie690 15e74a50d1
Update comment 2025-01-29 07:52:44 -05:00
Bertie690 9154ffed8b
Merge branch 'beta' into instruct 2025-01-29 07:41:05 -05:00
AJ Fontaine 8d11313458
[Misc] Charms in any events (#5194) 2025-01-27 14:44:21 -08:00
Lugiad ec68ec2066
[UI/UX] Year of the Snake event banners (#5192)
* Update loading-scene.ts

* 2025 Lunar Year Banners
2025-01-27 15:22:47 -07:00
Bertie690 f44bdd2709
Merge branch 'beta' into instruct 2025-01-27 07:43:31 -05:00
NightKev 2593d0206c
[i18n] Update locales submodule (#5190) 2025-01-26 16:12:11 -08:00
David Yang 33982c311e
[UI/UX] Allow viewing egg list from rewards screen (#5181) 2025-01-26 10:28:03 -07:00
AJ Fontaine f1c06a5476
[Sprite] Fix Lugia backsprite being cut off (#5144) 2025-01-25 18:58:21 -08:00
damocleas 706a23238c
Revert "[Bug] Fix miniblackhole (#5169)" (#5183)
This reverts commit 9c29cdc63d.
2025-01-25 14:29:09 -08:00
Bertie690 5fe09e0ecf Fixed test comments + added copycat test 2025-01-25 16:32:36 -05:00
Bertie690 37bbc1d232
comment fix
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-25 15:39:20 -05:00
NightKev d6ee42ea2d Merge branch 'beta' into instruct 2025-01-25 12:01:39 -08:00
NightKev 996ce5d986
[Misc] Update version to 1.5.0 (#5175) 2025-01-24 21:06:57 -08:00
NightKev 1a57d3998f
Merge branch 'main' into beta 2025-01-24 21:04:13 -08:00
AJ Fontaine 8685ec3c3c
[Misc] Rework some aspects of timed events (#5099)
* Refactor timed event changes

* Use getWeather function

* Add mystery encounter tier change/disabling to timed events

* Event luck boost, event encounter helper function

* Events without shiny boost shouldn't give shiny charm

* globalScene -> this in battle scene class

* Change event pools
2025-01-24 15:59:24 -07:00
Bertie690 747656e8df
[Test] Added learn move utility function & level cap overrides (#5058)
* Added learn move utility function
* Added utility functions
* add another test
* Update overrides.ts
* Update moveHelper.ts
* Update overridesHelper.ts
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-23 18:47:22 -07:00
Xavion3 9c29cdc63d
[Bug] Fix miniblackhole (#5169) 2025-01-23 17:18:21 -07:00
Lugiad 134c6e928f
[UI/UX] New version of the 0 (zero) of pokemon-emerald-pro font (#5167) 2025-01-22 11:15:48 -07:00
Wlowscha d10b7c05f7
[Refactor] Descriptions for evolution and form change requirements (#5147)
* Adding extensions of the SpeciesEvolutionCondition class

* Commented out logs

* Introducing descriptions for form changes; new class SpeciesFormChangeAbilityTrigger which is functionally identical to SpeciesFormChangeManualTrigger but has appropriate description

* Fix in description of compound trigger

* Commenting out logs

* Small fixes, clearing logs, implementing suggestions

* Apply suggestions from code review

Trigger functions are declared with no arguments when not needed.

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* Removed exports for new classes

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-21 16:42:27 -07:00
AJ Fontaine 271e51be58
[Balance] [Feature] Match evil teams to monogen challenge (#4850)
* Match evil teams to monogen challenge

* Remove outdated comment

* Remove BBL adjustment

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-21 15:40:05 -07:00
Madmadness65 93fc779350
[Bug] Fix G-Max Urshifus having wrong movesets (#5162) 2025-01-21 15:34:18 -07:00
AJ Fontaine 39283e373b
[UI/UX] Add sort by caught/hatched count to starter select (#5161) 2025-01-20 15:43:55 -07:00
NightKev d85aedbdfc
[Bug] Prevent pokemon with 0 HP from being statused (#5137)
* [Bug] Prevent pokemon with 0 HP from being statused

* Update test

* Move check to `trySetStatus()` and update test
2025-01-20 09:12:58 -08:00
NightKev d495c48716 [i18n] Update locales submodule 2025-01-20 09:11:58 -08:00
Wlowscha f551c51413
[UI/UX] Adding options to see mons with only one or only two cost reductions (#5045) 2025-01-20 10:01:42 -07:00
Unicornpowerstar ce30897c0a
[Sprite] Update Primal Kyogre Backsprite (#5156) 2025-01-19 16:48:07 -07:00
Scooom 58b7f67ca8
[Challenge] Fix flip inverse achievement (#5145)
* Actually issue FLIP_INVERSE achivement

* Local to remote

* Update src/system/achv.ts

Fix correctly giving FLIP_INVERSE

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

---------

Co-authored-by: Scooom <jerry@hosterslice.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-19 12:15:59 -07:00
Unicornpowerstar 05485aefdd
[Sprite] Flutter mane back sprite adjustments (#5057)
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-19 11:15:33 -07:00
geeilhan f3256ec5d4
[Move] Improve implementation of Rage Fist damage increase (#5129)
* implementation of rage fist

* Apply suggestions from code review

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* Update src/test/moves/rage_fist.test.ts

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* added removed TODO from some test cases

* Apply suggestions from code review

Added changes to documentation and cleaning up code

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* added protected to updateHitReceivedCount()

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-19 11:52:50 -06:00
Unicornpowerstar 75e66b4099
[Sprite] Update Shelly sprite (#5155)
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-19 11:50:19 -06:00
Unicornpowerstar 46e1268a64
[Sprite][Color fix] 3 Venusaur and all forms (#5153) 2025-01-19 11:26:59 -06:00
NightKev ab17df83c7
[Misc] Disable enforced type-only imports in `overrides.ts` (#5154) 2025-01-19 09:13:48 -08:00
NightKev 24f1fedcd0 [i18n] Update locales submodule 2025-01-18 21:11:29 -08:00
NightKev ea3fbecfd3
[Misc] Replace `globalScene` with `this` in `BattleScene` (#5142) 2025-01-18 19:12:50 -08:00
damocleas ae2c9071e4
[Balance] Update starters.ts, removed redundant starters (#5125) 2025-01-17 17:40:40 -05:00
Bertie690 c85c700b98 fixed flaky test 2025-01-17 12:51:46 -05:00
Bertie690 45649413a4 Merge remote-tracking branch 'upstream/beta' into instruct 2025-01-17 00:07:44 -05:00
Bertie690 d86ce5403e Merge branch 'instruct' of https://github.com/Bertie690/pokerogue into instruct 2025-01-17 00:02:51 -05:00
Bertie690 21c7546ae5 Fixed interaction with instruct and dead mon redirection 2025-01-17 00:02:36 -05:00
Bertie690 81329cfde3
Update ui.ts coment fix
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-16 21:34:30 -05:00
Bertie690 be6595006d
Update moveHelper.ts comment fix
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-16 21:34:17 -05:00
Bertie690 22c6e449b9
Update move.ts comment fix
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-16 21:34:00 -05:00
Bertie690 4526a5b1b3
Update pokemon.ts comment fix
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-16 21:33:50 -05:00
Scooom ca0522436a
[Challenge] Make the Flip Inverse Challenge Secret (#5133)
Co-authored-by: Scooom <jerry@hosterslice.com>
2025-01-16 16:50:19 -08:00
Bertie690 e0600a9476 qqq 2025-01-16 19:42:42 -05:00
Bertie690 131f08a9d7 fixed conflict bugs maybe 2025-01-16 17:37:54 -05:00
Bertie690 fd1577ee82 Merge remote-tracking branch 'upstream/beta' into instruct 2025-01-16 17:33:27 -05:00
Bertie690 01b4cc3b09 Actually fixed tests i think 2025-01-16 16:44:29 -05:00
AJ Fontaine 481616c2ad
[Sprite] Fix female Scizor variants not showing (#5097)
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-16 16:25:50 -05:00
NightKev 188664f389
[Sprite] Fix game not waiting for variant data to finish loading (#5130)
Co-authored-by: Moka <millennium.stitcher@gmail.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-15 20:25:08 -07:00