RedstonewolfX
f1fdcbe427
Merge branch 'main' of https://github.com/pagefaultgames/pokerogue
2024-09-09 18:11:33 -04:00
RedstonewolfX
9dd3ffc9b3
Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into beta
2024-09-09 18:09:22 -04:00
RedstonewolfX
bc99520a5f
Merge pull request #27 from PokeRogue-Projects/main
...
Help
2024-09-09 18:05:28 -04:00
Raidette
a919b9c0af
[Move] Implement After You ( #1789 )
...
* Complete after you implementation (no localization)
* reset override changes
* Remove hardcoded English text, add tests
* Fix test
* Make sure phases occur in the correct order
* fix after-you issues
- fix i18n interpolation ot state "target name" and not "pokemon name" as the target takes the offer, not the user
- fix some tsdocs
- add override to apply
- update scene.findPhase to be able to use generic types. Add tsdocs
* add move-trigger.afterYou for DE
* fix after_you.test.ts
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-09 14:35:04 -07:00
RedstonewolfX
7766a5efa9
Merge pull request #25 from PokeRogue-Projects/beta
...
Yippee
2024-09-09 17:34:22 -04:00
RedstonewolfX
4da5812247
Yippee
...
Finished working in beta because I forgot main still gets updates
2024-09-09 17:32:45 -04:00
RedstonewolfX
6282c0e647
Merge pull request #23 from PokeRogue-Projects/beta
...
Transfer Beta to Main
2024-09-09 16:45:29 -04:00
Adrian T.
e959595471
[Test] Fix throat chop and gorilla tactics tests ( #4140 )
2024-09-09 16:03:29 -04:00
Jannik Tappert
d9a8448c6e
[Enhancement] Added the ability to localize the tera type hover text ( #4138 )
2024-09-09 15:57:07 -04:00
Adrian T.
a82d64b5b5
[Ability] Implement Gorilla Tactics ( #4051 )
...
* fully implement gorilla tactics
* fix atk increase
* update oversight
* add showAbility param
* fix postmerge
* fix postmerge
* update tests
2024-09-09 15:41:53 -04:00
Brandon Bay
9317093044
[Enhancement] [UI/UX] Add ability and passive tooltips to starter select screen ( #4023 )
...
* Add ability and passive tooltips to starter select screen
* Remove explicit casts to BattleScene
* Increase tooltip size, reverse y when necessary, and always show passive tooltip
* Add ability name to tooltip title and persist tooltips between Pokemon
* Use vi function mocks
2024-09-09 15:07:00 -04:00
Adrian T.
9afab182e9
[Test] Remove obsolete splash_only ( #4139 )
2024-09-09 15:02:11 -04:00
Adrian T.
401568609b
[Dev] Add imports, Handle kebab-case fileName argument in test boilerplate script ( #4072 )
...
* add imports, handle kebab-case fileName argument
* fix spacing
2024-09-09 13:00:26 -04:00
Taylor Le Lievre
8df7422e8f
[Bug] Primal weather no longer persists if last mon dies to indirect damage ( #3492 )
...
* Fixed Delta Stream remaining active when last mon dies to indirect damage
* Rebasing changes
* Linting fix
* Combined if statements
* Changed params to optional
* Added unit test
* Apply suggestions from code review
* Fix test and remove `.js` from import
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-09 12:59:58 -04:00
NightKev
11d912bad8
[Dev] Make OPP_MOVESET_OVERRIDE fully override the enemy's moveset ( #4062 )
...
* Make `OPP_MOVESET_OVERRIDE` fully override the enemy's moveset
* Update tests with new override behavior
* Fix tests
* Fix another test
* Move overrides no longer required to be arrays
* Remove `SPLASH_ONLY` test utility variable
* Update moveset override helper functions
* Missed some tests
2024-09-09 12:55:11 -04:00
Adrian T.
c59f6edf36
[Move] Implement Power Shift ( #4083 )
...
* fully implement power shift
* cleanup
2024-09-09 12:54:31 -04:00
Leo Kim
80e347840d
[Bug] Fix line spacing in level up stats and move info in Japanese ( #4095 )
2024-09-09 12:54:17 -04:00
NightKev
89b33466a9
[Test] Fix Safeguard test that relied on a now-fixed bug ( #4098 )
2024-09-09 12:53:45 -04:00
Lugiad
3d01e905df
[Localization][UI/UX] Clean up of unused localized images ( #4110 )
...
* Delete public/images/ui/legacy/summary_moves_effect_de.png
* Delete public/images/ui/legacy/summary_moves_effect_es.png
* Delete public/images/ui/legacy/summary_moves_effect_fr.png
* Delete public/images/ui/legacy/summary_moves_effect_it.png
* Delete public/images/ui/legacy/summary_moves_effect_pt-BR.png
* Delete public/images/ui/legacy/summary_moves_effect_zh-CN.png
2024-09-09 12:53:22 -04:00
Adrian T.
3c05237b2e
[Move] Fully implement Throat Chop ( #4115 )
...
* fully implement throat chop
* add linkcode in docs
* address comments
* update test
2024-09-09 12:52:20 -04:00
José Ricardo
a88b989939
[Localization] [pt_BR] Updated some translations ( #4131 )
2024-09-09 12:50:47 -04:00
Chapybara-jp
e84fe8c24e
[Localisation] [JA] Translated/updated spacing in several files, fixed Ice Face bug ( #4129 )
...
* Update ability-trigger.json
* Update ability.json
* Update arena-flyout.json
* Update arena-tag.json
* Update battle.json
* Update fight-ui-handler.json
* Update berry.json
* Update menu.json
* Update party-ui-handler.json
* Update starter-select-ui-handler.json
* Update tutorial.json
* Update move.json
* Update battle.json
* Update arena-flyout.json
* Update arena-flyout.json
* Update arena-tag.json
* Update party-ui-handler.json
* Update settings.json
2024-09-09 12:50:30 -04:00
Mumble
26eb63cf67
[Refactor] Cleaning up Learn move phase ( #3672 )
...
* Learn Move Phase rewrite
* Typedocs
* messages with confirm do not need an extra button press no more
* Added Documentation
* This does not work
* so sad
* Some updates
* Eslint issues + clean up
* Additions to handle learning during evolution + test fixes
* some more checks
* Update src/overrides.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update src/test/phases/learn-move-phase.test.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Added new function and updated tests
* Fixed bracketing and added parameter types
* Added Sketch to the conditional
* Added some fixes. Weird stuff going on.
* Whoops
* async implementation done
* Update src/phases/learn-move-phase.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Made showText=> summary a promise
* adapt learn-move-phase to `async-await`
* await add
---------
Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-09 09:11:46 -07:00
RedstonewolfX
ecb86753bd
Logs show Pokemon data
...
If a log doesn't contain starter data, but matches a save file, it shows your current party in that save instead.
2024-09-09 12:03:30 -04:00
RedstonewolfX
dee46e090f
Update log-select-ui-handler.ts
...
Fixes some formatter errors yelling at me
Adds file size to logs list
2024-09-09 11:16:27 -04:00
RedstonewolfX
5888da59c8
Update logger.ts
...
DRPDs no longer export wave 0
2024-09-09 11:03:18 -04:00
AJ Fontaine
16fc3a87b7
Fix usedTMs crash ( #4132 )
2024-09-09 14:07:05 +01:00
Adrian T.
f5bf766ff7
[Move] Fully implement Tar Shot ( #4043 )
2024-09-09 00:42:53 -07:00
innerthunder
c710f85fd3
Fix Pokemon.isTrapped only checking enemy Pokemon for trapping abilities ( #4124 )
2024-09-09 14:19:59 +08:00
flx-sta
39b6a72517
[Bug] Fix #762 : All Pokemon become invisible when capturing then switching with your only pokemon that was not fainted ( #4025 )
...
* fix #762 by using slotIndex to add to party
for now the new pokemon was ALWAYS just pushed to the party array. Now it's put into the slot that was also previously selected as the mon to release
* add docs for `Pokemon.addToParty()`
* add simple tests for addToParty
* update `isBetween` docs. Remove `.js` imports
2024-09-09 01:10:47 -04:00
Adrian T.
06f98f6737
[Bug] Fix console error from undefined stockpilingTag ( #4118 )
2024-09-08 20:50:47 -07:00
innerthunder
68b956cbe6
[Bug] Fix incorrect defensive properties on Terastallized Pokemon ( #4070 )
...
* Fix incorrect defensive properties on Terastallized Pokemon
* Add tests to `effectiveness.test.ts`
* Suppress errors from Tera achievement validation
2024-09-08 20:48:09 -07:00
Mumble
a30201f185
[Hotfix] Retrieving the correct form index for correct cry keys ( #4121 )
...
* [DOCS] adding JSDocs to `arena.ts` (#3590 )
* adding some docs
* Update src/field/pokemon.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* seems like battleStats changed to statStages
* Apply suggestions from code review
editing doc text
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* Update tsdocs, convert comment to tsdoc in `pokemon.ts`
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* [Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067 )
* fix scrappy + etc. update inverse battle test code
* update test code following request from swain
* fix and optimize imports (#4061 )
- remove any `.js` extension imports
- remove unncessary dynamic imports of `modifier.ts` file. The file was being imported statically & dynamically. Made it pure static
- increase vite chunk-size warning limit
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
* returned main
* Fixed cry key
* Revert "[DOCS] adding JSDocs to `arena.ts` (#3590 )"
This reverts commit 675e6a0635#4067 )"
This reverts commit 45af0dd170#4061 )"
This reverts commit e12548cdb0
2024-09-08 22:12:37 -04:00
Amani H.
38cb10ff97
[Hotfix] Fix System Data Conversion Failure ( #4123 )
2024-09-09 02:50:00 +01:00
Opaque02
93d6375894
Updated all fields (except passwords) to allow for 20 characters ( #4119 )
2024-09-09 00:57:44 +01:00
RedstonewolfX
590016218c
Bugfixing
...
Removed another RNG inconsistency where a 100% accurate move could still miss 1% of the time
Fixed attack calculation
2024-09-08 19:08:21 -04:00
Mumble
021f31b589
[Hotfix] Retrieve the right cry when alternate-form Pokemon faint + retrieve the correct sprite key ( #4117 )
...
* [DOCS] adding JSDocs to `arena.ts` (#3590 )
* adding some docs
* Update src/field/pokemon.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* seems like battleStats changed to statStages
* Apply suggestions from code review
editing doc text
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* Update tsdocs, convert comment to tsdoc in `pokemon.ts`
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* [Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067 )
* fix scrappy + etc. update inverse battle test code
* update test code following request from swain
* fix and optimize imports (#4061 )
- remove any `.js` extension imports
- remove unncessary dynamic imports of `modifier.ts` file. The file was being imported statically & dynamically. Made it pure static
- increase vite chunk-size warning limit
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
* Fusion hotfix
* returned main
* Faint cry properly retrieved for non fused Pokemon with forms
* Revert "[DOCS] adding JSDocs to `arena.ts` (#3590 )"
This reverts commit b73fd97760#4067 )"
This reverts commit 31fcbf49f4#4061 )"
This reverts commit d1bd6974e4
2024-09-09 00:03:37 +01:00
RedstonewolfX
186d6f906e
Make move thing show
2024-09-08 18:40:18 -04:00
Mumble
22c60ab532
[Hotfix][Bug] Retrieves the correct cry for Fused Pokemon ( #4116 )
...
* [DOCS] adding JSDocs to `arena.ts` (#3590 )
* adding some docs
* Update src/field/pokemon.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* seems like battleStats changed to statStages
* Apply suggestions from code review
editing doc text
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* Update tsdocs, convert comment to tsdoc in `pokemon.ts`
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* [Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067 )
* fix scrappy + etc. update inverse battle test code
* update test code following request from swain
* fix and optimize imports (#4061 )
- remove any `.js` extension imports
- remove unncessary dynamic imports of `modifier.ts` file. The file was being imported statically & dynamically. Made it pure static
- increase vite chunk-size warning limit
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
* Fusion hotfix
* Revert "fix and optimize imports (#4061 )"
This reverts commit 287d671cfd#4067 )"
This reverts commit 9fd34c95d5#3590 )"
This reverts commit 0742efd196
2024-09-08 21:42:11 +01:00
RedstonewolfX
282ecca47d
Fix RNG break
2024-09-08 16:18:23 -04:00
RedstonewolfX
e39f33bd4f
Update fight-ui-handler.ts
2024-09-08 16:06:59 -04:00
RedstonewolfX
01152314f0
Update Beta
...
yippee
2024-09-08 12:15:52 -04:00
RedstonewolfX
6c9360ab7c
Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into beta
2024-09-08 12:15:44 -04:00
Lugiad
df250c8b90
[Localization] New translations batch locales (Move-disabling effects, abilities triggers, error messages and some misc ajustements) ( #4068 )
...
* Update battle.json
* Update battler-tags.json
* Update battle.json
* Update battle.json
* Update battler-tags.json
* Update battle.json
* Update battler-tags.json
* Update battler-tags.json
* Update battle.json
* Update battle.json
* Update battler-tags.json
* Update battler-tags.json
* Update battle.json
* Update battle.json
* Update battler-tags.json
* Update battler-tags.json
* Update battle.json
* Update battle.json
* Update battler-tags.json
* Update battle.json
* Update battle.json
* Update battle.json
* Update battler-tags.json
* Update battle.json
* Update battle.json
* Update src/locales/de/battle.json
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/de/battler-tags.json
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update battler-tags.json
* Update src/locales/ko/battle.json
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
* Update src/locales/ko/battler-tags.json
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
* Update src/locales/it/battle.json
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
* Update src/locales/it/battler-tags.json
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
* Update menu.json
* Update ability-trigger.json
* Update ability-trigger.json
* Update ability-trigger.json
* Update ability-trigger.json
* Update ability-trigger.json
* Update ability-trigger.json
* Update ability-trigger.json
* Update ability-trigger.json
* Update menu.json
* Update menu.json
* Update menu.json
* Update menu.json
* Update menu.json
* Update menu.json
* Update menu.json
* Update menu.json
* Update src/locales/de/ability-trigger.json
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/de/ability-trigger.json
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/de/menu.json
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/ko/ability-trigger.json
Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
* Update src/locales/ko/menu.json
Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
* Update src/locales/ko/ability-trigger.json
Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
* Update src/locales/ko/menu.json
Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
* Update menu.json
* Update ability-trigger.json
* Update ability-trigger.json
* Update ability-trigger.json
* Update ability-trigger.json
* Update ability-trigger.json
* Update ability-trigger.json
* Update menu.json
* Update ability-trigger.json
* Update battle.json
* Update battler-tags.json
* Update src/locales/zh_CN/battle.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/locales/zh_TW/battle.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update modifier-type.json
* Update modifier-type.json
* Update modifier-type.json
* Update modifier-type.json
* Update modifier-type.json
* Update modifier-type.json
* Update modifier-type.json
* Update modifier-type.json
* Update modifier-type.json
* Update modifier-type.json
* Update modifier-type.json
* Update menu.json
* Update battler-tags.json
* Update battle.json
* Update ability-trigger.json
* Update battler-tags.json
* Update battler-tags.json
* Update battler-tags.json
* Update battler-tags.json
* Update modifier-type.json
* Update menu.json
* Update battle.json
* Update tutorial.json
* Update tutorial.json
* Update egg.json
* Update battle.json
* Update battle.json
* Update tutorial.json
* Update egg.json
* Update modifier-type.json
* Update modifier-type.json
* Update modifier-type.json
* Update modifier-type.json
* Update modifier-type.json
* Update challenges.json
* Update src/locales/ko/modifier-type.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/ko/modifier-type.json
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/ja/battle.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ja/menu.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ja/modifier-type.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ja/modifier-type.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ja/modifier-type.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update dialogue.json
* Update dialogue-misc.json
* Update dialogue-final-boss.json
* Update dialogue-double-battle.json
* Update ability-trigger.json
* Update achv.json
* Update arena-tag.json
* Update battle.json
* Update battler-tags.json
* Update command-ui-handler.json
* Update menu.json
* Update modifier-type.json
* Update modifier.json
* Update move-trigger.json
* Update pokemon-info-container.json
* Update pokemon-info.json
* Update splash-messages.json
* Update status-effect.json
* Update tutorial.json
* Update voucher.json
* Update weather.json
* Update ability-trigger.json
* Update src/locales/de/modifier-type.json
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/de/modifier-type.json
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update modifier-type.json
* Update bgm-name.json
* Update bgm-name.json
* Update src/locales/it/menu.json
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
* types_ja.png update
* Apply suggestions from code review
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
---------
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
2024-09-08 13:57:17 +02:00
Mumble
4a98c36427
[Hotfix] Properly whitelisting fused Pokemon that happen to have Pokemon with alt. forms ( #4104 )
2024-09-08 02:58:24 -04:00
NightKev
55b89e82c7
[Hotfix] Remove extra Roark victory line, fix baton pass i18n in achv.ts ( #4103 )
2024-09-08 02:46:56 -04:00
James Diefenbach
7ab0bbbd94
[Hotfix] Fix cases where hatched Pokemon don't get an egg move ( #4102 )
...
Co-authored-by: James Diefenbach <z5421232@ad.unsw.edu.au>
2024-09-08 02:45:30 -04:00
innerthunder
8082e6dc58
[Hotfix] Fix harsh weather cancelling moves based on base type ( #4097 )
2024-09-08 02:29:49 -04:00
James Diefenbach
0bdb697077
[Hotfix] Show enemy item icons after egg summary ( #4101 )
...
Co-authored-by: James Diefenbach <z5421232@ad.unsw.edu.au>
2024-09-08 02:18:51 -04:00
flx-sta
2bd07cb84e
fix and optimize imports ( #4061 )
...
- remove any `.js` extension imports
- remove unncessary dynamic imports of `modifier.ts` file. The file was being imported statically & dynamically. Made it pure static
- increase vite chunk-size warning limit
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
2024-09-07 21:37:37 -07:00
