Commit Graph

4636 Commits

Author SHA1 Message Date
damocleas
a9e0dd5d80
Merge branch 'beta' into flip_stats_challange 2025-01-15 04:13:10 -05:00
Jimmybald1
d624733565
[Bug] Fix #5034 removed unnecessary caught data block for certain forms (#5119)
Co-authored-by: Jimmybald1 <147992650+IBBCalc@users.noreply.github.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-15 02:12:50 -07:00
Dean
39b4d74e95
[Bug] Fix #5029 Memory leak when saving and exiting (#5128)
* Add destroy function to ui handlers

* Implement destroy() for StarterSelectUiHandler

* Update battlescene to free memory when resetting

* Document destroy for starter select

---------

Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-15 02:06:09 -07:00
AJ Fontaine
e2c6bec418
[Bug] Fix Poltergeist message displaying before move use (#5040) 2025-01-15 00:53:16 -08:00
Wlowscha
d2a3e4bb2d
[UI/UX] Looping cursor in save slot selection screen (#5109)
* Save slot selection allows looping

* Removed debug logs

---------

Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-15 00:23:38 -07:00
Wlowscha
7ae216f0d6
[UI/UX] Shop cursor freedom (#5110)
* Allowing cursor in shop to cycle horizontally

* Improved cycling of commands

---------

Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-14 23:18:24 -07:00
Scooom
ea6d53605d Fix FlipStat applyChallenges inside calculateBaseStats 2025-01-14 22:07:40 -06:00
Scooom
02725694e9 Merge branch 'flip_stats_challange' of github.com:Scoooom/pokerogue into flip_stats_challange 2025-01-14 20:31:36 -06:00
Scooom
7751e79679 Manually implement
b0d00e9
2025-01-14 20:29:47 -06:00
Scooom
f20c3d3423 Fix gameData call 2025-01-14 20:26:37 -06:00
NightKev
b0d00e9861
Fix classic victory achievements 2025-01-14 18:26:03 -08:00
Scooom
16526ca3c7
Merge branch 'beta' into flip_stats_challange 2025-01-14 20:21:19 -06:00
damocleas
d5f84cf3df
Change Archen HA from Emergency Exit to Wimp Out (#5124) 2025-01-14 19:07:09 -07:00
Scooom
323f0ee072 Fix missed update from scene to globalScene 2025-01-14 19:37:23 -06:00
Scooom
9cd709bdbc
Merge branch 'beta' into flip_stats_challange 2025-01-14 19:33:10 -06:00
Scooom
1821ba9314 Update code for #4766 changes to global scene 2025-01-14 19:31:28 -06:00
Amani H.
6681a913fe
[Bug] Prevent Duplicate Signature Species in Trainer Battles (#5059)
* [Bug] Prevent Duplicate Signature Species in Trainer Battles

* Apply Kev's Suggestion

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-14 18:25:18 -07:00
Scooom
bcfa901933 Merge branch 'flip_stats_challange' of github.com:Scoooom/pokerogue into flip_stats_challange 2025-01-14 19:19:10 -06:00
Scooom
9351bc3c56 Remove outdated image 2025-01-14 19:18:22 -06:00
Scooom
423af0c788
Merge branch 'beta' into flip_stats_challange 2025-01-14 19:16:15 -06:00
schmidtc1
001b61c1c7
[Bug][Move] Refactor moves that call a random move (#3380)
* Combine moveset from allies and uses it to get a move

* Clearer implementation of combining user and teammates' moves

* Refactor assist and sleep talk to use metronome's attribute for calling a move

* Refactor move filtering in RandomMovesetMoveAttr, creates arrays with invalid moves for assist/sleep talk

* Refactor RandomMoveAttr to set moveId in condition, places reused code in callMove in RandomMoveAttr

* Correct invalid move lists, adds Max/Z moves to metronome's list

* Remove ignoresVirtual from beta merge

* Remove Max/Z moves per frutescens' comment

* Fix bug with metronome/copycat/assist/sleep talk targeting ally

* Experimental async/await to be tested

* Refactor other attributes to extend CallMoveAttr

* Replace QueuedMove with TurnMove, refactor to attempt two-turn move fix for metronome

* Fix Swallow test due to TurnMove refactor

* Further fixes for TurnMove refactor

* Fix metronome two turn moves for enemy pokemon

* Replace nested ternary with if-else block per DayKev's comment

* Minor fixes

* Adjust command phase args handling

* Create metronome test, refactor RandomMoveAttr for easier testing

* Add unit test for recharge moves

* Refactor Copycat and Mirror Move, adjust move targeting

* Add unit test for ally targeting with Aromatic Mist

* Add tests for secondary effects and recharge moves for metronome

* Add test for Roar, remove test for Acupressure

* Create test for Assist

* Add test for assist failing

* Add sleep talk unit test coverage

* Adjust move-phase to better track last move for copycat, write and update unit tests for assist/copycat

* Create moveHistory in Battle to track all moves used, adjust mirror move to use this, writes unit tests

* Correct mirror move implementation, rewrite unit test to adjust

* Add docs to attrs, update assist to only grab allies sets

* Update assist unit test to match expected functionality

* Update metronome unit test to use getMoveOverride

* Update copycat unit test to use metronome getMoveOverride mock

* Fix phase interception

* Add docs from missed conversations

* Update assist tests to use manual moveset overrides

Minor fixes to other tests

* Remove `export` from `CallMoveAttr`

* Add missing `.unimplemented()` to some Max- and Z-Moves

---------

Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-14 15:26:35 -08:00
Jimmybald1
f1e500400a
[Balance][Bug] Fix off by one error in Generate random biome and Daily Mode now has its own function (#5121)
* [Balance] Allow Island and Laboratory in Generate Random Biome

* [Bug] Fix off by one error in Generate Random Biome

* [Balance] Daily Mode now has its own Generate Random Starting Biome

* [Misc] Filtering out Town and End specifically instead of assuming enum value stays consistent forever

---------

Co-authored-by: Jimmybald1 <147992650+IBBCalc@users.noreply.github.com>
2025-01-14 15:45:11 -07:00
NightKev
3a3ebfb783
[Balance] Multi-hit moves now use gen 5+ behavior (#5117) 2025-01-12 15:39:06 -08:00
NightKev
0107b1d47e
[Refactor] Create global scene variable (#4766)
* Replace various `scene` pass-arounds with global scene variable

* Modify tests

* Add scene back to `fade[in|out]()` calls

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

* Fix Bug Superfan ME test

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

* Re-enable fixed test

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

* Rename `gScene` to `globalScene`

* Move `globalScene` to its own file to fix import/async issues

* Fix `SelectModifierPhase` tests

* Fix ME tests by removing `scene` from `expect()`s

* Resolve merge issues

* Remove tsdocs referencing `scene` params

Remove missed instances of `.scene`

* Remove unnecessary `globalScene` usage in `loading-scene.ts`

* Fix merge conflicts

* Attempt to fix circular import issue

* Found the source of the import issue

* Fix merge issues

---------

Co-authored-by: Moka <54149968+MokaStitcher@users.noreply.github.com>
2025-01-12 15:33:05 -08:00
Madmadness65
f83ab00ce4 Add missing 'unused' comment before Max Moves 2025-01-12 13:34:21 -06:00
Ori shalhon
d3fafa2770
[UI/UX] Add random selection option during starter select (#5075)
* Update submodule public/locales to the latest upstream commit

* feat: add random selection option during starter select

* move random selection behavior to seperate label

* Update public/locales submodule reference

* Remove debug console.log statement

* Update locales

* Update src/ui/starter-select-ui-handler.ts

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

* Update src/ui/starter-select-ui-handler.ts

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

* Update src/ui/starter-select-ui-handler.ts

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

* Update locales submodule

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-10 20:10:52 -06:00
Amani H.
29087710b7
[Balance] Adjust Orb & Light Ball Weight Functions (#5070)
* [Balance] Adjust Orb & Light Ball Weight Functions

* Apply Kev's Suggestions

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-10 19:34:16 -05:00
Zain
b0c347e20d
[Bug] Fixed defog not removing the target's Safeguard and Mist (#5107)
* Fixed defog not removing the target's Safeguard and Mist

* Made requested changes and added unit test

* Remove stray newline

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-10 18:29:25 -06:00
Scooom
dc482ea2f0 Fix FLIP_INVERSE achivement to check ALL challanges are met, not SOME 2025-01-08 19:14:35 -06:00
Scooom
d1cb43386a Adjust the image for Flip Stat, and add an additional achivement for completing both Flip and Inverse 2025-01-08 19:06:38 -06:00
Jimmybald1
d0db6a35d2
[Bug] fix #5102 Catching Charm now always max weight in Daily Mode (#5103)
Co-authored-by: Jimmybald1 <147992650+IBBCalc@users.noreply.github.com>
2025-01-08 20:27:23 +01:00
Scooom
20f750adc8
Update src/system/achv.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-06 20:56:38 -06:00
Scooom
c7dcaf1ee4 Change the way achivements are blocked by challenge modes to a more flexible method 2025-01-06 20:45:50 -06:00
Scooom
834371951d Properly block other challange achviements 2025-01-06 18:57:11 -06:00
Unicornpowerstar
07b69c9485
[Sprite] Fix Issues with the 658-ash.json to display sprite correctly (#5055)
* [Sprite][Color] Fixing Issues with the 658-ash.json to display sprite correctly

- Fix colors not being shown correctly in the json.
   - Said fix are adding a new entry to separate the whites that are F8f8f8 by adding f4f4f4
   - Changed the wrong color into the correct one on the rare.

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-06 16:26:00 -08:00
NightKev
197b264fb0
[Bug] Gimmighoul & Eevee eggs will now properly randomize their forms (#5080) 2025-01-06 16:24:08 -08:00
Scooom
13ec567d69 Merge branch 'flip_stats_challange' of github.com:Scoooom/pokerogue into flip_stats_challange 2025-01-06 18:16:36 -06:00
Scooom
172a8901e0 Add ChallengeType.FLIP_STAT case to export function applyChallenges (Master Switch Function) 2025-01-06 18:16:13 -06:00
Scooom
d71c7996d5
Update src/game-mode.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-06 18:09:39 -06:00
Scooom
6049cbd412 Merge branch 'flip_stats_challange' of github.com:Scoooom/pokerogue into flip_stats_challange 2025-01-06 18:08:04 -06:00
Scooom
6af29300f5 Add applyFlipStat override to Challenge Class, and add override inside of FlipStatsChallenge 2025-01-06 18:06:25 -06:00
Scooom
6d36ccf235
Update src/field/pokemon.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-06 18:01:37 -06:00
Scooom
c67c992a01 Fix comment for FlipStatChallenge 2025-01-06 18:00:15 -06:00
Scooom
927b465695 Add FLIP_STAT to enum ChallengeType 2025-01-06 17:58:12 -06:00
Scooom
e9faa149c8
Update src/data/challenge.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-06 14:56:16 -06:00
Scooom
5422dd7a7c
Update src/data/challenge.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-06 14:55:47 -06:00
Scooom
824bca73eb
Update src/data/challenge.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-06 14:55:22 -06:00
Scooom
fae46ecc48
Update src/data/challenge.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-06 14:54:23 -06:00
Scooom
1734854bd8
Update src/game-mode.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-06 14:53:56 -06:00
Scooom
6e332e4299 Fix Ribbon not being granted 2025-01-05 12:36:24 -06:00