Commit Graph

4381 Commits

Author SHA1 Message Date
innerthunder
2c07c3dbe2 Merge branch 'beta' into pr/4700 2024-10-23 12:35:04 -07:00
innerthunder
c7e9eaf435
[P2] Fix binding, etc. not being removed when switching with Baton Pass (#4709)
* Fix binding, etc. not being removed when switching with Baton Pass

* New baton pass test
2024-10-23 11:24:50 -04:00
schmidtc1
958d79140c
[P2] Fixes Transform/Imposter not updating type/battle stat changes immediately; set move PP to 5 when transforming (#3462)
* Adds updateInfo to transform move/ability, mirrors Transform functionality in Imposter

* Implements functionality for reducing pp to 5 or less for each move when transforming

* Refactors to async/await pattern, adds back removed anims/sounds from last commit

* Eslint fix attempt

* Update src/data/ability.ts

per DayKev's suggestion

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

* Merge and fix conflicts

* Adds unit tests for pp-change with transform/imposter

* Updates to consistency in syntax/deprecated code

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-23 11:12:53 -04:00
NightKev
fd38ab4cb4
[P2] Missing Minior form (violet) now spawns in the wild (#4711) 2024-10-23 11:10:43 -04:00
innerthunder
03025b2674
[P2] Fix various charge move bugs (#4595)
* Add charge move classes and phase

* Integrate `MoveChargePhase` in battle phase sequence

* Fix Protean + charge move interaction

* Fix effect chance applying to semi-invulnerability

* Remove `ChargeAttr` and fix ChargeAnim loading

* Restore move history entry for charge phases

* Gravity now cancels Fly, etc. after charge turn

* Dig integration tests

* Fly integration tests

* Dive integration test + fix Dive in Harsh Sun bug

* Solar Beam integration tests + `CHARGING` tag fixes

* Fix dive test

* Electro Shot integration tests

* fix import in MoveChargePhase

* Electro Shot Multi Lens test

* Geomancy integration tests

* Fix duplicate move queue

* Update import

* Docs + Fix Meteor Beam being boosted by Sheer Force

* Fix volt absorb test

* Apply PigeonBar's suggested move-phase changes

Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>

* Make Electro Shot Sheer Force boosted again

* Apply PigeonBar's feedback pt. 2

* Apply suggestions from code review

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

* Fix mistimed/dupe showMoveText and leftover TODO

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
2024-10-23 11:08:40 -04:00
Moka
16b7194366
[P3] Fix Egg Summary not showing new abilities in blue (#4712) 2024-10-23 11:05:13 -04:00
bjparker1226
a0baf89297
[P2] Fix dark deal reducing transformed Pokemon's held item stack to 1 (#4707) 2024-10-23 11:04:37 -04:00
NightKev
1ad4f3b376
[Test] Add STATUS_ACTIVATION_OVERRIDE to overrides.ts (#4689)
This applies to Paralysis and Freeze

Added Paralysis test to demonstrate usage

- Consolidate `this.cancel()` calls
2024-10-22 23:11:02 -04:00
Blitzy
0fe57b44b5
[Balance] Add Exclusive Moves from Prior Evolutions via Memory Mushroom (#4681) 2024-10-22 18:13:10 -07:00
damocleas
96e5f2d763
Starmobile Stat Adjustments (#4704)
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
2024-10-22 18:07:28 -07:00
flx-sta
6ccc6449c4
Merge branch 'beta' into me-balance-changes 2024-10-22 13:24:13 -07:00
Mumble
5e7f2042fc
[UI][QoL] Cursor defaults to Fight at the start of each new wave (#4666)
* cursors are dumb

* update

* fixed?

* maybe solution

* fix in!

* Possible cursor fixes

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: Opaque02 <66582645+Opaque02@users.noreply.github.com>
2024-10-22 13:05:37 -07:00
NightKev
181f59882a
[P2] Fix Early Bird (#4632)
* Fix Early Bird, add tests

* Update tsdocs for Early Bird's `AbAttr`

Rename `turnCount` to `toxicTurnCount` and
`turnsRemaining` to `sleepTurnsRemaining` in `status-effect.ts`

* Fix Toxic Orb test

* Redundant code :despair:

* Fix status override to set the number of sleep turns
2024-10-22 12:37:13 -04:00
MokaStitcher
987fceb733 [me] Weird Dream: apply same old gateau logic to team in options 1 and 2 2024-10-22 18:06:38 +02:00
Moka
751e871b02
Merge branch 'beta' into me-balance-changes 2024-10-22 14:32:32 +02:00
MokaStitcher
6a244e6c69 Apply code review suggestions 2024-10-22 14:25:56 +02:00
MokaStitcher
6982f34f9a revert 'offer you can't refuse' giving Silver Pokeball' 2024-10-22 14:25:55 +02:00
Mason S
7066a15ceb
[Refactor] Added BattlerTagLapseType.AFTER_HIT (#3655)
* [Refactor] Added ON_GET_HIT BattlerTagLapseType

Adjusted BeakBlastChargingTag and ShellTrapTag to use new lapse type

Adjusted MoveEffectPhase to now lapse all tags with the ON_GET_HIT lapse type

* [Refactor] Added ON_GET_HIT BattlerTagLapseType

Adjusted BeakBlastChargingTag and ShellTrapTag to use new lapse type

Adjusted MoveEffectPhase to now lapse all tags with the ON_GET_HIT lapse type

* Fix nits

* Rename `ON_GET_HIT` to `AFTER_HIT`

Change `isOpponentTo` to `isOpponent`

* Fix a couple minor nits

* Remove single-use function

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-21 23:53:00 -07:00
innerthunder
c2eb9de9df
[Ability] Partially Implement Infiltrator (does not work with mist) (#4636)
* Implement Infiltrator

* Integration tests + Infiltrator is (P) again

* Fix screen tests

* Fix `hitsSubstitute`

* docs for Infiltrator attr
2024-10-21 21:41:25 -04:00
PrabbyDD
467841d167
[P2] Nightmare triggers at turn end instead of after move (#4702) 2024-10-21 21:33:41 -04:00
flx-sta
a3fb7bc829
[ME] update CombinationRequirements to allow AND or OR combinations
* refactor: CombinationPokemonRequirement `.Some()` and `Every()`

* chore: rename `orRequirements` to `requirements`

* fix: returns of `Some()` and `Any()`

* apply `Some()` / `Any()` pattern to `CombinationSceneRequirement` too
2024-10-21 22:16:36 +02:00
MokaStitcher
96d8a2127a [balance] update Weird Dream ME maximum spawn wave 2024-10-21 22:13:30 +02:00
MokaStitcher
37392d9466 [balance] Training session ME does not update Seen/Defeated GameStats 2024-10-21 22:13:30 +02:00
flx-sta
9ac6033e4e
Merge branch 'beta' into me-balance-changes 2024-10-21 12:51:26 -07:00
NightKev
f7797603a1
[P2] Fix oversight where hazards cannnot affect Pokemon that set it (#4693)
Fixes #935
2024-10-21 11:03:12 -04:00
NightKev
966b07f62b
[Misc] Shiny overrides can now force Pokemon to not be shiny (#4699)
Also fixes random shinies breaking tests
2024-10-21 11:00:58 -04:00
innerthunder
f51814467a
[P3] Fix mistimed sound effect in LearnMovePhase (#4698) 2024-10-21 10:59:23 -04:00
MokaStitcher
92e2968280 Fix fiery fallout missing argument 2024-10-21 15:36:56 +02:00
MokaStitcher
d9f7c27ff1 update locale repo to latest commit 2024-10-21 15:23:11 +02:00
MokaStitcher
40a4deec72 revert 'revert item atlas' 2024-10-21 14:23:23 +02:00
MokaStitcher
52c74591c6 eslint 2024-10-21 14:06:22 +02:00
MokaStitcher
4846722630 Merge branch 'beta' into 'ME balance changes' 2024-10-21 14:02:34 +02:00
MokaStitcher
b06276a6c6 revert item atlas changes 2024-10-21 13:10:06 +02:00
MokaStitcher
69e8b49e79 Merge branch 'beta' (pre ME bugfixes) in 'ME balance changes' 2024-10-21 13:05:56 +02:00
NightKev
b76e54fe7f
Replace duplicate code with getDoubleBattleChance() (#4690) 2024-10-21 02:29:21 -07:00
Lugiad
75a114a89f
[Localization][UI/UX] emerald-pro font update (#4697)
* Add files via upload

* Delete public/fonts/pokemon-emerald-pro.ttf

* Rename pokemon-emerald-pro2.ttf to pokemon-emerald-pro.ttf
2024-10-20 22:45:12 -04:00
MokaStitcher
e6c06d57be
[P All][Bug] Various ME bugfixes (copy) (#4695)
* Mystery Encounter bugfixes

* more ME bug fixes

* update allowed pokemon in ME requirements

* some unit test cleanup and general tidying

* fix null exception on isBattleMysteryEncounter

* clean up tsdocs and fix pokemon hasAbility check

* fix double battle crash in challenge mode with a single eligible pokemon

* apply suggestions from PR#4619's code reviews

* revert fix for Keldeo crashes + implement fix suggestion from PR #4619

* fix session migration for PokemonCustomData

* prevent test failure due to keldeo fix

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-10-20 22:55:07 +01:00
NightKev
39abac65be
Add eslint rule to enforce indenting of case statements (#4692) 2024-10-20 02:44:36 +01:00
Frederico Santos
5c70ab238e
Merge pull request #4684 from pagefaultgames/main
Main -> Beta
2024-10-18 21:53:21 +01:00
PigeonBar
de64fd7720
[Misc] [Beta] Fix crash when loading save preview with Mystery Encounter Override active (#4683) 2024-10-17 23:52:46 -04:00
ImperialSympathizer
3a0084b517
Update src/modifier/modifier.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-17 14:58:45 -04:00
ImperialSympathizer
a764134d56
Update src/modifier/modifier.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-17 14:58:39 -04:00
ImperialSympathizer
a386e2b93a
Update src/phases/select-modifier-phase.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-17 14:58:32 -04:00
ImperialSympathizer
759a301fd9
Update src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-17 14:58:14 -04:00
MokaStitcher
c5b3220b86
[Beta P3][UI] Fix item/cursor placement in reward screen (#4678) 2024-10-17 13:46:51 -04:00
Mumble
2f212f52eb
fixed effectChanceOVerrride location + removed ability tags (#4677)
Co-authored-by: frutescens <info@laptop>
2024-10-16 23:31:30 -07:00
Amani H.
85b8ca6467
[Dev] Bump Game Version, Overhaul Version Migration (#4388)
* Bump Version, Remove "Outdated" Message

* Fix `src/ui/ui.ts`

* Fix `src/system/game-data.ts`

* Clean Up & Organize Version Migration

* Rename Methods & Session Migration Adjustment

* Collapse Version Migrators to Single File as Arrays

* Address NITs

* Restructure Migration Initialization

* Fix Spacing, Increment to v1.6.0

* Revert Back to v1.1.0

* Add `gameVersion` to Mocked Game

* Add More Documentation

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-17 00:48:28 +01:00
Madmadness65
afebecd43c
[P2 Bug] Fix pool entry for Jynx not using baby species (#4675) 2024-10-16 17:16:10 -05:00
NightKev
d92d63e81f
[Misc] Restore info comment that was accidentally removed (#4674) 2024-10-16 16:10:19 -04:00
AJ Fontaine
d5fee37868
[Refactor] Add friendship related constants (#4657)
* Add constants for friendship

* Absolute path in battle-scene.ts

* Address nits

* Apply negative to constant
2024-10-16 14:55:23 -04:00