Lylian
59c0ec3d11
resolve conflicts
2025-04-09 21:08:32 +02:00
Sirz Benjie
787feceb14
[Refactor] Refactor variant sprite code part 1 ( #5592 )
...
* Move exp to its own masterlist, simplify initVariantData
* Update test/sprites/pokemonSprite.test.ts
* Extract loadPokemonVariantAssets out of BattleScene
* move variant.ts and update pokemon.loadAssets
* Add fuzzy matching for applying variant recolors
* Move glsl shaders to their own files
* Remove extra variants from shader masterlist
Their exp sprites have since been removed.
Co-authored-by: Unicorn_Power <189861924+Unicornpowerstar@users.noreply.github.com>
* Make exp sprite keys a set instead of an array
* Remove outdated exp sprite jsons
Co-authored-by: Unicorn_Power <189861924+Unicornpowerstar@users.noreply.github.com>
---------
Co-authored-by: Unicorn_Power <189861924+Unicornpowerstar@users.noreply.github.com>
2025-04-09 10:43:05 -05:00
Lylian BALL
5acf933066
Merge branch 'beta' into pr-illusion
2025-04-09 14:08:19 +02:00
damocleas
b3a4c75c06
[Refactor] Delete stale pokemon objects at the end of a battle
2025-04-08 18:10:39 -04:00
NightKev
2c2a34cfaf
Merge branch 'beta' into refactor/delete-stale-pokemon-objects
2025-04-08 15:08:34 -07:00
Dean
31835e6d53
[Bug] Fix #4972 Status-Prevention Abilities do not Cure Status ( #5406 )
...
* Add PostSummonHealAbAttr and give it to appropriate abilities
* Add attr to insomnia
* Remove attr from leaf guard (it does not activate on gain with sun up)
* Add tests and remove attr from shields down
* Add PostSummonRemoveBattlerTag and give it to oblivious and own tempo
* Add tests for oblivious and own tempo
* Fix oblivious test sometimes failing
* Remove Comatose changes as it doesn't reapply
* Remove unused tagRemoved field
* Fix tests checking status instead of tag
* Fix attr comments
* Add PostSetStatusHealStatusAbAttr
* Add ResetStatusPhase
* Modify pokemon.resetStatus to use ResetStatusPhase
* Move post status effects to ObtainStatusEffectPhase
* Ensure status overriding (ie rest) works properly
* Add PostApplyBattlerTagRemoveTagAbAttr for own tempo and oblivious
* Guard removeTag call in PostApplyBattlerTagRemoveTagAbAttr
* Commenting
* Handle Mold Breaker case in MoveEndPhase
* Remove PostSummonHealStatusAbAttr from purifying salt
* Fix not passing overrideStatus to canSetStatus
* Apply suggestions from code review
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Add isNullOrUndefined import
* Add canApply to new attrs
* Add followup argument back
* Remove guard around new MoveEndPhase
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-04-07 16:32:10 -07:00
NightKev
1171656d12
Update console message
2025-04-07 16:02:58 -07:00
NightKev
17a56cc6c1
Move try/catch
inside for
loop
...
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-04-07 15:58:17 -07:00
NightKev
cb5deb408f
[Refactor] Delete stale pokemon objects at the end of a battle
...
Co-authored-by: Frutescens <info@laptop>
2025-04-07 15:58:17 -07:00
NightKev
1b79d1f832
[Refactor] Re-implement save migration system ( #5634 )
2025-04-07 22:53:35 +00:00
Lylian BALL
fd2a6c2e65
Merge branch 'beta' into pr-illusion
2025-04-07 19:28:25 +02:00
Diogo Cruz Diniz
0479b9dfcc
Fix #2735 : Hazard moves incorrectly require targets ( #5635 )
...
* Fix #2735 : Hazard moves incorrectly require targets
Hazard moves should no longer require targets to successfully execute
* Apply suggestions from code review made by NightKev
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-04-07 08:50:52 -05:00
Lylian
efc3c2510e
Merge branch 'pr-illusion' of https://github.com/PyGaVS/pokerogue into pr-illusion
2025-04-06 17:55:33 +02:00
Lylian
db63776147
add pokemon.getPokeball()
2025-04-06 17:55:08 +02:00
Lylian BALL
e9ee0656e4
Merge branch 'beta' into pr-illusion
2025-04-06 17:48:26 +02:00
Lylian
f2a120a848
bug fix to save illusion status
2025-04-06 16:46:58 +02:00
NightKev
1e6ceb5581
[Misc] Clean up various phases (part 1) ( #4797 )
...
* Clean up various phases
Remove redundant code, utilize default parameters,
clean up some leftover `strict-null` `TODO`s,
replace `integer` with `number`
* Replace `* as Utils` imports with named imports
* Apply Biome
2025-04-06 03:10:52 +00:00
damocleas
fdf8c1a695
[Balance] Remove accuracy cap from Wide Lens
2025-04-05 01:45:10 -04:00
Sirz Benjie
46d234983c
Merge branch 'beta' into balance/remove-wide-lens-cap
2025-04-05 00:43:30 -05:00
Sirz Benjie
5318d717b3
[Refactor] [Docs] Minor refactor of move.checkFlags
into move.doesFlagEffectApply
( #5264 )
...
* Refactor Move.checkFlags
* Improve jsdoc clarity
* Fix improper recursive call for the IGNORE_PROTECT check
* Fix improper placement of followUp check
* Get rid of unnecssary break
* Fix last import
* Remove latent checkFlag call in move-effect-phase
* Remedy perish body oversight
* Apply kev's suggestions from code review
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-04-05 00:43:46 +00:00
Sirz Benjie
9e4162d429
[Bug] Fix super luck implementation ( #5625 )
...
* Fix super luck implementation
* Use numberholder instead of booleanholder
* Update tsdoc for getCritStage
2025-04-04 17:40:25 -07:00
Sirz Benjie
420c2e37c2
[GitHub] Add path filters to avoid unnecessarily re-running tests ( #5497 )
...
* Add path filters to avoid unnecessarily re-running tests
* Apply suggestions from kev's review
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update .github/workflows/tests.yml
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Don't ignore image files for tests
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-04-04 22:13:21 +00:00
Sirz Benjie
e31bf91223
[Bug][Ability] Fix mold breaker effect lingering if the user's move runs out of PP ( #5265 )
...
* Fix mold breaker pp bug
* Update Dancer test to account for changed phase behavior
* Update doc comment for move-phase's `end` method
* Add null handling for pokemon in `move-end` phase
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-04-04 23:57:39 +02:00
Sirz Benjie
b364bb1899
[Bug][Ability] Fix wimp out and emergency exit skipping waves in double battles ( #5261 )
...
Fix wimp out causing battles to skip
2025-04-04 14:39:53 -07:00
Lylian
83491b0c3c
get submodule back
2025-04-03 19:43:15 +02:00
Lylian
8807db3306
get submodule back
2025-04-03 19:41:57 +02:00
Lylian
4c517bf707
g
2025-04-03 19:17:13 +02:00
Lylian
cfb5097f63
g
2025-04-03 19:09:55 +02:00
Lylian
e06684a6d4
bug fix
2025-04-03 18:33:32 +02:00
damocleas
68f10dc199
Merge branch 'main' into beta
2025-04-03 00:28:55 -04:00
NightKev
7b38596a12
Sync locales and update version to 1.8.4 ( #5620 )
2025-04-02 19:37:48 -07:00
damocleas
333975017f
Hotfixes 1.8.3
2025-04-02 20:37:45 -04:00
damocleas
d0703e0e0b
Merge branch 'main' into beta
2025-04-02 20:31:13 -04:00
Dean
4c8f81bb09
[Bug] Fix uses of getAlly() ( #5618 )
...
* Fix plus/minus crash
* Update getAlly() uses
2025-04-02 17:28:58 -07:00
Wlowscha
c6721521ab
[BUG] Fix broken forms of Pichu starter ( #5616 )
...
* Unlock base Pichu form when catching a Pikachu form
* Implementing migrator for broken Pichu forms
2025-04-02 19:59:31 -04:00
Wlowscha
db7ed43ad7
[Bug][UI/UX] Make sure forms and evolutions are counted in challenges again ( #5617 )
...
Making sure to actually count forms...
2025-04-02 19:42:36 -04:00
Unicorn_Power
a7394130a7
(Beta) Undoing the Pika-etern stuff ( #5615 )
2025-04-02 17:21:04 -04:00
damocleas
cf1616212c
Hotfixes 1.18.2
2025-04-02 03:05:51 -04:00
damocleas
7f4b37a36f
Merge branch 'main' into beta
2025-04-02 02:58:27 -04:00
Dean
2773354193
[Bug][Hotfix] Fix various ability flyouts not disappearing ( #5614 )
...
* Add hide phases for rogue ability showing
* Hide ability bar on game over
* Hide ability bar in TurnEndPhase
2025-04-02 02:56:19 -04:00
damocleas
951d8b633d
[Balance] Minor Passive Adjustments for 1.8.2 ( #5613 )
...
* Update passives.ts
2025-04-02 02:42:10 -04:00
damocleas
d92bf29030
[i18n] Update locales submodule and 1.8.2 bump
2025-04-02 00:25:05 -04:00
NightKev
70ba974348
[Balance] Remove accuracy cap from Wide Lens
2025-04-01 21:02:14 -07:00
Dean
5416c76ecb
[Bug][Hotfix] Fix crash when pulling trainer names for (certain) non-English languages ( #5608 )
...
* Fix key usage for trainer locales
* Update gts
* Fix partner name generation
---------
Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
2025-04-01 21:31:52 -04:00
Lylian BALL
83018a558a
Update src/data/ability.ts
...
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-04-01 23:55:18 +02:00
Lylian BALL
76dda14722
Update src/data/ability.ts
...
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-04-01 23:55:08 +02:00
Lylian BALL
0499d5e456
Update src/data/ability.ts
...
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-04-01 23:54:49 +02:00
Lylian BALL
93924f8328
Update src/data/ability.ts
...
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-04-01 23:54:32 +02:00
Lylian BALL
20dbb39d29
Update src/field/pokemon.ts
...
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-04-01 23:49:21 +02:00
Lylian
4e42173118
illusion will break before evolution
2025-04-01 23:48:01 +02:00