Commit Graph

4620 Commits

Author SHA1 Message Date
Scooom
1821ba9314 Update code for #4766 changes to global scene 2025-01-14 19:31:28 -06: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
Scooom
c6e360eda2 Add Achievment Image 2025-01-05 09:18:49 -06:00
Scooom
c64c853270 Update challenge code to block other challenges. TODO: Helper function at some point 2025-01-05 08:38:08 -06:00
Scooom
757a26ff33 Remove Debug Code 2025-01-05 07:56:54 -06:00
Scooom
464c931acf Add Achivement 2025-01-05 07:47:30 -06:00
Lugiad
1be95e8a1a
[Localization] [UI/UX] Updates for pokemon-emerald-pro & pkmnems (#4968)
* Add files via upload

* Add files via upload
2025-01-04 23:43:40 +01:00
Scooom
bcb891de17 Implement Flip Stat Challange 2025-01-04 06:50:39 -06:00
Amani H.
355e70328c
[Misc] 1.4.3 Version Bump + Locales Update (#5077) 2025-01-03 18:27:26 -06:00
AJ Fontaine
ec5dadb4f4
[Misc] Undo winter holiday event changes (#5068) 2025-01-03 16:42:06 -07:00
NightKev
206419c9f1
Merge pull request #5061 from pagefaultgames/main
Merge main (1.4.2) into beta
2024-12-31 02:38:07 -08:00
NightKev
14902cdb60
[Hotfix] Prevent Keldeo from changing forms in Daily Run (#5060)
* [Hotfix] Prevent Keldeo from changing forms in Daily Run

* Update patch version
2024-12-30 20:20:23 -08:00
NightKev
1b6374f469
[UI/UX] Change label for music settings (#5053)
Changes from "Consistent/Mixed" to "Gen V + PMD"/"All Gens"

Update `MusicPreferences` enum

* Update locales submodule
2024-12-30 18:55:28 -08:00
Wlowscha
6946abadb8
[UI/UX] Add cursor memory option (#5028)
* Adding a new key determining whether the command cursor resets at the beginning of each new battle.

* Allowing user to toggle commandCursorReset on and off.

* Changing option name to commandCursorMemory

* Fixed caps in settings.ts

* Moved Command_Cursor_Memory from Display settings to General settings
2024-12-30 09:35:45 -06:00
Asuka Kuwahara
8f884a7ef0
[BUG] fix #5038 update shedinja's gender to genderless on evolution (#5039)
* update shedinja's gender to genderless

* update unit test
2024-12-29 20:09:11 -06:00
NightKev
10e0f9f0de
Merge pull request #5024 from pagefaultgames/main
Merge main to beta
2024-12-20 19:32:30 -08:00
AJ Fontaine
8457fb96fe
[Hotfix] Fix off-by-one error for event encounters (#5022)
* Fix off-by-one error for event encounters

* Increment version to 1.4.1

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-12-20 18:41:07 -08:00
damocleas
f95a5d41cb
Merge pull request #5019 from pagefaultgames/beta
Release 1.4.0
2024-12-20 19:06:24 -05:00