mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-17 21:09:25 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,679 Commits 8 Branches 8 Tags 2.9 GiB
42ccbc6956
Commit Graph

4679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
NightKev
42ccbc6956 Add missing .unimplemented() to some Max- and Z-Moves 2025-01-14 15:20:23 -08:00
NightKev
27c5a0a7c2
Remove stray newline 2025-01-14 15:13:44 -08:00
NightKev
dae3545482 Fix merge issues 2025-01-14 14:57:36 -08:00
NightKev
02828eb878 Merge branch 'beta' into assistbug2 2025-01-14 14:54:13 -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
schmidtc1
bfc802b83e
Merge branch 'beta' into assistbug2 2025-01-10 12:46:33 -05: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
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
NightKev
7e2da92f71
Merge branch 'beta' into assistbug2 2025-01-05 18:39:33 -08: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
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
d7262232f5
Merge branch 'beta' into assistbug2 2024-12-31 02:38:33 -08: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
ce72b9707c
Remove export from CallMoveAttr 2024-12-31 02:36:41 -08:00
NightKev
c5a944a5ae
Merge branch 'beta' into assistbug2 2024-12-30 22:20:12 -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
NightKev
8b3a484f0b
Merge branch 'beta' into assistbug2 2024-12-30 04:34:38 -08:00
NightKev
31ff6dc54e Update assist tests to use manual moveset overrides 
Minor fixes to other tests
 2024-12-29 23:27:27 -08: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
Christopher Schmidt
499a7eb344 Add docs from missed conversations 2024-12-29 12:10:03 -05:00
Christopher Schmidt
013c6b2c15 Correcting phase interception 2024-12-29 11:50:59 -05:00
Christopher Schmidt
400cdb3784 Updates copycat unit test to use metronome getMoveOverride mock 2024-12-29 11:27:26 -05:00
Christopher Schmidt
f6953e6ad7 Updates metronome unit test to use getMoveOverride 2024-12-29 11:22:31 -05:00
schmidtc1
462eb6da74
Update src/data/move.ts 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-12-29 10:56:34 -05:00
Christopher Schmidt
5b8229cbeb Updates assist unit test to match expected functionality 2024-12-29 10:52:24 -05:00
Christopher Schmidt
0871b83a2a Adds docs to attrs, updates assist to only grab allies sets 2024-12-29 10:25:26 -05:00
Christopher Schmidt
d4839284ad Merge branch 'assistbug2' of https://github.com/schmidtc1/pokerogue into assistbug2 2024-12-29 10:15:17 -05:00
schmidtc1
c403574b74
Update src/data/move.ts 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-12-29 10:06:32 -05:00
schmidtc1
ab0d149ef4
Update src/data/move.ts 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-12-29 10:05:48 -05:00
schmidtc1
5ccd18416c
Update src/phases/command-phase.ts 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-12-29 10:05:33 -05:00
schmidtc1
7f46670192
Update src/phases/command-phase.ts 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-12-29 10:05:17 -05:00
schmidtc1
9258e973c0
Update src/field/pokemon.ts 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-12-29 10:04:34 -05:00
Christopher Schmidt
5d37ffba5a Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into assistbug2 2024-12-29 10:03:25 -05:00
schmidtc1
313ce835ae
Merge branch 'beta' into assistbug2 2024-12-22 20:42:30 -05: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
AJ Fontaine
6392ee857c
[Balance] Allow event Stantler to evolve (#5021) 2024-12-20 15:53:42 -08:00
NightKev
e75fa0d16d
Merge main into beta to fix git history (#5020) 
Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>
 2024-12-20 14:27:49 -08:00
AJ Fontaine
82dad5568c
[Balance] Fix Annihilape Tera Blast TM Compatibility (#5016) 2024-12-20 14:14:16 -08:00