mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-05 16:02:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: mika:03de6cfe3699463dfaace587c6bdac06ee80ceab
Branches Tags
mika:main
mika:minor-adds
mika:bgm-changes
mika:beta
mika:gh-pages
mika:wild-ghost-goo
mika:modifier-rework
mika:frog/dev
mika:2024-12-3-balanced-friendship
mika:2024-11-17-carpe-diem
mika:2024-10-26-halloween
mika:2024-09-07-egg-summary
mika:2024-09-27-mystery-encounter
mika:2024-08-16-august-variant-update
mika:2024-09-01-run-history
mika:beginning
...
compare: mika:72702abb2ff0aa2902b13345cc8e6fc907d46451
Branches Tags
mika:minor-adds
mika:bgm-changes
mika:beta
mika:gh-pages
mika:main
mika:wild-ghost-goo
mika:modifier-rework
mika:frog/dev
mika:2024-12-3-balanced-friendship
mika:2024-11-17-carpe-diem
mika:2024-10-26-halloween
mika:2024-09-07-egg-summary
mika:2024-09-27-mystery-encounter
mika:2024-08-16-august-variant-update
mika:2024-09-01-run-history
mika:beginning

12 Commits
03de6cfe36 ... 72702abb2f

Author SHA1 Message Date
NightKev
72702abb2f
Fix egg tests (memory use: ~2.4G -> ~550M) (#3757) 2024-08-25 19:07:06 +01:00
Jannik Tappert
2df5da2f61
[QOL] Trainers will display their title after defeat in the name box (#3738) 
* Enemy trainers will now show their title after defeat

* Basically titles are now always shown (like in the real games)

* Revert "Basically titles are now always shown (like in the real games)"

This reverts commit 6943860539.
 2024-08-25 19:52:07 +02:00
flx-sta
49f4f8ea71
[Localization] fix run-history locale files namings (#3745) 
* fix `run-history` locale files namings

* fix imports in `config.ts`
 2024-08-25 19:44:35 +02:00
chaosgrimmon
451307a7d8
Merge pull request #3732 from pom-eranian/variant_png_to_json 
[Sprite] Variant Fixes and Images Converted to Color Swap JSON
 2024-08-25 13:43:09 -04:00
Mumble
933cfcbad3
[Refactor][QoL] Game Audio + New Settings (#3527) 
* Changed how non-BGM are loaded into the game + moved into directories

* some leftovers

* Apply suggestions from code review

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Added setting for Field Volume + rewrote playSound() and updateSoundVolume() functions to reflect the new settings.

* Main -> Beta (#3635)

* Fixed issue with falsy issue within condition to get a stat for IV scanner

* add fix setting code to prevent form/variant bug when default form/variant setting is wrong.
in addition, that fix code include gender fix, so i revert old gender fix.
update wrong log message.

* [Hotfix] Fix Memory Mushroom not showing relearner moves (#3619)

* Fix Memory Mushroom not showing relearner moves

* Fix rollout test

* Rewrite player faint logic in FaintPhase (#3614)

* 867 runerigus sprite (#3629)

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

* [Bug] Preventing the MBH from being stolen in Endless (#3630)

* Endless MBH Fix

* add import

* Revert "add import"

This reverts commit 814a4059c2.

* Revert "Endless MBH Fix"

This reverts commit 8eb4481301.

* removed newline

---------

Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: frutescens <info@laptop>

* [Bug] Fix type-hints for immunity (#3620)

* 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"

* fix wrong message key of curse(ghost type) (#3631)

Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>

* [Hotfix] Steal-able Mini Black Hole Pt 2  (#3632)

* Still have no idea where Eternatus is given the MBH....

* typedocs

---------

Co-authored-by: frutescens <info@laptop>

* [Hotfix] Abilities that prevent ATK drops no longer stop other stat drops (#3624)

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

* Apply suggestions from code review

Co-authored-by: Mumble <kimjoanne@protonmail.com>

* Add `isNullOrUndefined()` utility function

---------

* Grip Claw now shows the proper pokemon nickname (#3634)

Co-authored-by: frutescens <info@laptop>

---------

Co-authored-by: Opaque02 <66582645+Opaque02@users.noreply.github.com>
Co-authored-by: KimJeongSun <leo@atlaslabs.ai>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: cam <lrlrliwoo@gmail.com>
Co-authored-by: Mumble <kimjoanne@protonmail.com>
Co-authored-by: frutescens <info@laptop>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>

* [Bug] Preventing the MBH from being stolen in Endless (#3630)

* Endless MBH Fix

* add import

* Revert "add import"

This reverts commit 814a4059c2.

* Revert "Endless MBH Fix"

This reverts commit 8eb4481301.

* removed newline

---------

Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: frutescens <info@laptop>

* [Hotfix] Steal-able Mini Black Hole Pt 2  (#3632)

* Still have no idea where Eternatus is given the MBH....

* typedocs

---------

Co-authored-by: frutescens <info@laptop>

* Deleted phases.ts (#3618)

* Updated sound terms

* Added space for localization

* Update src/locales/ko/settings.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/locales/zh_TW/settings.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/pt_BR/settings.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/zh_CN/settings.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/de/settings.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/ko/settings.ts

Co-authored-by: returntoice <dieandbecome@gmail.com>

* Update src/locales/fr/settings.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/it/settings.ts

Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>

* Include sound effects that were loaded in as BGM.

* Removed stray placeholder localization

---------

Co-authored-by: Frutescens <info@laptop>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Opaque02 <66582645+Opaque02@users.noreply.github.com>
Co-authored-by: KimJeongSun <leo@atlaslabs.ai>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: cam <lrlrliwoo@gmail.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
 2024-08-25 17:40:14 +01:00
MokaStitcher
163fadbd62
[Bug] Prevent being able to start with a hidden ability that's not unlocked for some Pokemon (#3663) 
* prevent being able to start with a hidden ability that's not unlocked for some Pokemon

* fix starter ui for pokemon with a single ability and only ability 2 unlocked
 2024-08-26 00:25:40 +09:00
gitlocalize-app[bot]
3b4b45f83c
Translate modifier.json via GitLocalize (#3730) 
Co-authored-by: Leo Kim <leo@atlaslabs.ai>
 2024-08-26 00:24:52 +09:00
Lugiad
ac543d3662
Merge pull request #3751 from pagefaultgames/gitlocalize-30710 
[Localization] [ES] Reviewed and finished pokemon-info.json
 2024-08-25 17:07:11 +02:00
Mumble
1ab472cbdf
[Bug] Achievements/Vouchers doesn't update if Cursor doesn't move (#3747) 
Co-authored-by: frutescens <info@laptop>
 2024-08-25 07:14:47 -07:00
Asdar
606050fc4d Translate pokemon-info.json via GitLocalize 2024-08-25 11:55:47 +00:00
pom-eranian
ee8c1625e2 Reverted 935 charcadet values on masterlist 2024-08-24 14:20:23 -04:00
pom-eranian
55cebd84b8 [Sprite] 
(_masterlist.json )  Set 472, 469, 751, 970  to use json instead of images.

469 Yanmega - fix & variant convert to json - @rival-kieran
472 Gliscor - fix & variant convert to json - @rival-kieran
751 Dewpider - fix & variant convert to json - @vari
970 Glimmora - fix & variant convert to json - @vari
 2024-08-24 13:03:28 -04:00
1400 changed files with 3654 additions and 1250 deletions
Show Stats Expand all files Collapse all files

0
public/audio/se/battle_anims/Absorb2.m4a → public/audio/battle_anims/Absorb2.m4a
View File

0
public/audio/se/battle_anims/Ace.m4a → public/audio/battle_anims/Ace.m4a
View File

0
public/audio/se/battle_anims/Acupressure.mp3 → public/audio/battle_anims/Acupressure.mp3
View File

0
public/audio/se/battle_anims/Applause.m4a → public/audio/battle_anims/Applause.m4a
View File

0
public/audio/se/battle_anims/Battle1.m4a → public/audio/battle_anims/Battle1.m4a
View File

0
public/audio/se/battle_anims/Blow1.m4a → public/audio/battle_anims/Blow1.m4a
View File

0
public/audio/se/battle_anims/Blow3.m4a → public/audio/battle_anims/Blow3.m4a
View File

0
public/audio/se/battle_anims/Blow4.m4a → public/audio/battle_anims/Blow4.m4a
View File

0
public/audio/se/battle_anims/Blow5.m4a → public/audio/battle_anims/Blow5.m4a
View File

0
public/audio/se/battle_anims/Blow6.m4a → public/audio/battle_anims/Blow6.m4a
View File

0
public/audio/se/battle_anims/Blow7.m4a → public/audio/battle_anims/Blow7.m4a
View File

0
public/audio/se/battle_anims/Bow1.m4a → public/audio/battle_anims/Bow1.m4a
View File

0
public/audio/se/battle_anims/Collapse1.m4a → public/audio/battle_anims/Collapse1.m4a
View File

0
public/audio/se/battle_anims/Comet Punch.mp3 → public/audio/battle_anims/Comet Punch.mp3
View File

0
public/audio/se/battle_anims/Confuse.m4a → public/audio/battle_anims/Confuse.m4a
View File

0
public/audio/se/battle_anims/Crash.m4a → public/audio/battle_anims/Crash.m4a
View File

0
public/audio/se/battle_anims/Damage1.m4a → public/audio/battle_anims/Damage1.m4a
View File

0
public/audio/se/battle_anims/Darkness2.m4a → public/audio/battle_anims/Darkness2.m4a
View File

0
public/audio/se/battle_anims/Darkness6.m4a → public/audio/battle_anims/Darkness6.m4a
View File

0
public/audio/se/battle_anims/Defense Curl.mp3 → public/audio/battle_anims/Defense Curl.mp3
View File

0
public/audio/se/battle_anims/Dizzy Punch.mp3 → public/audio/battle_anims/Dizzy Punch.mp3
View File

0
public/audio/se/battle_anims/Earth1.m4a → public/audio/battle_anims/Earth1.m4a
View File

0
public/audio/se/battle_anims/Earth3.m4a → public/audio/battle_anims/Earth3.m4a
View File

0
public/audio/se/battle_anims/Earth4.m4a → public/audio/battle_anims/Earth4.m4a
View File

0
public/audio/se/battle_anims/Earth5.m4a → public/audio/battle_anims/Earth5.m4a
View File

0
public/audio/se/battle_anims/Explosion.mp3 → public/audio/battle_anims/Explosion.mp3
View File

0
public/audio/se/battle_anims/Explosion1.m4a → public/audio/battle_anims/Explosion1.m4a
View File

0
public/audio/se/battle_anims/Explosion2.m4a → public/audio/battle_anims/Explosion2.m4a
View File

0
public/audio/se/battle_anims/Explosion3.m4a → public/audio/battle_anims/Explosion3.m4a
View File

0
public/audio/se/battle_anims/Explosion4.m4a → public/audio/battle_anims/Explosion4.m4a
View File

0
public/audio/se/battle_anims/Explosion6.m4a → public/audio/battle_anims/Explosion6.m4a
View File

0
public/audio/se/battle_anims/Explosion7.m4a → public/audio/battle_anims/Explosion7.m4a
View File

0
public/audio/se/battle_anims/Fire1.m4a → public/audio/battle_anims/Fire1.m4a
View File

0
public/audio/se/battle_anims/Fire2.m4a → public/audio/battle_anims/Fire2.m4a
View File

0
public/audio/se/battle_anims/Fire3.m4a → public/audio/battle_anims/Fire3.m4a
View File

0
public/audio/se/battle_anims/Fire4.m4a → public/audio/battle_anims/Fire4.m4a
View File

0
public/audio/se/battle_anims/Fire5.m4a → public/audio/battle_anims/Fire5.m4a
View File

0
public/audio/se/battle_anims/Fire6.m4a → public/audio/battle_anims/Fire6.m4a
View File

0
public/audio/se/battle_anims/Flail.mp3 → public/audio/battle_anims/Flail.mp3
View File

0
public/audio/se/battle_anims/Flash2.m4a → public/audio/battle_anims/Flash2.m4a
View File

0
public/audio/se/battle_anims/Follow Me.mp3 → public/audio/battle_anims/Follow Me.mp3
View File

0
public/audio/se/battle_anims/Fury Swipes.m4a → public/audio/battle_anims/Fury Swipes.m4a
View File

0
public/audio/se/battle_anims/GEN8- Electricity1.wav → public/audio/battle_anims/GEN8- Electricity1.wav
View File

0
public/audio/se/battle_anims/GEN8- Exclaim.wav → public/audio/battle_anims/GEN8- Exclaim.wav
View File

0
public/audio/se/battle_anims/GEN8- Revelation Dance 1.m4a → public/audio/battle_anims/GEN8- Revelation Dance 1.m4a
View File

0
public/audio/se/battle_anims/GEN8- Revelation Dance 2.m4a → public/audio/battle_anims/GEN8- Revelation Dance 2.m4a
View File

0
public/audio/se/battle_anims/Gen8- Pyroball.wav → public/audio/battle_anims/Gen8- Pyroball.wav
View File

0
public/audio/se/battle_anims/Harden.mp3 → public/audio/battle_anims/Harden.mp3
View File

0
public/audio/se/battle_anims/Ice2.m4a → public/audio/battle_anims/Ice2.m4a
View File

0
public/audio/se/battle_anims/Ice5.m4a → public/audio/battle_anims/Ice5.m4a
View File

0
public/audio/se/battle_anims/Ice8.m4a → public/audio/battle_anims/Ice8.m4a
View File

0
public/audio/se/battle_anims/Knock.m4a → public/audio/battle_anims/Knock.m4a
View File

0
public/audio/se/battle_anims/Lock On.mp3 → public/audio/battle_anims/Lock On.mp3
View File

0
public/audio/se/battle_anims/Lovely Kiss.mp3 → public/audio/battle_anims/Lovely Kiss.mp3
View File

0
public/audio/se/battle_anims/Lucky Chant.mp3 → public/audio/battle_anims/Lucky Chant.mp3
View File

0
public/audio/se/battle_anims/Mega Punch.mp3 → public/audio/battle_anims/Mega Punch.mp3
View File

0
public/audio/se/battle_anims/Metronome.mp3 → public/audio/battle_anims/Metronome.mp3
View File

0
public/audio/se/battle_anims/MiningCollapse.mp3 → public/audio/battle_anims/MiningCollapse.mp3
View File

0
public/audio/se/battle_anims/MiningPing.mp3 → public/audio/battle_anims/MiningPing.mp3
View File

0
public/audio/se/battle_anims/Natural Gift.mp3 → public/audio/battle_anims/Natural Gift.mp3
View File

0
public/audio/se/battle_anims/PRSFX- Absorb1.wav → public/audio/battle_anims/PRSFX- Absorb1.wav
View File

0
public/audio/se/battle_anims/PRSFX- Absorb2.wav → public/audio/battle_anims/PRSFX- Absorb2.wav
View File

0
public/audio/se/battle_anims/PRSFX- Accelerock1.wav → public/audio/battle_anims/PRSFX- Accelerock1.wav
View File

0
public/audio/se/battle_anims/PRSFX- Accelerock2.wav → public/audio/battle_anims/PRSFX- Accelerock2.wav
View File

0
public/audio/se/battle_anims/PRSFX- Accelerock3.wav → public/audio/battle_anims/PRSFX- Accelerock3.wav
View File

0
public/audio/se/battle_anims/PRSFX- Acid Armor1.wav → public/audio/battle_anims/PRSFX- Acid Armor1.wav
View File

0
public/audio/se/battle_anims/PRSFX- Acid Armor2.wav → public/audio/battle_anims/PRSFX- Acid Armor2.wav
View File

0
public/audio/se/battle_anims/PRSFX- Acid Spray.wav → public/audio/battle_anims/PRSFX- Acid Spray.wav
View File

0
public/audio/se/battle_anims/PRSFX- Acid.wav → public/audio/battle_anims/PRSFX- Acid.wav
View File

0
public/audio/se/battle_anims/PRSFX- Acrobatics1.wav → public/audio/battle_anims/PRSFX- Acrobatics1.wav
View File

0
public/audio/se/battle_anims/PRSFX- Acrobatics2.wav → public/audio/battle_anims/PRSFX- Acrobatics2.wav
View File

0
public/audio/se/battle_anims/PRSFX- Acrobatics3.wav → public/audio/battle_anims/PRSFX- Acrobatics3.wav
View File

0
public/audio/se/battle_anims/PRSFX- Acupressure1.wav → public/audio/battle_anims/PRSFX- Acupressure1.wav
View File

0
public/audio/se/battle_anims/PRSFX- Acupressure2.wav → public/audio/battle_anims/PRSFX- Acupressure2.wav
View File

0
public/audio/se/battle_anims/PRSFX- Aerial Ace.wav → public/audio/battle_anims/PRSFX- Aerial Ace.wav
View File

0
public/audio/se/battle_anims/PRSFX- Aeroblast.wav → public/audio/battle_anims/PRSFX- Aeroblast.wav
View File

0
public/audio/se/battle_anims/PRSFX- After You1.wav → public/audio/battle_anims/PRSFX- After You1.wav
View File

0
public/audio/se/battle_anims/PRSFX- After You2.wav → public/audio/battle_anims/PRSFX- After You2.wav
View File

0
public/audio/se/battle_anims/PRSFX- Agility.wav → public/audio/battle_anims/PRSFX- Agility.wav
View File

0
public/audio/se/battle_anims/PRSFX- Air Cutter1.wav → public/audio/battle_anims/PRSFX- Air Cutter1.wav
View File

0
public/audio/se/battle_anims/PRSFX- Air Cutter2.wav → public/audio/battle_anims/PRSFX- Air Cutter2.wav
View File

0
public/audio/se/battle_anims/PRSFX- Air Slash1.wav → public/audio/battle_anims/PRSFX- Air Slash1.wav
View File

0
public/audio/se/battle_anims/PRSFX- Air Slash2.wav → public/audio/battle_anims/PRSFX- Air Slash2.wav
View File

0
public/audio/se/battle_anims/PRSFX- Air Slash3.wav → public/audio/battle_anims/PRSFX- Air Slash3.wav
View File

0
public/audio/se/battle_anims/PRSFX- All Out Pummeling1.wav → public/audio/battle_anims/PRSFX- All Out Pummeling1.wav
View File

0
public/audio/se/battle_anims/PRSFX- All Out Pummeling2.wav → public/audio/battle_anims/PRSFX- All Out Pummeling2.wav
View File

0
public/audio/se/battle_anims/PRSFX- All Out Pummeling3.wav → public/audio/battle_anims/PRSFX- All Out Pummeling3.wav
View File

0
public/audio/se/battle_anims/PRSFX- Ally Switch.wav → public/audio/battle_anims/PRSFX- Ally Switch.wav
View File

0
public/audio/se/battle_anims/PRSFX- Amnesia.wav → public/audio/battle_anims/PRSFX- Amnesia.wav
View File

0
public/audio/se/battle_anims/PRSFX- Anchor Shot.wav → public/audio/battle_anims/PRSFX- Anchor Shot.wav
View File

0
public/audio/se/battle_anims/PRSFX- Anchor Shot1.wav → public/audio/battle_anims/PRSFX- Anchor Shot1.wav
View File

0
public/audio/se/battle_anims/PRSFX- Anchor Shot2.wav → public/audio/battle_anims/PRSFX- Anchor Shot2.wav
View File

0
public/audio/se/battle_anims/PRSFX- Ancient Power1.wav → public/audio/battle_anims/PRSFX- Ancient Power1.wav
View File

0
public/audio/se/battle_anims/PRSFX- Ancient Power2.wav → public/audio/battle_anims/PRSFX- Ancient Power2.wav
View File

0
public/audio/se/battle_anims/PRSFX- Aqua Jet.wav → public/audio/battle_anims/PRSFX- Aqua Jet.wav
View File

0
public/audio/se/battle_anims/PRSFX- Aqua Ring1.wav → public/audio/battle_anims/PRSFX- Aqua Ring1.wav
View File

0
public/audio/se/battle_anims/PRSFX- Aqua Ring2.wav → public/audio/battle_anims/PRSFX- Aqua Ring2.wav
View File

0
public/audio/se/battle_anims/PRSFX- Aqua Tail.wav → public/audio/battle_anims/PRSFX- Aqua Tail.wav
View File

0
public/audio/se/battle_anims/PRSFX- Arm Thrust.wav → public/audio/battle_anims/PRSFX- Arm Thrust.wav
View File

0
public/audio/se/battle_anims/PRSFX- Aromatherapy.wav → public/audio/battle_anims/PRSFX- Aromatherapy.wav
View File

Some files were not shown because too many files have changed in this diff Show More