Commit Graph

5528 Commits

Author SHA1 Message Date
Madmadness65
d99b7480e9 Optimize new images, re-export item atlas 2025-08-20 15:28:25 -05:00
damocleas
d6a2c524d9 egg s 2025-08-20 16:01:42 -04:00
Sirz Benjie
333e80d172
Merge branch 'beta' into doTheAchievementShuffle 2025-08-20 08:45:45 -05:00
Bertie690
6c03181621
[Bug] Refactored status code, fixed Rest/Sleep Talk status checks (#5872)
* Reworked status code, fixed bugs and added Rest tests

* Fixed rest bug

* Fixed bugs, split up status code, re-added required Rest parameter

* Cleaned up comments and such

* Added edge case to rest about locales

* Maybe did stuff

* Split up `trySetStatus` fully; fixed rest turn order display to match mainline

* Reverted healing changes to move to other PR

* Fixed message code a bit

* Condensed all status immunity tests under 1 roof

* Fixed the tests

* Added pollen puff tests back again

* Fixed swallow test

* Reverted swallow test

fixing in other prs

* Fixed pollen puff

* Fixed cirrc dep isuse

* fixed stockpile to no longer fail on stack full

* Fixed rest thing...?

* readded swallow conds

* Fixed tests

* wip

* Fixed tests

* Added pokemon heal phase to the turn queue

* ddddd

* Fixed the tests

* Fixed corrosion test

* Ran linting

* Fixed infiltrator bug

* Fix pokemon.ts

* Update move.ts

* Update corrosion.test.ts

* Update pokemon.ts documentation

* Remove missed line in TSDocs

* Update pokemon.ts

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>

* Update modifier.ts

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>

* Update modifier.ts

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>

* Update obtain-status-effect-phase.ts

* Fix merge issues and apply Biome

* Revert pokemon-heal-phase.ts

* ddddd

* Fixed test file syntax err

* Update toxic spikes status set text to be quiet

* ran biome

* ran boime

* Prevent rest failure message from displaying outside of move phase

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-08-20 08:45:09 -05:00
Bertie690
2821728743
[Refactor] Cleaned up arena trap moves; prevented serialization of max layers (#6210)
* Grabbed matchers from other branch

* Cleaned up entry hazard arena tags; merged tests into 1 file

* Marked test as TODO because IDK how to make it pass

* Re-added test file + ran biome

* Sort imports in `vitest.d.ts`

* Fix Stealth Rocks test

* Renamed arena traps to entry hazards fr fr

* fixed matcher to have default value

* Fixed errors

* Update arena-tag.ts

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

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
2025-08-20 08:32:27 -05:00
Sirz Benjie
8ed32ed31e
Fix achievement test file 2025-08-20 08:18:13 -05:00
Sirz Benjie
336da565ed
Fix tera stellar missing icon path 2025-08-19 20:52:58 -05:00
Sirz Benjie
3955d2d992
Fix achievement test file 2025-08-19 20:48:35 -05:00
damocleas
4c5798e33c
Merge branch 'beta' into doTheAchievementShuffle 2025-08-19 21:02:38 -04:00
Bertie690
cf5378905e
[Test] Removed deprecated functions from phase interceptor (#6195)
* Removed deprecated functions from phase interceptor

* Added minor docs to the phase manager + renamed `shift` to `shiftPhase`

* Added `selectStarterPhase` to the end by set mode collection

* Fixed issues and syntax errors

* somehow fixed reload bug by making things actively worse

* Perhaps fixed things?

* maybe fixed?

* Fixed tests

* fixed another dumb error bc me big dumb bozo

* dddddd

* Update phase-interceptor.ts

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

* Re-add `!` and add `TODO` comment instead

---------

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-08-19 19:54:40 -05:00
Bertie690
545d7349dc
[Test] Hopefully fixed salesman ME flaky test (#6298) 2025-08-19 17:43:39 -07:00
Bertie690
8734062401
[Test] Cleaned up tests to use updated test utils; part 1 (#6176)
* Removed bangs from `getEnemyParty` and `getPlayerParty`

* Replaced instances of consecutive `game.scene.getPlayerParty` with destructuring

* More array destructuring!!!

* Replaced `game.scene.getXXXParty()[0]` with `game.field.getEnemyPokemon`

* Deleted duplicate sturdy test case

* Fiexd syntax errors

* Fixed remaining issues; removed direct assignment to `Pokemon.moveset`

* Fixed remaining error
2025-08-19 19:21:40 -05:00
damocleas
9b10f312b9
Update achievement.test.ts 2025-08-19 17:01:41 -04:00
fabske0
effa45228e
[i18n] Change i18n keys to be camel case Part 4 (#6290)
* change run-history

* change menu

* change settings

* change splash texts

* Change trainer classes

* change trainer names

* Change trainer titles

* fix trainer config comments and `setTitle()`

* change challenges

* update challenge 2

* change pokedex ui handler

* Update locales submodule
2025-08-19 13:17:23 -07:00
Sirz Benjie
dd03887d05
[Challenge] [Beta] Block other ribbons when flip stats or inverse battle is active (#6289) 2025-08-19 01:37:43 +00:00
Wlowscha
3d9cb539c7
[Bug][P1] Fix trapping abilities crashing game on switch out (#6293)
Move trapped messages into a .then() statement
2025-08-19 00:30:12 +00:00
NightKev
5500f2ff8d
[Dev] Generate moveset when using player Species override (#6039) 2025-08-19 00:01:18 +00:00
damocleas
8ff1dbda43 run biome 2025-08-18 17:38:01 -04:00
damocleas
feeb705307
Merge branch 'beta' into doTheAchievementShuffle 2025-08-18 17:30:29 -04:00
Lugiad
7131e1fb01
[UI/UX] Tiny round of PNG optimizations (#6291)
Tiny round of PNG optimizations
2025-08-18 12:44:32 -07:00
Madmadness65
9662b7c8c9
[Audio] Add new Wasteland BGM track (#6285) 2025-08-18 09:27:37 -04:00
Jimmybald1
74136a9c2b
[Beta][Bug] Fixing Ribbons that do not work because of integer overflow (#6288)
Change ribbondata number to bigint

Co-authored-by: Jimmybald1 <147992650+IBBCalc@users.noreply.github.com>
2025-08-18 08:04:23 -05:00
Madmadness65
2ff9bd4652 Add missing short party slots to Legacy UI
No longer will output an error to the console due to a missing image.
2025-08-17 17:57:24 -05:00
Jimmybald1
02de259554
[Beta][Bug] Fix ribbon pre-evolution award not using prevoid (#6283)
Fix ribbon pre-evolution award not using prevoid

Co-authored-by: Jimmybald1 <147992650+IBBCalc@users.noreply.github.com>
2025-08-17 21:22:04 +00:00
NightKev
a5190396fa [i18n] Update locales submodule 2025-08-17 14:13:48 -07:00
G Sai Nikhilesh
bf9f0880b6
[UI/UX] Add Username to Stats Screen (#6270)
* [Feature] Add Username to Stats Screen

* [Feature] username fallback to "Guest"

* [UI/UX] Update display name fallback to use translation for guest user

* Update locales submodule

* [Fix] Username updates without refresh

* Update locales submodule

---------

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-08-17 14:02:29 -07:00
Bertie690
432f505f65
[Dev] Added devcontainer.json and VS code config files (#6190)
* [Dev] Added `devcontainer.json` and VS code config files

* Update settings.json

* Removed "don't lint vscode json files" setting from `biome.jsonc`

* Update settings.json

* Update extensions.json

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

* Update settings.json

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

* Update settings.json

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

* Update settings.json

* Re-add `.vscode/` to Biome ignore list

* Update settings.json

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

* Update .devcontainer/devcontainer.json

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

* Removed non-`extensions.json` files; added default config directly to devcontainer

* Added mention of alternate dev setup to `CONTRIBUTING.md`

* Update CONTRIBUTING.md

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-08-17 13:26:20 -07:00
fabske0
06496f9135
[i18n] Change i18n keys to be camel case Part 3 (#6266)
* chnage nature locales use

* chnage party ui locales use

* change pokemon category locales use

* chnage pokemon evos locales uses

* change pokemon form battle use

* change pokemon form uses

* Change pokemon info uses

* fix `stat.ts` workflow fail

* Change pokemon summary

* Change pokemon localize

* Temporarily revert changes to `achv.ts`

* Re-add changes to `achv.ts`

* Update locales submodule
2025-08-17 13:13:09 -07:00
fabske0
03f54c1d8a
[i18n] Change i18n keys to be camel case Part 2 (#6250)
* Change Achv locales

* Change berry locales use

* change bgm name locales use

* change biome locales uses

* change double battle dialogue use

* change misc dialogue locales use

* change dialogue locales use

* change growth locales use

* update menu-ui-handler locales use

* change ME texts locales uses

* fix biome drop down

* fix a few missed keys

* Update locales submodule
2025-08-17 12:59:09 -07:00
fabske0
5d13714ea6
[i18n] Change i18n keys to be camel case MEs (#6237)
* changed ME `intro_dialogue` to camel case

* changed MEs part 1

* changed MEs part 2

* changed MEs part 3

* chnaged MEs part 4

* Update locales submodule
2025-08-17 12:46:12 -07:00
damocleas
c41a3dc79b
[Balance] Adjust Eternatus' Catchrate from 255 -> 45 (#6279)
Eternatus Catchrate 255 -> 45
2025-08-16 19:26:33 -04:00
damocleas
0b107bcbcd
[Balance] Buff OHKO moves from 200 -> 250 Base Power against Bosses (#6278)
OHKO moves 200 -> 250 Base Power
2025-08-16 19:09:31 -04:00
NightKev
7d0bde4604 [Dev] Remove obsolete ESLint commands from package.json 2025-08-16 15:17:43 -07:00
Wlowscha
46c78a0540
[Bug][UI/UX] Bringing mon icon overlays on top correctly (#6272)
Bringing mon icon overlays on top correctly
2025-08-15 22:51:28 +00:00
AJ Fontaine
98809c28bd
[Balance] Add TM for Shock Wave (#6274)
Add TM for Shock Wave
2025-08-15 22:23:13 +00:00
damocleas
e0559e03ff Update locales 2025-08-15 17:09:51 -04:00
SmhMyHead
f6b99780fb
[UI/UIX] Dex unseen species filter (#5909)
* [UI/UIX] Dex unseen species filter

* Removed changes to icon visibility rules

* Update src/ui/pokedex-ui-handler.ts

---------

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
2025-08-15 19:27:16 +00:00
Amani H.
19af9bdb8b
[Beta] [Bug] Fix Various Nuzlocke-related Issues (#6261)
* [Bug] Fix Various Nuzlocke-related Issues

* Update encounter-pokemon-utils.ts

* Update attempt-capture-phase.ts

---------

Co-authored-by: damocleas <damocleas25@gmail.com>
Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
2025-08-15 19:22:59 +02:00
fabske0
8e61b642a3
[UI/UX Bug] Position runname dynamically (#6271)
Fix runname position

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
2025-08-15 13:16:37 -04:00
fabske0
da7903ab92
[i18n] rename cancel to cancelButton (#6267)
rename cancel to cancelButton
2025-08-15 11:34:54 -04:00
Bertie690
70e7f8b4d4
[Misc] Removed populateAnims script (#6229)
Removed `populateAnims`

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
2025-08-15 17:11:37 +02:00
Sirz Benjie
b2990aaa15
[Bug] [Beta] Fix renaming runs (#6268)
Rename run name field, don't encrypt before updating
2025-08-14 16:57:01 -05:00
Bertie690
ee4950633e
[Test] Added toHaveArenaTagMatcher + fixed prior matchers (#6205)
* [Test] Added `toHaveArenaTagMatcher` + fixed prior matchers

* Fixed imports and stuff

* Removed accidental test file addition

* More improvements and minor fixes

* More semantic changes

* Shuffled a few funcs around

* More fixups to strings

* Added `toHavePositionalTag` matcher

* Applied reviews and fixed my godawful penmanship

* Fix vitest.d.ts

* Fix imports in `vitest.d.ts`

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-08-14 13:16:23 -07:00
Sirz Benjie
30058ed70e
[Feature] Add per-species tracking for ribbons, show nuzlocke ribbon (#6246)
* Add tracking for nuzlocke completion

* Add ribbon to legacy ui folder

* Add tracking for friendship ribbon

* fix overlapping flag set

* Replace mass getters with a single method

* Add tracking for each generational ribbon

* Add ribbons for each challenge

* 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-08-14 13:20:48 -05:00
Wlowscha
140e4ab142
[UI/UX] Party slots refactor (#6199)
* constants for position of discard button

* Moved transfer/discard button up in doubles

* Fixed the various `.setOrigin(0,0)`

* Small clean up

* Added `isBenched` property to slots; x origin of `slotBg` is now 0

* Also set y origin to 0

* Offsets are relevant to the same thing

* Introducing const object to store ui magic numbers

* More magic numbers in const

* Laid out numbers for slot positions

* Added smaller main slots for transfer mode in doubles

* Changed background to fit new slot disposition

* Apply suggestions from code review

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

* Optimized PNGs

* Updated comment

* Removed "magicNumbers" container, added multiple comments

* Update src/ui/party-ui-handler.ts

Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>

* Fainted pkmn slots displaying correctly

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Co-authored-by: Adri1 <adrien.grivel@hotmail.fr>
Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-08-14 13:10:15 -05:00
fabske0
76d8357d0b
[Dev] Rename OPP_ overrides to ENEMY_ (#6255)
rename `OPP_` to `ENEMY_`
2025-08-14 18:06:24 +00:00
Bertie690
f42237d415
[Refactor] Removed map(x => x) (#6256)
* Enforced a few usages of `toCamelCase`

* Removed `map(x => x)`

* Removed more maps and sufff

* Update test/mystery-encounter/encounters/weird-dream-encounter.test.ts

* Update game-data.ts types to work
2025-08-14 10:25:44 -07:00
fabske0
b44f0a4176
[Refactor] Remove bgm param from arena constructor (#6254) 2025-08-14 16:52:56 +00:00
Sirz Benjie
076ef81691
[Bug] [UI/UX] [Beta] Fix icons not showing in save slot selection (#6262)
Fix icons not showing in save slot selection
2025-08-13 20:49:46 -05:00
fabske0
23271901cf
[Docs] Add locale key naming info to localization.md (#6260) 2025-08-14 01:12:00 +00:00