Bertie690
3876ba93be
Merge branch 'beta' into waveData
2025-04-22 20:23:24 -04: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
Bertie690
a2c6a62598
Fixed test
2025-04-22 11:41:27 -04:00
Bertie690
b550088384
Fixed failing test by not trying to mock rng
2025-04-22 11:39:01 -04:00
Bertie690
68adbcbe83
Fixed migrate script, re-added deprecated attributes out of necessity
2025-04-22 11:29:47 -04:00
Bertie690
9e65d0a07b
added commented out console.log statement
...
uncomment to see new berry data
2025-04-21 23:55:44 -04:00
Bertie690
82572b263d
Hopefully fixed bug
...
my sanity and homework are paying the price for this lol
2025-04-21 23:54:48 -04:00
Bertie690
b341943ea8
huhjjjjjb
2025-04-21 23:34:59 -04:00
Bertie690
745714ea28
Fixed test
2025-04-21 18:22:52 -04:00
Bertie690
3707c00e20
Fixed test
...
I forgot that we outsped and oneshot
2025-04-21 18:19:48 -04:00
Bertie690
5a9fbd13f0
Merge branch 'beta' into waveData
2025-04-21 18:15:00 -04:00
Bertie690
02b6bf732b
Fixed summondata being cleared inside summonPhase, removed summonDataPrimer
...
like seriously how come no-one checked this
2025-04-21 18:14:43 -04:00
Bertie690
6374f38b11
test added
2025-04-21 17:57:06 -04: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
Bertie690
024b413611
Fixed tests
2025-04-21 15:27:01 -04:00
Sirz Benjie
0da56cda9f
[Bug][Sprite] Fix variant loading console spam ( #5690 )
2025-04-21 13:46:32 -05:00
Bertie690
102554cdb7
Moved empty moveset verification mapping thing to upgrade script bc i wanted to
2025-04-21 12:51:28 -04:00
Bertie690
2746a658df
Fixed constructor (maybe), moved deepCopy and deepMergeSpriteData to own file
...
`common.ts` is hella bloated so seems legit
2025-04-21 10:42:58 -04:00
Bertie690
169789f25e
Fied a few
2025-04-21 09:07:00 -04:00
Bertie690
a7b5a4d2e1
fixed formattign
2025-04-20 23:30:35 -04:00
Bertie690
079d50e2e0
Added version migrator for rage fist data + deepMergeSpriteData tests
2025-04-20 23:23:11 -04:00
Bertie690
c3db9e3532
Merge remote-tracking branch 'upstream/beta' into waveData
2025-04-20 17:37:28 -04:00
Bertie690
14b47c0eef
Grabbed reverted changes from stuff
2025-04-20 17:17:25 -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
Dean
2cf0b51299
[Bug] Properly handle suppression with Illusion ( #5671 )
...
* Remove extra attributes on neutralizing gas
* Add IllusionBreakAbAttr to applyOnLose
* Add test case
2025-04-20 11:14:19 -07:00
Blitzy
8515cadd77
[Balance] Update Gym Leader Teams and Teras ( #5670 )
...
* Update Gym Leader Teams
* Set Tera slots for Gym Leaders
* Change Giovanni's Specialty Type to Ground
---
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-04-20 00:20:07 -05:00
Chris
bda286cebb
[Bug] Fix Login Screen Buttons can be Pressed While Animating ( #5170 )
...
* destroy containers when processing external containers
* make form buttons uninteractible until tweens finished instead
* fix holding enter spam
* fix conflicts
2025-04-19 14:00:12 -07:00
Sirz Benjie
65294f408e
[Bug][UI/UX] Fix type hint after enemy disappears ( #5677 )
...
* Fix type hint after enemy disappears
* Add automated test for type hint bugfix
* Make onField default to true
* Replace reference to Mode with UiMode and battleType with BattleStyle
2025-04-19 08:04:19 -07:00
Sirz Benjie
5854b21da0
[Refactor] Remove circular imports part 1 ( #5663 )
...
* Extract Mode enum out of UI and into its own file
Reduces circular imports from 909 to 773
* Move around utility files
Reduces cyclical dependencies from 773 to 765
* Remove starterColors and bypassLogin from battle-scene
Reduces cyclical dependencies from 765 to 623
* Fix test runner error
* Update import for bypassLogin in test
* Update mocks for utils in tests
* Fix broken tests
* Update selectWithTera override
* Update path for utils in ab-attr.ts
* Update path for utils in ability-class.ts
* Fix utils import path in healer.test.ts
2025-04-19 11:57:03 +00:00
damocleas
a6e87c8438
[Bug] [Move] Supercell Slam now hits Minimized targets for double damage and can't miss ( #5680 )
...
Added AlwaysHitMinimizeAttr and HitsTagForDoubleDamageAttr to Supercell Slam for Minimize
2025-04-18 22:25:05 -04:00
Sirz Benjie
54ce58411b
[Bug] Fix forced switch bugs in enemy partner trainer battles ( #5644 )
...
* Add isPartner method to trainer class
* Ensure force switches cannot pull pokemon from the wrong trainer
* Add override for battle type
* Fixup tests and broken assumptions
* Make move fail override semi-invuln check
Bandaid fix because move effect phase does not allow for the move to fail if all of its conditions fail
* Restore overrides
* Apply kev's suggestions from code review
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Fix illusion test battle type invocation
* Update struggle and healer tests to use battleStyle
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-04-18 09:35:46 +00:00
Lylian BALL
82cd492117
[Bug] Pokemon with illusion imitate the cry of the illusion ( #5675 )
2025-04-18 09:33:28 +00:00
Sirz Benjie
b8b101119c
[Bug][Sprite] Use floats for variant shader recolor comparison ( #5668 )
...
* Use float values for comparison
* Remove unused colorInt
2025-04-17 20:31:57 +00:00
Sirz Benjie
3a46aae687
[Bug] Fix beak blast: not applying if user faints and not respecting long reach ( #5639 )
...
* Add test for beak blast applying after user faints
* Rewrite tags for contact protected and check moveFlags.doesFlagEffectApply
* Add test to beak blast ensuring a long reach user does not get burned
* Re-add DamageProtectedTag to relevant inheritance chains
* Move resetSummonData to faintPhase instead of pokemon.apply
* Remove passing of grudge and destiny bond tags to faint phase
2025-04-17 15:25:38 -05:00
Sirz Benjie
eef8367caf
[Bug] Fix experimental sprites not loading in starter select ( #5664 )
...
[Bug][Sprite] Fix experimental variant sprites not being loaded in starter select screen
2025-04-17 09:57:30 -07:00
Sirz Benjie
45a2f42602
[Bug] Prevent game from hanging when loading in a new battle ( #5676 )
2025-04-17 11:44:50 -04:00
Sirz Benjie
b2bab46e1c
[Bug][Ability] Fix healer queueing its message when its ally is fainted ( #5642 )
...
* Add check against faint status effect
* Add tests for healer
* Remove redundant portions of the tests
* Fix broken test
2025-04-17 04:47:49 +00:00
damocleas
8d311e65cf
[Bug] [Ability] Fixed wrong Sheer Force interactions and multiplier from ~1.33 -> 1.3 ( #5515 )
...
* sheer force #, sheer force and burning jealousy test fix, and move chance fixes
* removed order up sheer force interaction mention and test - updated comments
* remove electro shot from changes
2025-04-16 19:31:53 -07:00
Sirz Benjie
ae588ebff9
[Bug][Move] Struggle no longer gets STAB ( #5643 )
...
* Struggle no longer gets STAB
* 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-04-16 16:05:40 -05:00
NightKev
efad0d1324
[GitHub] Use .nvmrc for pages workflow ( #5666 )
2025-04-15 20:55:29 -07:00
Stephen Kelman
18c4dddcf0
[Bug] Fixing Tera Starstorm for first turn of terastallization ( #5658 )
...
* Updating tera starstorm targeting condition so that it is a spread move on the turn that terastallization happens
* added new unit tests to verify behavior of tera starstorm under non-tera conditions as well as on terastallization turns
2025-04-15 14:19:19 +00:00
Sirz Benjie
ff44cbfa97
[Refactor] Refactor ability file part 1 ( #5589 )
...
* Move ability.ts to subfolder
* Extract types out of ability.ts
* Update imports in ability.ts and friends
* Cleanup imports in ability.ts
* Re-add imports lost during sort
* Update imports forgotten during rebase
* Re-import proper type from enums
* Update biome.jsonc
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Add commit to force tests to rerun
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-04-15 14:08:35 +00:00
Madmadness65
4740b593a0
[Balance] Fix Depot Agent trainer type lacking Pokémon ( #5623 )
...
Fix Depot Agent trainer type lacking Pokémon
Also removes a stray duplicate Barboach from the Fisherman.
2025-04-15 05:27:14 +00:00
AJ Fontaine
3ec8f236f9
[Refactor] Change how rival event rewards are generated ( #5638 )
...
* Change how rival event rewards are generated
* Simplify to switch case
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-04-15 00:13:05 +00:00
Sirz Benjie
8216a379bf
[Dev][GitHub] Update to node 22 ( #5586 )
...
* Update node and workflows to use version 22.14
* Update @types/node package
* Update engines field in package.json
* Hardcode node version in github pages workflow
* Update to checkout@v4 in github pages workflow
2025-04-14 12:37:26 -05:00
damocleas
b41eee3c7f
Revert "[Refactor] Move many interfaces and enums to their own file" ( #5661 )
...
Revert "[Refactor] Move many interfaces and enums to their own file (#5646 )"
This reverts commit c82e01eed3
2025-04-14 12:28:36 -04:00
Sirz Benjie
c82e01eed3
[Refactor] Move many interfaces and enums to their own file ( #5646 )
...
* Move LearnMoveSituation to its own file
* Remove unused selfStatLowerMoves array
* Move all-moves to its own file
* Move TurnMove interface to its own file
* move AiType to its own file
* Move PokemonMove to its own file
* Move DamageCalculationResult interface to its own file
* Move fieldPosition to its own file
* Move hit-result to its own file
* Move DamageResult to its own file
* Move SpeciesWildEvolutionDelay to its own file
* move EvolutionItem to its own file
2025-04-14 08:31:26 -07:00
Lylian BALL
15e535a1a0
[Ability] Implement Illusion ( #3273 )
...
* implement illusion ability with unit test and localizations
* try removing whitespace change on unnecessary files
* nit corrections
* nit update src/field/pokemon.ts
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
* nit update src/phases.ts
Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>
* illusion test correction
* unexpected error correction
* refactor property pokemon.illusion to pokemon.battleData.illusion
* nit
* nit
* update unit test up-to-date
* add docs
* merge up to date
* bugfix
* bugfix
* merge up to date
* refactor field illusion out of battleData
* fix nit
* fix nit
* Zoroark change illusion after lastPokemon update
* Zoroark change illusion after lastPokemon update
* refactor bug fix
* bugfix
* bug fix on tests
* Update src/field/pokemon.ts
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
* use GetFailedText
* remove useless import
* add condition 'no illusion' into transform move
* wild Zoroark creates an illusion according to the current biome
* wild Zoroark creates an illusion according to the current biome
* delete console.log()
* add doc
* Update src/field/pokemon.ts
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
* fix tests
* update locales submodule
* update Illusion interface
* bug fix
* bug fix
* bugfix
* rename some params for future implementations
* Zoroark keep illusion between battles
* Zoroark keep illusion between battles
* delete draft
* merge up-to-date
* bugfix
* merge
* merge
* implement canApplyPresummon method
* Update test/abilities/illusion.test.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* Update src/data/ability.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* Update src/data/ability.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* Update test/abilities/illusion.test.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* Update test/abilities/illusion.test.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* nit
* review corrections
* nit
* type hints affected by enemy illusion
* type hints affected by enemy illusionin fight-ui-handler
* nit
* rename some parameters back in useIllusion
* Update src/field/pokemon.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update src/field/pokemon.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* refactor battleData.illusion as summonData.illusion and delete oncePerBattleClause
* add comments
* illusion will break before evolution
* Update src/field/pokemon.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* Update src/data/ability.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* Update src/data/ability.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* Update src/data/ability.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* Update src/data/ability.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* bug fix
* g
* get submodule back
* get submodule back
* bug fix to save illusion status
* add pokemon.getPokeball()
* Update src/field/pokemon.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* Update src/field/pokemon.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* Update src/field/pokemon.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* Update src/data/ability.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
* Update src/field/pokemon.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update src/field/pokemon.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update src/field/pokemon.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update src/field/pokemon.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---------
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@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>
2025-04-12 21:22:04 -04:00
