mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-07 08:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,086 Commits 7 Branches 8 Tags 2.8 GiB
8012b29969
Commit Graph

5086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bertie690
8012b29969
Merge branch 'beta' into markdown 2025-04-29 19:21:15 -04:00
AJ Fontaine
9a9759d31c
[Balance] Fix Basculin white stripe moveset (#5729) 
* Fix Basculin moveset and TMs
 2025-04-29 17:27:40 -04:00
Bertie690
71ee27d487
Merge pull request #2 from DayKev/pr/5682-review 2025-04-29 10:44:20 -04:00
NightKev
307991038a Apply suggestions to the suggestions 2025-04-29 04:40:50 -07:00
NightKev
463f0e0e27 Update biome.jsonc comments 
Update `comments.md`

Update docs for `AddSubstituteAttr` in `move.ts` to match example
 2025-04-29 01:13:33 -07:00
Sirz Benjie
34670fd921
[Bug] Only moves will show the explicit status immunity effect (#5728) 
* Add quiet parameter to trySetStatus

* Make quiet default to false
 2025-04-28 23:53:01 -04:00
Bertie690
7a2c6b8828 Fixed up documentation for comments.md and linting.md 
Comments.md added info pertaining to Kev's review
linting.md i just stopped spouting misinformation
 2025-04-28 23:41:37 -04:00
Bertie690
aef5882b20 Reverted boilerplate code fixes and applied review comments 
Will now be handled by milkmaiden
 2025-04-28 22:18:49 -04:00
NightKev
217fbe027a
[Test] Replace Axew with Feebas in some Illusion tests (#5727) 
* [Test] Replace Axew with Feebas in some Illusion tests

* Fix test command in `package.json`
 2025-04-28 16:33:19 -05:00
Blitzy
69df76dd88
[Balance] Elite 4 tweaks (#5706) 
* Update trainer-config.ts

* Update signature-species.ts

* Update trainer-config.ts

* Fix Notes

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
 2025-04-28 15:40:58 -05:00
NightKev
a7479c8eb6
[Balance] Trainer pokemon now have minimum IVs of wave/10 (#5719) 2025-04-27 12:27:34 -07:00
NightKev
89a9d55d3c
[Dev] Add enemy pokemon level to encounter logging (#5718) 2025-04-27 01:22:56 -05:00
Bertie690
06b9c9574d
Update create-test-boilerplate.js 
Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
 2025-04-26 23:36:38 -04:00
Bertie690
b2a20b1075
Update create-test-boilerplate.js 
Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
 2025-04-26 23:35:59 -04:00
Bertie690
0e982c914a
Update create-test-boilerplate.js 
Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
 2025-04-26 23:35:54 -04:00
NightKev
c87598d01d
Merge pull request #5717 from pagefaultgames/main 
Sync beta with main
 2025-04-26 16:59:45 -07:00
Sirz Benjie
c6e7dd660e
[Bug] Hotfix 1.8.5 (#5715) 
* Loading data now checks statusCode not error string

* Bump version to 1.8.5
 2025-04-26 16:04:40 -07:00
Bertie690
269810724f Fix tpyo 2025-04-26 18:11:46 -04:00
NightKev
6460d46a5d
[Bug] API / Save data hotfix (#5716) 
* Loading data now checks statusCode not error string

* Bump version to 1.8.5

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
 2025-04-26 15:01:46 -07:00
Bertie690
269380b94c Update linting.md, fix lefthook etc. 2025-04-26 17:55:26 -04:00
Dean
ab7d010a17
[Bug] Fix message for StatusEffectImmunityAbAttr (#5701) 
Use class var for getTriggerMessage
 2025-04-26 20:32:49 +00:00
Wlowscha
423bab1057
[UI/UX] Move Pokémon sprite below name and other text in starter select (#5714) 
Moving the sprite down
 2025-04-26 13:17:54 -04:00
Bertie690
a09e8a8183
Update .gitignore to include workspace files 2025-04-26 10:35:49 -04:00
Bertie690
59f4e7827c Merge remote-tracking branch 'upstream/beta' into markdown 2025-04-26 09:48:15 -04:00
Sirz Benjie
a036f865f0
[Bug] Fix improper critical hit key in move effect phase (#5713) 2025-04-26 06:17:42 +00:00
Wlowscha
0a48726e70
[UI/UX] Move Pokémon sprite below name and other text in dex pages (#5698) 
Moved sprite below name
 2025-04-26 01:24:11 -04:00
Sirz Benjie
a288de700d
[Docs][Dev] Update linting docs (#5709) 2025-04-25 22:14:08 -07:00
Bertie690
a3122a6786 Fixde boilerplate to use snake case 2025-04-25 23:47:14 -04:00
AndrewErting
42f291eab3
[Bug] [UI/UX] Make , . / and \ Bindable Keys (#5707) 
Added , . / and \ to the key atlas, json mapping, and cfg_keyboard_qwerty.ts
 2025-04-26 01:34:57 +00:00
Xavion3
38d75897bb
[Balance] Remove Dynamax Cannon being a discouraged move for AI (#5708) 
Remove dynamax cannon from being discouraged on Eternatus Phase 2
 2025-04-26 01:28:52 +00:00
zaccie
30e74eaaa8
[Bug] Fix boss level location (#5688) 2025-04-25 20:33:59 +00:00
Sirz Benjie
6dc2a7fddc
[Dev] Update phaser to 3.88 and fix graphical bug (#5704) 2025-04-24 20:30:00 +00:00
damocleas
793d89fa24 [i18n] Update locales submodule 
Update locales submodule
 2025-04-24 16:04:17 -04:00
NightKev
6ea5b4fa9d
[Bug] Fix doubles trainers not initializing properly (#5702) 
* [Bug] Fix doubles trainers not initializing properly

* Add missing override in Whirlwind test
 2025-04-23 17:22:25 -07:00
Inês Simões
75400a39ed
[Bug] [UI/UX] Status moves now play a No Effect Message Against Immune Type Pokemon (#5533) 
* Fix #5085  Moves dont play a No Effect Message Against Immune Type

When using non-volatile status move like: Will-O-Wisp, Thunder
Wave, Toxic, or Poison Gas against a Pokémon whose type is immune
to that Status condition, no "It doesn't affect" message plays.

My proposed fixes:
In move.ts:
Removed a redudant if statement in StatusEffectAttr class

In pokemon.ts:
Renamed the "messageIsImmune" function to "queueImmuneMessage"
 2025-04-23 21:29:44 +00:00
AJ Fontaine
5de567a3db
[Balance] Wave 90 gym leader has 5 mons (#5699) 
5 mons on wave 90
 2025-04-23 21:18:03 +00:00
Blitzy
c7265543bd
[Balance] Update Transistor to Gen IX version (#5700) 
Update ability.ts
 2025-04-23 17:15:45 -04:00
AJ Fontaine
b49c994d2d
[Balance][Refactor] Move fixed boss waves enum to file, adjust GL templates (#5689) 
* Move fixed boss waves enum to file, adjust GL templates

* Move post return to default case

* Address comment

---------

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
 2025-04-23 14:48:04 -05:00
Sirz Benjie
389ad6ceb6
[Tests][UI/UX] Add automated tests for the pokedex (#5637) 
* Remove unneeded fields from src/ui/filter-text.ts

* Add setOverlayMode to phaseInterceptor

* initialize pokemon starters before running tests

* Add getWrappedText to mockText

* Add initial pokedex test

* Add test for wrapping cursor in pokedex view

* Make pokedex use getPassiveAbility instead of checking passive map

Allows for tests to mock passives

* Add test for filtering double ability combinations

* Add test for filtering by types

* Mark failing test as TODO

* Apply suggestions from code review

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

* Use ts-expect-error instead of ts-ignore in comments

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

* Add save for pokedex tests

* Add test for filtering by cost reduction

* Add test for filtering by shiny

* Add tests for filtering by cost reductions

* Fix typo in test name

* Update test/ui/pokedex.test.ts

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>

* Update Mode import in pokedex test

* Replace reference to Mode with UiMode

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Madmadness65 <59298170+Madmadness65@users.noreply.github.com>
Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
 2025-04-23 18:10:01 +00:00
Jimmybald1
b848777880
[Bug][Misc] Moved SelectBiomePhase in front of NewBattlePhase (#5694) 
* Moved SelectBiomePhase in front of NewBattlePhase

* disguise test now has to go to QuietFormChangePhase

---------

Co-authored-by: Jimmybald1 <147992650+IBBCalc@users.noreply.github.com>
 2025-04-23 10:54:43 -07:00
Sirz Benjie
110fd2f0a1
[Refactor][Move] Refactor move effect phase (#5678) 
* Add enum for hit check result

Co-authored-by: innerthunder <brandonerickson98@gmail.com>

* Refactor parameter list for pokemon#getBaseDamage and pokemon#getAttackDamage

* Rewrite move phase

Co-authored-by: innerthunder <brandonerickson98@gmail.com>

* Update tests to reflect move effect phase changes

Co-authored-by: innerthunder <brandonerickson98@gmail.com>

* Fix pluck / bug bite

Co-authored-by: innerthunder <brandonerickson98@gmail.com>

* Fix reviver seed ohko, remove leftover dead code

Co-authored-by: innerthunder <brandonerickson98@gmail.com>

* Cleanup jsdoc comments

* Remove hitsSubstitute check from postDefend abilities

* Fix improper i18nkey in moveEffectPhase#applyToTargets

* Cleanup comments

* Fix type issue with substitute test

* Move MYSTERY_ENCOUNTER_WAVES to constants.ts

* Update linkcode in damageparams to use proper tsdoc syntax

---------

Co-authored-by: innerthunder <brandonerickson98@gmail.com>
 2025-04-23 00:10:27 +00:00
AJ Fontaine
aadb57ab75
[Balance] [Mystery] Salesman ME offers mons from event encounter pool (#5674) 
* Initial event commit

* Salesman odds

* Clean up imports

* globalScene shiny rate getter, fix reroll, remove placeholder event

* Rerolling shiny also tries rerolling for better variant

* Shiny reroll affects 'trainer' mons too

---------

Co-authored-by: damocleas <damocleas25@gmail.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
 2025-04-23 00:03:49 +00:00
Sirz Benjie
be6a117b1e
[Bug][Sprite] Fix variants not using recolors for back sprite (#5691) 
Fix variants not showing back recolors with exp
 2025-04-21 14:52:08 -05:00
Sirz Benjie
0da56cda9f
[Bug][Sprite] Fix variant loading console spam (#5690) 2025-04-21 13:46:32 -05:00
Bertie690
c043ebf7c4
Merge branch 'beta' into markdown 2025-04-20 15:33:22 -04:00
Bertie690
46214f7c8a
Fixed the things 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2025-04-20 15:33:18 -04:00
Bertie690
80f968b6d8 Fixed doc thing 2025-04-20 14:56:37 -04:00
Bertie690
c5f1db3f85 Merge remote-tracking branch 'upstream/beta' into markdown 2025-04-20 14:54:16 -04:00
NightKev
b89b945b11
[Dev] Fix imports in overrides.ts and illusion.test.ts (#5686) 2025-04-20 13:51:06 -05:00
zaccie
d0be6a9274
[Bug] Fix order of operations when displaying enemy Boss level (#5685) 
* order of operations in creating boss battleInfo

fixed a bug where because of an order of operations error in this file it ignored the position update of the boss life value set in battle-info.ts (around line 562)
 2025-04-20 18:33:17 +00:00