random-mirrors
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,303 Commits 36 Branches 7 Tags 2.6 GiB
Commit Graph

4303 Commits

Author SHA1 Message Date
Mumble 480660f535
Merge branch 'beta' into bug4604 2024-10-11 09:28:14 -07:00
frutescens cd1bff287f added new arenaroomtag parent class 2024-10-11 09:26:30 -07:00
frutescens 44348ce6da Revert "added removeOnOverlap param" 
This reverts commit 2040c85c81.
 2024-10-11 09:26:30 -07:00
frutescens 05ff80461a Revert "quick fix to conditional" 
This reverts commit 6fe8c24e81.
 2024-10-11 09:26:30 -07:00
Mason S 70b9a43c8b
[P2] Fix first-turn status damage and arena hazards (#3528) 
* [Bug] Toxic Spikes implementation issues fixed

Adjusted MoveEffectPhase.start() so that ENEMY_SIDE targeted moves no longer occur twice per use in double battles.

Updated Toxic Orb test to no longer expect a tick of damage turn 1.

Fixed Toxic/Poison dealing damage immediately when applied.

Fixed Hazards not persisting through save

Added unit tests

Fixed flyout not displaying correct number of Spikes/Toxic Spikes after a refresh

* Update Toxic Orb test

* Updates Toxic Spikes tests

* Apply suggestions from code review

* Fix merge issues

Replace `integer` with `number` in `arena-tag.ts`

* Remove partial Magic Bounce implementation

* Remove stray newline

* Remove extra change in safeguard test

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-10-11 10:41:54 -04:00
MokaStitcher 4f456339f4
[UI] Remove score display in voucher menu (#4616) 2024-10-11 10:26:47 -04:00
MokaStitcher 80a784ac8d
[P3 Beta][UI] Fix loading behavior introduced with save preview (#4633) 
* [ui] partially revert loading behavior introduced with save preview

* [beta][ui] fix scrolling issue in Load Game menu
 2024-10-11 10:24:53 -04:00
NightKev 407cd65dcb
[Misc] Enemy item override will now apply to all enemies (#4620) 
* Enemy item override will now apply to all enemies

* Update tsdocs
 2024-10-11 00:20:28 -07:00
Mumble f2485492af
Merge branch 'beta' into bug4604 2024-10-10 19:14:24 -07:00
Amani H. 3f63c147a3
[P3] Fix "Stat Won't Go Any Lower/Higher" Not Appearing (#4635) 2024-10-10 12:44:51 -07:00
NightKev 5d0b361320
[P2] Syrup Bomb effect is removed when user leaves the field (#4606) 
* Syrup Bomb's effect expires when the move user leaves the field

* Add test

* Remove check for the affected pokemon being switched out
 2024-10-10 13:19:05 -04:00
ImperialSympathizer 6ad5ba972c
[Enhancement] Refactor Starter Species to use separate EggTier map (#4591) 
* creates table for tracking species egg tiers

* creates table for tracking species egg tiers

* rename EggTier enum values

* replace clamp util function with Phaser function

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
 2024-10-10 09:29:26 -07:00
Adrian T. 0996789ee6
[Refactor] Improve typing in `phaseInterceptor.ts` (#4560) 
* improve typing in phaseInterceptor

* add more param typings

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-10-10 11:54:43 -04:00
NightKev ba7e26152e
[Bug] Fix substitute interactions with `PostDefendAbAttr`s (#4570) 
* Fixes some Substitute interactions

Specifically with Disguise/Ice Face and Gulp Missile

* Add tests

* Fix linting

* Add `hitsSubstitute()` checks to all `PostDefendAbAttr`s

Also fix comment indentation in `MoveEffectPhase`

* Revert `move-effect-phase.ts` changes
 2024-10-10 11:45:02 -04:00
Mumble a778537cca
[P2] Sketch Failure Bug involving multiple Sketch-s in a moveset (#4618) 
* Sketch bug fix

* Added test

---------

Co-authored-by: frutescens <info@laptop>
 2024-10-10 11:43:50 -04:00
PigeonBar 64147e4414
[P2] Fix Battle Bond continuing to affect Water Shuriken after Greninja returns to base form (#4602) 
* [Bug] Fix Battle Bond continuing to buff Water Shuriken after Greninja returns to base form

* Test cleanup

* PR feedback

* Update test to use getMultiHitType()

* PR Feedback
 2024-10-10 11:40:14 -04:00
Mumble 51894d46c2
[P2] Pollen Puff ally behavior fixed (#4615) 
* pollen puff fix

* bcvbvcbfd

* integerholder to numberholder

* moved it back

---------

Co-authored-by: frutescens <info@laptop>
 2024-10-10 11:38:17 -04:00
Mumble e9906ea229
[P2] Obstruct/Kings Shield/etc no longer reduce stats through Clear Body/etc (#4627) 
* bug fix

* Add test

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-10-10 11:31:10 -04:00
NightKev 52257def2f
[P3] Fix enemy used PP flyout, fixes #4622 (#4629) 
Also add missing function return types
 2024-10-10 11:30:19 -04:00
PigeonBar ca3cc3c9c6
[P1 Bug] Fix infinite recursion from abilities disabled by Sheer Force (#4631) 2024-10-10 11:28:26 -04:00
frutescens 6fe8c24e81 quick fix to conditional 2024-10-09 23:20:44 -07:00
frutescens f1d018d3a6 Revert "bug fix" 
This reverts commit c9cc32b9f3.
 2024-10-09 23:16:01 -07:00
frutescens 2040c85c81 added removeOnOverlap param 2024-10-09 23:15:47 -07:00
frutescens c9cc32b9f3 bug fix 2024-10-09 22:52:37 -07:00
flx-sta f180b6070e
[Qol] Load i18n en locales during tests (#4553) 
* add: i18n backend support

the backend is being supported by using msw which will import the correct file from the local locales folder

* fix: tests to no longer rely on static i18n keys

* Update src/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts

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

* Update src/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts

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

* Update src/test/ui/type-hints.test.ts

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

* Update src/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts

Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>

* Fix typos

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>

* Fix linting

* update locales submodule

update reference to `56eeb809eb5a2de40cfc5bc6128a78bef14deea9` (from `3ccef8472dd7cc7c362538489954cb8fdad27e5f`)

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
 2024-10-09 13:01:49 -07:00
Mumble ffe941d235
[Feature][UI] Save Preview (#4410) 
* Making 3 Option UI real

* idk anymore

* Revert "Making 3 Option UI real"

This reverts commit beaad44c1e.

* Let's see

* Current issues - scrolling upwards and correct cursor landing

* argh

* Fixed reactive scrolling

* Adding ME handling

* set up descriptions

* Cleaned up UI i think

* stupid alder

* Added double trainer handling + changed enum name

* Apply suggestions from code review

Thank you Moka!

Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>

* Arrow Visibility now depends on Session Slot hasData

* documentation

* Simplified calls to revertSessionSlot + changed function name per feedback

* Fixed scrollCursor issue.

* added comment

* Update src/ui/save-slot-select-ui-handler.ts

Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>

* Fixed sound played + added better conditional

* Balance Team....

* ME related changes

* Apply suggestions from code review

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

* Update src/data/mystery-encounters/mystery-encounter.ts

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

* Update src/data/mystery-encounters/mystery-encounter.ts

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

* Sending Doubles-fix

* eslint..

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-10-09 15:04:13 -04:00
MokaStitcher d2c579cf2a
[P2] Prevent generating Pokemon with duplicate IDs in daily runs (#4623) 2024-10-09 14:32:20 -04:00
MokaStitcher deb2035610
[Beta][P2] Fix Grip Claw (#4614) 
* [Beta][P2] Fix Grip Claw

* Add test for Grip Claw

* [test] improve grip claw's test readability

* PR feedback

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-10-09 14:30:28 -04:00
flx-sta d8c914c768
[Beta P3] Fix i18n namespaces map for `mysteryEncounterMessages` from `mystery-encounter-messages` -> `mystery-encounter-texts` (#4617) 
Something I missed in #4611
 2024-10-08 13:44:23 -04:00
flx-sta 39cebb76d0
[Bug] i18n messages files fix (#4611) 
* fix matching for i18n messages files

* update public/locales head
 2024-10-08 13:30:48 -04:00
MokaStitcher 57a967890a
[Offline P1] Fix wrong local save being deleted when creating a new run (#4598) 2024-10-08 11:11:21 -04:00
MokaStitcher 0ede7b057d
[P3][UI] Fix egg gacha overlay not getting cleared properly (#4600) 2024-10-08 11:10:54 -04:00
MokaStitcher 6e10f6600f
[P2] Fix damage achievements not awarding (#4613) 2024-10-08 11:08:25 -04:00
chaosgrimmon 9bb6398385
[Sprite] Fix stray pixels in Kirlia's animation (#4612) 
* [Sprite] Fix Kirlia padding bleedover

* [Sprite] Fix shiny Kirlia padding bleedover
 2024-10-08 11:03:47 -04:00
NightKev a1ca7e632b
[Move] Triple Arrows effect chance for stat change is now 50% (#4543) 
* Triple Arrows effect chance for stat change is now properly 50%

* Add tsdocs to `StatStageChangeAttr`

* Add test for Serene Grace interaction

* Fix linting

---------

Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
 2024-10-08 05:32:51 -07:00
Acelynn Zhang f5fa478eb8
[P1] Fix crash when starting a challenge run after revisiting challenge select screen (#4603) 
Ensure EncounterPhase initializes correctly at the start of the game
after revisting the challenge selection screen.

Fixes #4520
 2024-10-07 12:01:15 -04:00
AJ Fontaine a259ccfc34
[Beta][Test] Fix Scale Shot flaky test (#4564) 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
 2024-10-06 20:29:57 -07:00
NightKev c01fff49c4
[Beta P1] Fix regression in Metal Burst caused by #3974 (#4589) 
Also adds a regression test for the scenario
 2024-10-06 17:31:11 -04:00
chaosgrimmon 1226ab37e1
[Sprite] Compress Bronzor animation (#4593) 
* [Sprite] Compress Bronzor front animation

* [Sprite] Compress Bronzor back animation

* [Sprite] Compress shiny Bronzor back animation

* [Sprite] Compress shiny Bronzor front animation
 2024-10-06 17:29:39 -04:00
ImperialSympathizer a7157bbe9a
fix shop option cursor indexing (#4601) 
Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
 2024-10-06 13:51:34 -07:00
NightKev f9691b872b
Change deploy script to specify "main" instead of `default_branch` (#4557) 2024-10-06 05:47:34 +01:00
Frederico Santos c2c41d9be8 Update subproject commit reference for locales 2024-10-06 02:49:03 +01:00
innerthunder f629a3e453
[P2] Stop G-Max Pokemon from evolving (#4581) 2024-10-05 19:52:53 -04:00
NightKev e8f40c10c9
[Test] Update `create-test` script for linting changes (#4587) 
Add additional boilerplate code

Change prompt to be slightly more accurate

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
 2024-10-05 19:52:13 -04:00
flx-sta 42b75e8440
[Qol] Make i18n money formatter controlled by translators (#4550) 
* fix: i18n money formatter

* fix wrongful console.warn on i18n money formatter

* update locales submodule

update reference to `56eeb809eb5a2de40cfc5bc6128a78bef14deea9` (from `3ccef8472dd7cc7c362538489954cb8fdad27e5f`)
 2024-10-05 23:01:41 +02:00
Xavion3 f562a76332
Make repeat abilities not stack (#4588) 
If due to fusions you have the same ability as both passive and normal, it'll no longer stack with itself.
 2024-10-05 15:10:32 +08:00
innerthunder c99df9712a
[Move] Implement Ion Deluge (#4579) 2024-10-04 17:23:20 -04:00
MokaStitcher 1947472f1c
[P3] Fix start button cursor not being cleared properly in starter select (#4558) 2024-10-04 16:47:12 -04:00
NightKev d362456501
[P2] Diamond Storm should only trigger once when hitting multiple pokemon (#4544) 
* Diamond Storm should only trigger once when hitting multiple pokemon

* Also fix Clangorous Soulblaze just in case

* Fix linting

* Fix linting

Oops missed this one
 2024-10-04 16:29:20 -04:00
innerthunder 27537286b9
[Move] Implement Electrify (#4569) 
* Implement Electrify

* ESLint

* Fix docs
 2024-10-04 16:24:52 -04:00