Commit Graph

4460 Commits

Author SHA1 Message Date
pom-eranian
4e811ae7ed Merge branch 'variant_update_oct' of https://github.com/pom-eranian/pokerogue into variant_update_oct 2024-10-25 21:43:45 -04:00
pom-eranian
cf7e1c7e94 Reverted override file pushed By Mistake
WHY WAS IT THERE.
2024-10-25 21:41:28 -04:00
pom-eranian
1e265071f1
Merge branch 'pagefaultgames:beta' into variant_update_oct 2024-10-25 21:30:26 -04:00
pom-eranian
add7373052 Updated variant icon sheets 2024-10-25 21:26:46 -04:00
pom-eranian
83e744d9ee [fix] 658 corrected color error
white on knees
2024-10-25 20:51:28 -04:00
pom-eranian
fa104fb822 [fix][icons] torchic, combusken, blaziken gender icons 2024-10-25 20:12:02 -04:00
pom-eranian
0f815e2d66 658 greninja, ash greninja [rare epic]
base fixes
animation standardized front / back
variant palettes
variant icons
added to masterlist
2024-10-25 20:09:43 -04:00
Smewkie
61cf937cab
[Balance] Ferroseed HA
Ferroseed HA
2024-10-26 00:38:12 +01:00
PigeonBar
f87ac116fa
[Beta] Stop Transform giving copied moves negative fractional ppUp (#4722)
* [Beta] Stop Transform giving copied moves negative fractional `ppUp`

* Remove some bangs/etc

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-25 19:34:40 -04:00
chaosgrimmon
6418f46bf7
[Sprite] Fix transparency of pixels on Fletchinder (#4720)
* [Sprite] Front Fletchinder

* [Sprite] Back Fletchinder

* [Sprite] Shiny front Fletchinder

* [Sprite] Shiny back Fletchinder
2024-10-25 16:02:05 -07:00
Frederico Santos
a50763cd89 updating locales 2024-10-25 23:29:20 +01:00
innerthunder
414e0a5447
[Balance] Change Tyrogue to move-based evolutions (#4694) 2024-10-23 23:17:55 -07:00
pom-eranian
df327e6fa5 [658] ash-greninja static front variants 2024-10-23 22:44:47 -04:00
Opaque02
a2419c4fc3
[Misc] Add admin for (un)linking 3rd party accounts (#4198)
* Updated admin panel to allow the concept of unlinking accounts

* Don't look too hard at this commit, nothing to see here

* Admin stuff

* Fixed linking and unlinking and updated menu options

* Undid some changes and cleaned up some code

* Updated some logic and added some comments

* Updates to admin panel logic

* Stupid promises everyone hates them and they deserver to die

* Promise stuff still

* Promises working thanks to Ydarissep on discord - pushing with debug code before it decides to stop working again

* Removed debugging code

* All discord functionality seems to be working here?? Not sure what happened but yay

* Fixed up some bugs and code

* Added registered date to the panel

* Fixed and updated some minor error message related stuff

* Minor changes

* Fixed some minor bugs, made the save related errors have error codes, and added updated icons

* Updated search field error

* Missed a couple of things to push

* Fixed linting and doc errors

* Revert dev related code and clean up dev comments

* Reverting utils

* Updating front end to match back end from Pancakes' comments

* make getFields and getInputFieldConfigs a single function of FormUiHandler

* remove outdated doc

* Apply suggestions from code review

Moka review changes

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

* Added docs

* eslint fixes

* Fixed error not showing up in certain conditions

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: MokaStitcher <millennium.stitcher@gmail.com>
Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
Co-authored-by: innerthunder <brandonerickson98@gmail.com>
2024-10-23 22:00:07 +02:00
Moka
a13550ec44
[Balance][ME] Various ME Balance changes (#4700)
* balance changes and updates to various MEs

* fix import to new item

* fix import to new item

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

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

* Update src/phases/select-modifier-phase.ts

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

* Update src/modifier/modifier.ts

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

* Update src/modifier/modifier.ts

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

* revert item atlas changes

* eslint

* revert 'revert item atlas'

* update locale repo to latest commit

* Fix fiery fallout missing argument

* [balance] Training session ME does not update Seen/Defeated GameStats

* [balance] update Weird Dream ME maximum spawn wave

* [ME] update CombinationRequirements to allow AND or OR combinations

* refactor: CombinationPokemonRequirement `.Some()` and `Every()`

* chore: rename `orRequirements` to `requirements`

* fix: returns of `Some()` and `Any()`

* apply `Some()` / `Any()` pattern to `CombinationSceneRequirement` too

* revert 'offer you can't refuse' giving Silver Pokeball'

* Apply code review suggestions

* [me] Weird Dream: apply same old gateau logic to team in options 1 and 2

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
Co-authored-by: ImperialSympathizer <110984302+ben-lear@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: innerthunder <brandonerickson98@gmail.com>
2024-10-23 21:46:57 +02:00
innerthunder
c7e9eaf435
[P2] Fix binding, etc. not being removed when switching with Baton Pass (#4709)
* Fix binding, etc. not being removed when switching with Baton Pass

* New baton pass test
2024-10-23 11:24:50 -04:00
schmidtc1
958d79140c
[P2] Fixes Transform/Imposter not updating type/battle stat changes immediately; set move PP to 5 when transforming (#3462)
* Adds updateInfo to transform move/ability, mirrors Transform functionality in Imposter

* Implements functionality for reducing pp to 5 or less for each move when transforming

* Refactors to async/await pattern, adds back removed anims/sounds from last commit

* Eslint fix attempt

* Update src/data/ability.ts

per DayKev's suggestion

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

* Merge and fix conflicts

* Adds unit tests for pp-change with transform/imposter

* Updates to consistency in syntax/deprecated code

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-23 11:12:53 -04:00
NightKev
fd38ab4cb4
[P2] Missing Minior form (violet) now spawns in the wild (#4711) 2024-10-23 11:10:43 -04:00
innerthunder
03025b2674
[P2] Fix various charge move bugs (#4595)
* Add charge move classes and phase

* Integrate `MoveChargePhase` in battle phase sequence

* Fix Protean + charge move interaction

* Fix effect chance applying to semi-invulnerability

* Remove `ChargeAttr` and fix ChargeAnim loading

* Restore move history entry for charge phases

* Gravity now cancels Fly, etc. after charge turn

* Dig integration tests

* Fly integration tests

* Dive integration test + fix Dive in Harsh Sun bug

* Solar Beam integration tests + `CHARGING` tag fixes

* Fix dive test

* Electro Shot integration tests

* fix import in MoveChargePhase

* Electro Shot Multi Lens test

* Geomancy integration tests

* Fix duplicate move queue

* Update import

* Docs + Fix Meteor Beam being boosted by Sheer Force

* Fix volt absorb test

* Apply PigeonBar's suggested move-phase changes

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

* Make Electro Shot Sheer Force boosted again

* Apply PigeonBar's feedback pt. 2

* Apply suggestions from code review

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

* Fix mistimed/dupe showMoveText and leftover TODO

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
2024-10-23 11:08:40 -04:00
Moka
16b7194366
[P3] Fix Egg Summary not showing new abilities in blue (#4712) 2024-10-23 11:05:13 -04:00
bjparker1226
a0baf89297
[P2] Fix dark deal reducing transformed Pokemon's held item stack to 1 (#4707) 2024-10-23 11:04:37 -04:00
pom-eranian
4b7f6c6ddb
Merge branch 'pagefaultgames:beta' into variant_update_oct 2024-10-22 23:57:58 -04:00
pom-eranian
c53a164490 688 689 Binacle Barbaracle [Base Fix, Rare, Epic] - @ saltedcarriemel
replaced front static by first frame of exp
base fixes
variant palettes
variant icons
added to masterlist
2024-10-22 23:56:52 -04:00
pom-eranian
639fb01790 [masterlist] added 656 657 froakie frogadier [GRENINJA MISSING] 2024-10-22 23:48:16 -04:00
pom-eranian
96c8cd9a2c [masterlist] added 1012 1013 poltchaageist sinistcha 2024-10-22 23:47:22 -04:00
pom-eranian
537f312940 [masterlist] added 25 26 172 2025 pikachu raichu pichu a-raichu 2024-10-22 23:46:04 -04:00
pom-eranian
5fecd9708e removed variant images included in commits for 25 26 172 2026, 1012 1013, 656 657 2024-10-22 23:27:36 -04:00
pom-eranian
c45ee71023 656 657 froakie frogadier 2024-10-22 23:19:40 -04:00
pom-eranian
af8f088f75 25 other icons 2024-10-22 23:18:30 -04:00
pom-eranian
de1eaf7436 25 pikachu - corrected icon colors, shiny correct colors 2024-10-22 23:18:16 -04:00
pom-eranian
205e9397dc 2026 alolan raichu [basefix rare epic] 2024-10-22 23:17:43 -04:00
pom-eranian
381874111f 25-cosplay pikachu 2024-10-22 23:16:51 -04:00
pom-eranian
5dafcf8241 25 pikachu 2024-10-22 23:16:50 -04:00
pom-eranian
9f7c306d5f 25-partner pikachu 2024-10-22 23:16:50 -04:00
pom-eranian
dd867a22f3 25-cool-cosplay pikachu 2024-10-22 23:16:02 -04:00
pom-eranian
6a085442f8 25-cute-cosplay pikachu 2024-10-22 23:16:01 -04:00
pom-eranian
106a628bc5 25-smart-cosplay pikachu 2024-10-22 23:16:00 -04:00
pom-eranian
21a9af262a 25-tough-cosplay pikachu [epic rare] 2024-10-22 23:16:00 -04:00
pom-eranian
25244e5b96 25-beauty-cosplay pikachu 2024-10-22 23:15:19 -04:00
pom-eranian
754d91cafe 25 raichu [basefix] added missing female back 2024-10-22 23:15:18 -04:00
pom-eranian
eb8cf580a3 25-gmax pikachu [basefix rare epic] 2024-10-22 23:15:18 -04:00
pom-eranian
d24c35e54f 26 raichu [basefix rare epic] 2024-10-22 23:15:17 -04:00
pom-eranian
2fe370b715 172 Pichu [basefix rare epic] 2024-10-22 23:14:43 -04:00
pom-eranian
2afe852f1e 1012 1013 Poltchageist, Sinistcha
icons, variants, base fixes, my sanity
2024-10-22 23:13:44 -04:00
NightKev
1ad4f3b376
[Test] Add STATUS_ACTIVATION_OVERRIDE to overrides.ts (#4689)
This applies to Paralysis and Freeze

Added Paralysis test to demonstrate usage

- Consolidate `this.cancel()` calls
2024-10-22 23:11:02 -04:00
Blitzy
0fe57b44b5
[Balance] Add Exclusive Moves from Prior Evolutions via Memory Mushroom (#4681) 2024-10-22 18:13:10 -07:00
damocleas
96e5f2d763
Starmobile Stat Adjustments (#4704)
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
2024-10-22 18:07:28 -07:00
Mumble
5e7f2042fc
[UI][QoL] Cursor defaults to Fight at the start of each new wave (#4666)
* cursors are dumb

* update

* fixed?

* maybe solution

* fix in!

* Possible cursor fixes

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: Opaque02 <66582645+Opaque02@users.noreply.github.com>
2024-10-22 13:05:37 -07:00
pom-eranian
0441fc9465 reformat of masterlist with less whitespace 2024-10-22 16:04:11 -04:00
pom-eranian
0617df049d [QoL] reordered key for 6713 exp 2024-10-22 14:44:26 -04:00