Commit Graph

4333 Commits

Author SHA1 Message Date
pom-eranian
484915a12b 378 Regice [Base shiny + replacement] - @ Vari 2024-10-14 23:05:09 -04:00
pom-eranian
bb4aba5ef9
Merge pull request #21 from pom-eranian/swirlix-var
682 683 Sprizee Aromatisse - @ Koda_want_to_sleep  - 684 685 Swirlix Slurpuff  - @ gerolau
2024-10-14 20:58:38 -04:00
pom-eranian
a5c1c241f8 682 683 - Sprizee Aromatisse [Rare Epic] - @ Koda_want_to_sleep 2024-10-14 20:43:51 -04:00
pom-eranian
4287ae1cd0 684 685 Swirlix Slurpuff [Rare Epic] - @ gerolau 2024-10-14 20:38:32 -04:00
pom-eranian
b4b6cad32c
Merge pull request #20 from pom-eranian/regibranch
377 378 379 486 894 895 Regis - @ greenninja757, @ _vari_, @ splashceles, @ gonfold, @ sphinx_sage
2024-10-13 17:05:15 -04:00
pom-eranian
813405b15c 377 378 379 486 894 895 Regirock Regice Registeel Regigigas Regieleki Regidrago @greenninja757 @_vari_ @splashceles @gonfold @sphinx_sage
variant icons
variant palettes
base fixes for regigigas, regieleki & registeel
added all to masterlist
2024-10-13 16:07:18 -04:00
pom-eranian
61211ab7c8
Merge pull request #19 from pom-eranian/foongus-sprite
[211 Qwilfish - @  wormhood] [587 Emolga - @ bagonganda] [590 591 Foongus Amoongus - @ Omniv]
2024-10-13 15:40:05 -04:00
pom-eranian
5f4af620ba [fix] masterlist Added missiing variants. Added Qwuilfish variants
Qwilfish icons
variant palettes

Enabled variants for pokemon in title.
39 40  174 Jigglypff Wigglytuff Igglybuff
587 Emolga
211 Qwilfish
2024-10-13 15:28:49 -04:00
pom-eranian
4c2c2dc2a5 587 Emolga [Rare Epic] @ bagonganda
icons variants
front back base fix
variant palettes
2024-10-13 15:18:04 -04:00
pom-eranian
56975e336e 590 591 Foongus Amoongus @ Omniv
variant icons
variant palettes
fixes for base front and back
2024-10-13 15:12:21 -04:00
pom-eranian
0ae54d5dce
Merge branch 'beta' into variant_update_oct 2024-10-12 14:06:31 -04:00
pom-eranian
f95c06a152 Merge branch 'variant_update_oct' of https://github.com/pom-eranian/pokerogue into variant_update_oct 2024-10-12 14:05:19 -04:00
pom-eranian
bc5b018ef2 [fix] masterlist -removed incorrect entry 2024-10-12 14:04:49 -04:00
pom-eranian
b1f60c4183
Merge pull request #18 from pom-eranian/var-swoobat
527 528 Woobat Swoobat [Epic Rare] @ rival_kieran
2024-10-12 13:57:37 -04:00
pom-eranian
fd2f840bc0 527 528 Woobat Swoobat [Epic Rare] @ rival_kieran
base fix on  woobat back, swoobat front, back
palette files for front, back
added to masterlist
variant icons
2024-10-12 13:50:41 -04:00
pom-eranian
bd428caadf [fix] 359 - masterlist - removed ghost entry for exp absol 2024-10-12 13:18:35 -04:00
PigeonBar
b7eb95b761
[Test] Fix several flaky tests (#4639) 2024-10-12 11:22:26 -04:00
pom-eranian
b411c787b8 Merge branch 'variant_update_oct' of https://github.com/pom-eranian/pokerogue into variant_update_oct 2024-10-11 19:31:44 -04:00
pom-eranian
0530b3681c
Merge pull request #17 from pom-eranian/var-honchkrow
198 430 Murkrow Honchkrow [Epic Rare] @ hamez
2024-10-11 19:12:46 -04:00
pom-eranian
e1118ef92c Merge remote-tracking branch 'upstream/beta' into variant_update_oct 2024-10-11 19:11:48 -04:00
Mumble
cfb92b4e08
[Move] Telekinesis + [Bug] Ingrain (#4506)
* some early set up

* localization

* Added Wiglett family to restrictions

* Added Smack Down + 1000 Arrows Interactions

* Added checks for certain tags

* Gravity removes telekinesis from all pokemon on the field

* need to check something else real quick

* mmmmmm

* think this is fine?

* ingrain fixes

* more ingrain

* Telekinesis Test + Move Fix

* Test Name change

* another day another try...

* Test Cleanup

* fsfdsfds

* Revert "fsfdsfds"

This reverts commit cb7abcfd9f.

* whoops

* Apply suggestions from code review

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

* Missed one

* Update src/data/move.ts

Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>

* Add separate battler tags in move attr

* Update src/data/battler-tags.ts

Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>

* removed onRemove

* Documentation

* Update src/data/battler-tags.ts

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
2024-10-11 17:44:16 -04:00
pom-eranian
78c853aea0 198 430 Murkrow Honchkrow Variants [Epic Rare] 2024-10-11 17:42:23 -04:00
pom-eranian
11822573ea Murkrow Honchkrow - Icons for variant & female murkrow 2024-10-11 16:25:43 -04:00
pom-eranian
d7b59c1553 Honchcrow Murkrow [Base fixes] 2024-10-11 16:17:21 -04:00
innerthunder
7645d5042d
[P3] Fix "falsex" type hint for Sheer Cold against ice types (#4638)
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-11 16:09:15 -04:00
pom-eranian
f0cc1fc88b
[Sprite] Hisui Goodra, Sliggoo, Shiftry (#4642)
* [Sprite][Anim] 275 Shiftree- cropped ear fix - @hamez

* 705 6706 Sliggoo Hisuian Goodra [Color Fixes] - @ rival_kieran

- Fix to Kalosian Sligoo (705). Front exp should now use shaders properly.
- Fix to all of Hisuian Goodra's base sprites + Variants to allow them to use shaders properly (as they didn't before). .json file included.
- Fix to Hisuian Goodra's back static Rare Variant which used colors from the Epic variant on accident on cheeks + spots and drips.
- Hisuian Goodra's eyes on Variant (Rare, Epic) exps were mapped to the wrong color compared to the statics, this has been fixed.
- All images should be indexed.

* Set variants to palette, removed old files
2024-10-11 16:08:39 -04:00
MokaStitcher
89d7e7ea65
[P3][UI] Fix tooltip bugs in Starter Select screen (#4641)
* [UI] Fix candy friendship tooltip bug in Starter Select

* [UI] remove tooltip when exiting starter select screen
2024-10-11 15:46:00 -04: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
pom-eranian
d5485e310d Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into beta 2024-10-10 22:02:54 -04:00
pom-eranian
bd83ab9f24 [Sprite][Anim] 275 Shiftree- cropped ear fix - @hamez 2024-10-10 17:17:20 -04: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 PostDefendAbAttrs (#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
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
pom-eranian
ba2f5dd6fb
Merge pull request #16 from pom-eranian/variant-absol
359 - Absol Mega Absol [Variants] - @ rival_kieran
2024-10-09 09:52:49 -04:00
pom-eranian
fb94e7801b
Merge branch 'beta' into variant_update_oct 2024-10-09 09:49:39 -04:00